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

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/controller/YuLinDataDockController.java

 package com.yeejoin.amos.api.openapi.controller;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yeejoin.amos.api.openapi.face.model.ElevatorModel;
 import com.yeejoin.amos.api.openapi.feign.TzsJgServiceFeignClient;
 import com.yeejoin.amos.boot.module.cylinder.api.dto.PageParam;
 import io.swagger.annotations.Api;
@@ -17,8 +15,6 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import java.util.Date;
-import java.util.List;
-import java.util.Map;
 
 /**
  * 特种设备监管controller
@@ -42,11 +38,11 @@ public class YuLinDataDockController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/getElevatorInfo")
 	@ApiOperation(httpMethod = "GET", value = "查询电梯信息列表", notes = "查询电梯信息列表")
-	public ResponseModel<IPage<ElevatorModel>> getElevatorInfo(@RequestParam(value = "equCode", required = false) String equCode,
-															  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime,
-															  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime,
-															  PageParam pageParam) {
-		return ResponseHelper.buildResponse(jgServiceFeignClient.getElevatorInfo(equCode, startTime, endTime, pageParam));
+	public ResponseModel<Object> getElevatorInfo(@RequestParam(value = "equCode", required = false) String equCode,
+												 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime,
+												 @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime,
+											     PageParam pageParam) {
+		return ResponseHelper.buildResponse(jgServiceFeignClient.getElevatorInfo(equCode, startTime, endTime, pageParam.getCurrent(), pageParam.getSize()));
 	}
 
 	/**
@@ -60,11 +56,11 @@ public class YuLinDataDockController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/getCylinderInfo")
 	@ApiOperation(httpMethod = "GET", value = "根据时间范围查询液化石油气瓶档案", notes = "根据时间范围查询液化石油气瓶档案")
-	public ResponseModel<IPage<ElevatorModel>> getCylinderInfo(@RequestParam(value = "equCode", required = false) String equCode,
-															   @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime,
-															   @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime,
-															   PageParam pageParam) {
-		return ResponseHelper.buildResponse(jgServiceFeignClient.getCylinderInfo(equCode, startTime, endTime, pageParam));
+	public ResponseModel<Object> getCylinderInfo(@RequestParam(value = "equCode", required = false) String equCode,
+											     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime,
+											     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime,
+											     PageParam pageParam) {
+		return ResponseHelper.buildResponse(jgServiceFeignClient.getCylinderInfo(equCode, startTime, endTime, pageParam.getCurrent(), pageParam.getSize()));
 	}
 
 	/**
@@ -75,7 +71,7 @@ public class YuLinDataDockController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/getVehicleCylinderInfo")
 	@ApiOperation(httpMethod = "GET", value = "车用气气瓶档案", notes = "车用气气瓶档案")
-	public ResponseModel<List<Map<String, Object>>> getVehicleCylinderInfo(@RequestParam(value = "useCode") String useCode) {
+	public ResponseModel<Object> getVehicleCylinderInfo(@RequestParam(value = "useCode") String useCode) {
 		return ResponseHelper.buildResponse(jgServiceFeignClient.getVehicleCylinderInfo(useCode));
 	}
 
@@ -86,7 +82,7 @@ public class YuLinDataDockController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@GetMapping(value = "/getCylinderStationInfo")
 	@ApiOperation(httpMethod = "GET", value = "查询气站信息", notes = "查询气站信息")
-	public ResponseModel<List<Map<String, Object>>> getCylinderStationInfo() {
+	public ResponseModel<Object> getCylinderStationInfo() {
 		return ResponseHelper.buildResponse(jgServiceFeignClient.getCylinderStationInfo());
 	}
 }

amos-boot-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/feign/TzsJgServiceFeignClient.java

 package com.yeejoin.amos.api.openapi.feign;
 
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.api.openapi.dto.XiAnEquipInfoExcelDto;
-import com.yeejoin.amos.api.openapi.face.model.ElevatorModel;
 import com.yeejoin.amos.boot.biz.common.feign.FeignConfiguration;
-import com.yeejoin.amos.boot.module.cylinder.api.dto.PageParam;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -44,11 +41,13 @@ public interface TzsJgServiceFeignClient {
      * @param endTime   结束时间
      * @return 电梯数据
      */
-    @RequestMapping(value = "/equipment-register/getElevatorInfo", method = RequestMethod.GET)
-    IPage<ElevatorModel> getElevatorInfo(@RequestParam("equCode") String equCode,
-                                         @RequestParam("startTime") Date startTime,
-                                         @RequestParam("startTime") Date endTime,
-                                         PageParam pageParam);
+    @GetMapping(value = "/equipment-register/getElevatorInfo")
+    ResponseModel<Page<Map<String, Object>>> getElevatorInfo(@RequestParam("equCode") String equCode,
+                                                             @RequestParam("startTime") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime,
+                                                             @RequestParam("endTime") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime,
+                                                             @RequestParam(value = "current") int current,
+                                                             @RequestParam(value = "size") int size
+    );
 
     /**
      * 根据时间范围查询液化石油气瓶档案
@@ -58,11 +57,13 @@ public interface TzsJgServiceFeignClient {
      * @param endTime   结束时间
      * @return 电梯数据
      */
-    @RequestMapping(value = "/equipment-register/getCylinderInfo", method = RequestMethod.GET)
-    IPage<ElevatorModel> getCylinderInfo(@RequestParam("equCode") String equCode,
-                                         @RequestParam("startTime") Date startTime,
-                                         @RequestParam("startTime") Date endTime,
-                                         PageParam pageParam);
+    @GetMapping(value = "/equipment-register/getCylinderInfo")
+    ResponseModel<Page<Map<String, Object>>> getCylinderInfo(@RequestParam("equCode") String equCode,
+                                                             @RequestParam("startTime") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime,
+                                                             @RequestParam("endTime") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime,
+                                                             @RequestParam(value = "current") int current,
+                                                             @RequestParam(value = "size") int size
+    );
 
     /**
      * 查询气站信息
@@ -70,10 +71,12 @@ public interface TzsJgServiceFeignClient {
      * @return
      */
     @RequestMapping(value = "/equipment-register/getCylinderStationInfo", method = RequestMethod.GET)
-    List<Map<String, Object>> getCylinderStationInfo();
+    ResponseModel<List<Map<String, Object>>> getCylinderStationInfo();
+
+
+    @GetMapping(value = "/equipment-register/getVehicleCylinderInfo")
+    ResponseModel<List<Map<String, Object>>> getVehicleCylinderInfo(@RequestParam("useCode") String useCode);
 
-    @RequestMapping(value = "/equipment-register/getVehicleCylinderInfo", method = RequestMethod.GET)
-    List<Map<String, Object>> getVehicleCylinderInfo(String useCode);
 
     /**
      * 批量保存西安上传的设备数据

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

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
-import com.yeejoin.amos.boot.module.ymt.api.entity.PageParam;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -22,7 +20,6 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
@@ -301,12 +298,12 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getElevatorInfo")
     @ApiOperation(httpMethod = "GET", value = "查询电梯信息列表", notes = "查询电梯信息列表")
-    public ResponseModel<IPage<Map<String, Object>>> getElevatorInfo(@RequestParam(value = "equCode", required = false) String equCode,
-                                                                     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime,
-                                                                     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime,
-                                                                     PageParam pageParam) {
-
-        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.getElevatorInfo(equCode, startTime, endTime, pageParam));
+    public ResponseModel<Page<Map<String, Object>>> getElevatorInfo(@RequestParam(value = "equCode", required = false) String equCode,
+                                                                    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime,
+                                                                    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime,
+                                                                    @RequestParam(value = "current") int current,
+                                                                    @RequestParam(value = "size") int size) {
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.getElevatorInfo(equCode, startTime, endTime, current, size));
     }
 
     /**
@@ -344,12 +341,12 @@ public class IdxBizJqEquipmentRegisterController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/getCylinderInfo")
     @ApiOperation(httpMethod = "GET", value = "根据时间范围查询液化石油气瓶档案", notes = "根据时间范围查询液化石油气瓶档案")
-    public ResponseModel<IPage<Map<String, Object>>> getCylinderInfo(@RequestParam(value = "equCode", required = false) String equCode,
+    public ResponseModel<Page<Map<String, Object>>> getCylinderInfo(@RequestParam(value = "equCode", required = false) String equCode,
                                                                      @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date startTime,
                                                                      @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date endTime,
-                                                                     PageParam pageParam) {
-
-        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.getCylinderInfo(equCode, startTime, endTime, pageParam));
+                                                                     @RequestParam(value = "current") int current,
+                                                                     @RequestParam(value = "size") int size) {
+        return ResponseHelper.buildResponse(idxBizJgRegisterInfoService.getCylinderInfo(equCode, startTime, endTime, current, size));
     }
 
     /**

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

 package com.yeejoin.amos.boot.module.jg.biz.service;
 
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.module.ymt.api.entity.PageParam;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import org.springframework.web.multipart.MultipartFile;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
@@ -60,13 +58,13 @@ public interface IIdxBizJgRegisterInfoService {
      */
     List<Map<String, Object>> getProjectContraptionList(String useUnitCreditCode);
 
-    Page<Map<String, Object>> getElevatorInfo(String equCode, Date startTime, Date endTime, PageParam pageParam);
+    Page<Map<String, Object>> getElevatorInfo(String equCode, Date startTime, Date endTime, int current, int size);
 
     List<Map<String, Object>> getCylinderStationInfo();
 
     List<Map<String, Object>> getVehicleCylinderInfo(String useCode);
 
-    IPage<Map<String, Object>> getCylinderInfo(String equCode, Date startTime, Date endTime, PageParam pageParam);
+    Page<Map<String, Object>> getCylinderInfo(String equCode, Date startTime, Date endTime, int current, int size);
 
     void initUserExpirationReminderOnce();
 

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

@@ -1563,10 +1563,10 @@ public class DataDockServiceImpl {
         String equListCode = String.valueOf(equipInfo.get("EQU_LIST"));
         String equCategoryCode = String.valueOf(equipInfo.get("EQU_CATEGORY"));
         String equDefineCode = String.valueOf(equipInfo.get("EQU_DEFINE"));
-        String receiveOrgCode = String.valueOf(equipInfo.get("RECEIVE_ORG_CODE"));
+        String receiveOrgCode = Optional.ofNullable(equipInfo.get("RECEIVE_ORG_CODE")).map(String::valueOf).orElse(null);
         String inspectUnitCreditCode = Optional.ofNullable(equLists.get(0).getInspectOrgCode()).orElse("");
         String inspectUnitName = Optional.ofNullable(equLists.get(0).getInspectOrgName()).orElse("");
-        String useOrgCode = String.valueOf(equipInfo.get("USE_ORG_CODE"));
+        String useOrgCode = Optional.ofNullable(equipInfo.get("USE_ORG_CODE")).map(String::valueOf).orElse(null);
         String province = String.valueOf(equipInfo.get("province"));
         String city = String.valueOf(equipInfo.get("city"));
         String county = String.valueOf(equipInfo.get("county"));
@@ -1598,8 +1598,16 @@ public class DataDockServiceImpl {
                 .setOrgBranchName(orgBranchCode.split("_").length > 1 ? orgBranchCode.split("_")[1] : "")
                 .setUseOrgCode(useOrgCode)
                 .setVehicleApanage(String.valueOf(equipInfo.get("VEHICLE_APANAGE")))
-                .setReceiveOrgCode(receiveOrgCode.split("_")[0])
-                .setReceiveOrgName(receiveOrgCode.split("_")[1])
+                .setReceiveOrgCode(Optional.ofNullable(receiveOrgCode)
+                                           .map(code -> code.split("_"))
+                                           .filter(parts -> parts.length > 0)
+                                           .map(parts -> parts[0])
+                                           .orElse(null))
+                .setReceiveOrgName(Optional.ofNullable(receiveOrgCode)
+                                           .map(code -> code.split("_"))
+                                           .filter(parts -> parts.length > 1)
+                                           .map(parts -> parts[1])
+                                           .orElse(null))
                 .setProjectContraption(String.valueOf(equipInfo.get("PROJECT_CONTRAPTION")))
                 .setProjectContraptionNo(String.valueOf(equipInfo.get("PROJECT_CONTRAPTION_NO")))
                 .setProductPhoto(toJSONString(equipInfo.get("PRODUCT_PHOTO")))

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

@@ -625,15 +625,17 @@ public class DataHandlerServiceImpl {
             projectContraptionService.saveBatch(projectContraptionList);
         }
         // 更新设备es的装置id、使用信息的装置id
-        projectContraptionIdRecordsMap.forEach((k, v) -> {
+        projectContraptionIdRecordsMap.forEach((k,v)->{
+            IdxBizJgProjectContraption idxBizJgProjectContraption = projectContraptionService.getById(k);
             Iterable<ESEquipmentCategoryDto> equipmentCategories = esEquipmentCategory.findAllById(v);
-            equipmentCategories.forEach(e -> e.setProjectContraptionId(k + ""));
+            equipmentCategories.forEach(e-> e.setProjectContraptionId(k + ""));
             esEquipmentCategory.saveAll(equipmentCategories);
-            Collection<IdxBizJgUseInfo> useInfos = useInfoService.listByIds(v);
-            useInfos.forEach(u -> {
+            Collection<IdxBizJgUseInfo> useInfos = useInfoService.getUseInfoListByEquIds(v);
+            useInfos.forEach(u->{
                 LambdaUpdateWrapper<IdxBizJgUseInfo> updateWrapper = new LambdaUpdateWrapper<>();
                 updateWrapper.eq(IdxBizJgUseInfo::getRecord, u.getRecord());
-                updateWrapper.set(IdxBizJgUseInfo::getProjectContraptionId, u.getProjectContraptionId());
+                updateWrapper.set(IdxBizJgUseInfo::getProjectContraptionId, k);
+                updateWrapper.set(IdxBizJgUseInfo::getProjectContraption, idxBizJgProjectContraption.getProjectContraption());
                 useInfoService.update(updateWrapper);
             });
         });
@@ -824,10 +826,14 @@ public class DataHandlerServiceImpl {
         eqs.forEach(eq -> {
             Optional<ESEquipmentCategoryDto> equInfosWithEs = esEquipmentCategory.findById(eq.getEquId());
             equInfosWithEs.ifPresent(equInfoEs -> {
-                LambdaUpdateWrapper<IdxBizJgUseInfo> updateWrapper = new LambdaUpdateWrapper<>();
-                updateWrapper.eq(IdxBizJgUseInfo::getRecord, equInfoEs.getSEQUENCE_NBR());
-                updateWrapper.set(IdxBizJgUseInfo::getProjectContraptionId, equInfoEs.getProjectContraptionId());
-                useInfoService.update(updateWrapper);
+                if(StringUtils.isNotEmpty(equInfoEs.getProjectContraptionId())){
+                    IdxBizJgProjectContraption idxBizJgProjectContraption = projectContraptionService.getById(equInfoEs.getProjectContraptionId());
+                    LambdaUpdateWrapper<IdxBizJgUseInfo> updateWrapper = new LambdaUpdateWrapper<>();
+                    updateWrapper.eq(IdxBizJgUseInfo::getRecord, equInfoEs.getSEQUENCE_NBR());
+                    updateWrapper.set(IdxBizJgUseInfo::getProjectContraptionId, idxBizJgProjectContraption.getSequenceNbr());
+                    updateWrapper.set(IdxBizJgUseInfo::getProjectContraption, idxBizJgProjectContraption.getProjectContraption());
+                    useInfoService.update(updateWrapper);
+                }
             });
         });
         List<JgInstallationNoticeEq> eqsAfter = jgInstallationNoticeEqMapper.selectPCIdNeErrorPieLineInUseInfo();

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

@@ -134,11 +134,13 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
         List<IdxBizJgUseInfo> useInfos = useInfoService.lambdaQuery().select(IdxBizJgUseInfo::getRecord).eq(IdxBizJgUseInfo::getProjectContraptionId, sequenceNbr).list();
         // 删除idx设备表信息 + 删除对应es数据
         List<String> records = useInfos.stream().map(IdxBizJgUseInfo::getRecord).collect(Collectors.toList());
-        if (records.isEmpty()) return Boolean.TRUE;
-        Map<String, Object> map = new HashMap<>();
-        map.put("recordList", records);
-        map.put("equList", PipelineEnum.PRESSURE_PIPELINE.getCode());
-        registerInfoService.batchDeleteByRecord(map);
+        if (!records.isEmpty()){
+            Map<String, Object> map = new HashMap<>();
+            map.put("recordList", records);
+            map.put("equList", PipelineEnum.PRESSURE_PIPELINE.getCode());
+            registerInfoService.batchDeleteByRecord(map);
+        }
+
         // 删除装置表信息
         this.removeById(sequenceNbr);
         return Boolean.TRUE;

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

@@ -84,6 +84,8 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.io.IOException;
 import java.lang.reflect.Field;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.Timestamp;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -502,11 +504,13 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         projectContraption.setEquCategoryName(equCategoryName);
         projectContraption.setEquDefineName(equDefineName);
         projectContraption.setPipelineLength(
-                pipelineList.stream()
-                        .map(pipeline -> pipeline.get("pipeLength"))
-                        .filter(Objects::nonNull)
-                        .mapToDouble(pipeLength -> Double.parseDouble(String.valueOf(pipeLength)))
-                        .sum()
+                BigDecimal.valueOf(pipelineList.stream()
+                                .map(pipeline -> pipeline.get("pipeLength"))
+                                .filter(Objects::nonNull)
+                                .mapToDouble(pipeLength -> Double.parseDouble(String.valueOf(pipeLength)))
+                                .sum())
+                        .setScale(2, RoundingMode.HALF_UP)
+                        .doubleValue()
         );
 
         projectContraption.setUscUnitName(companyInfoMap.get("companyName").toString());
@@ -4413,9 +4417,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     }
 
     @Override
-    public Page<Map<String, Object>> getElevatorInfo(String equCode, Date startTime, Date endTime, PageParam
-            pageParam) {
-        Page<Map<String, Object>> result = new Page<>(pageParam.getCurrent(), pageParam.getSize());
+    public Page<Map<String, Object>> getElevatorInfo(String equCode, Date startTime, Date endTime, int current, int size) {
+        Page<Map<String, Object>> result = new Page<>(current, size);
         SearchRequest request = new SearchRequest();
         request.indices("idx_biz_view_jg_all");
         SearchSourceBuilder builder = new SearchSourceBuilder();
@@ -4446,8 +4449,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
         builder.query(boolMust);
         builder.sort("REC_DATE", SortOrder.DESC);
-        builder.from((pageParam.getCurrent() - 1) * pageParam.getSize());
-        builder.size(pageParam.getSize());
+        builder.from((current - 1) * size);
+        builder.size(size);
         request.source(builder);
         List<Map<String, Object>> elevatorModelVoList = Collections.emptyList();
         try {
@@ -4464,7 +4467,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 elevatorModelVoList = jgUseRegistrationMapper.getElevatorModeList(equIds);
             }
             result.setRecords(convertKeysToCamelCase(elevatorModelVoList));
-            result.setTotal(response.getHits().getTotalHits().value);
+            result.setTotal(Objects.requireNonNull(response.getHits().getTotalHits()).value);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -4482,9 +4485,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     }
 
     @Override
-    public IPage<Map<String, Object>> getCylinderInfo(String equCode, Date startTime, Date endTime, PageParam
-            pageParam) {
-        Page<Map<String, Object>> result = new Page<>(pageParam.getCurrent(), pageParam.getSize());
+    public Page<Map<String, Object>> getCylinderInfo(String equCode, Date startTime, Date endTime, int current, int size) {
+        Page<Map<String, Object>> result = new Page<>(current, size);
         SearchRequest request = new SearchRequest();
         request.indices("idx_biz_view_jg_all");
         SearchSourceBuilder builder = new SearchSourceBuilder();
@@ -4515,8 +4517,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
         builder.query(boolMust);
         builder.sort("REC_DATE", SortOrder.DESC);
-        builder.from((pageParam.getCurrent() - 1) * pageParam.getSize());
-        builder.size(pageParam.getSize());
+        builder.from((current - 1) * size);
+        builder.size(size);
         request.source(builder);
         List<Map<String, Object>> cylinderInfoList = Collections.emptyList();
         try {
@@ -4539,7 +4541,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                 cylinderInfoList.forEach(i -> i.computeIfPresent("chargingMedium", (key, value) -> fillingMediumMap.get(value)));
             }
             result.setRecords(convertKeysToCamelCase(cylinderInfoList));
-            result.setTotal(response.getHits().getTotalHits().value);
+            result.setTotal(Objects.requireNonNull(response.getHits().getTotalHits()).value);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }

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

@@ -89,6 +89,8 @@ import org.typroject.tyboot.core.restful.utils.ResponseModel;
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.net.URLEncoder;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -1923,7 +1925,9 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         result.fluentPut("deviceList", deviceList)
                 .fluentPut("projectContraption", projectContraption.getProjectContraption())
                 .fluentPut("projectContraptionNo", projectContraption.getProjectContraptionNo())
-                .fluentPut("pipelineLength", projectContraption.getPipelineLength())
+                .fluentPut("pipelineLength", BigDecimal.valueOf(projectContraption.getPipelineLength())
+                        .setScale(2, RoundingMode.HALF_UP)
+                        .doubleValue())
                 .fluentPut("projectContraptionId", projectContraptionSeq);
         if (!ValidationUtil.isEmpty(projectContraption.getCity())) {
             result.fluentPut("city", projectContraption.getCity() + "_" + projectContraption.getCityName());

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

@@ -313,111 +313,48 @@
     </select>
 
     <select id="countContraptionInUseTimesForDeleteByIntoManagement" resultType="java.lang.Integer">
-        SELECT
-        SUM(inUseNumber)
-        FROM (
-        SELECT
-        COUNT(1) AS inUseNumber
-        FROM tzs_jg_equip_transfer a
-        LEFT JOIN tzs_jg_equip_transfer_eq b ON b.equip_transfer_id=a.sequence_nbr
-        LEFT JOIN idx_biz_jg_use_info c ON b.equ_id=c.record
-        WHERE c.project_contraption_id = #{projectContraptionId}
-        AND a.is_delete = 0
-        AND ( a.apply_status != '6617')
-        UNION
-        SELECT
-        COUNT(1) AS inUseNumber
-        FROM
-        tzs_jg_use_registration a
-        WHERE a.project_contraption_id = #{projectContraptionId}
-        AND a.is_delete = 0
-        AND ( a.status != '已作废')
-        UNION
-        SELECT
-        COUNT(1) AS inUseNumber
-        FROM tzs_jg_change_registration_unit a
-        LEFT JOIN tzs_jg_change_registration_unit_eq b ON b.unit_change_registration_id=a.sequence_nbr
-        LEFT JOIN idx_biz_jg_use_info c ON b.equ_id=c.record
-        WHERE c.project_contraption_id = #{projectContraptionId}
-        AND a.is_delete = 0
-        AND ( a.status != '已作废')
-        UNION
-        SELECT
-        COUNT(1) AS inUseNumber
-        FROM tzs_jg_enable_disable a
-        LEFT JOIN tzs_jg_enable_disable_eq b ON b.enable_disable_apply_id=a.sequence_nbr
-        LEFT JOIN idx_biz_jg_use_info c ON b.equ_id=c.record
-        WHERE c.project_contraption_id = #{projectContraptionId}
-        AND a.is_delete = 0
-        AND ( a.audit_status != '已作废')
-        UNION
-        SELECT
-        COUNT(1) AS inUseNumber
-        FROM tzs_jg_scrap_cancel a
-        LEFT JOIN tzs_jg_scrap_cancel_eq b ON b.equip_transfer_id=a.sequence_nbr
-        LEFT JOIN idx_biz_jg_use_info c ON b.equ_id=c.record
-        WHERE c.project_contraption_id = #{projectContraptionId}
-        AND a.is_delete = 0
-        AND ( a.audit_status != '使用单位已撤回')
-        UNION
-        SELECT
-        COUNT(1) AS inUseNumber
-        FROM tzs_jg_change_registration_transfer a
-        LEFT JOIN tzs_jg_change_registration_transfer_eq b ON b.equip_transfer_id=a.sequence_nbr
-        LEFT JOIN idx_biz_jg_use_info c ON b.equ_id=c.record
-        WHERE c.project_contraption_id = #{projectContraptionId}
-        AND a.is_delete = 0
-        AND ( a.audit_status != '使用单位已撤回')
-        UNION
-        SELECT
-        COUNT(1) AS inUseNumber
-        FROM tzs_jg_change_registration_name a
-        LEFT JOIN tzs_jg_change_registration_name_eq b ON b.name_change_registration_id=a.sequence_nbr
-        LEFT JOIN idx_biz_jg_use_info c ON b.equ_id=c.record
-        WHERE c.project_contraption_id = #{projectContraptionId}
-        AND a.is_delete = 0
-        AND ( a.audit_status != '使用单位已撤回')
-        UNION
-        SELECT
-        COUNT(1) AS inUseNumber
-        FROM
-        tzs_jg_installation_notice a
-        WHERE a.project_contraption_id = #{projectContraptionId}
-        AND (a.notice_status != '6617')
-        UNION
-        SELECT
-        COUNT(1) AS inUseNumber
-        FROM tzs_jg_maintain_notice a
-        LEFT JOIN tzs_jg_maintain_notice_eq b ON b.equip_transfer_id=a.sequence_nbr
-        LEFT JOIN idx_biz_jg_use_info c ON b.equ_id=c.record
-        WHERE c.project_contraption_id = #{projectContraptionId}
-        AND a.is_delete = 0
-        AND ( a.notice_status != '6617')
-        UNION
-        SELECT
-        COUNT(1) AS inUseNumber
-        FROM tzs_jg_reform_notice a
-        LEFT JOIN tzs_jg_reform_notice_eq b ON b.equip_transfer_id=a.sequence_nbr
-        LEFT JOIN idx_biz_jg_use_info c ON b.equ_id=c.record
-        WHERE c.project_contraption_id = #{projectContraptionId}
-        AND a.is_delete = 0
-        AND ( a.notice_status != '6617')
-        UNION
-        SELECT
-        COUNT(1) AS inUseNumber
-        FROM tzs_jg_transfer_notice a
-        LEFT JOIN tzs_jg_transfer_notice_eq b ON b.equip_transfer_id=a.sequence_nbr
-        LEFT JOIN idx_biz_jg_use_info c ON b.equ_id=c.record
-        WHERE c.project_contraption_id = #{projectContraptionId}
-        AND a.is_delete = 0
-        AND ( a.notice_status != '6617')
-        UNION
-        SELECT
-        COUNT(1) AS inUseNumber
-        FROM tz_jyjc_inspection_application a
-        WHERE a.project_contraption_id = #{projectContraptionId}
-        AND ( a.status != '6617')
-        )
+        SELECT SUM(inUseNumber) FROM (
+         SELECT COUNT(DISTINCT A.sequence_nbr) AS inUseNumber FROM tzs_jg_equip_transfer A
+           LEFT JOIN tzs_jg_equip_transfer_eq b ON b.equip_transfer_id = A.sequence_nbr
+           LEFT JOIN idx_biz_jg_use_info C ON b.equ_id = C.record
+         WHERE C.project_contraption_id = #{projectContraptionId}
+           AND A.is_delete = 0
+           AND A.apply_status != '6617'
+         UNION
+         SELECT COUNT(1) AS inUseNumber FROM tzs_jg_use_registration A
+         WHERE A.project_contraption_id = #{projectContraptionId}
+           AND A.is_delete = 0
+           AND A.status != '已作废'
+         UNION
+         SELECT COUNT(DISTINCT A.sequence_nbr) AS inUseNumber FROM tzs_jg_change_registration_unit A
+               LEFT JOIN tzs_jg_change_registration_unit_eq b ON b.unit_change_registration_id = A.sequence_nbr
+               LEFT JOIN idx_biz_jg_use_info C ON b.equ_id = C.record
+         WHERE C.project_contraption_id = #{projectContraptionId}
+           AND A.is_delete = 0
+           AND A.status != '已作废'
+         UNION
+         SELECT COUNT(DISTINCT A.sequence_nbr) AS inUseNumber FROM tzs_jg_enable_disable A
+               LEFT JOIN tzs_jg_enable_disable_eq b ON b.enable_disable_apply_id = A.sequence_nbr
+               LEFT JOIN idx_biz_jg_use_info C ON b.equ_id = C.record
+         WHERE C.project_contraption_id = #{projectContraptionId}
+           AND A.is_delete = 0
+           AND A.audit_status != '已作废'
+         UNION
+         SELECT COUNT(DISTINCT A.sequence_nbr) AS inUseNumber FROM tzs_jg_scrap_cancel A
+               LEFT JOIN tzs_jg_scrap_cancel_eq b ON b.equip_transfer_id = A.sequence_nbr
+               LEFT JOIN idx_biz_jg_use_info C ON b.equ_id = C.record
+         WHERE C.project_contraption_id = #{projectContraptionId}
+           AND A.is_delete = 0
+           AND A.audit_status != '使用单位已撤回'
+         UNION
+         SELECT COUNT(1) AS inUseNumber FROM tzs_jg_installation_notice A
+         WHERE A.project_contraption_id = #{projectContraptionId}
+           AND A.notice_status != '6617'
+         UNION
+         SELECT COUNT(1) AS inUseNumber FROM tz_jyjc_inspection_application A
+         WHERE A.project_contraption_id = #{projectContraptionId}
+           AND A.status != '6617'
+     ) AS result
     </select>
 
     <select id="countContraptionInUseTimesForDeleteByIntoManagementBatch" resultMap="projectContraptionResultMap">