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

@@ -104,87 +104,6 @@ public class CylinderController {
 	@RestEventTrigger(value = "openapiLogEventHandler")
 	public ResponseModel<String> cylinderFillingInfo(@RequestBody String fillingData) throws Exception {
 		cylinderService.cylinderFillingHandler(fillingData);
-//		String token = RequestContext.getToken();
-//		AgencyUserModel me = Privilege.agencyUserClient.getme().getResult();
-//		String tokenKey = Redis.genKey(Constant.TOKEN_PREFIX, token);
-//		BizTokenModel bizTokenModel = (BizTokenModel)this.redisTemplate.opsForValue().get(tokenKey);
-//
-//		JSONObject jsonobject = JSONObject.fromObject(fillingData);
-//		CylinderFillingDataValidationResultModel validateResult = null;
-//		CylinderFillingMessage cylinderFillingMessage = new CylinderFillingMessage();
-//		cylinderFillingMessage.setTime(simpleDateFormat.format(new Date()));
-//		cylinderFillingMessage.setFillingCompanyName(me.getCompanys().get(0).getCompanyName());
-//		cylinderFillingMessage.setAppId(bizTokenModel.getAppId());
-//		try {
-//			validateResult = cylinderFillingDataValidationService.validateFilling(jsonobject);
-//		} catch (Exception e) {
-//			e.printStackTrace();
-//			logger.error("液化气体气瓶充装信息上报，数据校验失败");
-//			cylinderFillingMessage.setMessage(e.getMessage());
-//		}
-//
-//		if (!ObjectUtils.isEmpty(validateResult)) {
-//			cylinderFillingMessage.setCylinderNumber(validateResult.getCylinderNumber());
-//			List<String> message = new ArrayList<>();
-//            Integer errorNumber = 0;
-//			JSONObject error = new JSONObject();
-//			if (!ObjectUtils.isEmpty(validateResult.getBeforeErrorData())) {
-//				errorNumber += validateResult.getBeforeErrorData().size();
-//				error.put("充装前检查错误数据：", validateResult.getBeforeErrorData());
-//				message.add("充装前检查数据异常气瓶数：" + validateResult.getBeforeErrorCylinderNumber());
-//			}
-//
-//			if (!ObjectUtils.isEmpty(validateResult.getRecordErrorData())) {
-//				errorNumber += validateResult.getRecordErrorData().size();
-//				error.put("填充错误数据：", validateResult.getRecordErrorData());
-//				message.add("充装记录数据异常气瓶数：" + validateResult.getRecordErrorCylinderNumber());
-//			}
-//
-//			if (!ObjectUtils.isEmpty(validateResult.getAfterErrorData())) {
-//				errorNumber += validateResult.getAfterErrorData().size();
-//				error.put("充装后错误数据：", validateResult.getAfterErrorData());
-//				message.add("充装后复查数据异常气瓶数：" + validateResult.getAfterErrorCylinderNumber());
-//			}
-//
-//			if (!org.springframework.util.ObjectUtils.isEmpty(validateResult.getSeqCodeErrorData())) {
-//				errorNumber += validateResult.getSeqCodeErrorData().size();
-//				error.put("气瓶信息不存在：", validateResult.getSeqCodeErrorData());
-//				message.add("气瓶信息不存在数量：" + validateResult.getSeqCodeErrorData().size());
-//			}
-//
-//			if (errorNumber <= 0) {
-//				message.add("液化气体气瓶充装信息成功数：" + validateResult.getSuccessCylinderNumber() + "条");
-//			} else {
-//				cylinderFillingMessage.setMessage(String.join("条; ", message) + "个");
-//				CylinderFillingMessageModel cylinderFillingMessageModel = new CylinderFillingMessageModel();
-//				BeanUtils.copyProperties(cylinderFillingMessage, cylinderFillingMessageModel);
-//				cylinderFillingMessageService.createWithModel(cylinderFillingMessageModel);
-//				emqKeeper.getMqttClient().publish("openapi/cylinder/filling", JSONObject.fromObject(cylinderFillingMessage).toString().getBytes(), 2, false);
-//
-//				throw new BadRequest(error.toString());
-//			}
-//		} else {
-//			throw new BadRequest("数据校验失败！！！");
-//		}
-//
-//		TmCylinderFillingModelList cylinderFillingModelList = com.alibaba.fastjson.JSONObject.parseObject(fillingData, TmCylinderFillingModelList.class);
-//
-//		List<TmCylinderFillingModel> fillingBeforeList = cylinderFillingModelList.getFillingBefore();
-//		List<TmCylinderFillingRecordModel> fillingList = cylinderFillingModelList.getFilling();
-//		List<TmCylinderFillingCheckModel> fillingAfterList = cylinderFillingModelList.getFillingAfter();
-//		if (ValidationUtil.isEmpty(fillingBeforeList) && ValidationUtil.isEmpty(fillingList) && ValidationUtil.isEmpty(fillingAfterList)) {
-//			throw new BadRequest("液化气体气瓶充装信息-充装前检查信息、液化气体气瓶充装信息-充装记录信息、液化气体气瓶充装信息-充装后复查信息为空.");
-//		}
-//		cylinderFillingService.createCylinderFillingBefore(fillingBeforeList);
-//		cylinderFillingRecordService.createCylinderFilling(fillingList);
-//		cylinderFillingCheckService.createCylinderFillingAfter(fillingAfterList);
-//
-//		CylinderFillingMessageModel cylinderFillingMessageModel = new CylinderFillingMessageModel();
-//		BeanUtils.copyProperties(cylinderFillingMessage, cylinderFillingMessageModel);
-//		cylinderFillingMessageModel.setAppId(bizTokenModel.getAppId());
-//		cylinderFillingMessageService.createWithModel(cylinderFillingMessageModel);
-//		emqKeeper.getMqttClient().publish("openapi/cylinder/filling", JSONObject.fromObject(cylinderFillingMessage).toString().getBytes(), 2, false);
-//		Double a = (double) (1/0);
 		return ResponseHelper.buildResponse("OK");
 	}
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/mapper/JgUseRegistrationMapper.java

@@ -10,10 +10,8 @@ import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistration;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import com.yeejoin.amos.boot.module.jg.api.vo.tableDataExportVo.RegistrationVo;
-import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
-
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -71,17 +69,14 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
 
     Page<JSONObject> queryForEquipUsedByVehiclePageHistory(@Param("page") Page<JSONObject> page, @Param("jsonObject") JSONObject jsonObject);
 
-    @MapKey("records")
     List<Map<String, Object>> queryForUnitVesselEquipment(@Param("records") List<String> records);
 
     Page<JSONObject> queryForUnitPipelineEquipmentPage(@Param("page") Page<JSONObject> page, @Param("jsonObject") JSONObject jsonObject, @Param("records") Set<String> records);
 
-    @MapKey("records")
     List<Map<String, Object>> queryForUnitPipelineEquipment(@Param("records") List<String> records);
 
     List<Map<String, Object>> queryForUnitPipelineEquipmentForEdit(@Param("records") List<String> records);
 
-    @MapKey("id")
     List<Map<String, Object>> selectEquipList(@Param("id") Long id);
 
     List<CompanyEquipCountDto> queryForFlowingEquipList();
@@ -117,9 +112,8 @@ public interface JgUseRegistrationMapper extends BaseMapper<JgUseRegistration> {
 
     /**
      * 查询指定装置下可做使用登记的的管道，样式为汇总表样式
-     * @param projectContraptionSeq 装置id
+     * @param projectContraptionSeqList 原始装置idList
      * @return List<Map<String, Object>>
      */
-    List<Map<String, Object>> selectPieLineListByOfCanReg(@Param("projectContraptionSeq") String projectContraptionSeq);
-
+    List<Map<String, Object>> selectPieLineListByOfCanReg(@Param("projectContraptionSeqList") List<String> projectContraptionSeqList);
 }

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

@@ -1067,11 +1067,14 @@
         select * from (
         <include refid="page-list-pipeline"/>
         WHERE
-            ri."EQU_CATEGORY" = '8300'
-            and ui."PROJECT_CONTRAPTION_ID" = #{projectContraptionSeq}
-            AND ui.IS_INTO_MANAGEMENT = true
-            and (length(ri.USE_ORG_CODE) = 0 or ri.USE_ORG_CODE is null)
-            ORDER BY ui.REC_DATE DESC
+        ri."EQU_CATEGORY" = '8300'
+        AND ui."PROJECT_CONTRAPTION_ID" IN
+        <foreach collection="projectContraptionSeqList" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        AND ui.IS_INTO_MANAGEMENT = true
+        AND (length(ri.USE_ORG_CODE) = 0 OR ri.USE_ORG_CODE IS NULL)
+        ORDER BY ui.REC_DATE DESC
         )
     </select>
 

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

@@ -127,5 +127,13 @@ public class DataHandlerController extends BaseController {
         return ResponseHelper.buildResponse(true);
     }
 
-
+    /**
+     * 管道使用登记主表刷入原始工程装置ID集合和Eq表刷入工程装置ID
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "管道使用登记主表刷入原始工程装置ID集合和Eq表刷入工程装置ID", notes = "管道使用登记主表刷入原始工程装置ID集合和Eq表刷入工程装置ID")
+    @GetMapping(value = "/useRegistration/writeProjectContraptionIdInJgUseRegistration")
+    public ResponseModel<Boolean> writeProjectContraptionIdInJgUseRegistration() {
+        return ResponseHelper.buildResponse(dataHandlerService.writeProjectContraptionIdInJgUseRegistration());
+    }
 }

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

@@ -389,7 +389,8 @@ public class JgUseRegistrationController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "查询工程装置下的所有做过安装告知但是为做使用登记的管道", notes = "查询工程装置下的所有做过安装告知但是为做使用登记的管道")
     @GetMapping(value = "/getDeviceListByProjectContraptionSeq")
-    public ResponseModel<Object> getDeviceListByProjectContraption(@RequestParam("record") String projectContraptionSeq) {
-        return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.getDeviceListByProjectContraption(projectContraptionSeq));
+    public ResponseModel<Object> getDeviceListByProjectContraption(@RequestParam("record") String projectContraptionSeq,
+                                                                   @RequestParam("originProjectContraptionIds") String[] originProjectContraptionIds) {
+        return ResponseHelper.buildResponse(jgUseRegistrationServiceImpl.getDeviceListByProjectContraption(projectContraptionSeq, originProjectContraptionIds));
     }
 }

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

@@ -959,4 +959,35 @@ public class DataHandlerServiceImpl {
             useInfoService.update(updateWrapper);
         });
     }
+
+    public Boolean writeProjectContraptionIdInJgUseRegistration() {
+        List<JgUseRegistration> useRegistrations = useRegistrationService.list(
+                new LambdaQueryWrapper<JgUseRegistration>()
+                        .isNotNull(JgUseRegistration::getProjectContraptionId)
+                        .select(BaseEntity::getSequenceNbr, JgUseRegistration::getProjectContraptionId)
+        );
+
+        for (JgUseRegistration u : useRegistrations) {
+            // 更新 JgUseRegistration 表
+            useRegistrationService.lambdaUpdate()
+                    .set(JgUseRegistration::getOriginProjectContraptionIds, u.getProjectContraptionId())
+                    .eq(JgUseRegistration::getSequenceNbr, u.getSequenceNbr())
+                    .update();
+
+            // 更新 JgUseRegistrationEq 表
+            LambdaQueryWrapper<JgUseRegistrationEq> lambda = new QueryWrapper<JgUseRegistrationEq>().lambda();
+            lambda.eq(JgUseRegistrationEq::getEquipTransferId, u.getSequenceNbr());
+            List<JgUseRegistrationEq> jgUseRegistrationEqList = useRegistrationEqService.getBaseMapper().selectList(lambda);
+
+            if (jgUseRegistrationEqList != null) {
+                for (JgUseRegistrationEq eq : jgUseRegistrationEqList) {
+                    useRegistrationEqService.lambdaUpdate()
+                            .set(JgUseRegistrationEq::getOriginProjectContraptionId, u.getProjectContraptionId())
+                            .eq(JgUseRegistrationEq::getSequenceNbr, eq.getSequenceNbr())
+                            .update();
+                }
+            }
+        }
+        return 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

@@ -138,6 +138,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     public static final String DATA_SOURCE_NAME = "DATA_SOURCE_NAME";
     public static final String USE_PLACE_CODE = "USE_PLACE_CODE";
     public static final String EQU_CATEGORY_CODE = "EQU_CATEGORY_CODE";
+    public static final String EQU_LIST_CODE = "EQU_LIST_CODE";
     public static final String PROJECT_CONTRAPTION = "PROJECT_CONTRAPTION";// 工程装置名称
     /**
      * 业务类型 0：单个新增 1:批量导入
@@ -393,9 +394,9 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         }
         LinkedHashMap equipmentInfoForm = (LinkedHashMap) checkAndCast(paramMap.get(EQUIP_INFO_FORM_ID));
         String dataSource = (String) equipmentInfoForm.get(DATA_SOURCE);
-        String equCategory = (String) equipmentInfoForm.get(EQU_CATEGORY);
+        String equListCode = (String) equipmentInfoForm.get(EQU_LIST);
         //管道添加设备
-        if (PipelineEnum.INDUSTRIAL_PIPELINE.getCode().equals(equCategory)) {
+        if (PipelineEnum.PRESSURE_PIPELINE.getCode().equals(equListCode)) {
             return this.pipelineEquipCreateOrUpdate(paramMap);
         }
         if(dataSource.contains("black")){
@@ -2479,13 +2480,19 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             boolMust.must(scBuilder);
         }
         // 设备种类编码
-        if (!ObjectUtils.isEmpty(map.getString("EQU_LIST_CODE"))) {
+        if (!ObjectUtils.isEmpty(map.getString(EQU_LIST_CODE))) {
             BoolQueryBuilder elcBuilder = QueryBuilders.boolQuery();
-            String test = QueryParser.escape(map.getString("EQU_LIST_CODE"));
-            elcBuilder.must(QueryBuilders.matchPhraseQuery("EQU_LIST_CODE", test));
+            String test = QueryParser.escape(map.getString(EQU_LIST_CODE));
+            elcBuilder.must(QueryBuilders.matchPhraseQuery(EQU_LIST_CODE, test));
             boolMust.must(elcBuilder);
+        } else {
+            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+            String test = QueryParser.escape("8000");//不查管道，管道新菜单查询
+            pBuilder.mustNot(QueryBuilders.termQuery(EQU_LIST_CODE, test));
+            boolMust.must(pBuilder);
         }
-        // 设备类别编码
+
+        // 设备品种编码
         if (!ObjectUtils.isEmpty(map.getString("EQU_DEFINE_CODE"))) {
             BoolQueryBuilder elcBuilder = QueryBuilders.boolQuery();
             String test = QueryParser.escape(map.getString("EQU_DEFINE_CODE"));
@@ -2506,11 +2513,6 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             String test = QueryParser.escape(map.getString(EQU_CATEGORY_CODE));
             pBuilder.must(QueryBuilders.termQuery(EQU_CATEGORY_CODE, test));
             boolMust.must(pBuilder);
-        } else {
-            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
-            String test = QueryParser.escape("8300");// 不查管道，管道新菜单查询
-            pBuilder.mustNot(QueryBuilders.termQuery(EQU_CATEGORY_CODE, test));
-            boolMust.must(pBuilder);
         }
         // 是否车用气瓶
         if (!ObjectUtils.isEmpty(map.getString(WHETHER_VEHICLE_CYLINDER))) {

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

@@ -100,6 +100,7 @@ import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
+import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
@@ -835,6 +836,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
             // 具体地址
             useRegistration.setUseAddress("陕西省" + fullAddress + map.get("address"));
+            useRegistration.setOriginProjectContraptionIds((String) map.get("originProjectContraptionIds"));
 
             // 新增或编辑保存
             if (StringUtils.isEmpty(useRegistration.getSequenceNbr())) {
@@ -3907,6 +3909,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         LambdaQueryWrapper<IdxBizJgProjectContraption> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IdxBizJgProjectContraption::getUseUnitCreditCode, useUnitCreditCode)
                 .eq(IdxBizJgProjectContraption::getIsIntoManagement, true)
+
                 .notIn(!proIds.isEmpty(), BaseEntity::getSequenceNbr, proIds)
                 .and(w -> w.isNull(IdxBizJgProjectContraption::getUseRegistrationCode)
                         .or().eq(IdxBizJgProjectContraption::getUseRegistrationCode, "")
@@ -3914,19 +3917,31 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         return jgProjectContraptionService.page(page, wrapper);
     }
 
-    public Map<String, Object> getDeviceListByProjectContraption(String projectContraptionSeq) {
+    public Map<String, Object> getDeviceListByProjectContraption(String projectContraptionSeq, String[] originProjectContraptionIds) {
+        // 获取工程信息
         IdxBizJgProjectContraption projectContraption = jgProjectContraptionService.getById(projectContraptionSeq);
-        Map<String, Object> re = new HashMap<>();
-        List<Map<String, Object>> equList = this.getBaseMapper().selectPieLineListByOfCanReg(projectContraptionSeq);
-        re.put("equipmentLists", equList);
-        re.put("projectContraption", projectContraption.getProjectContraption());
-        re.put("projectContraptionId", projectContraptionSeq);
-        re.put("projectContraptionNo", projectContraption.getProjectContraptionNo());
-        re.put("pipelineLength", projectContraption.getPipelineLength());
-        this.setPieLineInspectInfo(projectContraptionSeq, re);
-        this.setConstructionInfo(projectContraptionSeq, re);
-        return re;
+        // 查询设备列表
+        List<String> uniqueContraptionList = Stream.concat(Arrays.stream(originProjectContraptionIds), Stream.of(projectContraptionSeq))
+                .distinct()
+                .collect(Collectors.toList());
+        List<Map<String, Object>> equList = this.getBaseMapper()
+                .selectPieLineListByOfCanReg(uniqueContraptionList);
+        // 计算管道长度总和
+        double totalPipelineLength = equList.stream()
+                .map(map -> map.get("pipeLength"))
+                .filter(Objects::nonNull)
+                .mapToDouble(value -> (Double) value)
+                .sum();
+
+        return MapBuilder.<String, Object>create()
+                .put("equipmentLists", equList)
+                .put("projectContraption", projectContraption.getProjectContraption())
+                .put("projectContraptionId", projectContraptionSeq)
+                .put("projectContraptionNo", projectContraption.getProjectContraptionNo())
+                .put("pipelineLength", totalPipelineLength)
+                .build();
     }
+
     private void setConstructionInfo(String projectContraptionSeq, Map<String, Object> re) {
         LambdaQueryWrapper<IdxBizJgProjectConstruction> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(IdxBizJgProjectConstruction::getProjectContraptionId, projectContraptionSeq)

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/entity/JyjcInspectionHistory.java

+package com.yeejoin.amos.boot.module.jyjc.api.entity;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 检验检测历史数据表
+ *
+ * @author system_generator
+ * @date 2025-01-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName(value = "tz_jyjc_inspection_history", autoResultMap = true)
+public class JyjcInspectionHistory extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 来源seq
+     */
+	@TableField("s_seq")
+    private Long sSeq;
+
+    /**
+     * 推送数据
+     */
+	@TableField(value = "history_data", typeHandler = JacksonTypeHandler.class)
+    private JSONObject historyData;
+
+    /**
+     * 备注
+     */
+	@TableField("remark")
+    private String remark;
+
+    /**
+     * 来源类型
+     */
+	@TableField("s_type")
+    private String sType;
+
+}

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcInspectionApplicationMapper.java

@@ -124,6 +124,13 @@ public interface JyjcInspectionApplicationMapper extends BaseMapper<JyjcInspecti
      * @return List<Map<String, Object>>
      */
     List<Map<String, Object>> selectPieLineListOfInspect(@Param("records") List<String> records);
+
+    /**
+     * 查询指定管道的信息，样式为汇总表样式-无检验信息
+     * @param records 管道ids
+     * @return List<Map<String, Object>>
+     */
+    List<Map<String, Object>> selectPieLineListOfNoInspectInfo(@Param("records") List<String> records);
 }
 
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/mapper/JyjcInspectionHistoryMapper.java

+package com.yeejoin.amos.boot.module.jyjc.api.mapper;
+
+import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionHistory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * 检验检测历史数据表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2025-01-14
+ */
+public interface JyjcInspectionHistoryMapper extends BaseMapper<JyjcInspectionHistory> {
+
+}

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/JyjcInspectionHistoryModel.java

+package com.yeejoin.amos.boot.module.jyjc.api.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 检验检测历史数据表
+ *
+ * @author system_generator
+ * @date 2025-01-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="JyjcInspectionHistoryModel", description="检验检测历史数据表")
+public class JyjcInspectionHistoryModel extends BaseModel {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "来源seq")
+    private Long sSeq;
+
+    @ApiModelProperty(value = "推送数据")
+    private String historyData;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "来源类型")
+    private String sType;
+
+}

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/service/IJyjcInspectionHistoryService.java

+package com.yeejoin.amos.boot.module.jyjc.api.service;
+
+/**
+ * 检验检测历史数据表接口类
+ *
+ * @author system_generator
+ * @date 2025-01-14
+ */
+public interface IJyjcInspectionHistoryService {}

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/service/IJyjcInspectionResultParamService.java

@@ -25,4 +25,11 @@ public interface IJyjcInspectionResultParamService {
      * @return 字段列表
      */
     List<Map<String,Object>> getParamByEquipTypeCode(String equipTypeCode);
+
+    /**
+     * 根据
+     * @param sequenceNbr
+     * @return
+     */
+    JyjcInspectionResultParam getOneParamByResultSeq(Long sequenceNbr);
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionApplicationMapper.xml

@@ -682,6 +682,50 @@
             LEFT JOIN idx_biz_jg_register_info ri on ri."RECORD" = ui."RECORD"
             LEFT JOIN idx_biz_jg_tech_params_pipeline pp ON pp."RECORD" = ui."RECORD"
     </sql>
+    <sql id="page-list-pipeline-no-inspect">
+        SELECT
+            ui."USE_UNIT_NAME" useUnitName,
+            ui."USE_UNIT_CREDIT_CODE" useUnitCreditCode,
+            ui."PROJECT_CONTRAPTION_ID" as projectContraptionId,
+            to_char(ui."USE_DATE", 'YYYY-MM') useDate,
+            (SELECT DESIGN_UNIT_NAME from idx_biz_jg_design_info where "RECORD" = ui."RECORD") designUnitName,
+            (SELECT USC_UNIT_NAME from idx_biz_jg_construction_info where "RECORD" = ui."RECORD" ORDER BY USC_DATE DESC limit 1) uscUnitName,
+            to_char((SELECT USC_DATE from idx_biz_jg_construction_info where "RECORD" = ui."RECORD" ORDER BY USC_DATE DESC limit 1), 'YYYY-MM') uscDate,
+            ui."RECORD" record,
+            ui.IS_INTO_MANAGEMENT as isIntoManagement,
+            ri."EQU_CODE" equCode,
+            ri."EQU_LIST" equList,
+            (select name from tz_equipment_category where code = ri."EQU_LIST") equListName,
+            ri."EQU_CATEGORY" equCategory,
+            (select name from tz_equipment_category where code = ri."EQU_CATEGORY") equCategoryName,
+            ri."EQU_DEFINE" equDefine,
+            (select name from tz_equipment_category where code = ri."EQU_DEFINE") equDefineName,
+            -- 历史遗留问题 故 as
+            pp."PIPE_NAME" as productName,
+            ri."BRAND_NAME" brandName,
+            ri."EQU_TYPE" equType,
+            ri."EQU_CODE_TYPE" equCodeType,
+            ri."WHETHER_VEHICLE_CYLINDER" whetherVehicleCylinder,
+            ri."USE_ORG_CODE" useOrgCode,
+            pp."DEVICE_NAME" deviceName,
+            (select name from cb_data_dictionary where code = pp."DEVICE_LEVEL" and type = 'GBI') deviceLevel,
+            pp."PIPE_NAME" pipeName,
+            pp."PIPELINE_NUMBER" pipelineNumber,
+            pp."NOMINAL_DIAMETER" nominalDiameter,
+            pp."WALL_THICKNESS" wallThickness,
+            pp."PIPE_LENGTH" pipeLength,
+            pp."PRESSURE" pressure,
+            pp."TEMPERATURE" temperature,
+            pp."MEDIUM" medium,
+            pp."REMARKS" remarks,
+            pp."WORK_PRESSURE" AS workPressure,
+            pp."WORK_TEMPERATURE" AS workTemperature,
+            pp."WORK_MEDIUM" AS workMedium
+        FROM
+            idx_biz_jg_use_info ui
+            LEFT JOIN idx_biz_jg_register_info ri on ri."RECORD" = ui."RECORD"
+            LEFT JOIN idx_biz_jg_tech_params_pipeline pp ON pp."RECORD" = ui."RECORD"
+    </sql>
     <select id="selectPieLineListByProjectId" resultType="java.util.Map">
         select * from (
         <include refid="page-list-pipeline"/>
@@ -700,4 +744,13 @@
         </foreach>
         ORDER BY ui.REC_DATE DESC
     </select>
+    <select id="selectPieLineListOfNoInspectInfo" resultType="java.util.Map">
+        <include refid="page-list-pipeline-no-inspect"/>
+        WHERE
+        ui.record in
+        <foreach collection="records" item="record" open="(" close=")" separator=",">
+            #{record}
+        </foreach>
+        ORDER BY ui.REC_DATE DESC
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/resources/mapper/JyjcInspectionHistoryMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionHistoryMapper">
+
+</mapper>

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

+package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionHistory;
+import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionHistoryMapper;
+import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionHistoryModel;
+import com.yeejoin.amos.boot.module.jyjc.api.service.IJyjcInspectionHistoryService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.Date;
+
+/**
+ * 检验检测历史数据表服务实现类
+ *
+ * @author system_generator
+ * @date 2025-01-14
+ */
+@Service
+public class JyjcInspectionHistoryServiceImpl extends BaseService<JyjcInspectionHistoryModel, JyjcInspectionHistory, JyjcInspectionHistoryMapper> implements IJyjcInspectionHistoryService {
+
+    public JyjcInspectionHistory getBySSeq(Long sSeq) {
+        return this.getOne(new LambdaQueryWrapper<JyjcInspectionHistory>().eq(JyjcInspectionHistory::getSSeq, sSeq));
+    }
+
+    public void saveBySeq(Long sSeq, JSONObject hisData, String sType) {
+        JyjcInspectionHistory history = this.getBySSeq(sSeq);
+        if (history != null) {
+            history.setHistoryData(hisData);
+            this.updateById(history);
+        } else {
+            history = new JyjcInspectionHistory();
+            history.setHistoryData(hisData);
+            history.setSSeq(sSeq);
+            history.setRecDate(new Date());
+            history.setSType(sType);
+            super.saveOrUpdate(history);
+        }
+    }
+
+}
\ 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/JyjcInspectionResultParamServiceImpl.java

@@ -60,4 +60,11 @@ public class JyjcInspectionResultParamServiceImpl extends BaseService<JyjcInspec
         }
         return paramList;
     }
+
+    @Override
+    public JyjcInspectionResultParam getOneParamByResultSeq(Long sequenceNbr) {
+        LambdaQueryWrapper<JyjcInspectionResultParam> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(JyjcInspectionResultParam::getResultSeq, sequenceNbr);
+        return this.baseMapper.selectOne(wrapper);
+    }
 }
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/dto/IdxBizJgProjectContraptionDto.java

@@ -126,4 +126,10 @@ public class IdxBizJgProjectContraptionDto extends BaseDto {
 
     @ApiModelProperty("投入日期")
     private String useDate;
+
+    @ApiModelProperty("工程装置父级ID（合并用）")
+    private String projectContraptionParentId;
+
+    @ApiModelProperty("是否首次合并新增")
+    private Boolean isFirstMerge;
 }

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

@@ -212,6 +212,7 @@
                 </otherwise>
              </choose>
              and not EXISTS (SELECt 1 FROM tz_jyjc_inspection_application a where a.status='6611' and a.application_unit_code=#{companyCode} and a.project_contraption_id = pc.sequence_nbr)
+             and (pc.project_contraption_parent_id is null or pc.project_contraption_parent_id = '')
     </select>
 
     <select id="selectEquipListByExport" resultType="java.util.Map">