diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 1fc46fa..41ae3c1 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 com.github.oshi diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 1fc46fa..41ae3c1 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java index 33d2f6b..1b4ece9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java @@ -17,4 +17,9 @@ String REMIND_CHECK_STATUS_BIZ_DELIVER = "1"; String REMIND_CHECK_STATUS_SUB_DELIVER = "2"; + + String USE_SIGN_MAIN = "0"; // 在用信息-在用 + + String USE_SIGN_SLAVE = "1"; // 在用信息-备用 + } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 1fc46fa..41ae3c1 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java index 33d2f6b..1b4ece9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java @@ -17,4 +17,9 @@ String REMIND_CHECK_STATUS_BIZ_DELIVER = "1"; String REMIND_CHECK_STATUS_SUB_DELIVER = "2"; + + String USE_SIGN_MAIN = "0"; // 在用信息-在用 + + String USE_SIGN_SLAVE = "1"; // 在用信息-备用 + } diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 561281e..797532f 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 1fc46fa..41ae3c1 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java index 33d2f6b..1b4ece9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java @@ -17,4 +17,9 @@ String REMIND_CHECK_STATUS_BIZ_DELIVER = "1"; String REMIND_CHECK_STATUS_SUB_DELIVER = "2"; + + String USE_SIGN_MAIN = "0"; // 在用信息-在用 + + String USE_SIGN_SLAVE = "1"; // 在用信息-备用 + } diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 561281e..797532f 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java index 0448ebd..3965846 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java @@ -27,7 +27,7 @@ Integer checkRfid(@Param("rfid")String rfid,@Param("equipmentId")Long equipmentId); String checkLocation(@Param("installLocationId")Long installLocationId, - @Param("usageStatus")String usageStatus, + @Param("useSign")String useSign, @Param("equipmentId")Long equipmentId); Integer checkInfo(@Param("modelId")Long modelId, diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 1fc46fa..41ae3c1 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java index 33d2f6b..1b4ece9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java @@ -17,4 +17,9 @@ String REMIND_CHECK_STATUS_BIZ_DELIVER = "1"; String REMIND_CHECK_STATUS_SUB_DELIVER = "2"; + + String USE_SIGN_MAIN = "0"; // 在用信息-在用 + + String USE_SIGN_SLAVE = "1"; // 在用信息-备用 + } diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 561281e..797532f 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java index 0448ebd..3965846 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java @@ -27,7 +27,7 @@ Integer checkRfid(@Param("rfid")String rfid,@Param("equipmentId")Long equipmentId); String checkLocation(@Param("installLocationId")Long installLocationId, - @Param("usageStatus")String usageStatus, + @Param("useSign")String useSign, @Param("equipmentId")Long equipmentId); Integer checkInfo(@Param("modelId")Long modelId, diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index c361369..4c86d23 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -56,6 +56,9 @@ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization") List listCheckOrganization(); + @Select("SELECT DISTINCT rfid FROM `eqpt_equipment_info` where is_del = '0' and rfid is not NULL and rfid != ''") + List listRfids(); + void truncateRemindTemp(); void insertRemindTemp(); diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 1fc46fa..41ae3c1 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java index 33d2f6b..1b4ece9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java @@ -17,4 +17,9 @@ String REMIND_CHECK_STATUS_BIZ_DELIVER = "1"; String REMIND_CHECK_STATUS_SUB_DELIVER = "2"; + + String USE_SIGN_MAIN = "0"; // 在用信息-在用 + + String USE_SIGN_SLAVE = "1"; // 在用信息-备用 + } diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 561281e..797532f 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java index 0448ebd..3965846 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java @@ -27,7 +27,7 @@ Integer checkRfid(@Param("rfid")String rfid,@Param("equipmentId")Long equipmentId); String checkLocation(@Param("installLocationId")Long installLocationId, - @Param("usageStatus")String usageStatus, + @Param("useSign")String useSign, @Param("equipmentId")Long equipmentId); Integer checkInfo(@Param("modelId")Long modelId, diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index c361369..4c86d23 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -56,6 +56,9 @@ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization") List listCheckOrganization(); + @Select("SELECT DISTINCT rfid FROM `eqpt_equipment_info` where is_del = '0' and rfid is not NULL and rfid != ''") + List listRfids(); + void truncateRemindTemp(); void insertRemindTemp(); diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml index bb2627d..8e20a9d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml @@ -122,10 +122,10 @@ with r2 as ( - select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0 + select id,install_location_id, use_sign, manufacture_no from eqpt_equipment_info where is_del = 0 ), r1 as ( - select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no + select t.equipment_id, t.install_location_id, t.use_sign, t.manufacture_no from eqpt_equipment_info_approval t where approval_status = '3' and approval_type != 3), r as (select * @@ -136,7 +136,7 @@ select DISTINCT manufacture_no from r - where install_location_id = #{installLocationId} and usage_status = #{usageStatus} + where install_location_id = #{installLocationId} and use_sign = #{useSign} and equipment_id != #{equipmentId} diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index a627a8c..2ef509d 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-job - 1.3.3.2 + 1.3.4.0 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 1fc46fa..41ae3c1 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java index 33d2f6b..1b4ece9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java @@ -17,4 +17,9 @@ String REMIND_CHECK_STATUS_BIZ_DELIVER = "1"; String REMIND_CHECK_STATUS_SUB_DELIVER = "2"; + + String USE_SIGN_MAIN = "0"; // 在用信息-在用 + + String USE_SIGN_SLAVE = "1"; // 在用信息-备用 + } diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 561281e..797532f 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java index 0448ebd..3965846 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java @@ -27,7 +27,7 @@ Integer checkRfid(@Param("rfid")String rfid,@Param("equipmentId")Long equipmentId); String checkLocation(@Param("installLocationId")Long installLocationId, - @Param("usageStatus")String usageStatus, + @Param("useSign")String useSign, @Param("equipmentId")Long equipmentId); Integer checkInfo(@Param("modelId")Long modelId, diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index c361369..4c86d23 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -56,6 +56,9 @@ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization") List listCheckOrganization(); + @Select("SELECT DISTINCT rfid FROM `eqpt_equipment_info` where is_del = '0' and rfid is not NULL and rfid != ''") + List listRfids(); + void truncateRemindTemp(); void insertRemindTemp(); diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml index bb2627d..8e20a9d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml @@ -122,10 +122,10 @@ with r2 as ( - select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0 + select id,install_location_id, use_sign, manufacture_no from eqpt_equipment_info where is_del = 0 ), r1 as ( - select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no + select t.equipment_id, t.install_location_id, t.use_sign, t.manufacture_no from eqpt_equipment_info_approval t where approval_status = '3' and approval_type != 3), r as (select * @@ -136,7 +136,7 @@ select DISTINCT manufacture_no from r - where install_location_id = #{installLocationId} and usage_status = #{usageStatus} + where install_location_id = #{installLocationId} and use_sign = #{useSign} and equipment_id != #{equipmentId} diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index a627a8c..2ef509d 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-job - 1.3.3.2 + 1.3.4.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java index e80f6ec..2442951 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java @@ -1,5 +1,7 @@ package com.casic.missiles.controller.system; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; @@ -70,4 +72,18 @@ return ReturnUtil.success(); } + @ApiOperation("批量添加") + @PostMapping("batchAdd") + @ResponseBody + public ReturnDTO batchAdd(@RequestBody List rfids){ + List existList = rfidService.batchAdd(rfids); + Integer successCount = rfids.size() - existList.size(); + if(CollUtil.isEmpty(existList) || existList.size() <= 0){ + return ReturnUtil.success(StrUtil.format("成功添加{}个标签",successCount)); + }else { + return ReturnUtil.failed(StrUtil.format("添加{}个标签，标签{}已存在",successCount,StrUtil.join("、",existList))); + } + } + + } diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 1a6ea8a..1515f77 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-dao - 1.3.3.2 + 1.3.4.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.3.2 + 1.3.4.0 compile diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 1fc46fa..41ae3c1 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java index 33d2f6b..1b4ece9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java @@ -17,4 +17,9 @@ String REMIND_CHECK_STATUS_BIZ_DELIVER = "1"; String REMIND_CHECK_STATUS_SUB_DELIVER = "2"; + + String USE_SIGN_MAIN = "0"; // 在用信息-在用 + + String USE_SIGN_SLAVE = "1"; // 在用信息-备用 + } diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 561281e..797532f 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java index 0448ebd..3965846 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java @@ -27,7 +27,7 @@ Integer checkRfid(@Param("rfid")String rfid,@Param("equipmentId")Long equipmentId); String checkLocation(@Param("installLocationId")Long installLocationId, - @Param("usageStatus")String usageStatus, + @Param("useSign")String useSign, @Param("equipmentId")Long equipmentId); Integer checkInfo(@Param("modelId")Long modelId, diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index c361369..4c86d23 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -56,6 +56,9 @@ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization") List listCheckOrganization(); + @Select("SELECT DISTINCT rfid FROM `eqpt_equipment_info` where is_del = '0' and rfid is not NULL and rfid != ''") + List listRfids(); + void truncateRemindTemp(); void insertRemindTemp(); diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml index bb2627d..8e20a9d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml @@ -122,10 +122,10 @@ with r2 as ( - select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0 + select id,install_location_id, use_sign, manufacture_no from eqpt_equipment_info where is_del = 0 ), r1 as ( - select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no + select t.equipment_id, t.install_location_id, t.use_sign, t.manufacture_no from eqpt_equipment_info_approval t where approval_status = '3' and approval_type != 3), r as (select * @@ -136,7 +136,7 @@ select DISTINCT manufacture_no from r - where install_location_id = #{installLocationId} and usage_status = #{usageStatus} + where install_location_id = #{installLocationId} and use_sign = #{useSign} and equipment_id != #{equipmentId} diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index a627a8c..2ef509d 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-job - 1.3.3.2 + 1.3.4.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java index e80f6ec..2442951 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java @@ -1,5 +1,7 @@ package com.casic.missiles.controller.system; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; @@ -70,4 +72,18 @@ return ReturnUtil.success(); } + @ApiOperation("批量添加") + @PostMapping("batchAdd") + @ResponseBody + public ReturnDTO batchAdd(@RequestBody List rfids){ + List existList = rfidService.batchAdd(rfids); + Integer successCount = rfids.size() - existList.size(); + if(CollUtil.isEmpty(existList) || existList.size() <= 0){ + return ReturnUtil.success(StrUtil.format("成功添加{}个标签",successCount)); + }else { + return ReturnUtil.failed(StrUtil.format("添加{}个标签，标签{}已存在",successCount,StrUtil.join("、",existList))); + } + } + + } diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 1a6ea8a..1515f77 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-dao - 1.3.3.2 + 1.3.4.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.3.2 + 1.3.4.0 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index d55f138..881c300 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java index 0d54a68..570bc86 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java @@ -172,7 +172,7 @@ @ApiModelProperty(value = "现场检定时间", dataType = "String") @TableField("on_site_check_time") - private Date onSiteCheckTime; + private String onSiteCheckTime; /** * 流程实例id diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 1fc46fa..41ae3c1 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java index 33d2f6b..1b4ece9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java @@ -17,4 +17,9 @@ String REMIND_CHECK_STATUS_BIZ_DELIVER = "1"; String REMIND_CHECK_STATUS_SUB_DELIVER = "2"; + + String USE_SIGN_MAIN = "0"; // 在用信息-在用 + + String USE_SIGN_SLAVE = "1"; // 在用信息-备用 + } diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 561281e..797532f 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java index 0448ebd..3965846 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java @@ -27,7 +27,7 @@ Integer checkRfid(@Param("rfid")String rfid,@Param("equipmentId")Long equipmentId); String checkLocation(@Param("installLocationId")Long installLocationId, - @Param("usageStatus")String usageStatus, + @Param("useSign")String useSign, @Param("equipmentId")Long equipmentId); Integer checkInfo(@Param("modelId")Long modelId, diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index c361369..4c86d23 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -56,6 +56,9 @@ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization") List listCheckOrganization(); + @Select("SELECT DISTINCT rfid FROM `eqpt_equipment_info` where is_del = '0' and rfid is not NULL and rfid != ''") + List listRfids(); + void truncateRemindTemp(); void insertRemindTemp(); diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml index bb2627d..8e20a9d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml @@ -122,10 +122,10 @@ with r2 as ( - select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0 + select id,install_location_id, use_sign, manufacture_no from eqpt_equipment_info where is_del = 0 ), r1 as ( - select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no + select t.equipment_id, t.install_location_id, t.use_sign, t.manufacture_no from eqpt_equipment_info_approval t where approval_status = '3' and approval_type != 3), r as (select * @@ -136,7 +136,7 @@ select DISTINCT manufacture_no from r - where install_location_id = #{installLocationId} and usage_status = #{usageStatus} + where install_location_id = #{installLocationId} and use_sign = #{useSign} and equipment_id != #{equipmentId} diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index a627a8c..2ef509d 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-job - 1.3.3.2 + 1.3.4.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java index e80f6ec..2442951 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java @@ -1,5 +1,7 @@ package com.casic.missiles.controller.system; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; @@ -70,4 +72,18 @@ return ReturnUtil.success(); } + @ApiOperation("批量添加") + @PostMapping("batchAdd") + @ResponseBody + public ReturnDTO batchAdd(@RequestBody List rfids){ + List existList = rfidService.batchAdd(rfids); + Integer successCount = rfids.size() - existList.size(); + if(CollUtil.isEmpty(existList) || existList.size() <= 0){ + return ReturnUtil.success(StrUtil.format("成功添加{}个标签",successCount)); + }else { + return ReturnUtil.failed(StrUtil.format("添加{}个标签，标签{}已存在",successCount,StrUtil.join("、",existList))); + } + } + + } diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 1a6ea8a..1515f77 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-dao - 1.3.3.2 + 1.3.4.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.3.2 + 1.3.4.0 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index d55f138..881c300 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java index 0d54a68..570bc86 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java @@ -172,7 +172,7 @@ @ApiModelProperty(value = "现场检定时间", dataType = "String") @TableField("on_site_check_time") - private Date onSiteCheckTime; + private String onSiteCheckTime; /** * 流程实例id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java index a788523..75c39dd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java @@ -8,10 +8,8 @@ import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; + import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @@ -205,7 +203,7 @@ * 备注 */ @ApiModelProperty(value = "备注",notes = "备注") - @TableField("remark") + @TableField(value = "remark",updateStrategy = FieldStrategy.IGNORED) @ExcelProperty(value = "备注",index = 9) private String remark; @@ -252,7 +250,7 @@ private String meterIdentifyName; @ApiModelProperty(value = "使用岗位id",notes = "使用岗位id") - @TableField("use_position_id") + @TableField(value = "use_position_id",updateStrategy = FieldStrategy.IGNORED) private Long usePositionId; /** @@ -296,7 +294,7 @@ private String useSignName; @ApiModelProperty(value = "安装位置id",notes = "安装位置id") - @TableField("install_location_id") + @TableField(value = "install_location_id",updateStrategy = FieldStrategy.IGNORED) private Long installLocationId; /** @@ -310,7 +308,7 @@ * 安装位置(自定义编写) */ @ApiModelProperty(value = "安装位置(自定义编写)",notes = "详细位置") - @TableField("install_location_ext") + @TableField(value = "install_location_ext",updateStrategy = FieldStrategy.IGNORED) private String installLocationExt; /** @@ -324,7 +322,7 @@ * 备注(扩展) */ @ApiModelProperty(value = "备注(扩展)",notes = "备注") - @TableField("remark_ext") + @TableField(value = "remark_ext",updateStrategy = FieldStrategy.IGNORED) private String remarkExt; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java index 7eb2168..04cb79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java @@ -136,7 +136,7 @@ @ApiModelProperty(value = "现场检定时间", dataType = "String") @TableField("on_site_check_time") - private Date onSiteCheckTime; + private String onSiteCheckTime; /** * 创建人部门id diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 1fc46fa..41ae3c1 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java index 33d2f6b..1b4ece9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java @@ -17,4 +17,9 @@ String REMIND_CHECK_STATUS_BIZ_DELIVER = "1"; String REMIND_CHECK_STATUS_SUB_DELIVER = "2"; + + String USE_SIGN_MAIN = "0"; // 在用信息-在用 + + String USE_SIGN_SLAVE = "1"; // 在用信息-备用 + } diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 561281e..797532f 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java index 0448ebd..3965846 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java @@ -27,7 +27,7 @@ Integer checkRfid(@Param("rfid")String rfid,@Param("equipmentId")Long equipmentId); String checkLocation(@Param("installLocationId")Long installLocationId, - @Param("usageStatus")String usageStatus, + @Param("useSign")String useSign, @Param("equipmentId")Long equipmentId); Integer checkInfo(@Param("modelId")Long modelId, diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index c361369..4c86d23 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -56,6 +56,9 @@ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization") List listCheckOrganization(); + @Select("SELECT DISTINCT rfid FROM `eqpt_equipment_info` where is_del = '0' and rfid is not NULL and rfid != ''") + List listRfids(); + void truncateRemindTemp(); void insertRemindTemp(); diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml index bb2627d..8e20a9d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml @@ -122,10 +122,10 @@ with r2 as ( - select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0 + select id,install_location_id, use_sign, manufacture_no from eqpt_equipment_info where is_del = 0 ), r1 as ( - select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no + select t.equipment_id, t.install_location_id, t.use_sign, t.manufacture_no from eqpt_equipment_info_approval t where approval_status = '3' and approval_type != 3), r as (select * @@ -136,7 +136,7 @@ select DISTINCT manufacture_no from r - where install_location_id = #{installLocationId} and usage_status = #{usageStatus} + where install_location_id = #{installLocationId} and use_sign = #{useSign} and equipment_id != #{equipmentId} diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index a627a8c..2ef509d 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-job - 1.3.3.2 + 1.3.4.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java index e80f6ec..2442951 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java @@ -1,5 +1,7 @@ package com.casic.missiles.controller.system; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; @@ -70,4 +72,18 @@ return ReturnUtil.success(); } + @ApiOperation("批量添加") + @PostMapping("batchAdd") + @ResponseBody + public ReturnDTO batchAdd(@RequestBody List rfids){ + List existList = rfidService.batchAdd(rfids); + Integer successCount = rfids.size() - existList.size(); + if(CollUtil.isEmpty(existList) || existList.size() <= 0){ + return ReturnUtil.success(StrUtil.format("成功添加{}个标签",successCount)); + }else { + return ReturnUtil.failed(StrUtil.format("添加{}个标签，标签{}已存在",successCount,StrUtil.join("、",existList))); + } + } + + } diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 1a6ea8a..1515f77 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-dao - 1.3.3.2 + 1.3.4.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.3.2 + 1.3.4.0 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index d55f138..881c300 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java index 0d54a68..570bc86 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java @@ -172,7 +172,7 @@ @ApiModelProperty(value = "现场检定时间", dataType = "String") @TableField("on_site_check_time") - private Date onSiteCheckTime; + private String onSiteCheckTime; /** * 流程实例id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java index a788523..75c39dd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java @@ -8,10 +8,8 @@ import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; + import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @@ -205,7 +203,7 @@ * 备注 */ @ApiModelProperty(value = "备注",notes = "备注") - @TableField("remark") + @TableField(value = "remark",updateStrategy = FieldStrategy.IGNORED) @ExcelProperty(value = "备注",index = 9) private String remark; @@ -252,7 +250,7 @@ private String meterIdentifyName; @ApiModelProperty(value = "使用岗位id",notes = "使用岗位id") - @TableField("use_position_id") + @TableField(value = "use_position_id",updateStrategy = FieldStrategy.IGNORED) private Long usePositionId; /** @@ -296,7 +294,7 @@ private String useSignName; @ApiModelProperty(value = "安装位置id",notes = "安装位置id") - @TableField("install_location_id") + @TableField(value = "install_location_id",updateStrategy = FieldStrategy.IGNORED) private Long installLocationId; /** @@ -310,7 +308,7 @@ * 安装位置(自定义编写) */ @ApiModelProperty(value = "安装位置(自定义编写)",notes = "详细位置") - @TableField("install_location_ext") + @TableField(value = "install_location_ext",updateStrategy = FieldStrategy.IGNORED) private String installLocationExt; /** @@ -324,7 +322,7 @@ * 备注(扩展) */ @ApiModelProperty(value = "备注(扩展)",notes = "备注") - @TableField("remark_ext") + @TableField(value = "remark_ext",updateStrategy = FieldStrategy.IGNORED) private String remarkExt; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java index 7eb2168..04cb79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java @@ -136,7 +136,7 @@ @ApiModelProperty(value = "现场检定时间", dataType = "String") @TableField("on_site_check_time") - private Date onSiteCheckTime; + private String onSiteCheckTime; /** * 创建人部门id diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index dd0fec3..1bad8bc 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-common - 1.3.3.2 + 1.3.4.0 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java b/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java index 9833ae1..4576f6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java @@ -126,8 +126,8 @@ JSONObject item = res.getJSONObject(i); String filedName = equipmentInfoService.getFieldName(item.getString("field")); if(StrUtil.isNotBlank(filedName)){ - String oldValue = equipmentInfoService.getFieldValue(item.getString("field"),item.getString("oldVal")); - String newValue = equipmentInfoService.getFieldValue(item.getString("field"),item.getString("newVal")); + String oldValue = equipmentInfoService.getFieldValue(item.getString("field"),item.get("oldVal")); + String newValue = equipmentInfoService.getFieldValue(item.getString("field"),item.get("newVal")); String msg = String.format("[%s]由 %s 变更为 %s；\n\r",filedName, StrUtil.isNotBlank(oldValue) ? oldValue : "空值", diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 1fc46fa..41ae3c1 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java index 33d2f6b..1b4ece9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java @@ -17,4 +17,9 @@ String REMIND_CHECK_STATUS_BIZ_DELIVER = "1"; String REMIND_CHECK_STATUS_SUB_DELIVER = "2"; + + String USE_SIGN_MAIN = "0"; // 在用信息-在用 + + String USE_SIGN_SLAVE = "1"; // 在用信息-备用 + } diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 561281e..797532f 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java index 0448ebd..3965846 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java @@ -27,7 +27,7 @@ Integer checkRfid(@Param("rfid")String rfid,@Param("equipmentId")Long equipmentId); String checkLocation(@Param("installLocationId")Long installLocationId, - @Param("usageStatus")String usageStatus, + @Param("useSign")String useSign, @Param("equipmentId")Long equipmentId); Integer checkInfo(@Param("modelId")Long modelId, diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index c361369..4c86d23 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -56,6 +56,9 @@ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization") List listCheckOrganization(); + @Select("SELECT DISTINCT rfid FROM `eqpt_equipment_info` where is_del = '0' and rfid is not NULL and rfid != ''") + List listRfids(); + void truncateRemindTemp(); void insertRemindTemp(); diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml index bb2627d..8e20a9d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml @@ -122,10 +122,10 @@ with r2 as ( - select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0 + select id,install_location_id, use_sign, manufacture_no from eqpt_equipment_info where is_del = 0 ), r1 as ( - select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no + select t.equipment_id, t.install_location_id, t.use_sign, t.manufacture_no from eqpt_equipment_info_approval t where approval_status = '3' and approval_type != 3), r as (select * @@ -136,7 +136,7 @@ select DISTINCT manufacture_no from r - where install_location_id = #{installLocationId} and usage_status = #{usageStatus} + where install_location_id = #{installLocationId} and use_sign = #{useSign} and equipment_id != #{equipmentId} diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index a627a8c..2ef509d 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-job - 1.3.3.2 + 1.3.4.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java index e80f6ec..2442951 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java @@ -1,5 +1,7 @@ package com.casic.missiles.controller.system; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; @@ -70,4 +72,18 @@ return ReturnUtil.success(); } + @ApiOperation("批量添加") + @PostMapping("batchAdd") + @ResponseBody + public ReturnDTO batchAdd(@RequestBody List rfids){ + List existList = rfidService.batchAdd(rfids); + Integer successCount = rfids.size() - existList.size(); + if(CollUtil.isEmpty(existList) || existList.size() <= 0){ + return ReturnUtil.success(StrUtil.format("成功添加{}个标签",successCount)); + }else { + return ReturnUtil.failed(StrUtil.format("添加{}个标签，标签{}已存在",successCount,StrUtil.join("、",existList))); + } + } + + } diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 1a6ea8a..1515f77 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-dao - 1.3.3.2 + 1.3.4.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.3.2 + 1.3.4.0 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index d55f138..881c300 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java index 0d54a68..570bc86 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java @@ -172,7 +172,7 @@ @ApiModelProperty(value = "现场检定时间", dataType = "String") @TableField("on_site_check_time") - private Date onSiteCheckTime; + private String onSiteCheckTime; /** * 流程实例id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java index a788523..75c39dd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java @@ -8,10 +8,8 @@ import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; + import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @@ -205,7 +203,7 @@ * 备注 */ @ApiModelProperty(value = "备注",notes = "备注") - @TableField("remark") + @TableField(value = "remark",updateStrategy = FieldStrategy.IGNORED) @ExcelProperty(value = "备注",index = 9) private String remark; @@ -252,7 +250,7 @@ private String meterIdentifyName; @ApiModelProperty(value = "使用岗位id",notes = "使用岗位id") - @TableField("use_position_id") + @TableField(value = "use_position_id",updateStrategy = FieldStrategy.IGNORED) private Long usePositionId; /** @@ -296,7 +294,7 @@ private String useSignName; @ApiModelProperty(value = "安装位置id",notes = "安装位置id") - @TableField("install_location_id") + @TableField(value = "install_location_id",updateStrategy = FieldStrategy.IGNORED) private Long installLocationId; /** @@ -310,7 +308,7 @@ * 安装位置(自定义编写) */ @ApiModelProperty(value = "安装位置(自定义编写)",notes = "详细位置") - @TableField("install_location_ext") + @TableField(value = "install_location_ext",updateStrategy = FieldStrategy.IGNORED) private String installLocationExt; /** @@ -324,7 +322,7 @@ * 备注(扩展) */ @ApiModelProperty(value = "备注(扩展)",notes = "备注") - @TableField("remark_ext") + @TableField(value = "remark_ext",updateStrategy = FieldStrategy.IGNORED) private String remarkExt; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java index 7eb2168..04cb79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java @@ -136,7 +136,7 @@ @ApiModelProperty(value = "现场检定时间", dataType = "String") @TableField("on_site_check_time") - private Date onSiteCheckTime; + private String onSiteCheckTime; /** * 创建人部门id diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index dd0fec3..1bad8bc 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-common - 1.3.3.2 + 1.3.4.0 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java b/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java index 9833ae1..4576f6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java @@ -126,8 +126,8 @@ JSONObject item = res.getJSONObject(i); String filedName = equipmentInfoService.getFieldName(item.getString("field")); if(StrUtil.isNotBlank(filedName)){ - String oldValue = equipmentInfoService.getFieldValue(item.getString("field"),item.getString("oldVal")); - String newValue = equipmentInfoService.getFieldValue(item.getString("field"),item.getString("newVal")); + String oldValue = equipmentInfoService.getFieldValue(item.getString("field"),item.get("oldVal")); + String newValue = equipmentInfoService.getFieldValue(item.getString("field"),item.get("newVal")); String msg = String.format("[%s]由 %s 变更为 %s；\n\r",filedName, StrUtil.isNotBlank(oldValue) ? oldValue : "空值", diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoApprovalService.java index 222ebdd..d837713 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoApprovalService.java @@ -24,7 +24,7 @@ boolean checkRfidRepeat(String rfid, Long equipmentId); - String checkLocation(Long installLocationId, String usageStatus, Long equipmentId); + String checkLocation(Long installLocationId, String useSign, Long equipmentId); void saveTurnoverLog(EquipmentInfo newObj, EquipmentInfo oldObj, Long createUserId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java index 18dce15..cf81671 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java @@ -82,7 +82,7 @@ void bindTask(EquipmentTaskBindForm bindForm); String getFieldName(String field); - String getFieldValue(String field, String fieldValue); + String getFieldValue(String field, Object fieldValue); Page orderSelectListPage(Page page, EquipmentRemindQueryForm queryForm); @@ -91,4 +91,6 @@ List listCheckOrganization(); void updateCheckDestination(Long modelId); + + List listRfids(); } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 1fc46fa..41ae3c1 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java index 33d2f6b..1b4ece9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java @@ -17,4 +17,9 @@ String REMIND_CHECK_STATUS_BIZ_DELIVER = "1"; String REMIND_CHECK_STATUS_SUB_DELIVER = "2"; + + String USE_SIGN_MAIN = "0"; // 在用信息-在用 + + String USE_SIGN_SLAVE = "1"; // 在用信息-备用 + } diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 561281e..797532f 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java index 0448ebd..3965846 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java @@ -27,7 +27,7 @@ Integer checkRfid(@Param("rfid")String rfid,@Param("equipmentId")Long equipmentId); String checkLocation(@Param("installLocationId")Long installLocationId, - @Param("usageStatus")String usageStatus, + @Param("useSign")String useSign, @Param("equipmentId")Long equipmentId); Integer checkInfo(@Param("modelId")Long modelId, diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index c361369..4c86d23 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -56,6 +56,9 @@ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization") List listCheckOrganization(); + @Select("SELECT DISTINCT rfid FROM `eqpt_equipment_info` where is_del = '0' and rfid is not NULL and rfid != ''") + List listRfids(); + void truncateRemindTemp(); void insertRemindTemp(); diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml index bb2627d..8e20a9d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml @@ -122,10 +122,10 @@ with r2 as ( - select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0 + select id,install_location_id, use_sign, manufacture_no from eqpt_equipment_info where is_del = 0 ), r1 as ( - select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no + select t.equipment_id, t.install_location_id, t.use_sign, t.manufacture_no from eqpt_equipment_info_approval t where approval_status = '3' and approval_type != 3), r as (select * @@ -136,7 +136,7 @@ select DISTINCT manufacture_no from r - where install_location_id = #{installLocationId} and usage_status = #{usageStatus} + where install_location_id = #{installLocationId} and use_sign = #{useSign} and equipment_id != #{equipmentId} diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index a627a8c..2ef509d 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-job - 1.3.3.2 + 1.3.4.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java index e80f6ec..2442951 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java @@ -1,5 +1,7 @@ package com.casic.missiles.controller.system; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; @@ -70,4 +72,18 @@ return ReturnUtil.success(); } + @ApiOperation("批量添加") + @PostMapping("batchAdd") + @ResponseBody + public ReturnDTO batchAdd(@RequestBody List rfids){ + List existList = rfidService.batchAdd(rfids); + Integer successCount = rfids.size() - existList.size(); + if(CollUtil.isEmpty(existList) || existList.size() <= 0){ + return ReturnUtil.success(StrUtil.format("成功添加{}个标签",successCount)); + }else { + return ReturnUtil.failed(StrUtil.format("添加{}个标签，标签{}已存在",successCount,StrUtil.join("、",existList))); + } + } + + } diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 1a6ea8a..1515f77 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-dao - 1.3.3.2 + 1.3.4.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.3.2 + 1.3.4.0 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index d55f138..881c300 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java index 0d54a68..570bc86 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java @@ -172,7 +172,7 @@ @ApiModelProperty(value = "现场检定时间", dataType = "String") @TableField("on_site_check_time") - private Date onSiteCheckTime; + private String onSiteCheckTime; /** * 流程实例id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java index a788523..75c39dd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java @@ -8,10 +8,8 @@ import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; + import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @@ -205,7 +203,7 @@ * 备注 */ @ApiModelProperty(value = "备注",notes = "备注") - @TableField("remark") + @TableField(value = "remark",updateStrategy = FieldStrategy.IGNORED) @ExcelProperty(value = "备注",index = 9) private String remark; @@ -252,7 +250,7 @@ private String meterIdentifyName; @ApiModelProperty(value = "使用岗位id",notes = "使用岗位id") - @TableField("use_position_id") + @TableField(value = "use_position_id",updateStrategy = FieldStrategy.IGNORED) private Long usePositionId; /** @@ -296,7 +294,7 @@ private String useSignName; @ApiModelProperty(value = "安装位置id",notes = "安装位置id") - @TableField("install_location_id") + @TableField(value = "install_location_id",updateStrategy = FieldStrategy.IGNORED) private Long installLocationId; /** @@ -310,7 +308,7 @@ * 安装位置(自定义编写) */ @ApiModelProperty(value = "安装位置(自定义编写)",notes = "详细位置") - @TableField("install_location_ext") + @TableField(value = "install_location_ext",updateStrategy = FieldStrategy.IGNORED) private String installLocationExt; /** @@ -324,7 +322,7 @@ * 备注(扩展) */ @ApiModelProperty(value = "备注(扩展)",notes = "备注") - @TableField("remark_ext") + @TableField(value = "remark_ext",updateStrategy = FieldStrategy.IGNORED) private String remarkExt; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java index 7eb2168..04cb79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java @@ -136,7 +136,7 @@ @ApiModelProperty(value = "现场检定时间", dataType = "String") @TableField("on_site_check_time") - private Date onSiteCheckTime; + private String onSiteCheckTime; /** * 创建人部门id diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index dd0fec3..1bad8bc 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-common - 1.3.3.2 + 1.3.4.0 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java b/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java index 9833ae1..4576f6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java @@ -126,8 +126,8 @@ JSONObject item = res.getJSONObject(i); String filedName = equipmentInfoService.getFieldName(item.getString("field")); if(StrUtil.isNotBlank(filedName)){ - String oldValue = equipmentInfoService.getFieldValue(item.getString("field"),item.getString("oldVal")); - String newValue = equipmentInfoService.getFieldValue(item.getString("field"),item.getString("newVal")); + String oldValue = equipmentInfoService.getFieldValue(item.getString("field"),item.get("oldVal")); + String newValue = equipmentInfoService.getFieldValue(item.getString("field"),item.get("newVal")); String msg = String.format("[%s]由 %s 变更为 %s；\n\r",filedName, StrUtil.isNotBlank(oldValue) ? oldValue : "空值", diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoApprovalService.java index 222ebdd..d837713 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoApprovalService.java @@ -24,7 +24,7 @@ boolean checkRfidRepeat(String rfid, Long equipmentId); - String checkLocation(Long installLocationId, String usageStatus, Long equipmentId); + String checkLocation(Long installLocationId, String useSign, Long equipmentId); void saveTurnoverLog(EquipmentInfo newObj, EquipmentInfo oldObj, Long createUserId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java index 18dce15..cf81671 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java @@ -82,7 +82,7 @@ void bindTask(EquipmentTaskBindForm bindForm); String getFieldName(String field); - String getFieldValue(String field, String fieldValue); + String getFieldValue(String field, Object fieldValue); Page orderSelectListPage(Page page, EquipmentRemindQueryForm queryForm); @@ -91,4 +91,6 @@ List listCheckOrganization(); void updateCheckDestination(Long modelId); + + List listRfids(); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java index f17c2d2..bb49f0c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java @@ -108,7 +108,7 @@ businessOrderInfo.setRequireOverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getRequireOverTime())); } if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getOnSiteCheckTime())){ - businessOrderInfo.setOnSiteCheckTime(DateUtil.formatDate(eqptBusinessOrderInfo.getOnSiteCheckTime())); + businessOrderInfo.setOnSiteCheckTime(eqptBusinessOrderInfo.getOnSiteCheckTime()); } businessOrderInfo.setDataSource("受检设备系统"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderSampleRelationServiceImpl.java index 7575947..08cc67e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderSampleRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderSampleRelationServiceImpl.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.enums.business.MeasureTypeEnum; +import com.casic.missiles.enums.plan.SampleStatusEnum; import com.casic.missiles.mapper.business.BizBusinessOrderSampleRelationMapper; import com.casic.missiles.mapper.business.EqptBusinessOrderSampleRelationMapper; import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; @@ -32,6 +33,7 @@ relationList.forEach(r->{ r.setOrderId(orderId); r.setMeasureType(MeasureTypeEnum.INSIDE_MEASURE); + r.setSampleStatus(SampleStatusEnum.TO_RECEIVE.getSampleStatus()); }); return this.saveBatch(relationList); } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 1fc46fa..41ae3c1 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java index 33d2f6b..1b4ece9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java @@ -17,4 +17,9 @@ String REMIND_CHECK_STATUS_BIZ_DELIVER = "1"; String REMIND_CHECK_STATUS_SUB_DELIVER = "2"; + + String USE_SIGN_MAIN = "0"; // 在用信息-在用 + + String USE_SIGN_SLAVE = "1"; // 在用信息-备用 + } diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 561281e..797532f 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java index 0448ebd..3965846 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java @@ -27,7 +27,7 @@ Integer checkRfid(@Param("rfid")String rfid,@Param("equipmentId")Long equipmentId); String checkLocation(@Param("installLocationId")Long installLocationId, - @Param("usageStatus")String usageStatus, + @Param("useSign")String useSign, @Param("equipmentId")Long equipmentId); Integer checkInfo(@Param("modelId")Long modelId, diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index c361369..4c86d23 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -56,6 +56,9 @@ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization") List listCheckOrganization(); + @Select("SELECT DISTINCT rfid FROM `eqpt_equipment_info` where is_del = '0' and rfid is not NULL and rfid != ''") + List listRfids(); + void truncateRemindTemp(); void insertRemindTemp(); diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml index bb2627d..8e20a9d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml @@ -122,10 +122,10 @@ with r2 as ( - select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0 + select id,install_location_id, use_sign, manufacture_no from eqpt_equipment_info where is_del = 0 ), r1 as ( - select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no + select t.equipment_id, t.install_location_id, t.use_sign, t.manufacture_no from eqpt_equipment_info_approval t where approval_status = '3' and approval_type != 3), r as (select * @@ -136,7 +136,7 @@ select DISTINCT manufacture_no from r - where install_location_id = #{installLocationId} and usage_status = #{usageStatus} + where install_location_id = #{installLocationId} and use_sign = #{useSign} and equipment_id != #{equipmentId} diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index a627a8c..2ef509d 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-job - 1.3.3.2 + 1.3.4.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java index e80f6ec..2442951 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java @@ -1,5 +1,7 @@ package com.casic.missiles.controller.system; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; @@ -70,4 +72,18 @@ return ReturnUtil.success(); } + @ApiOperation("批量添加") + @PostMapping("batchAdd") + @ResponseBody + public ReturnDTO batchAdd(@RequestBody List rfids){ + List existList = rfidService.batchAdd(rfids); + Integer successCount = rfids.size() - existList.size(); + if(CollUtil.isEmpty(existList) || existList.size() <= 0){ + return ReturnUtil.success(StrUtil.format("成功添加{}个标签",successCount)); + }else { + return ReturnUtil.failed(StrUtil.format("添加{}个标签，标签{}已存在",successCount,StrUtil.join("、",existList))); + } + } + + } diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 1a6ea8a..1515f77 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-dao - 1.3.3.2 + 1.3.4.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.3.2 + 1.3.4.0 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index d55f138..881c300 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java index 0d54a68..570bc86 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java @@ -172,7 +172,7 @@ @ApiModelProperty(value = "现场检定时间", dataType = "String") @TableField("on_site_check_time") - private Date onSiteCheckTime; + private String onSiteCheckTime; /** * 流程实例id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java index a788523..75c39dd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java @@ -8,10 +8,8 @@ import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; + import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @@ -205,7 +203,7 @@ * 备注 */ @ApiModelProperty(value = "备注",notes = "备注") - @TableField("remark") + @TableField(value = "remark",updateStrategy = FieldStrategy.IGNORED) @ExcelProperty(value = "备注",index = 9) private String remark; @@ -252,7 +250,7 @@ private String meterIdentifyName; @ApiModelProperty(value = "使用岗位id",notes = "使用岗位id") - @TableField("use_position_id") + @TableField(value = "use_position_id",updateStrategy = FieldStrategy.IGNORED) private Long usePositionId; /** @@ -296,7 +294,7 @@ private String useSignName; @ApiModelProperty(value = "安装位置id",notes = "安装位置id") - @TableField("install_location_id") + @TableField(value = "install_location_id",updateStrategy = FieldStrategy.IGNORED) private Long installLocationId; /** @@ -310,7 +308,7 @@ * 安装位置(自定义编写) */ @ApiModelProperty(value = "安装位置(自定义编写)",notes = "详细位置") - @TableField("install_location_ext") + @TableField(value = "install_location_ext",updateStrategy = FieldStrategy.IGNORED) private String installLocationExt; /** @@ -324,7 +322,7 @@ * 备注(扩展) */ @ApiModelProperty(value = "备注(扩展)",notes = "备注") - @TableField("remark_ext") + @TableField(value = "remark_ext",updateStrategy = FieldStrategy.IGNORED) private String remarkExt; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java index 7eb2168..04cb79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java @@ -136,7 +136,7 @@ @ApiModelProperty(value = "现场检定时间", dataType = "String") @TableField("on_site_check_time") - private Date onSiteCheckTime; + private String onSiteCheckTime; /** * 创建人部门id diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index dd0fec3..1bad8bc 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-common - 1.3.3.2 + 1.3.4.0 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java b/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java index 9833ae1..4576f6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java @@ -126,8 +126,8 @@ JSONObject item = res.getJSONObject(i); String filedName = equipmentInfoService.getFieldName(item.getString("field")); if(StrUtil.isNotBlank(filedName)){ - String oldValue = equipmentInfoService.getFieldValue(item.getString("field"),item.getString("oldVal")); - String newValue = equipmentInfoService.getFieldValue(item.getString("field"),item.getString("newVal")); + String oldValue = equipmentInfoService.getFieldValue(item.getString("field"),item.get("oldVal")); + String newValue = equipmentInfoService.getFieldValue(item.getString("field"),item.get("newVal")); String msg = String.format("[%s]由 %s 变更为 %s；\n\r",filedName, StrUtil.isNotBlank(oldValue) ? oldValue : "空值", diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoApprovalService.java index 222ebdd..d837713 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoApprovalService.java @@ -24,7 +24,7 @@ boolean checkRfidRepeat(String rfid, Long equipmentId); - String checkLocation(Long installLocationId, String usageStatus, Long equipmentId); + String checkLocation(Long installLocationId, String useSign, Long equipmentId); void saveTurnoverLog(EquipmentInfo newObj, EquipmentInfo oldObj, Long createUserId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java index 18dce15..cf81671 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java @@ -82,7 +82,7 @@ void bindTask(EquipmentTaskBindForm bindForm); String getFieldName(String field); - String getFieldValue(String field, String fieldValue); + String getFieldValue(String field, Object fieldValue); Page orderSelectListPage(Page page, EquipmentRemindQueryForm queryForm); @@ -91,4 +91,6 @@ List listCheckOrganization(); void updateCheckDestination(Long modelId); + + List listRfids(); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java index f17c2d2..bb49f0c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java @@ -108,7 +108,7 @@ businessOrderInfo.setRequireOverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getRequireOverTime())); } if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getOnSiteCheckTime())){ - businessOrderInfo.setOnSiteCheckTime(DateUtil.formatDate(eqptBusinessOrderInfo.getOnSiteCheckTime())); + businessOrderInfo.setOnSiteCheckTime(eqptBusinessOrderInfo.getOnSiteCheckTime()); } businessOrderInfo.setDataSource("受检设备系统"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderSampleRelationServiceImpl.java index 7575947..08cc67e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderSampleRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderSampleRelationServiceImpl.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.enums.business.MeasureTypeEnum; +import com.casic.missiles.enums.plan.SampleStatusEnum; import com.casic.missiles.mapper.business.BizBusinessOrderSampleRelationMapper; import com.casic.missiles.mapper.business.EqptBusinessOrderSampleRelationMapper; import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; @@ -32,6 +33,7 @@ relationList.forEach(r->{ r.setOrderId(orderId); r.setMeasureType(MeasureTypeEnum.INSIDE_MEASURE); + r.setSampleStatus(SampleStatusEnum.TO_RECEIVE.getSampleStatus()); }); return this.saveBatch(relationList); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java index 74e6308..9a0d821 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java @@ -19,6 +19,7 @@ import com.casic.missiles.dto.flowable.ApprovalSubmitRequest; import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.PrefixCodeEnum; +import com.casic.missiles.enums.equipment.EquipmentCheckConsts; import com.casic.missiles.enums.equipment.EquipmentStatusTypeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.EquipmentInfo; @@ -184,7 +185,7 @@ SystemLocation location = new SystemLocation(); location.setInstallLocation(approvalForm.getInstallLocation()); location.setSubSystemId(approvalForm.getDeptId()); - location.setPositionId(Long.valueOf(approvalForm.getUsePositionId())); + location.setPositionId(approvalForm.getUsePositionId()); Long locationId = locationService.add(location); approvalForm.setInstallLocationId(locationId); } @@ -194,7 +195,7 @@ if(checkRfidRepeat(approvalForm.getRfid(), approvalForm.getEquipmentId())){ throw new BusinessException(500,"RFID标签已使用"); } - String checkLoc = checkLocation(approvalForm.getInstallLocationId(), approvalForm.getUsageStatus(), approvalForm.getEquipmentId()); + String checkLoc = checkLocation(approvalForm.getInstallLocationId(), approvalForm.getUseSign(), approvalForm.getEquipmentId()); if(StrUtil.isNotEmpty(checkLoc)){ throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc)); } @@ -239,9 +240,9 @@ } @Override - public String checkLocation(Long installLocationId, String usageStatus, Long equipmentId){ - if(ObjectUtil.isNotEmpty(installLocationId) && EquipmentStatusTypeEnum.UNSEAL.equals(usageStatus)){ - return this.baseMapper.checkLocation(installLocationId,EquipmentStatusTypeEnum.UNSEAL,equipmentId); + public String checkLocation(Long installLocationId, String useSign, Long equipmentId){ + if(ObjectUtil.isNotEmpty(installLocationId) && EquipmentCheckConsts.USE_SIGN_MAIN.equals(useSign)){ + return this.baseMapper.checkLocation(installLocationId, EquipmentCheckConsts.USE_SIGN_MAIN,equipmentId); } return null; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index c13da6a..641dd8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -331,7 +331,7 @@ @Override public ReturnDTO> equipmentLabelReadList(Set strSet) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.and(QueryWrapper -> QueryWrapper.in("label", strSet)); + queryWrapper.and(QueryWrapper -> QueryWrapper.in("rfid", strSet)); List resultList = this.baseMapper.selectList(queryWrapper); return ReturnUtil.success(resultList); } @@ -1144,7 +1144,15 @@ } @Override - public String getFieldValue(String fieldName, String fieldValue) { + public String getFieldValue(String fieldName, Object fieldValueObj) { + if(ObjectUtil.isEmpty(fieldValueObj)){ + return ""; + } + String fieldValue = fieldValueObj.toString(); + if(fieldValueObj instanceof Date){ + fieldValue = DateUtil.formatDate((Date)fieldValueObj); + } + if (StrUtil.isBlank(fieldValue)) { return fieldValue; } @@ -1211,6 +1219,11 @@ return this.baseMapper.listCheckOrganization(); } + @Override + public List listRfids() { + return this.baseMapper.listRfids(); + } + public void updateCheckDestination(Long modelId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("model_id", modelId); diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 1fc46fa..41ae3c1 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java index 33d2f6b..1b4ece9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java @@ -17,4 +17,9 @@ String REMIND_CHECK_STATUS_BIZ_DELIVER = "1"; String REMIND_CHECK_STATUS_SUB_DELIVER = "2"; + + String USE_SIGN_MAIN = "0"; // 在用信息-在用 + + String USE_SIGN_SLAVE = "1"; // 在用信息-备用 + } diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 561281e..797532f 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java index 0448ebd..3965846 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java @@ -27,7 +27,7 @@ Integer checkRfid(@Param("rfid")String rfid,@Param("equipmentId")Long equipmentId); String checkLocation(@Param("installLocationId")Long installLocationId, - @Param("usageStatus")String usageStatus, + @Param("useSign")String useSign, @Param("equipmentId")Long equipmentId); Integer checkInfo(@Param("modelId")Long modelId, diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index c361369..4c86d23 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -56,6 +56,9 @@ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization") List listCheckOrganization(); + @Select("SELECT DISTINCT rfid FROM `eqpt_equipment_info` where is_del = '0' and rfid is not NULL and rfid != ''") + List listRfids(); + void truncateRemindTemp(); void insertRemindTemp(); diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml index bb2627d..8e20a9d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml @@ -122,10 +122,10 @@ with r2 as ( - select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0 + select id,install_location_id, use_sign, manufacture_no from eqpt_equipment_info where is_del = 0 ), r1 as ( - select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no + select t.equipment_id, t.install_location_id, t.use_sign, t.manufacture_no from eqpt_equipment_info_approval t where approval_status = '3' and approval_type != 3), r as (select * @@ -136,7 +136,7 @@ select DISTINCT manufacture_no from r - where install_location_id = #{installLocationId} and usage_status = #{usageStatus} + where install_location_id = #{installLocationId} and use_sign = #{useSign} and equipment_id != #{equipmentId} diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index a627a8c..2ef509d 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-job - 1.3.3.2 + 1.3.4.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java index e80f6ec..2442951 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java @@ -1,5 +1,7 @@ package com.casic.missiles.controller.system; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; @@ -70,4 +72,18 @@ return ReturnUtil.success(); } + @ApiOperation("批量添加") + @PostMapping("batchAdd") + @ResponseBody + public ReturnDTO batchAdd(@RequestBody List rfids){ + List existList = rfidService.batchAdd(rfids); + Integer successCount = rfids.size() - existList.size(); + if(CollUtil.isEmpty(existList) || existList.size() <= 0){ + return ReturnUtil.success(StrUtil.format("成功添加{}个标签",successCount)); + }else { + return ReturnUtil.failed(StrUtil.format("添加{}个标签，标签{}已存在",successCount,StrUtil.join("、",existList))); + } + } + + } diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 1a6ea8a..1515f77 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-dao - 1.3.3.2 + 1.3.4.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.3.2 + 1.3.4.0 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index d55f138..881c300 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java index 0d54a68..570bc86 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java @@ -172,7 +172,7 @@ @ApiModelProperty(value = "现场检定时间", dataType = "String") @TableField("on_site_check_time") - private Date onSiteCheckTime; + private String onSiteCheckTime; /** * 流程实例id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java index a788523..75c39dd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java @@ -8,10 +8,8 @@ import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; + import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @@ -205,7 +203,7 @@ * 备注 */ @ApiModelProperty(value = "备注",notes = "备注") - @TableField("remark") + @TableField(value = "remark",updateStrategy = FieldStrategy.IGNORED) @ExcelProperty(value = "备注",index = 9) private String remark; @@ -252,7 +250,7 @@ private String meterIdentifyName; @ApiModelProperty(value = "使用岗位id",notes = "使用岗位id") - @TableField("use_position_id") + @TableField(value = "use_position_id",updateStrategy = FieldStrategy.IGNORED) private Long usePositionId; /** @@ -296,7 +294,7 @@ private String useSignName; @ApiModelProperty(value = "安装位置id",notes = "安装位置id") - @TableField("install_location_id") + @TableField(value = "install_location_id",updateStrategy = FieldStrategy.IGNORED) private Long installLocationId; /** @@ -310,7 +308,7 @@ * 安装位置(自定义编写) */ @ApiModelProperty(value = "安装位置(自定义编写)",notes = "详细位置") - @TableField("install_location_ext") + @TableField(value = "install_location_ext",updateStrategy = FieldStrategy.IGNORED) private String installLocationExt; /** @@ -324,7 +322,7 @@ * 备注(扩展) */ @ApiModelProperty(value = "备注(扩展)",notes = "备注") - @TableField("remark_ext") + @TableField(value = "remark_ext",updateStrategy = FieldStrategy.IGNORED) private String remarkExt; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java index 7eb2168..04cb79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java @@ -136,7 +136,7 @@ @ApiModelProperty(value = "现场检定时间", dataType = "String") @TableField("on_site_check_time") - private Date onSiteCheckTime; + private String onSiteCheckTime; /** * 创建人部门id diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index dd0fec3..1bad8bc 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-common - 1.3.3.2 + 1.3.4.0 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java b/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java index 9833ae1..4576f6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java @@ -126,8 +126,8 @@ JSONObject item = res.getJSONObject(i); String filedName = equipmentInfoService.getFieldName(item.getString("field")); if(StrUtil.isNotBlank(filedName)){ - String oldValue = equipmentInfoService.getFieldValue(item.getString("field"),item.getString("oldVal")); - String newValue = equipmentInfoService.getFieldValue(item.getString("field"),item.getString("newVal")); + String oldValue = equipmentInfoService.getFieldValue(item.getString("field"),item.get("oldVal")); + String newValue = equipmentInfoService.getFieldValue(item.getString("field"),item.get("newVal")); String msg = String.format("[%s]由 %s 变更为 %s；\n\r",filedName, StrUtil.isNotBlank(oldValue) ? oldValue : "空值", diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoApprovalService.java index 222ebdd..d837713 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoApprovalService.java @@ -24,7 +24,7 @@ boolean checkRfidRepeat(String rfid, Long equipmentId); - String checkLocation(Long installLocationId, String usageStatus, Long equipmentId); + String checkLocation(Long installLocationId, String useSign, Long equipmentId); void saveTurnoverLog(EquipmentInfo newObj, EquipmentInfo oldObj, Long createUserId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java index 18dce15..cf81671 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java @@ -82,7 +82,7 @@ void bindTask(EquipmentTaskBindForm bindForm); String getFieldName(String field); - String getFieldValue(String field, String fieldValue); + String getFieldValue(String field, Object fieldValue); Page orderSelectListPage(Page page, EquipmentRemindQueryForm queryForm); @@ -91,4 +91,6 @@ List listCheckOrganization(); void updateCheckDestination(Long modelId); + + List listRfids(); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java index f17c2d2..bb49f0c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java @@ -108,7 +108,7 @@ businessOrderInfo.setRequireOverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getRequireOverTime())); } if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getOnSiteCheckTime())){ - businessOrderInfo.setOnSiteCheckTime(DateUtil.formatDate(eqptBusinessOrderInfo.getOnSiteCheckTime())); + businessOrderInfo.setOnSiteCheckTime(eqptBusinessOrderInfo.getOnSiteCheckTime()); } businessOrderInfo.setDataSource("受检设备系统"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderSampleRelationServiceImpl.java index 7575947..08cc67e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderSampleRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderSampleRelationServiceImpl.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.enums.business.MeasureTypeEnum; +import com.casic.missiles.enums.plan.SampleStatusEnum; import com.casic.missiles.mapper.business.BizBusinessOrderSampleRelationMapper; import com.casic.missiles.mapper.business.EqptBusinessOrderSampleRelationMapper; import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; @@ -32,6 +33,7 @@ relationList.forEach(r->{ r.setOrderId(orderId); r.setMeasureType(MeasureTypeEnum.INSIDE_MEASURE); + r.setSampleStatus(SampleStatusEnum.TO_RECEIVE.getSampleStatus()); }); return this.saveBatch(relationList); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java index 74e6308..9a0d821 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java @@ -19,6 +19,7 @@ import com.casic.missiles.dto.flowable.ApprovalSubmitRequest; import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.PrefixCodeEnum; +import com.casic.missiles.enums.equipment.EquipmentCheckConsts; import com.casic.missiles.enums.equipment.EquipmentStatusTypeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.EquipmentInfo; @@ -184,7 +185,7 @@ SystemLocation location = new SystemLocation(); location.setInstallLocation(approvalForm.getInstallLocation()); location.setSubSystemId(approvalForm.getDeptId()); - location.setPositionId(Long.valueOf(approvalForm.getUsePositionId())); + location.setPositionId(approvalForm.getUsePositionId()); Long locationId = locationService.add(location); approvalForm.setInstallLocationId(locationId); } @@ -194,7 +195,7 @@ if(checkRfidRepeat(approvalForm.getRfid(), approvalForm.getEquipmentId())){ throw new BusinessException(500,"RFID标签已使用"); } - String checkLoc = checkLocation(approvalForm.getInstallLocationId(), approvalForm.getUsageStatus(), approvalForm.getEquipmentId()); + String checkLoc = checkLocation(approvalForm.getInstallLocationId(), approvalForm.getUseSign(), approvalForm.getEquipmentId()); if(StrUtil.isNotEmpty(checkLoc)){ throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc)); } @@ -239,9 +240,9 @@ } @Override - public String checkLocation(Long installLocationId, String usageStatus, Long equipmentId){ - if(ObjectUtil.isNotEmpty(installLocationId) && EquipmentStatusTypeEnum.UNSEAL.equals(usageStatus)){ - return this.baseMapper.checkLocation(installLocationId,EquipmentStatusTypeEnum.UNSEAL,equipmentId); + public String checkLocation(Long installLocationId, String useSign, Long equipmentId){ + if(ObjectUtil.isNotEmpty(installLocationId) && EquipmentCheckConsts.USE_SIGN_MAIN.equals(useSign)){ + return this.baseMapper.checkLocation(installLocationId, EquipmentCheckConsts.USE_SIGN_MAIN,equipmentId); } return null; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index c13da6a..641dd8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -331,7 +331,7 @@ @Override public ReturnDTO> equipmentLabelReadList(Set strSet) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.and(QueryWrapper -> QueryWrapper.in("label", strSet)); + queryWrapper.and(QueryWrapper -> QueryWrapper.in("rfid", strSet)); List resultList = this.baseMapper.selectList(queryWrapper); return ReturnUtil.success(resultList); } @@ -1144,7 +1144,15 @@ } @Override - public String getFieldValue(String fieldName, String fieldValue) { + public String getFieldValue(String fieldName, Object fieldValueObj) { + if(ObjectUtil.isEmpty(fieldValueObj)){ + return ""; + } + String fieldValue = fieldValueObj.toString(); + if(fieldValueObj instanceof Date){ + fieldValue = DateUtil.formatDate((Date)fieldValueObj); + } + if (StrUtil.isBlank(fieldValue)) { return fieldValue; } @@ -1211,6 +1219,11 @@ return this.baseMapper.listCheckOrganization(); } + @Override + public List listRfids() { + return this.baseMapper.listRfids(); + } + public void updateCheckDestination(Long modelId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("model_id", modelId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionApprovalServiceImpl.java index 0cd93ed..eb520d9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionApprovalServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.plan.ExecuteStatusEnum; +import com.casic.missiles.enums.plan.SampleStatusEnum; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; import com.casic.missiles.model.business.EqptBusinessOrderInfo; @@ -104,8 +105,14 @@ BizBusinessOrderInfo businessOrderInfo = new BizBusinessOrderInfo(); BeanUtil.copyProperties(inspectionApproval,businessOrderInfo); bizOrderInfoService.initOrderInfo(businessOrderInfo); + businessOrderInfo.setCustomerPhone(inspectionApproval.getDelivererTel()); + businessOrderInfo.setDeptId(inspectionApproval.getCreateDeptId()); + businessOrderInfo.setCreateUserId(inspectionApproval.getCreateUserId()); + businessOrderInfo.setCreateUserName(inspectionApproval.getCreateUserName()); businessOrderInfo.setCreateTime(DateUtil.formatDateTime(inspectionApproval.getCreateTime())); businessOrderInfo.setUpdateTime(DateUtil.formatDateTime(inspectionApproval.getUpdateTime())); + + if(ObjectUtil.isNotEmpty(inspectionApproval.getPlanDeliverTime())){ businessOrderInfo.setPlanDeliverTime(DateUtil.formatDate(inspectionApproval.getPlanDeliverTime())); } @@ -113,7 +120,7 @@ businessOrderInfo.setRequireOverTime(DateUtil.formatDate(inspectionApproval.getRequireOverTime())); } if(ObjectUtil.isNotEmpty(inspectionApproval.getOnSiteCheckTime())){ - businessOrderInfo.setOnSiteCheckTime(DateUtil.formatDate(inspectionApproval.getOnSiteCheckTime())); + businessOrderInfo.setOnSiteCheckTime(inspectionApproval.getOnSiteCheckTime()); } businessOrderInfo.setDataSource("受检设备系统"); @@ -126,6 +133,7 @@ sampleRelation.setSampleModel(i.getModel()); sampleRelation.setAppendixDescn(i.getAppendixDescn()); sampleRelation.setSpecialRequire(i.getSpecialRequire()); + sampleRelation.setSampleStatus(SampleStatusEnum.TO_RECEIVE.getSampleStatus()); businessOrderSampleRelations.add(sampleRelation); }); businessOrderInfo.setCustomerSampleInfoList(businessOrderSampleRelations); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemRfidServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemRfidServiceImpl.java index cad7c72..008b6e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemRfidServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemRfidServiceImpl.java @@ -197,4 +197,36 @@ } return queryWrapper; } + + @Override + public List batchAdd(List rfids) { + + List rfidList = this.list(); + List allRfids = rfidList.stream().map(SystemRfid::getRfid).collect(Collectors.toList()); + allRfids.addAll(equipmentInfoService.listRfids()); + + List existRfids = new ArrayList<>(); + List newRfids = new ArrayList<>(); + for (String rfid : rfids) { + if(allRfids.contains(rfid)){ + existRfids.add(rfid); + }else { + newRfids.add(rfid); + } + } + + if(CollUtil.isNotEmpty(newRfids)){ + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + List systemRfids = new ArrayList<>(); + for (String newRfid : newRfids) { + SystemRfid rfid = new SystemRfid(newRfid); + rfid.setCreateUserId(authUser.getId()); + rfid.setCreateUserDept(authUser.getDeptId()); + systemRfids.add(rfid); + } + this.saveBatch(systemRfids); + } + + return existRfids; + } } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index 1fc46fa..41ae3c1 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java index 33d2f6b..1b4ece9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/equipment/EquipmentCheckConsts.java @@ -17,4 +17,9 @@ String REMIND_CHECK_STATUS_BIZ_DELIVER = "1"; String REMIND_CHECK_STATUS_SUB_DELIVER = "2"; + + String USE_SIGN_MAIN = "0"; // 在用信息-在用 + + String USE_SIGN_SLAVE = "1"; // 在用信息-备用 + } diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index 561281e..797532f 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java index 0448ebd..3965846 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoApprovalMapper.java @@ -27,7 +27,7 @@ Integer checkRfid(@Param("rfid")String rfid,@Param("equipmentId")Long equipmentId); String checkLocation(@Param("installLocationId")Long installLocationId, - @Param("usageStatus")String usageStatus, + @Param("useSign")String useSign, @Param("equipmentId")Long equipmentId); Integer checkInfo(@Param("modelId")Long modelId, diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java index c361369..4c86d23 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentInfoMapper.java @@ -56,6 +56,9 @@ @Select("SELECT DISTINCT check_organization FROM `eqpt_equipment_info` where is_del = '0' and check_organization is not NULL and check_organization != '' ORDER BY check_organization") List listCheckOrganization(); + @Select("SELECT DISTINCT rfid FROM `eqpt_equipment_info` where is_del = '0' and rfid is not NULL and rfid != ''") + List listRfids(); + void truncateRemindTemp(); void insertRemindTemp(); diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml index bb2627d..8e20a9d 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentInfoApprovalMapper.xml @@ -122,10 +122,10 @@ with r2 as ( - select id,install_location_id, usage_status, manufacture_no from eqpt_equipment_info where is_del = 0 + select id,install_location_id, use_sign, manufacture_no from eqpt_equipment_info where is_del = 0 ), r1 as ( - select t.equipment_id, t.install_location_id, t.usage_status, t.manufacture_no + select t.equipment_id, t.install_location_id, t.use_sign, t.manufacture_no from eqpt_equipment_info_approval t where approval_status = '3' and approval_type != 3), r as (select * @@ -136,7 +136,7 @@ select DISTINCT manufacture_no from r - where install_location_id = #{installLocationId} and usage_status = #{usageStatus} + where install_location_id = #{installLocationId} and use_sign = #{useSign} and equipment_id != #{equipmentId} diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index a627a8c..2ef509d 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-job - 1.3.3.2 + 1.3.4.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java index e80f6ec..2442951 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/system/SystemRfidController.java @@ -1,5 +1,7 @@ package com.casic.missiles.controller.system; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.BaseController; import com.casic.missiles.core.base.controller.ExportController; @@ -70,4 +72,18 @@ return ReturnUtil.success(); } + @ApiOperation("批量添加") + @PostMapping("batchAdd") + @ResponseBody + public ReturnDTO batchAdd(@RequestBody List rfids){ + List existList = rfidService.batchAdd(rfids); + Integer successCount = rfids.size() - existList.size(); + if(CollUtil.isEmpty(existList) || existList.size() <= 0){ + return ReturnUtil.success(StrUtil.format("成功添加{}个标签",successCount)); + }else { + return ReturnUtil.failed(StrUtil.format("添加{}个标签，标签{}已存在",successCount,StrUtil.join("、",existList))); + } + } + + } diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 1a6ea8a..1515f77 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-dao - 1.3.3.2 + 1.3.4.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.3.2 + 1.3.4.0 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index d55f138..881c300 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java index 0d54a68..570bc86 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/EqptBusinessOrderInfo.java @@ -172,7 +172,7 @@ @ApiModelProperty(value = "现场检定时间", dataType = "String") @TableField("on_site_check_time") - private Date onSiteCheckTime; + private String onSiteCheckTime; /** * 流程实例id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java index a788523..75c39dd 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/equipment/EquipmentInfo.java @@ -8,10 +8,8 @@ import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; + import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @@ -205,7 +203,7 @@ * 备注 */ @ApiModelProperty(value = "备注",notes = "备注") - @TableField("remark") + @TableField(value = "remark",updateStrategy = FieldStrategy.IGNORED) @ExcelProperty(value = "备注",index = 9) private String remark; @@ -252,7 +250,7 @@ private String meterIdentifyName; @ApiModelProperty(value = "使用岗位id",notes = "使用岗位id") - @TableField("use_position_id") + @TableField(value = "use_position_id",updateStrategy = FieldStrategy.IGNORED) private Long usePositionId; /** @@ -296,7 +294,7 @@ private String useSignName; @ApiModelProperty(value = "安装位置id",notes = "安装位置id") - @TableField("install_location_id") + @TableField(value = "install_location_id",updateStrategy = FieldStrategy.IGNORED) private Long installLocationId; /** @@ -310,7 +308,7 @@ * 安装位置(自定义编写) */ @ApiModelProperty(value = "安装位置(自定义编写)",notes = "详细位置") - @TableField("install_location_ext") + @TableField(value = "install_location_ext",updateStrategy = FieldStrategy.IGNORED) private String installLocationExt; /** @@ -324,7 +322,7 @@ * 备注(扩展) */ @ApiModelProperty(value = "备注(扩展)",notes = "备注") - @TableField("remark_ext") + @TableField(value = "remark_ext",updateStrategy = FieldStrategy.IGNORED) private String remarkExt; /** diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java index 7eb2168..04cb79a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/plan/InspectionApproval.java @@ -136,7 +136,7 @@ @ApiModelProperty(value = "现场检定时间", dataType = "String") @TableField("on_site_check_time") - private Date onSiteCheckTime; + private String onSiteCheckTime; /** * 创建人部门id diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index dd0fec3..1bad8bc 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.3.2 + 1.3.4.0 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-model - 1.3.3.2 + 1.3.4.0 com.casic casic-metering-common - 1.3.3.2 + 1.3.4.0 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java b/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java index 9833ae1..4576f6f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/aop/EquipmentLogAop.java @@ -126,8 +126,8 @@ JSONObject item = res.getJSONObject(i); String filedName = equipmentInfoService.getFieldName(item.getString("field")); if(StrUtil.isNotBlank(filedName)){ - String oldValue = equipmentInfoService.getFieldValue(item.getString("field"),item.getString("oldVal")); - String newValue = equipmentInfoService.getFieldValue(item.getString("field"),item.getString("newVal")); + String oldValue = equipmentInfoService.getFieldValue(item.getString("field"),item.get("oldVal")); + String newValue = equipmentInfoService.getFieldValue(item.getString("field"),item.get("newVal")); String msg = String.format("[%s]由 %s 变更为 %s；\n\r",filedName, StrUtil.isNotBlank(oldValue) ? oldValue : "空值", diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoApprovalService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoApprovalService.java index 222ebdd..d837713 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoApprovalService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoApprovalService.java @@ -24,7 +24,7 @@ boolean checkRfidRepeat(String rfid, Long equipmentId); - String checkLocation(Long installLocationId, String usageStatus, Long equipmentId); + String checkLocation(Long installLocationId, String useSign, Long equipmentId); void saveTurnoverLog(EquipmentInfo newObj, EquipmentInfo oldObj, Long createUserId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java index 18dce15..cf81671 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentInfoService.java @@ -82,7 +82,7 @@ void bindTask(EquipmentTaskBindForm bindForm); String getFieldName(String field); - String getFieldValue(String field, String fieldValue); + String getFieldValue(String field, Object fieldValue); Page orderSelectListPage(Page page, EquipmentRemindQueryForm queryForm); @@ -91,4 +91,6 @@ List listCheckOrganization(); void updateCheckDestination(Long modelId); + + List listRfids(); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java index f17c2d2..bb49f0c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java @@ -108,7 +108,7 @@ businessOrderInfo.setRequireOverTime(DateUtil.formatDate(eqptBusinessOrderInfo.getRequireOverTime())); } if(ObjectUtil.isNotEmpty(eqptBusinessOrderInfo.getOnSiteCheckTime())){ - businessOrderInfo.setOnSiteCheckTime(DateUtil.formatDate(eqptBusinessOrderInfo.getOnSiteCheckTime())); + businessOrderInfo.setOnSiteCheckTime(eqptBusinessOrderInfo.getOnSiteCheckTime()); } businessOrderInfo.setDataSource("受检设备系统"); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderSampleRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderSampleRelationServiceImpl.java index 7575947..08cc67e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderSampleRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderSampleRelationServiceImpl.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.enums.business.MeasureTypeEnum; +import com.casic.missiles.enums.plan.SampleStatusEnum; import com.casic.missiles.mapper.business.BizBusinessOrderSampleRelationMapper; import com.casic.missiles.mapper.business.EqptBusinessOrderSampleRelationMapper; import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; @@ -32,6 +33,7 @@ relationList.forEach(r->{ r.setOrderId(orderId); r.setMeasureType(MeasureTypeEnum.INSIDE_MEASURE); + r.setSampleStatus(SampleStatusEnum.TO_RECEIVE.getSampleStatus()); }); return this.saveBatch(relationList); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java index 74e6308..9a0d821 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoApprovalServiceImpl.java @@ -19,6 +19,7 @@ import com.casic.missiles.dto.flowable.ApprovalSubmitRequest; import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.PrefixCodeEnum; +import com.casic.missiles.enums.equipment.EquipmentCheckConsts; import com.casic.missiles.enums.equipment.EquipmentStatusTypeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.equipment.EquipmentInfo; @@ -184,7 +185,7 @@ SystemLocation location = new SystemLocation(); location.setInstallLocation(approvalForm.getInstallLocation()); location.setSubSystemId(approvalForm.getDeptId()); - location.setPositionId(Long.valueOf(approvalForm.getUsePositionId())); + location.setPositionId(approvalForm.getUsePositionId()); Long locationId = locationService.add(location); approvalForm.setInstallLocationId(locationId); } @@ -194,7 +195,7 @@ if(checkRfidRepeat(approvalForm.getRfid(), approvalForm.getEquipmentId())){ throw new BusinessException(500,"RFID标签已使用"); } - String checkLoc = checkLocation(approvalForm.getInstallLocationId(), approvalForm.getUsageStatus(), approvalForm.getEquipmentId()); + String checkLoc = checkLocation(approvalForm.getInstallLocationId(), approvalForm.getUseSign(), approvalForm.getEquipmentId()); if(StrUtil.isNotEmpty(checkLoc)){ throw new BusinessException(500,String.format("当前安装位置已存在一台在用设备，编号为%s",checkLoc)); } @@ -239,9 +240,9 @@ } @Override - public String checkLocation(Long installLocationId, String usageStatus, Long equipmentId){ - if(ObjectUtil.isNotEmpty(installLocationId) && EquipmentStatusTypeEnum.UNSEAL.equals(usageStatus)){ - return this.baseMapper.checkLocation(installLocationId,EquipmentStatusTypeEnum.UNSEAL,equipmentId); + public String checkLocation(Long installLocationId, String useSign, Long equipmentId){ + if(ObjectUtil.isNotEmpty(installLocationId) && EquipmentCheckConsts.USE_SIGN_MAIN.equals(useSign)){ + return this.baseMapper.checkLocation(installLocationId, EquipmentCheckConsts.USE_SIGN_MAIN,equipmentId); } return null; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java index c13da6a..641dd8e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/equipment/EquipmentInfoServiceImpl.java @@ -331,7 +331,7 @@ @Override public ReturnDTO> equipmentLabelReadList(Set strSet) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.and(QueryWrapper -> QueryWrapper.in("label", strSet)); + queryWrapper.and(QueryWrapper -> QueryWrapper.in("rfid", strSet)); List resultList = this.baseMapper.selectList(queryWrapper); return ReturnUtil.success(resultList); } @@ -1144,7 +1144,15 @@ } @Override - public String getFieldValue(String fieldName, String fieldValue) { + public String getFieldValue(String fieldName, Object fieldValueObj) { + if(ObjectUtil.isEmpty(fieldValueObj)){ + return ""; + } + String fieldValue = fieldValueObj.toString(); + if(fieldValueObj instanceof Date){ + fieldValue = DateUtil.formatDate((Date)fieldValueObj); + } + if (StrUtil.isBlank(fieldValue)) { return fieldValue; } @@ -1211,6 +1219,11 @@ return this.baseMapper.listCheckOrganization(); } + @Override + public List listRfids() { + return this.baseMapper.listRfids(); + } + public void updateCheckDestination(Long modelId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("model_id", modelId); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionApprovalServiceImpl.java index 0cd93ed..eb520d9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/plan/InspectionApprovalServiceImpl.java @@ -13,6 +13,7 @@ import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.plan.ExecuteStatusEnum; +import com.casic.missiles.enums.plan.SampleStatusEnum; import com.casic.missiles.model.business.BizBusinessOrderInfo; import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; import com.casic.missiles.model.business.EqptBusinessOrderInfo; @@ -104,8 +105,14 @@ BizBusinessOrderInfo businessOrderInfo = new BizBusinessOrderInfo(); BeanUtil.copyProperties(inspectionApproval,businessOrderInfo); bizOrderInfoService.initOrderInfo(businessOrderInfo); + businessOrderInfo.setCustomerPhone(inspectionApproval.getDelivererTel()); + businessOrderInfo.setDeptId(inspectionApproval.getCreateDeptId()); + businessOrderInfo.setCreateUserId(inspectionApproval.getCreateUserId()); + businessOrderInfo.setCreateUserName(inspectionApproval.getCreateUserName()); businessOrderInfo.setCreateTime(DateUtil.formatDateTime(inspectionApproval.getCreateTime())); businessOrderInfo.setUpdateTime(DateUtil.formatDateTime(inspectionApproval.getUpdateTime())); + + if(ObjectUtil.isNotEmpty(inspectionApproval.getPlanDeliverTime())){ businessOrderInfo.setPlanDeliverTime(DateUtil.formatDate(inspectionApproval.getPlanDeliverTime())); } @@ -113,7 +120,7 @@ businessOrderInfo.setRequireOverTime(DateUtil.formatDate(inspectionApproval.getRequireOverTime())); } if(ObjectUtil.isNotEmpty(inspectionApproval.getOnSiteCheckTime())){ - businessOrderInfo.setOnSiteCheckTime(DateUtil.formatDate(inspectionApproval.getOnSiteCheckTime())); + businessOrderInfo.setOnSiteCheckTime(inspectionApproval.getOnSiteCheckTime()); } businessOrderInfo.setDataSource("受检设备系统"); @@ -126,6 +133,7 @@ sampleRelation.setSampleModel(i.getModel()); sampleRelation.setAppendixDescn(i.getAppendixDescn()); sampleRelation.setSpecialRequire(i.getSpecialRequire()); + sampleRelation.setSampleStatus(SampleStatusEnum.TO_RECEIVE.getSampleStatus()); businessOrderSampleRelations.add(sampleRelation); }); businessOrderInfo.setCustomerSampleInfoList(businessOrderSampleRelations); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemRfidServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemRfidServiceImpl.java index cad7c72..008b6e9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemRfidServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/system/SystemRfidServiceImpl.java @@ -197,4 +197,36 @@ } return queryWrapper; } + + @Override + public List batchAdd(List rfids) { + + List rfidList = this.list(); + List allRfids = rfidList.stream().map(SystemRfid::getRfid).collect(Collectors.toList()); + allRfids.addAll(equipmentInfoService.listRfids()); + + List existRfids = new ArrayList<>(); + List newRfids = new ArrayList<>(); + for (String rfid : rfids) { + if(allRfids.contains(rfid)){ + existRfids.add(rfid); + }else { + newRfids.add(rfid); + } + } + + if(CollUtil.isNotEmpty(newRfids)){ + AuthUser authUser = permissionContext.getAuthService().getLoginUser(); + List systemRfids = new ArrayList<>(); + for (String newRfid : newRfids) { + SystemRfid rfid = new SystemRfid(newRfid); + rfid.setCreateUserId(authUser.getId()); + rfid.setCreateUserDept(authUser.getDeptId()); + systemRfids.add(rfid); + } + this.saveBatch(systemRfids); + } + + return existRfids; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemRfidService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemRfidService.java index dba5c77..43d6a07 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemRfidService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/system/ISystemRfidService.java @@ -25,4 +25,6 @@ boolean remove(List rfids); boolean batchImport(MultipartFile file) throws IOException; + + List batchAdd(List rfids); } diff --git a/pom.xml b/pom.xml index 698eebf..bd9a456 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.casic casic-metering-eqpt-xichang - 1.3.3.2 + 1.3.4.0 casic-metering-eqpt-xichang pom