bug 30190、30170修改

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/DataDockController.java

@@ -162,6 +162,17 @@ public class DataDockController {
     }
 
     /**
+     * 管道设备表省市区缺失字段补充
+     **/
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/updatePipingUseInfo")
+    @ApiOperation(httpMethod = "GET", value = "管道设备表省市区缺失字段补充", notes = "管道设备表省市区缺失字段补充")
+    @RestEventTrigger(value = "updatePipingUseInfo")
+    public ResponseModel<String> updatePipingUseInfo() {
+        return ResponseHelper.buildResponse(dataDockService.updatePipingUseInfo());
+    }
+
+    /**
      * 公用、长输道批量检查
      **/
     @TycloudOperation(ApiLevel = UserType.AGENCY)

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

@@ -24,7 +24,6 @@ import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.common.api.dao.ExcelImportErrorLogDao;
 import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.common.api.dto.ExcelImportErrorLogDto;
-import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent;
 import com.yeejoin.amos.boot.module.jg.api.common.DataDockTemplateVersionUtils;
 import com.yeejoin.amos.boot.module.jg.api.converter.DictParamsConverter;
 import com.yeejoin.amos.boot.module.jg.api.converter.EquCategoryConverter;
@@ -41,7 +40,6 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.JgVehicleInformationMapper;
 import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
 import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
 import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
-import com.yeejoin.amos.boot.module.jg.biz.event.CancellationEvent;
 import com.yeejoin.amos.boot.module.jg.biz.event.publisher.EventPublisher;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.reminder.core.event.EquipCreateOrEditEvent;
@@ -63,7 +61,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
@@ -2046,6 +2043,15 @@ public class DataDockServiceImpl {
             useInfo.setCreateDate(new Date());
             useInfo.setDataSource(paramsDto.getDataSource());
             useInfo.setIsIntoManagement(Boolean.TRUE);
+            useInfo.setProvince(paramsDto.getProvince());
+            useInfo.setCity(paramsDto.getCity());
+            useInfo.setCounty(paramsDto.getCounty());
+            useInfo.setFactoryUseSiteStreet(paramsDto.getStreet());
+            useInfo.setProvinceName(paramsDto.getProvinceName());
+            useInfo.setCityName(paramsDto.getCityName());
+            useInfo.setCountyName(paramsDto.getCountyName());
+            useInfo.setStreetName(paramsDto.getStreetName());
+            useInfo.setAddress(paramsDto.getAddress());
             useInfo.setEquState(Optional.ofNullable(paramsDto.getEquState()).orElse(String.valueOf(EquimentEnum.ZAIYONG.getCode())));
             useInfo.setUseUnitCreditCode(paramsDto.getCompanyCode());
             useInfo.setUseUnitName(paramsDto.getCompanyName());
@@ -2928,4 +2934,37 @@ public class DataDockServiceImpl {
         }
     }
 
+    public String updatePipingUseInfo() {
+        LambdaQueryWrapper<IdxBizJgProjectContraption> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(IdxBizJgProjectContraption::getIsDelete, 0);
+        queryWrapper.isNotNull(IdxBizJgProjectContraption::getProvince);
+        List<IdxBizJgProjectContraption> idxBizJgProjectContraptions = idxBizJgProjectContraptionServiceImpl.getBaseMapper().selectList(queryWrapper);
+        if (!ObjectUtils.isEmpty(idxBizJgProjectContraptions)) {
+            List<Long> seqList = idxBizJgProjectContraptions.stream().map(e -> e.getSequenceNbr()).collect(Collectors.toList());
+            LambdaQueryWrapper<IdxBizJgUseInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.in(IdxBizJgUseInfo::getProjectContraptionId, seqList);
+            List<IdxBizJgUseInfo> useInfoList = idxBizJgUseInfoService.getBaseMapper().selectList(lambdaQueryWrapper);
+            List<IdxBizJgUseInfo> newList = new ArrayList<>();
+            if (!ObjectUtils.isEmpty(useInfoList)) {
+                for (IdxBizJgUseInfo useInfo : useInfoList) {
+                    List<IdxBizJgProjectContraption> collect = idxBizJgProjectContraptions.stream().filter(e -> useInfo.getProjectContraptionId().equals(e.getSequenceNbr().toString())).collect(Collectors.toList());
+                    if (!ObjectUtils.isEmpty(collect)) {
+                        IdxBizJgProjectContraption idxBizJgProjectContraption = collect.get(0);
+                        useInfo.setProvince(idxBizJgProjectContraption.getProvince());
+                        useInfo.setCity(idxBizJgProjectContraption.getCity());
+                        useInfo.setCounty(idxBizJgProjectContraption.getCounty());
+                        useInfo.setFactoryUseSiteStreet(idxBizJgProjectContraption.getStreet());
+                        useInfo.setProvinceName(idxBizJgProjectContraption.getProvinceName());
+                        useInfo.setCityName(idxBizJgProjectContraption.getCityName());
+                        useInfo.setCountyName(idxBizJgProjectContraption.getCountyName());
+                        useInfo.setStreetName(idxBizJgProjectContraption.getStreetName());
+                        useInfo.setAddress(idxBizJgProjectContraption.getAddress());
+                        newList.add(useInfo);
+                    }
+                }
+            }
+            idxBizJgUseInfoService.saveOrUpdateBatch(newList);
+        }
+        return "success";
+    }
 }

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

@@ -554,6 +554,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         projectContraption.setEquListName(equListName);
         projectContraption.setEquCategoryName(equCategoryName);
         projectContraption.setEquDefineName(equDefineName);
+        if (!ObjectUtils.isEmpty(projectContraption.getOrgCode()) && projectContraption.getOrgCode().contains("_")) {
+            String[] split = projectContraption.getOrgCode().split("_");
+            projectContraption.setOrgCode(split[0]);
+            projectContraption.setOrgName(split[1]);
+        }
         projectContraption.setPipelineLength(
                 BigDecimal.valueOf(pipelineList.stream()
                                 .map(pipeline -> pipeline.get("pipeLength"))
@@ -636,6 +641,34 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             // 使用信息
             IdxBizJgUseInfo useInfo = JSON.parseObject(toJSONString(pipeline), IdxBizJgUseInfo.class);
             // 使用信息
+            if(!ObjectUtils.isEmpty(projectContraption.getProvince())){
+                useInfo.setProvince(projectContraption.getProvince());
+                useInfo.setProvinceName(projectContraption.getProvinceName());
+            }
+            if(!ObjectUtils.isEmpty(projectContraption.getCity())){
+                useInfo.setCity(projectContraption.getCity());
+                useInfo.setCityName(projectContraption.getCityName());
+            }
+            if(!ObjectUtils.isEmpty(projectContraption.getCounty())){
+                useInfo.setCounty(projectContraption.getCounty());
+                useInfo.setCountyName(projectContraption.getCountyName());
+            }
+            if(!ObjectUtils.isEmpty(projectContraption.getStreet())){
+                useInfo.setFactoryUseSiteStreet(projectContraption.getStreet());
+                useInfo.setStreetName(projectContraption.getStreetName());
+            }
+            if(!ObjectUtils.isEmpty(projectContraption.getAddress())){
+                useInfo.setAddress(projectContraption.getAddress());
+                useInfo.setProvinceName(projectContraption.getProvinceName());
+            }
+            if(!ObjectUtils.isEmpty(projectContraption.getUseUnitName())){
+                useInfo.setUseUnitName(projectContraption.getUseUnitName());
+                useInfo.setUseUnitCreditCode(projectContraption.getUseUnitCreditCode());
+            }
+            if(!ObjectUtils.isEmpty(projectContraption.getUseDate())){
+                useInfo.setUseDate(projectContraption.getUseDate());
+            }
+
             useInfo.setRecord(record);
             useInfo.setSequenceNbr(null);
             useInfo.setRecDate(date);
@@ -707,6 +740,10 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
             // 监督管理
             IdxBizJgSupervisionInfo supervisionInfo = JSON.parseObject(toJSONString(pipeline), IdxBizJgSupervisionInfo.class);
+            if(!ObjectUtils.isEmpty(projectContraption.getOrgCode())){
+                supervisionInfo.setOrgBranchCode(projectContraption.getOrgCode());
+                supervisionInfo.setOrgBranchName(projectContraption.getOrgName());
+            }
             supervisionInfo.setRecord(record);
             supervisionInfo.setRecDate(date);
             supervisionInfo.setSequenceNbr(null);

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgUseInfo.java

@@ -10,8 +10,6 @@ import com.yeejoin.amos.boot.module.common.api.dto.IBaseChangeData;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.springframework.data.elasticsearch.annotations.Field;
-import org.springframework.data.elasticsearch.annotations.FieldType;
 
 import java.util.Date;