Merge remote-tracking branch 'origin/develop_tzs_main' into develop_tzs_main

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/dto/ProjectContraptionChangeDataDto.java

@@ -132,4 +132,11 @@ public class ProjectContraptionChangeDataDto extends BaseChangeDataDto {
     @FieldDisplayDefine(value = "使用登记编号")
     private String useRegistrationCode;
 
+
+    @FieldDisplayDefine(value = "监管码", isExist = false)
+    private String supervisoryCode;
+
+    @FieldDisplayDefine(value = "设备代码", isExist = false)
+    private String equCode;
+
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/PieLineDataChangeServiceImpl.java

@@ -113,6 +113,8 @@ public class PieLineDataChangeServiceImpl {
 
     private ProjectContraptionChangeDataDto getOldProjectContraptionData(ProjectContraptionChangeDataDto projectContraptionChangeDataDtoNew) {
         IdxBizJgProjectContraption projectContraption = idxBizJgProjectContraptionServiceImpl.getById(projectContraptionChangeDataDtoNew.getProjectContraptionId());
+        projectContraptionChangeDataDtoNew.setEquCode(projectContraption.getEquCode());
+        projectContraptionChangeDataDtoNew.setSupervisoryCode(projectContraption.getSupervisoryCode());
         return BeanUtil.copyProperties(projectContraption, ProjectContraptionChangeDataDto.class);
     }
 
@@ -197,7 +199,7 @@ public class PieLineDataChangeServiceImpl {
         // 汇总表打印会使用
         useInfo.setUseDate(projectContraptionChangeDataDto.getUseDate());
         useInfo.setDataSource(projectContraptionChangeDataDto.getDataSource());
-        useInfo.setIsIntoManagement(Boolean.FALSE);
+        useInfo.setIsIntoManagement(Boolean.TRUE);
         useInfo.setEquState(String.valueOf(EquipmentEnum.ZAIYONG.getCode()));
         SingleProjectEquipChangeProcess.setNewUseAddressInfo(projectContraptionChangeDataDto, useInfo);
         commonEquipDataProcessService.getIdxBizJgUseInfoService().save(useInfo);
@@ -255,6 +257,7 @@ public class PieLineDataChangeServiceImpl {
         otherInfo.setSequenceNbr(null);
         otherInfo.setClaimStatus("已认领");
         otherInfo.setRecDate(new Date());
+        otherInfo.setSupervisoryCode(projectContraptionChangeDataDto.getSupervisoryCode());
         commonEquipDataProcessService.getIdxBizJgOtherInfoMapper().insert(otherInfo);
 
         //管道技术参数
@@ -291,6 +294,11 @@ public class PieLineDataChangeServiceImpl {
         esEquipmentDto.setORG_BRANCH_NAME(projectContraptionChangeDataDto.getOrgName());
         esEquipmentDto.setOrgBranchCode(projectContraptionChangeDataDto.getOrgCode());
         esEquipmentDto.setCREATE_DATE(new Date().getTime());
+        esEquipmentDto.setUSE_PLACE(String.join("/", projectContraptionChangeDataDto.getProvinceName(), projectContraptionChangeDataDto.getCityName(), projectContraptionChangeDataDto.getCountyName(), projectContraptionChangeDataDto.getStreetName()));
+        esEquipmentDto.setUSE_PLACE_CODE(String.join("#", projectContraptionChangeDataDto.getProvince(), projectContraptionChangeDataDto.getCity(), projectContraptionChangeDataDto.getCounty(), projectContraptionChangeDataDto.getStreet()));
+        esEquipmentDto.setADDRESS(projectContraptionChangeDataDto.getAddress());
+        esEquipmentDto.setSUPERVISORY_CODE(projectContraptionChangeDataDto.getSupervisoryCode());
+        esEquipmentDto.setEQU_CODE(projectContraptionChangeDataDto.getEquCode());
         esEquipmentDto.setProjectContraptionId(projectContraptionChangeDataDto.getProjectContraptionId());
         if (inspectionDetectionInfo.getNextInspectDate() != null) {
             esEquipmentDto.setNEXT_INSPECT_DATE(inspectionDetectionInfo.getNextInspectDate().getTime());
@@ -387,6 +395,11 @@ public class PieLineDataChangeServiceImpl {
             esEquipmentDto.setORG_BRANCH_NAME(projectContraptionChangeDataDto.getOrgName());
             esEquipmentDto.setOrgBranchCode(projectContraptionChangeDataDto.getOrgCode());
             esEquipmentDto.setUSE_ORG_CODE(projectContraptionChangeDataDto.getUseRegistrationCode());
+            esEquipmentDto.setUSE_PLACE(String.join("/", projectContraptionChangeDataDto.getProvinceName(), projectContraptionChangeDataDto.getCityName(), projectContraptionChangeDataDto.getCountyName(), projectContraptionChangeDataDto.getStreetName()));
+            esEquipmentDto.setUSE_PLACE_CODE(String.join("#", projectContraptionChangeDataDto.getProvince(), projectContraptionChangeDataDto.getCity(), projectContraptionChangeDataDto.getCounty(), projectContraptionChangeDataDto.getStreet()));
+            esEquipmentDto.setADDRESS(projectContraptionChangeDataDto.getAddress());
+            esEquipmentDto.setSUPERVISORY_CODE(projectContraptionChangeDataDto.getSupervisoryCode());
+            esEquipmentDto.setEQU_CODE(projectContraptionChangeDataDto.getEquCode());
             if (pipelineNew.getNextInspectDate() != null) {
                 esEquipmentDto.setNEXT_INSPECT_DATE(pipelineNew.getNextInspectDate().getTime());
             }

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

@@ -842,7 +842,7 @@ public class DataDockServiceImpl {
      * @param record 设备唯一编码
      */
     private void saveEquInfoToEs(String record, String isCompleteXa) {
-        Map<String, Object> map = categoryOtherInfoMapper.selectDataById(record);
+        Map<String, Object> map = categoryOtherInfoMapper.selectJgAllViewDataById(record);
         ESEquipmentCategoryDto equipmentCategoryDto = JSON.parseObject(toJSONString(map), ESEquipmentCategoryDto.class);
         if (!ObjectUtils.isEmpty(equipmentCategoryDto)) {
             long recTime;
@@ -2975,7 +2975,7 @@ public class DataDockServiceImpl {
             idxBizJgUseInfoService.updateById(useInfo);
 
             // es更新
-            Map<String, Object> map = categoryOtherInfoMapper.selectDataById(useInfo.getRecord());
+            Map<String, Object> map = categoryOtherInfoMapper.selectJgAllViewDataById(useInfo.getRecord());
             ESEquipmentCategoryDto equipmentCategoryDto = JSON.parseObject(toJSONString(map), ESEquipmentCategoryDto.class);
             equipmentCategoryDto.setIS_INTO_MANAGEMENT(Boolean.TRUE);
             esEquipmentCategory.save(equipmentCategoryDto);

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/DataHandlerServiceImpl.java

@@ -106,7 +106,6 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
 
 import static com.alibaba.fastjson.JSON.toJSONString;
 import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgInstallationNoticeServiceImpl.CONSTRUCTION_TYPE;
@@ -1141,7 +1140,7 @@ public class DataHandlerServiceImpl {
         }
         String[] recordArr = records.trim().split(",");
         for (String record : recordArr) {
-            Map<String, Object> map = categoryOtherInfoMapper.selectDataById(record);
+            Map<String, Object> map = categoryOtherInfoMapper.selectJgAllViewDataById(record);
             categoryOtherInfoMapper.updateEsStatus(record);
             ESEquipmentCategoryDto dto = JSON.parseObject(toJSONString(map), ESEquipmentCategoryDto.class);
             Optional<ESEquipmentCategoryDto> data = esEquipmentCategory.findById(record);

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/ShCarServiceImpl.java

@@ -13,7 +13,9 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
+import com.yeejoin.amos.boot.module.common.api.dao.EsEquipmentDao;
 import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
+import com.yeejoin.amos.boot.module.common.api.entity.ESEquipmentInfo;
 import com.yeejoin.amos.boot.module.jg.api.dto.ShCarDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
@@ -94,6 +96,8 @@ public class ShCarServiceImpl extends BaseService<ShCar, ShCar, ShCarMapper> imp
     @Resource
     private ESEquipmentCategory esEquipmentCategory;
     @Resource
+    private EsEquipmentDao esEquipmentDao;
+    @Resource
     private TzsServiceFeignClient tzsServiceFeignClient;
     @Resource
     private JgVehicleInformationServiceImpl vehicleInformationService;
@@ -707,13 +711,23 @@ public class ShCarServiceImpl extends BaseService<ShCar, ShCar, ShCarMapper> imp
      * 认领过程中报错，回滚第一步的es数据
      */
     public void handleClaimFailed(List<String> records) {
-        if (!records.isEmpty()) {
-            records.forEach(record -> {
-                Optional<ESEquipmentCategoryDto> data = esEquipmentCategory.findById(record);
-                if (!ObjectUtils.isEmpty(data)) {
-                    esEquipmentCategory.deleteById(record);
+        esEquipmentCategory.deleteAll(this.buildEquipCategoryData(records));
+        esEquipmentDao.deleteAll(this.buildEquipData(records));
     }
-            });
+
+    private Iterable<? extends ESEquipmentInfo> buildEquipData(List<String> records) {
+        return records.stream().map(record->{
+            ESEquipmentInfo esEquipmentInfo = new ESEquipmentInfo();
+            esEquipmentInfo.setSEQUENCE_NBR(record);
+            return esEquipmentInfo;
+        }).collect(Collectors.toList());
     }
+
+    private Iterable<? extends ESEquipmentCategoryDto> buildEquipCategoryData(List<String> records) {
+        return records.stream().map(record->{
+            ESEquipmentCategoryDto esEquipmentInfo = new ESEquipmentCategoryDto();
+            esEquipmentInfo.setSEQUENCE_NBR(record);
+            return esEquipmentInfo;
+        }).collect(Collectors.toList());
     }
 }
\ No newline at end of file

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

@@ -313,6 +313,7 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
         JyjcInspectionResultModel dbResultModel = this.queryBySeq(model.getSequenceNbr());
         // 更新使用信息、检验信息、技术参数
         Set<String> records = this.updateTechParamAndInspectInfo(dbResultModel, jybgFile);
+        sendDataRefreshMsg(records);
         return dbResultModel;
     }
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/mapper/CategoryOtherInfoMapper.java

@@ -30,7 +30,7 @@ public interface CategoryOtherInfoMapper extends BaseMapper<CategoryOtherInfo> {
 
     int updateOtherInfo(String supervisorCode, String editStatus);
 
-    Map<String, Object> selectDataById(String id);
+    Map<String, Object> selectJgAllViewDataById(String id);
 
     CategoryOtherInfo queryInitCode(@Param("initCode") @NonNull String initCode);
 

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/CategoryOtherInfoMapper.xml

@@ -73,7 +73,7 @@
                  LEFT JOIN idx_biz_jg_use_info ibjui ON ibjoi.RECORD = ibjui.RECORD
         WHERE ibjoi."RECORD" = #{record}
     </select>
-    <select id="selectDataById" resultType="java.util.Map">
+    <select id="selectJgAllViewDataById" resultType="java.util.Map">
         SELECT "SEQUENCE_NBR",
                "REC_DATE",
                "CREATE_DATE",

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

@@ -1664,7 +1664,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
 
     @Override
     public void checkEsData(String id) {
-        Map<String, Object> map = categoryOtherInfoMapper.selectDataById(id);
+        Map<String, Object> map = categoryOtherInfoMapper.selectJgAllViewDataById(id);
         categoryOtherInfoMapper.updateEsStatus(id);
         ESEquipmentCategoryDto dto = JSON.parseObject(toJSONString(map), ESEquipmentCategoryDto.class);
         Optional<ESEquipmentCategoryDto> data = esEquipmentCategory.findById(id);