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-data/amos-boot-data-openapi/src/main/java/com/yeejoin/amos/api/openapi/face/service/TmCylinderFillingExamineService.java

 package com.yeejoin.amos.api.openapi.face.service;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.api.openapi.face.model.TmCylinderFillingExamineModel;
@@ -94,6 +95,7 @@ public class TmCylinderFillingExamineService extends MyBaseServiceImpl<TmCylinde
         }
     }
 
+    @DS("tzs")
     private void syncCylinderFillingExamine(List<TmCylinderFillingExamineModel> model) {
         syncCylinderDataService.syncCylinderFillingExamine(model);
     }

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

 package com.yeejoin.amos.api.openapi.face.service;
 
 
+import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.yeejoin.amos.api.openapi.face.model.TmCylinderOffloadingModel;
@@ -70,6 +71,7 @@ public class TmCylinderOffloadingService extends MyBaseServiceImpl<TmCylinderOff
      * 同步气站信息至气瓶服务
      * @param model
      */
+    @DS("tzs")
     private void syncCylinderOffloadingModel(List<TmCylinderOffloadingModel> model) {
         syncCylinderDataService.syncCylinderOffloading(model);
     }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/converter/DictParamsConverter.java

@@ -34,10 +34,6 @@ public class DictParamsConverter implements Converter<String> {
         dictMap.put("过热器出口集箱", "6006");
         dictMap.put("启动分离器", "6007");
         dictMap.put("长输管道", "5994");
-        dictMap.put("磁粉", "5988");
-        dictMap.put("射线", "5986");
-        dictMap.put("超声", "5987");
-        dictMap.put("渗透", "5989");
         dictMap.put("A1", "6094");
         dictMap.put("A2", "6095");
         dictMap.put("A7", "6100");

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

+package com.yeejoin.amos.boot.module.jg.api.dto;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class InspectConclusionConverter implements Converter<String> {
+
+    private static final Map<String, String> dictMap = new HashMap<>();
+
+    static {
+        // 填充映射关系
+        dictMap.put("合格", "6040");
+        dictMap.put("不合格", "6041");
+        dictMap.put("复检合格", "6042");
+        dictMap.put("复检不合格", "6043");
+        dictMap.put("整改后合格", "6045");
+        dictMap.put("符合", "6046");
+        dictMap.put("不符合", "6047");
+        dictMap.put("符合要求", "6048");
+        dictMap.put("基本符合要求", "6049");
+        dictMap.put("不符合要求", "6050");
+        dictMap.put("允许使用", "6051");
+        dictMap.put("降压使用", "6052");
+        dictMap.put("进行合于使用评价", "6053");
+        dictMap.put("其他", "6044");
+    }
+
+    @Override
+    public Class<?> supportJavaTypeKey() {
+        // 实体类中对象属性类型
+        return String.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    @Override
+    public String convertToJavaData(CellData cellData, ExcelContentProperty excelContentProperty,
+                                    GlobalConfiguration globalConfiguration) {
+        // 从Cell中读取数据
+        String cellValue = cellData.getStringValue();
+        // 判断Excel中的值，将其转换为预期的数值
+        return dictMap.getOrDefault(cellValue, null);
+    }
+
+    @Override
+    public CellData convertToExcelData(String o, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        return new CellData("");
+    }
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.jg.api.dto;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.CellData;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class InspectTypeConverter implements Converter<String> {
+
+    private static final Map<String, String> dictMap = new HashMap<>();
+
+    static {
+        // 填充映射关系
+        dictMap.put("定期检验", "DQJY");
+        dictMap.put("首次检验", "SCJY");
+        dictMap.put("安装监督检验", "AZJDJY");
+        dictMap.put("改造监督检验", "GZJDJY");
+        dictMap.put("维修监督检验", "WXJDJY");
+        dictMap.put("制造监督检验", "ZZJDJY");
+
+    }
+
+    @Override
+    public Class<?> supportJavaTypeKey() {
+        // 实体类中对象属性类型
+        return String.class;
+    }
+
+    @Override
+    public CellDataTypeEnum supportExcelTypeKey() {
+        return CellDataTypeEnum.STRING;
+    }
+
+    @Override
+    public String convertToJavaData(CellData cellData, ExcelContentProperty excelContentProperty,
+                                    GlobalConfiguration globalConfiguration) {
+        // 从Cell中读取数据
+        String cellValue = cellData.getStringValue();
+        // 判断Excel中的值，将其转换为预期的数值
+        return dictMap.getOrDefault(cellValue, null);
+    }
+
+    @Override
+    public CellData convertToExcelData(String o, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
+        return new CellData("");
+    }
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.jg.api.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "管道-设备信息", description = "管道-设备信息")
+public class PipingExcelDto extends BaseDto {
+
+    @ExcelIgnore
+    private static final long serialVersionUID = 1L;
+
+
+    //----------------------------------------------------------------------基本信息
+
+    @ApiModelProperty(value = "设备种类")
+    @ExcelIgnore
+    private String equList;
+
+    @ApiModelProperty(value = "设备类别")
+    @ExcelIgnore
+    private String equCategory;
+
+    @ApiModelProperty(value = "设备品种")
+    @ExcelIgnore
+    private String equDefine;
+
+    @ApiModelProperty(value = "单位内编号")
+    @ExcelProperty(value = "单位内编号")
+    private String useInnerCode;
+
+    @ApiModelProperty(value = "产品名称")
+    @ExcelProperty(value = "产品名称")
+    private String productName;
+
+    @ApiModelProperty(value = "管道名称（登记单元）")
+    @ExcelProperty(value = "管道名称（登记单元）")
+    private String pipeName;
+
+    @ApiModelProperty(value = "设备型号")
+    @ExcelProperty(value = "设备型号")
+    private String equType;
+
+    @ApiModelProperty(value = "设备总价值（万元）")
+    @ExcelProperty(value = "设备总价值（万元）")
+    private String equPrice;
+
+
+    @ApiModelProperty(value = "有无设备代码")
+    @ExcelProperty(value = "有无设备代码")
+    private String equCodeType;
+
+    @ApiModelProperty(value = "设备代码")
+    @ExcelProperty(value = "设备代码")
+    private String equCode;
+
+    @ApiModelProperty(value = "工程（装置）名称")
+    @ExcelProperty(value = "工程（装置）名称")
+    private String projectContraption;
+
+
+    @ApiModelProperty(value = "工程（装置）编号")
+    @ExcelProperty(value = "工程（装置）编号")
+    private String projectContraptionNo;
+
+    @ApiModelProperty(value = "使用登记证编号")
+    @ExcelProperty(value = "使用登记证编号")
+    private String useOrgCode;
+
+    //-----------------------------------------------------------------------使用信息
+
+    @ApiModelProperty(value = "使用单位统一社会信用代码")
+    @ExcelProperty(value = "使用单位统一社会信用代码")
+    private String useUnitCode;
+
+    @ApiModelProperty(value = "使用单位名称")
+    @ExcelProperty(value = "使用单位名称")
+    private String useUnit;
+
+    //-----------------------------------------------------------------------安装信息
+
+    @ApiModelProperty(value = "安装单位统一社会信用代码")
+    @ExcelProperty(value = "安装单位统一社会信用代码")
+    private String installUnitCode;
+
+    @ApiModelProperty(value = "安装单位名称")
+    @ExcelProperty(value = "安装单位名称")
+    private String installUnitName;
+
+    //-----------------------------------------------------------------------检验检测信息
+
+    @ApiModelProperty(value = "检验检测机构统一社会信用代码")
+    @ExcelProperty(value = "检验检测机构统一社会信用代码")
+    private String inspectUnitCode;
+
+    @ApiModelProperty(value = "检验检测机构名称")
+    @ExcelProperty(value = "检验检测机构名称")
+    private String inspectUnitName;
+
+    @ApiModelProperty(value = "检验结论")
+    @ExcelProperty(value = "检验结论")
+    private String inspectConclusion;
+
+    @ApiModelProperty(value = "检验类型")
+    @ExcelProperty(value = "检验类型")
+    private String inspectType;
+
+    @ApiModelProperty(value = "检验日期")
+    @ExcelProperty(value = "检验日期")
+    private String inspectDate;
+
+    @ApiModelProperty(value = "检验人员名称")
+    @ExcelProperty(value = "检验人员名称")
+    private String inspectPersonName;
+
+    @ApiModelProperty(value = "下次检验日期")
+    @ExcelProperty(value = "下次检验日期")
+    private String nextInspectDate;
+
+    @ApiModelProperty(value = "检验报告编号")
+    @ExcelProperty(value = "检验报告编号")
+    private String inspectReportCode;
+
+    //-----------------------------------------------------------------------设计信息
+
+    @ApiModelProperty(value = "设计单位统一社会信用代码")
+    @ExcelProperty(value = "设计单位统一社会信用代码")
+    private String designUnitCreditCode;
+
+    @ApiModelProperty(value = "设计单位名称")
+    @ExcelProperty(value = "设计单位名称")
+    private String designUnitName;
+
+
+    //--------------------------------------------------------------------压力管道----技术参数
+
+    @ExcelProperty(value = "管道类别")
+    @ApiModelProperty(value = "管道类别")
+    private String pipelineClass;
+
+    @ExcelProperty(value = "公称壁厚(mm)")
+    @ApiModelProperty(value = "公称壁厚(mm)")
+    private String wallThickness;
+
+    @ExcelProperty(value = "公称直径（mm）")
+    @ApiModelProperty(value = "公称直径（mm）")
+    private String nominalDiameter;
+
+    @ExcelProperty(value = "管道长度（m）")
+    @ApiModelProperty(value = "管道长度（m）")
+    private String pipeLength;
+
+    @ExcelProperty(value = "设计-压力（MPa）")
+    @ApiModelProperty(value = "设计-压力（MPa）")
+    private String pressure;
+
+    @ExcelProperty(value = "设计-介质")
+    @ApiModelProperty(value = "设计-介质")
+    private String medium;
+
+    @ExcelProperty(value = "起/始位置 （经纬度）（格式：经度-纬度）")
+    @ApiModelProperty(value = "起/始位置 （经纬度）（格式：经度-纬度）")
+    private String startePosition;
+
+    @ExcelProperty(value = "设计-温度（℃）")
+    @ApiModelProperty(value = "设计-温度（℃）")
+    private String temperature;
+
+    @ExcelProperty(value = "管道编号")
+    @ApiModelProperty(value = "管道编号")
+    private String pipelineNumber;
+
+    @ExcelProperty(value = "管道级别")
+    @ApiModelProperty(value = "管道级别")
+    private String deviceLevel;
+
+    @ExcelProperty(value = "工作条件-压力(MPa)")
+    @ApiModelProperty(value = "工作条件-压力(MPa)")
+    private String workPressure;
+
+    @ExcelProperty(value = "工作条件-温度(℃)")
+    @ApiModelProperty(value = "工作条件-温度(℃)")
+    private String workTemperature;
+
+    @ExcelProperty(value = "工作条件-介质")
+    @ApiModelProperty(value = "工作条件-介质")
+    private String workMedium;
+
+    @ExcelProperty(value = "备注")
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/enums/PipelineEnum.java

@@ -13,7 +13,9 @@ public enum PipelineEnum {
 
     PRESSURE_PIPELINE("压力管道", "8000"),
 
-    INDUSTRIAL_PIPELINE("工业管道", "8300");
+    INDUSTRIAL_PIPELINE("工业管道", "8300"),
+    LONG_DISTANCE_PIPELINE("长输管道", "8100"),
+    COMMON_PIPELINE("公用管道", "8200");
 
     private final String name;
 

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

@@ -7,6 +7,7 @@ import org.apache.commons.io.FilenameUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import org.typroject.tyboot.component.event.RestEventTrigger;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
@@ -58,32 +59,38 @@ public class DataDockController {
         return ResponseHelper.buildResponse(dataDockService.dataCheckAndImportEquipmentData(remark, file));
     }
 
-    // @TycloudOperation(ApiLevel = UserType.AGENCY)
-    // @PostMapping(value = "/delete")
-    // @ApiOperation(httpMethod = "POST", value = "八大类历史设备导入shanchu", notes = "八大类历史设备导入shachu")
-    // public Object importData() {
-    //     dataDockService.delete();
-    //     return ResponseHelper.buildResponse("ok");
-    // }
+    /**
+     * 工业管道批量检查
+     **/
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/checkGYGDData")
+    @ApiOperation(httpMethod = "POST", value = "工业管道批量检查", notes = "工业管道批量检查")
+    @RestEventTrigger(value = "operateLogRestEventHandler")
+    public ResponseModel<?> checkGYGDData(@RequestPart("file") MultipartFile multipartFile) throws Exception {
+        return ResponseHelper.buildResponse(dataDockService.checkGDData(multipartFile, true));
+    }
+
+    /**
+     * 工业 、公用、长输管道批量保存
+     **/
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/savePipingData")
+    @ApiOperation(httpMethod = "POST", value = "工业管道批量保存", notes = "工业管道批量保存")
+    @RestEventTrigger(value = "operateLogRestEventHandler")
+    public ResponseModel<?> savePipingData(@RequestBody Map<String, Object> paramMap) {
+        return ResponseHelper.buildResponse(dataDockService.savePipingData(paramMap));
+    }
+
+    /**
+     * 公用、长输道批量检查
+     **/
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/checkGYCSGDData")
+    @ApiOperation(httpMethod = "POST", value = "公用、长输管道批量检查", notes = "公用、长输管道批量检查")
+    @RestEventTrigger(value = "operateLogRestEventHandler")
+    public ResponseModel<?> checkGYCSGDData(@RequestPart("file") MultipartFile multipartFile) throws Exception {
+        return ResponseHelper.buildResponse(dataDockService.checkGDData(multipartFile, false));
+    }
 
-    // @TycloudOperation(ApiLevel = UserType.AGENCY)
-    // @GetMapping(value = "/yanChang/ORG_BRANCH_CODE")
-    // @ApiOperation(httpMethod = "get", value = "延炼-延长-刷入属地监管部门", notes = "延炼-延长-刷入属地监管部门")
-    // public Object writeOrgBranchCode2YanChang(@RequestParam String remark) {
-    //     if (ValidationUtil.isEmpty(remark)) {
-    //         throw new BadRequest("remark必填！");
-    //     }
-    //     return ResponseHelper.buildResponse("更新成功，共" + dataDockService.writeOrgBranchCode2YanChang(remark) + "条数据");
-    // }
-    //
-    // @TycloudOperation(ApiLevel = UserType.AGENCY)
-    // @GetMapping(value = "/yanChang/USE_PLACE")
-    // @ApiOperation(httpMethod = "get", value = "延炼-延长-刷入所属区域", notes = "延炼-延长-刷入所属区域")
-    // public Object writeUsePlace2YanChang(@RequestParam String remark) {
-    //     if (ValidationUtil.isEmpty(remark)) {
-    //         throw new BadRequest("remark必填！");
-    //     }
-    //     return ResponseHelper.buildResponse("更新成功，共" + dataDockService.writeUsePlace2YanChang(remark) + "条数据");
-    // }
 }
 

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

@@ -6,9 +6,11 @@ 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.impl.IdxBizJgProjectContraptionServiceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.dto.IdxBizJgProjectContraptionDto;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgInspectionDetectionInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
@@ -16,6 +18,9 @@ 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.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -97,6 +102,7 @@ public class IdxBizJgProjectContraptionController extends BaseController {
 		return ResponseHelper.buildResponse(idxBizJgProjectContraptionServiceImpl.proConPageByParams(params, page, reginParams));
 	}
 
+
 	/**
 	 * 根据入参 列表查询（当前）单位下的工程管道
 	 *
@@ -127,6 +133,70 @@ public class IdxBizJgProjectContraptionController extends BaseController {
 	}
 
 	/**
+	 * 根据sequenceNbr分页查询管道信息
+	 *
+	 * @param sequenceNbr
+	 * @param current 当前页
+	 * @param size 大小
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/techParamsPipelinePage")
+	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询管道信息",  notes = "管道工程装置表分页查询")
+	public ResponseModel <Page<Map<String, Object>>> techParamsPipelinePage(@RequestParam("sequenceNbr") String sequenceNbr,
+																		   @RequestParam(value = "current") int current,
+																		   @RequestParam(value = "size") int size) {
+		return ResponseHelper.buildResponse(idxBizJgProjectContraptionServiceImpl.techParamsPipelinePage(sequenceNbr,current,size));
+	}
+
+	/**
+	 * 新增或者更新检验信息
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/saveOrUpdateDetectionInfo")
+	@ApiOperation(httpMethod = "POST", value = "新增或者更新检验信息", notes = "新增或者更新检验信息")
+	public ResponseModel<?> saveOrUpdateDetectionInfo(@RequestBody IdxBizJgInspectionDetectionInfo detectionInfo) {
+		idxBizJgProjectContraptionServiceImpl.saveOrUpdateDetectionInfo(detectionInfo);
+		return ResponseHelper.buildResponse("更新成功");
+	}
+
+	/**
+	 * 新增或者更新检验信息批量
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@PostMapping(value = "/saveOrUpdateDetectionInfoBatch")
+	@ApiOperation(httpMethod = "POST", value = "新增或者更新检验信息", notes = "新增或者更新检验信息")
+	public ResponseModel<?> saveOrUpdateDetectionInfoBatch(@RequestBody List<IdxBizJgInspectionDetectionInfo> detectionInfos) {
+		idxBizJgProjectContraptionServiceImpl.saveOrUpdateDetectionInfoBatch(detectionInfos);
+		return ResponseHelper.buildResponse("更新成功");
+	}
+
+	/**
+	 * 获取检验信息详情
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/getDetectionInfoDetail")
+	@ApiOperation(httpMethod = "GET", value = "获取检验信息详情", notes = "获取检验信息详情")
+	public ResponseModel<IdxBizJgInspectionDetectionInfo> getDetectionInfoDetail(@RequestParam("sequenceNbr") String sequenceNbr) {
+		return ResponseHelper.buildResponse(idxBizJgProjectContraptionServiceImpl.getDetectionInfoDetail(sequenceNbr));
+	}
+
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/summaryBasicInfo/export")
+	@ApiOperation(httpMethod = "GET", value = "导出基本信息汇总表(长输/公用管道)", notes = "导出基本信息汇总表(长输/公用管道)")
+	public void exportSummaryBasicInfo(HttpServletResponse response,
+									   @RequestParam("sequenceNbr") String sequenceNbr,
+									   @RequestParam("category") String category) {
+		idxBizJgProjectContraptionServiceImpl.exportSummaryBasicInfo(sequenceNbr, response, category);
+	}
+
+	/**
      * 列表分页查询
      *
      * @param current 当前页
@@ -144,6 +214,7 @@ public class IdxBizJgProjectContraptionController extends BaseController {
 	    return ResponseHelper.buildResponse(idxBizJgProjectContraptionServiceImpl.queryForIdxBizJgProjectContraptionPage(page));
 	}
 
+
 	/**
 	 * 列表全部数据查询
      *
@@ -155,4 +226,5 @@ public class IdxBizJgProjectContraptionController extends BaseController {
 	public ResponseModel<List<IdxBizJgProjectContraptionDto>> selectForList() {
 	    return ResponseHelper.buildResponse(idxBizJgProjectContraptionServiceImpl.queryForIdxBizJgProjectContraptionList());
 	}
+
 }

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")){
@@ -1142,16 +1143,22 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         if ("his".equals(dataSource) || "black".equals(dataSource)) {
             // 历史数据导入设备类别限制  bug-21172
             if (!ObjectUtils.isEmpty(type) && "PL_DR".equals(type)) {
+                if (EquipmentClassifityEnum.YLRQ.getCode().equals(equList)) {
                     return this.baseMapper.queryAllEquCategoriesUnderTheEquList(equList).stream()
                             .filter(x -> "2300".equals(x.getDictDataKey()))
                             .collect(Collectors.toList());
                 }
-            // 历史数据新增设备类别限制 bug-21139
-            if (!ObjectUtils.isEmpty(equList) && "8000".equals(equList)) {
+                if (EquipmentClassifityEnum.YLGD.getCode().equals(equList) && "his".equals(dataSource)) {
                     return this.baseMapper.queryAllEquCategoriesUnderTheEquList(equList).stream()
                             .filter(x -> "8300".equals(x.getDictDataKey()))
                             .collect(Collectors.toList());
                 }
+                if (EquipmentClassifityEnum.YLGD.getCode().equals(equList) && "black".equals(dataSource)) {
+                    return this.baseMapper.queryAllEquCategoriesUnderTheEquList(equList).stream()
+                            .filter(x -> !"8300".equals(x.getDictDataKey()))
+                            .collect(Collectors.toList());
+                }
+            }
             return this.baseMapper.queryAllEquCategoriesUnderTheEquList(equList);
         }
 
@@ -2473,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"));
@@ -2500,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))) {
@@ -3821,7 +3829,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             otherInfo.setRecDate(new Date());
             otherInfo.setCylinderStampAttachment(cylinderStampAttachment);
             if ("his".equals(equipInfoDto.getDataSource())) {
-                otherInfo.setSupervisoryCode(this.getSupervisoryCode(equipInfoDto.getPossession(), registerInfo));
+                otherInfo.setSupervisoryCode(this.getSupervisoryCode(equipInfoDto.getPossession(), registerInfo.getEquCategory()));
             }
             otherInfo.setClaimStatus("已认领");
             otherInfoList.add(otherInfo);
@@ -4335,13 +4343,13 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
     /**
      * 生成监管码
      */
-    private String getSupervisoryCode(String possession, IdxBizJgRegisterInfo registerInfo) {
+    public String getSupervisoryCode(String possession, String equCategory) {
         Map<String, Object> map = new HashMap<>();
         boolean isXiXian = XI_XIAN.getCode().equals(possession);
         String cityOrCountyCode = isXiXian ? XIAN_YANG.getCode() : possession;
         map.put("cityCode", cityOrCountyCode);
         map.put("isXiXian", isXiXian ? 1 : 0);
-        map.put("equCategory", registerInfo.getEquCategory());
+        map.put("equCategory", equCategory);
         map.put("countyCode", cityOrCountyCode);
         return Optional.ofNullable(tzsServiceFeignClient.createCode(map).getResult())
                 .filter(res -> !res.isEmpty())

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

@@ -2436,6 +2436,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
         String formattedDate = currentDate.format(formatter);
         exportParamsMap.put("printDate", formattedDate);
+        //获取分类名称
+        exportParamsMap.put("categoryName", "工业管道");
         // 使用单位
         exportParamsMap.put("useUnitName", jsonObject.get("useUnitName"));
         // 使用单位地址

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/templates/PressurePipeBasicInformationSummary.ftl

@@ -69,7 +69,7 @@
                                 <w:sz w:val="36"/>
                                 <w:szCs w:val="36"/>
                             </w:rPr>
-                            <w:t>工业管道</w:t>
+                            <w:t>${categoryName}</w:t>
                         </w:r>
                     </w:p>
                     <w:p w14:paraId="7AEDB7EF" w14:textId="156F0207" w:rsidR="00EA7A71" w:rsidRDefault="00DB6291">

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-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JGDPStatisticsServiceImpl.java

@@ -2413,6 +2413,7 @@ public class JGDPStatisticsServiceImpl {
                 equipParamsMap.put(EQU_LIST, String.valueOf(equIpClassMap.get(EQU_LIST)));
                 equipParamsMap.put(EQU_CATEGORY, String.valueOf(equIpClassMap.get(EQU_CATEGORY)));
                 equipParamsMap.put(EQU_DEFINE, String.valueOf(equIpClassMap.get(EQU_DEFINE)));
+                equipParamsMap.put("PIPELINE_CLASS", String.valueOf(equIpClassMap.get(EQU_DEFINE)));
                 resultMap.put(EQUIP_PARAMS_FORM_ID, equipParamsMap);
             }
         }

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/dao/mapper/PlanTaskMapper.java

@@ -302,7 +302,7 @@ public interface PlanTaskMapper extends BaseMapper {
 
 	void insertAll(String table, StaticDay item);
 
-	void updateData(String table, List<StaticDay> list);
+	void updateData(String table, @Param(value = "list") List<StaticDay> list);
 
 	void updateSingle(String table, int riskEnd, int noRiskEnd, String orgCode, String checkTime);
 

amos-boot-system-tzs/amos-boot-module-tzspatrol/amos-boot-module-tzspatrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PatrolDataSyncServiceImpl.java

@@ -267,32 +267,29 @@ public class PatrolDataSyncServiceImpl implements IPatrolDataSyncService {
         List<Map<String, Object>> listDay = checkMapper.planCount(runDate, null, String.valueOf(PlanTaskTypeStatusEnum.day.getValue()), null,null,null);
         List<StaticDay> staticDays = listDay.stream().map(e->{
             String s = JSON.toJSONString(e);
-            StaticDay staticDay = JSON.parseObject(s, StaticDay.class);
-            return staticDay;
+            return JSON.parseObject(s, StaticDay.class);
         }).collect(Collectors.toList());
         // 插入周统计表
         List<Map<String, Object>> listWeek = checkMapper.planCount(runDate, null, String.valueOf(PlanTaskTypeStatusEnum.week.getValue()), null,null,null);
         List<StaticDay> staticWeeks = listWeek.stream().map(e->{
             String s = JSON.toJSONString(e);
-            StaticDay staticWeek = JSON.parseObject(s, StaticDay.class);
-            return staticWeek;
+            return JSON.parseObject(s, StaticDay.class);
         }).collect(Collectors.toList());
         // 插入月统计表
         List<Map<String, Object>> listMonth = checkMapper.planCount(runDate, null, String.valueOf(PlanTaskTypeStatusEnum.month.getValue()), null,null,null);
         List<StaticDay> staticMonths = listMonth.stream().map(e->{
             String s = JSON.toJSONString(e);
-            StaticDay staticMonth = JSON.parseObject(s, StaticDay.class);
-            return staticMonth;
+            return JSON.parseObject(s, StaticDay.class);
         }).collect(Collectors.toList());
 
-        if(staticDays.size() > 0) {
-            planTaskMapper.updateData(P_STATIC_DAY,staticDays);
+        if(!staticDays.isEmpty()) {
+            planTaskMapper.updateData(P_STATIC_DAY, staticDays);
         }
-        if(staticWeeks.size() > 0) {
-            planTaskMapper.updateData(P_STATIC_WEEK,staticDays);
+        if(!staticWeeks.isEmpty()) {
+            planTaskMapper.updateData(P_STATIC_WEEK, staticWeeks);
         }
-        if(staticMonths.size() > 0) {
-            planTaskMapper.updateData(P_STATIC_MONTH,staticDays);
+        if(!staticMonths.isEmpty()) {
+            planTaskMapper.updateData(P_STATIC_MONTH, staticMonths);
         }
         log.info("更新统计表完成=======");
     }

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

@@ -51,4 +51,27 @@ public interface IdxBizJgProjectContraptionMapper extends BaseMapper<IdxBizJgPro
      * @return 分页
      */
     IPage<IdxBizJgProjectContraption> queryJgProjectContraptionPage(Page<IdxBizJgProjectContraption> page, @Param("inspectionType") String inspectionType, @Param("companyCode") String companyCode, @Param("equCategory") String equCategory);
+
+    /**
+     * 获取管道信息分页
+     * @param sequenceNbr
+     * @param current
+     * @param size
+     * @return
+     */
+    List<Map<String, Object>> selectEquipListPage(@Param("sequenceNbr") String sequenceNbr, @Param("current") int current, @Param("size") int size);
+
+    /**
+     * 获取管道信息总数
+     * @param sequenceNbr
+     * @return
+     */
+    long selectEquipCount(@Param("sequenceNbr") String sequenceNbr);
+
+    /**
+     * 获取导出传输/公共管道的信息
+     * @param sequenceNbr
+     * @return
+     */
+    List<Map<String, Object>> selectEquipListByExport(@Param("sequenceNbr") String sequenceNbr);
 }

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

@@ -141,6 +141,47 @@
           and p.is_into_management = false
           and n.is_delete = false
     </select>
+
+    <select id="selectEquipListPage" resultType="java.util.Map">
+        SELECT ibjtpp."SEQUENCE_NBR" AS sequenceNbr,
+        ibjtpp."PIPE_NAME" AS pipeName,
+        ibjtpp."PIPELINE_NUMBER" AS pipelineNumber,
+        ibjtpp."DEVICE_LEVEL" AS deviceLevel,
+        ibjtpp."NOMINAL_DIAMETER" AS nominalDiameter,
+        ibjtpp."WALL_THICKNESS" AS wallThickness,
+        ibjtpp."PIPE_LENGTH" AS pipeLength,
+        ibjtpp."PRESSURE" AS pressure,
+        ibjtpp."TEMPERATURE" AS temperature,
+        ibjtpp."MEDIUM" AS medium,
+        ibjtpp."WORK_PRESSURE" AS workPressure,
+        ibjtpp."WORK_TEMPERATURE" AS workTemperature,
+        ibjtpp."WORK_MEDIUM" AS workMedium,
+        ibjtpp."REMARKS" AS remarks,
+        (select SEQUENCE_NBR from idx_biz_jg_inspection_detection_info where "RECORD" = ibjui."RECORD" ORDER BY INSPECT_DATE DESC limit 1) detectionInfoSequenceNbr,
+        (select INSPECT_ORG_NAME from idx_biz_jg_inspection_detection_info where "RECORD" = ibjui."RECORD" ORDER BY INSPECT_DATE DESC limit 1) inspectOrgName,
+        (select INSPECT_CONCLUSION from idx_biz_jg_inspection_detection_info where "RECORD" = ibjui."RECORD" ORDER BY INSPECT_DATE DESC limit 1) inspectConclusion,
+        (select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ibjui."RECORD" ORDER BY INSPECT_DATE DESC limit 1) nextInspectDate,
+        (select USC_UNIT_NAME from idx_biz_jg_construction_info jci where ibjui.RECORD = jci.RECORD ORDER BY  jci."USC_DATE" DESC limit 1) as uscUnitName,
+        (select USC_DATE from idx_biz_jg_construction_info jci where ibjui.RECORD = jci.RECORD ORDER BY  jci."USC_DATE" DESC limit 1) as uscDate,
+        ibjdi."DESIGN_UNIT_NAME" AS designUnitName,
+        ibjui."USE_DATE" AS useDate,
+        ibjui."RECORD" AS record
+        FROM idx_biz_jg_use_info ibjui
+        LEFT JOIN idx_biz_jg_tech_params_pipeline ibjtpp ON ibjui.RECORD = ibjtpp.RECORD
+        LEFT JOIN idx_biz_jg_design_info ibjdi ON ibjui.RECORD = ibjdi.RECORD
+        WHERE ibjui.project_contraption_id = #{sequenceNbr}
+        ORDER BY ibjtpp.REC_DATE ASC
+        limit #{current},#{size}
+    </select>
+
+    <select id="selectEquipCount" resultType="long">
+        SELECT count(1)
+        FROM idx_biz_jg_use_info ibjui
+        LEFT JOIN idx_biz_jg_tech_params_pipeline ibjtpp ON ibjui.RECORD = ibjtpp.RECORD
+        LEFT JOIN idx_biz_jg_design_info ibjdi ON ibjui.RECORD = ibjdi.RECORD
+        WHERE ibjui.project_contraption_id = #{sequenceNbr}
+        ORDER BY ibjtpp.REC_DATE ASC
+    </select>
     <select id="queryJgProjectContraptionPage"
             resultType="com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption">
          select
@@ -171,5 +212,35 @@
                 </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">
+        SELECT ibjtpp."PIPE_NAME" AS productName,
+        ibjtpp."PIPELINE_NUMBER" AS pipelineNumber,
+        ibjtpp."DEVICE_LEVEL" AS deviceLevel,
+        ibjtpp."NOMINAL_DIAMETER" AS nominalDiameter,
+        ibjtpp."WALL_THICKNESS" AS wallThickness,
+        ibjtpp."PIPE_LENGTH" AS pipeLength,
+        ibjtpp."PRESSURE" AS pressure,
+        ibjtpp."TEMPERATURE" AS temperature,
+        ibjtpp."MEDIUM" AS medium,
+        ibjtpp."WORK_PRESSURE" AS workPressure,
+        ibjtpp."WORK_TEMPERATURE" AS workTemperature,
+        ibjtpp."WORK_MEDIUM" AS workMedium,
+        ibjtpp."REMARKS" AS remarks,
+        (select INSPECT_ORG_NAME from idx_biz_jg_inspection_detection_info where "RECORD" = ibjui."RECORD" ORDER BY INSPECT_DATE DESC limit 1) inspectOrgName,
+        (select INSPECT_CONCLUSION from idx_biz_jg_inspection_detection_info where "RECORD" = ibjui."RECORD" ORDER BY INSPECT_DATE DESC limit 1) inspectConclusion,
+        (select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ibjui."RECORD" ORDER BY INSPECT_DATE DESC limit 1) nextInspectDate,
+        (select USC_UNIT_NAME from idx_biz_jg_construction_info jci where ibjui.RECORD = jci.RECORD ORDER BY  jci."USC_DATE" DESC limit 1) as uscUnitName,
+        (select USC_DATE from idx_biz_jg_construction_info jci where ibjui.RECORD = jci.RECORD ORDER BY  jci."USC_DATE" DESC limit 1) as uscDate,
+        ibjdi."DESIGN_UNIT_NAME" AS designUnitName,
+        ibjui."USE_DATE" AS useDate,
+        ibjui."RECORD" AS record
+        FROM idx_biz_jg_use_info ibjui
+        LEFT JOIN idx_biz_jg_tech_params_pipeline ibjtpp ON ibjui.RECORD = ibjtpp.RECORD
+        LEFT JOIN idx_biz_jg_design_info ibjdi ON ibjui.RECORD = ibjdi.RECORD
+        WHERE ibjui.project_contraption_id = #{sequenceNbr}
+        ORDER BY ibjtpp.REC_DATE ASC
     </select>
 </mapper>