feat(jg): 增加设备数据来源标识及历史登记逻辑控制

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/dto/XiAnElevatorExcelDto.java

@@ -438,6 +438,10 @@ public class XiAnElevatorExcelDto extends BaseDto {
     @ExcelProperty(value = "市场监管所代码")
     private String supervisionOfficeCode;
 
+    @ApiModelProperty(value = "数据来源")
+    @ExcelIgnore
+    private String dataSource;
+
     public void setoRegUnit(String oRegUnit) {
         this.oRegUnit = oRegUnit;
     }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/service/XiAnDataDockServiceImpl.java

@@ -565,7 +565,7 @@ public class XiAnDataDockServiceImpl {
             return ResponseHelper.buildFailureResponse(e.getMessage(), "参数校验失败，详细请看返回信息", HttpStatus.BAD_REQUEST);
         }
 
-        return ResponseHelper.buildResponse(this.batchSaveElevatorData(elevatorExcelDtos));
+        return ResponseHelper.buildResponse(this.batchSaveElevatorData(elevatorExcelDtos, isRegistration));
     }
 
     /**
@@ -774,8 +774,9 @@ public class XiAnDataDockServiceImpl {
      * 批量异步保存设备数据
      *
      * @param elevatorExcelDtos
+     * @param isRegistration
      */
-    public Map<String, Object> batchSaveElevatorData(List<XiAnElevatorExcelDto> elevatorExcelDtos) {
+    public Map<String, Object> batchSaveElevatorData(List<XiAnElevatorExcelDto> elevatorExcelDtos, Boolean isRegistration) {
         log.info("解析成功，准备上传数据，条数：{}", elevatorExcelDtos.size());
         int batchSize = 1000;
         int totalSize = elevatorExcelDtos.size();
@@ -793,6 +794,17 @@ public class XiAnDataDockServiceImpl {
                 try {
                     semaphore.acquire(); // 获取许可
                     contextWrapper.apply();
+
+                    batch.forEach(equ -> {
+                        if (isRegistration) {
+                            // 已登记的设备作为历史设备
+                            equ.setDataSource("jg_his_xa");
+                        } else {
+                            // 未做过登记的新设备
+                            equ.setDataSource("jg_xa");
+                        }
+                    });
+
                     Object result = jgServiceFeignClient.saveElevatorData(batch);
                     LinkedHashMap<String, Object> resultMap = (LinkedHashMap<String, Object>) result;
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml

@@ -3326,7 +3326,8 @@
         from
             tzs_jg_resume_info
         where
-            equ_id = #{record} and change_content = '设备编辑'
+            equ_id = #{record} AND business_type <![CDATA[ <> ]]> '历史设备登记'
+            AND data_source = 0
         ) a
     </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/DataDockServiceImpl.java

@@ -2660,6 +2660,8 @@ public class DataDockServiceImpl {
         String businessId = Optional.ofNullable(equ.get("businessId")).map(String::valueOf).orElse("");
         String isCompleteXa = Optional.ofNullable(equ.get("isCompleteXa")).map(String::valueOf).orElse("");
         String useRegistrationCode = Optional.ofNullable(equ.get("useOrgCode")).map(String::valueOf).orElse("").trim();
+
+        dataSource = !ValidationUtil.isEmpty(equ.get("dataSource")) ? MapUtil.getStr(equ, "dataSource") : dataSource;
         try {
             if (!equList.isEmpty()) {
                 // 判断设备是否已经做过除历史登记外的其他业务，如果做了其他业务则不能更新并记录反馈
@@ -2690,8 +2692,8 @@ public class DataDockServiceImpl {
                 saveEquInfoToEs(record, isCompleteXa);
                 this.saveInstallInfo(equ);//安装信息
                 this.historyEquUpdateMaintenanceInfo(equ);//维保信息
-                // isRegistered=false是未做过登记设备，且有使用登记证号则做历史登记
-                if (!ValidationUtil.isEmpty(useRegistrationCode) && !isRegistered) {
+                // isRegistered=false是未做过登记设备，且dataSource=jg_his，且有使用登记证号则做历史登记
+                if (!ValidationUtil.isEmpty(useRegistrationCode) && !isRegistered && "jg_his_xa".equals(dataSource)) {
                     this.handleHistoryEquip(equ);//历史登记
                 }
                 // isRegistered=true表示已做过历史平台登记，则需更新历史单据等信息。
@@ -2916,6 +2918,7 @@ public class DataDockServiceImpl {
         JgResumeInfo resumeInfo = jgResumeInfoService.lambdaQuery().eq(JgResumeInfo::getApplyNo, jgUseRegistration.getApplyNo()).one();
         if (ValidationUtil.isEmpty(resumeInfo)) {
             resumeInfo = new JgResumeInfo();
+            resumeInfo.setBusinessType(BusinessTypeEnum.JG_HISTORY_USAGE_REGISTRATION.getName());
             resumeInfo.setEquId(equ.get("record").toString());
             resumeInfo.setApplyNo(jgUseRegistration.getApplyNo());
             resumeInfo.setBusinessId(jgUseRegistration.getSequenceNbr() + "");