diff --git a/src/main/java/com/bonus/aqgqj/basis/entity/vo/TestVo.java b/src/main/java/com/bonus/aqgqj/basis/entity/vo/TestVo.java index 40653ba..4d68d05 100644 --- a/src/main/java/com/bonus/aqgqj/basis/entity/vo/TestVo.java +++ b/src/main/java/com/bonus/aqgqj/basis/entity/vo/TestVo.java @@ -188,6 +188,7 @@ public class TestVo { /** * 试验设备 */ + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) private List deviceVos; /** diff --git a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java index b85b383..1d85d05 100644 --- a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java @@ -242,15 +242,11 @@ public class ExperimentStandardServiceImpl implements ExperimentStandardService */ public String validatorsParams(String value) { try { - // 试验配置项、试验依据、试验设备、主要试验设备验证数据是否为空 + // 试验配置项、试验依据、主要试验设备验证数据是否为空 JSONObject obj = JSONObject.parseObject(value); JSONArray itemsList = obj.getJSONArray("items"); JSONArray yjList = obj.getJSONArray("yjList"); - JSONArray devList = obj.getJSONArray("devList"); JSONArray mainDevList = obj.getJSONArray("mainDevList"); - if (CollectionUtils.isEmpty(devList)) { - return Constants.ERROR_1; - } if (CollectionUtils.isEmpty(mainDevList)) { return Constants.ERROR_2; } diff --git a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java index f01f470..c3244b3 100644 --- a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentalServiceImpl.java @@ -100,10 +100,9 @@ public class ExperimentalServiceImpl implements ExperimentalService { if (vo.getConfigId() == null) { return ServerResponse.createByErrorMsg(HttpStatus.ERROR, "未配置该设备类型的试验标准,请先配置"); } - // 查询收样设备、试验配置依据、试验设备、试验主要设备、试验项信息 + // 查询收样设备、试验配置依据、试验主要设备、试验项信息 List sampleDeviceVos = mapper.getSampleDeviceVos(dto); List basisVos = standardMapper.getExperBasis(vo.getConfigId()); - List deviceVos = standardMapper.getConfigDev(vo.getConfigId()); List mainDevVos = standardMapper.getConfigMainDev(vo.getConfigId()); List configItemsVos = standardMapper.getConfigItems(vo.getConfigId()); for (ConfigItemsVo configItemsVo : configItemsVos) { @@ -112,7 +111,6 @@ public class ExperimentalServiceImpl implements ExperimentalService { } vo.setSampleDeviceVos(sampleDeviceVos); vo.setBasisVos(basisVos); - vo.setDeviceVos(deviceVos); vo.setMainDeviceVos(mainDevVos); vo.setConfigItemsVos(configItemsVos); } catch (Exception e) { @@ -144,15 +142,13 @@ public class ExperimentalServiceImpl implements ExperimentalService { if (testVo == null) { return ServerResponse.createByErrorMsg(HttpStatus.ERROR, "参数异常"); } - // 试验设备、试验主要设备、试验依据、试验项校验 + // 试验主要设备、试验依据、试验项校验 String result2 = singleValidators(testVo); if (StringUtils.isNotBlank(result2)) { return ServerResponse.createByErrorMsg(HttpStatus.ERROR, result2); } // 添加试验信息数据 mapper.addExper(vo); - // 添加试验设备数据 - mapper.addExperConfigDev(vo.getDeviceVos(), vo.getId()); // 添加试验依据信息数据 mapper.addConfigBasis(vo.getBasisVos(), vo.getId()); for (int i = 0; i < vo.getExperDevVos().size(); i++) { @@ -222,16 +218,15 @@ public class ExperimentalServiceImpl implements ExperimentalService { if (testVo == null) { return ServerResponse.createByErrorMsg(HttpStatus.ERROR, "参数异常"); } - // 试验设备、试验主要设备、试验依据、试验项校验 + // 试验主要设备、试验依据、试验项校验 String result2 = singleValidators(testVo); if (StringUtils.isNotBlank(result2)) { return ServerResponse.createByErrorMsg(HttpStatus.ERROR, result2); } - // 删除试验依据、试验设备、试验样品设备、设备试验项信息、设备试验项数据 + // 删除试验依据、试验样品设备、设备试验项信息、设备试验项数据 List experDevIds = mapper.getExperDevIds(vo.getId()); List experDevItemsIds = mapper.getExperDevItems(experDevIds); mapper.delConfigBasis(vo.getId()); - mapper.delExperConfigDev(vo.getId()); mapper.delExperDev(vo.getId()); mapper.delExperDevItems(experDevIds); mapper.delExperDevItem(experDevItemsIds); @@ -265,12 +260,11 @@ public class ExperimentalServiceImpl implements ExperimentalService { @Transactional(rollbackFor = Exception.class) public ServerResponse delTestData(ParamsDto dto) { try { - // 删除试验依据、试验设备、试验样品设备、设备试验项信息、设备试验项数据、试验项、试验项内容、试验信息 + // 删除试验依据、试验样品设备、设备试验项信息、设备试验项数据、试验项、试验项内容、试验信息 List experDevIds = mapper.getExperDevIds(dto.getId()); List experDevItemsIds = mapper.getExperDevItems(experDevIds); List experItemsIds = mapper.getExperItemsIds(dto.getId()); mapper.delConfigBasis(dto.getId()); - mapper.delExperConfigDev(dto.getId()); mapper.delExperDev(dto.getId()); mapper.delExperDevItems(experDevIds); mapper.delExperDevItem(experDevItemsIds); @@ -294,7 +288,7 @@ public class ExperimentalServiceImpl implements ExperimentalService { } // 试验数据详情 testVo = mapper.viewTestData(dto); - //试验依据信息、试验设备、试验项、试验项目信息、试验样品设备 + //试验依据信息、试验项、试验项目信息、试验样品设备 ConfigMainDevVo configMainDevVo = new ConfigMainDevVo(); configMainDevVo.setExperDevName(testVo.getExperDev()); configMainDevVo.setExperDevModule(testVo.getExperModule()); @@ -303,7 +297,6 @@ public class ExperimentalServiceImpl implements ExperimentalService { List configMainDevVos = new ArrayList<>(); configMainDevVos.add(configMainDevVo); List experBasisVos = mapper.getConfigBasis(dto); - List experConfigDevs = mapper.getExperConfigDevs(dto); List configItemsVos = mapper.getExperItems(dto); for (ConfigItemsVo configItemsVo : configItemsVos) { List configItemVos = mapper.getExperItem(configItemsVo.getId()); @@ -312,7 +305,6 @@ public class ExperimentalServiceImpl implements ExperimentalService { List experDevVos = mapper.getExperDev(dto); testVo.setMainDeviceVos(configMainDevVos); testVo.setBasisVos(experBasisVos); - testVo.setDeviceVos(experConfigDevs); testVo.setConfigItemsVos(configItemsVos); testVo.setExperDevVos(experDevVos); return ServerResponse.createSuccess(testVo); @@ -361,16 +353,12 @@ public class ExperimentalServiceImpl implements ExperimentalService { */ public String validatorsParams(String value) { try { - // 试验配置项、试验依据、试验设备、主要试验设备、样品设备验证数据是否为空 + // 试验配置项、试验依据、主要试验设备、样品设备验证数据是否为空 JSONObject obj = JSONObject.parseObject(value); JSONArray itemsList = obj.getJSONArray("items"); JSONArray yjList = obj.getJSONArray("yjList"); - JSONArray devList = obj.getJSONArray("devList"); JSONArray mainDevList = obj.getJSONArray("mainDevList"); JSONArray experDevList = obj.getJSONArray("experDevList"); - if (CollectionUtils.isEmpty(devList)) { - return Constants.ERROR_1; - } if (CollectionUtils.isEmpty(mainDevList)) { return Constants.ERROR_2; } @@ -443,17 +431,10 @@ public class ExperimentalServiceImpl implements ExperimentalService { * @date 2024/7/18 19:17 */ public String singleValidators(TestVo vo) { - List deviceVos = vo.getDeviceVos(); List mainDeviceVos = vo.getMainDeviceVos(); List basisVos = vo.getBasisVos(); List configItemsVos = vo.getConfigItemsVos(); List experDevVos = vo.getExperDevVos(); - for (ConfigDevVo deviceVo : deviceVos) { - String validResult = validatorsUtils.valid(deviceVo, ConfigDevVo.Query.class); - if (StringUtils.isNotBlank(validResult)) { - return validResult; - } - } for (ConfigMainDevVo mainDeviceVo : mainDeviceVos) { String validResult = validatorsUtils.valid(mainDeviceVo, ConfigMainDevVo.Query.class); if (StringUtils.isNotBlank(validResult)) {