1.检验检测报检信息推送功能开发

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

@@ -10,8 +10,6 @@ import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 import java.util.Date;
 
 /**
- * 
- *
  * @author system_generator
  * @date 2023-12-14
  */
@@ -26,151 +24,151 @@ public class JyjcInspectionApplication extends BaseEntity {
     /**
      * 检验检测单位编码
      */
-	@TableField("inspection_unit_code")
+    @TableField("inspection_unit_code")
     private String inspectionUnitCode;
 
-	@TableField("inspection_unit_name")
+    @TableField("inspection_unit_name")
     private String inspectionUnitName;
 
     /**
      * 检验检测类型
      */
-	@TableField("inspection_type")
+    @TableField("inspection_type")
     private String inspectionType;
 
     /**
      * 设备种类
      */
-	@TableField("equip_classify")
+    @TableField("equip_classify")
     private String equipClassify;
 
     /**
      * 报检单号
      */
-	@TableField("application_no")
+    @TableField("application_no")
     private String applicationNo;
 
     /**
      * 申请日期
      */
-	@TableField("application_date")
+    @TableField("application_date")
     private Date applicationDate;
 
     /**
      * 检验检测类别
      */
-	@TableField("inspection_classify")
+    @TableField("inspection_classify")
     private String inspectionClassify;
 
     /**
      * 申请联系人
      */
-	@TableField("application_contact_name")
+    @TableField("application_contact_name")
     private String applicationContactName;
 
     /**
      * 申请联系人电话
      */
-	@TableField("application_contact_phone")
+    @TableField("application_contact_phone")
     private String applicationContactPhone;
 
     /**
      * 申请说明
      */
-	@TableField("application_remark")
+    @TableField("application_remark")
     private String applicationRemark;
 
     /**
      * 项目负责人(检验员)
      */
-	@TableField("inspection_charge_person")
+    @TableField("inspection_charge_person")
     private String inspectionChargePerson;
 
-	@TableField("inspection_charge_person_name")
+    @TableField("inspection_charge_person_name")
     private String inspectionChargePersonName;
 
     /**
      * 项目负责人联系电话（检验员联系电话）
      */
-	@TableField("inspection_charge_phone")
+    @TableField("inspection_charge_phone")
     private String inspectionChargePhone;
 
     /**
      * 说明（受理说明、退回原因、转办说明）
      */
-	@TableField("process_description")
+    @TableField("process_description")
     private String processDescription;
 
     /**
      * 原始报检单号
      */
-	@TableField("original_application_no")
+    @TableField("original_application_no")
     private String originalApplicationNo;
 
     /**
      * 受理日期
      */
-	@TableField("accept_date")
+    @TableField("accept_date")
     private Date acceptDate;
 
     /**
      * 报检单位编号
      */
-	@TableField("application_unit_code")
+    @TableField("application_unit_code")
     private String applicationUnitCode;
 
-	@TableField("application_unit_name")
+    @TableField("application_unit_name")
     private String applicationUnitName;
 
-	/**
+    /**
      * 内部人员代码
-     * */
-	@TableField("inner_person_code")
+     */
+    @TableField("inner_person_code")
     private String innerPersonCode;
 
     /**
      * 包含设备数量（冗余）
      */
-	@TableField("number_of_equip")
+    @TableField("number_of_equip")
     private Integer numberOfEquip;
 
     /**
      * 工作流执行角色
      */
-	@TableField("workflow_role")
+    @TableField("workflow_role")
     private String workflowRole;
 
     /**
      * 工作流实例ID
      */
-	@TableField("instance_id")
+    @TableField("instance_id")
     private String processInstanceId;
 
     /**
      * 申请单二维码
      */
-	@TableField("application_qrcode")
+    @TableField("application_qrcode")
     private String applicationQrcode;
 
     /**
      * 状态
      */
-	@TableField("status")
+    @TableField("status")
     private String status;
 
     /**
      * 备注(无用预留)
      */
-	@TableField("remark")
+    @TableField("remark")
     private String remark;
 
     /**
      * 业务类型（与菜单对应拆表使用）
      */
-	@TableField("biz_type")
+    @TableField("biz_type")
     private String bizType;
 
-	@TableField("workflow_node")
+    @TableField("workflow_node")
     private String workflowNode;
 
     /**
@@ -200,4 +198,10 @@ public class JyjcInspectionApplication extends BaseEntity {
 
     @TableField(value = "transfer_to_user_ids")
     private String transferToUserIds;
+
+    /**
+     * 对接单位code
+     */
+    @TableField(value = "docking_unit_code")
+    private String dockingUnitCode;
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/enums/EquipCategoryEnum.java

@@ -11,13 +11,21 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum EquipCategoryEnum {
+    // 锅炉
     IDX_BIZ_JG_TECH_PARAMS_BOILER(1000),
+    // 压力容器
     IDX_BIZ_JG_TECH_PARAMS_VESSEL(2000),
+    // 电梯
     IDX_BIZ_JG_TECH_PARAMS_ELEVATOR(3000),
+    // 起重机械
     IDX_BIZ_JG_TECH_PARAMS_LIFTING(4000),
+    // 场（厂）内专用机动车辆
     IDX_BIZ_JG_TECH_PARAMS_VEHICLE(5000),
+    // 大型游乐设施
     IDX_BIZ_JG_TECH_PARAMS_RIDES(6000),
+    // 压力管道
     IDX_BIZ_JG_TECH_PARAMS_PIPELINE(8000),
+    // 客运索道
     IDX_BIZ_JG_TECH_PARAMS_ROPEWAY(9000);
 
     private final int equList;

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

@@ -155,6 +155,10 @@ public class JyjcInspectionApplicationModel extends BaseModel {
     private String supervisoryCode;
 
 
+    @ApiModelProperty(value = "对接单位code")
+    private String dockingUnitCode;
+
+
     private String instanceId;
 
     public String getProcessInstanceId() {

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/pom.xml

@@ -22,6 +22,10 @@
             <artifactId>amos-boot-module-common-biz</artifactId>
             <version>${amos-biz-boot.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.kafka</groupId>
+            <artifactId>spring-kafka</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/controller/JyjcInspectionApplicationController.java

@@ -14,6 +14,8 @@ import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEqui
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionResultModel;
 import com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException;
+import com.yeejoin.amos.boot.module.jyjc.biz.event.InspectionApplicationPushEvent;
+import com.yeejoin.amos.boot.module.jyjc.biz.event.publisher.EventPublisher;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionApplicationServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -47,6 +49,9 @@ public class JyjcInspectionApplicationController extends BaseController {
 	// 业务通用发起——技术参数-
 	private static final String filePageData = "filePageData";
 
+    @Autowired
+    EventPublisher eventPublisher;
+
     /**
      * 新增
      *
@@ -285,4 +290,14 @@ public class JyjcInspectionApplicationController extends BaseController {
         page.setSize(size);
         return ResponseHelper.buildResponse(jyjcInspectionApplicationServiceImpl.listByCategory(page, equipClassify));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "报检信息推送测试", notes = "报检信息推送测试")
+    @GetMapping(value = "/test-push")
+    public void pushTest(
+            @RequestParam("id") Long id) {
+        JyjcInspectionApplicationModel model= jyjcInspectionApplicationServiceImpl.queryBySeq(id);
+        InspectionApplicationPushEvent event = new InspectionApplicationPushEvent(this,model);
+        eventPublisher.publish(event);
+    }
 }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/event/listener/InspectionApplicationPushEventListener.java

@@ -12,6 +12,7 @@ import com.yeejoin.amos.boot.module.jyjc.api.model.InspectionApplicationPushData
 import com.yeejoin.amos.boot.module.jyjc.api.model.InspectionEquipData;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
 import com.yeejoin.amos.boot.module.jyjc.biz.event.InspectionApplicationPushEvent;
+import com.yeejoin.amos.boot.module.jyjc.biz.kafka.KafkaProducer;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionApplicationEquipServiceImpl;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcInspectionApplicationPushLogServiceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgConstructionInfo;
@@ -44,7 +45,7 @@ public class InspectionApplicationPushEventListener implements ApplicationListen
 
     private BlockingQueue<JyjcInspectionApplicationModel> queue = new LinkedBlockingQueue<>();
 
-    @Value("${inspection.push.max.deal.thread.num: 2}")
+    @Value("${inspection.push.max.deal.thread.num:2}")
     private int threadNum;
 
     @Autowired
@@ -86,6 +87,14 @@ public class InspectionApplicationPushEventListener implements ApplicationListen
     @Autowired
     private EquipTechParamRopewayMapper equipTechParamRopewayMapper;
 
+    @Autowired
+    KafkaProducer kafkaProducer;
+
+    /**
+     * 报检推送主题， 第一位为接收单位标识
+     */
+    private String INSPECTION_APPLICATION_PUSH_TOPIC = "%s_INSPECTION_APPLICATION_TOPIC";
+
 
     @Override
     public void onApplicationEvent(InspectionApplicationPushEvent event) {
@@ -104,7 +113,7 @@ public class InspectionApplicationPushEventListener implements ApplicationListen
                         //构建数据
                         JyjcInspectionApplicationPushLog pushLog = this.createPushData(applicationModel);
                         // 发送数据
-                        this.pushData2Kafka(pushLog);
+                        this.pushData2Kafka(applicationModel.getDockingUnitCode(), pushLog);
                     } catch (Exception e) {
                         log.error(e.getMessage(), e);
                     }
@@ -113,8 +122,12 @@ public class InspectionApplicationPushEventListener implements ApplicationListen
         }
     }
 
-    private void pushData2Kafka(JyjcInspectionApplicationPushLog pushLog) {
+    private void pushData2Kafka(String dockingUnitCode, JyjcInspectionApplicationPushLog pushLog) {
         // 发送kafka指定的主题
+        String topic = String.format(INSPECTION_APPLICATION_PUSH_TOPIC, dockingUnitCode);
+        kafkaProducer.sendMessage(topic, pushLog.getPushData());
+        pushLog.setPushStatus("2");
+        pushLogService.updateById(pushLog);
     }
 
     private JyjcInspectionApplicationPushLog createPushData(JyjcInspectionApplicationModel applicationModel) {
@@ -145,7 +158,9 @@ public class InspectionApplicationPushEventListener implements ApplicationListen
             InspectionEquipData equipData = new InspectionEquipData();
             BeanUtil.copyProperties(e, equipData);
             equipData.setAddress(this.getAddressByRecord(e.getEquipUnicode()));
+            // 单个查询执行，原因数据量较大 in 慢
             this.setUscUnitInfo(equipData, e.getEquipUnicode());
+            // 单个查询执行，原因数据量较大 in 慢
             this.setTechParams(equipData, e.getEquipUnicode());
             return equipData;
         }).collect(Collectors.toList());
@@ -159,22 +174,30 @@ public class InspectionApplicationPushEventListener implements ApplicationListen
     private Map<String, Object> populateEquipInfoWithTechParams(String equList, String record) {
         EquipCategoryEnum productType = EquipCategoryEnum.of(Integer.parseInt(equList));
         switch (Objects.requireNonNull(productType)) {
+            // 锅炉 - 暂时之前的 需求未出
             case IDX_BIZ_JG_TECH_PARAMS_BOILER:
-                return BeanUtil.beanToMap(equipTechParamBoilerMapper.getBoilerByDefaultValue(record));
+                return BeanUtil.beanToMap(equipTechParamBoilerMapper.queryTechParamInUse(record));
+            // 压力容器 - 暂时之前的 需求未出
             case IDX_BIZ_JG_TECH_PARAMS_VESSEL:
-                return BeanUtil.beanToMap(equipTechParamVesselMapper.getVesselByDefaultValue(record));
+                return BeanUtil.beanToMap(equipTechParamVesselMapper.queryTechParamInUse(record));
+            // 电梯
             case IDX_BIZ_JG_TECH_PARAMS_ELEVATOR:
-                return BeanUtil.beanToMap(equipTechParamElevatorMapper.getElevatorByDefaultValue(record));
+                return BeanUtil.beanToMap(equipTechParamElevatorMapper.queryTechParamInUse(record));
+            // 起重机械
             case IDX_BIZ_JG_TECH_PARAMS_LIFTING:
-                return BeanUtil.beanToMap(equipTechParamLiftingMapper.getLiftingByDefaultValue(record));
+                return BeanUtil.beanToMap(equipTechParamLiftingMapper.queryTechParamInUse(record));
+            // 场（厂）内专用机动车辆
             case IDX_BIZ_JG_TECH_PARAMS_VEHICLE:
-                return BeanUtil.beanToMap(equipTechParamVehicleMapper.getVehicleByDefaultValue(record));
+                return BeanUtil.beanToMap(equipTechParamVehicleMapper.queryTechParamInUse(record));
+            // 大型游乐设施
             case IDX_BIZ_JG_TECH_PARAMS_RIDES:
-                return BeanUtil.beanToMap(equipTechParamRidesMapper.getRidesByDefaultValue(record));
+                return BeanUtil.beanToMap(equipTechParamRidesMapper.queryTechParamInUse(record));
+            // 压力管道 - 暂时之前的 需求未出
             case IDX_BIZ_JG_TECH_PARAMS_PIPELINE:
-                return BeanUtil.beanToMap(equipTechParamPipelineMapper.getPipelineByDefaultValue(record));
+                return BeanUtil.beanToMap(equipTechParamPipelineMapper.queryTechParamInUse(record));
+            // 客运索道
             case IDX_BIZ_JG_TECH_PARAMS_ROPEWAY:
-                return BeanUtil.beanToMap(equipTechParamRopewayMapper.getRopewayByDefaultValue(record));
+                return BeanUtil.beanToMap(equipTechParamRopewayMapper.queryTechParamInUse(record));
             default:
                 break;
         }

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/kafka/KafkaProducer.java

+package com.yeejoin.amos.boot.module.jyjc.biz.kafka;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.kafka.core.KafkaTemplate;
+import org.springframework.kafka.support.SendResult;
+import org.springframework.stereotype.Component;
+import org.springframework.util.concurrent.ListenableFuture;
+import org.springframework.util.concurrent.ListenableFutureCallback;
+
+/**
+ * @author Administrator
+ */
+@Component
+@Slf4j
+public class KafkaProducer {
+
+    private final KafkaTemplate<String, String> kafkaTemplate;
+
+    @Autowired
+    public KafkaProducer(KafkaTemplate<String, String> kafkaTemplate) {
+        this.kafkaTemplate = kafkaTemplate;
+    }
+
+    /**
+     * 发送消息（异步）
+     *
+     * @param topic   主题
+     * @param message 消息内容
+     */
+    public void sendMessage(String topic, String message) {
+        if (log.isInfoEnabled()) {
+            log.info("kafka开始发送数据：主题:{}，消息{}", topic, message);
+        }
+        ListenableFuture<SendResult<String, String>> future = kafkaTemplate.send(topic, message);
+        future.addCallback(new ListenableFutureCallback<SendResult<String, String>>() {
+            @Override
+            public void onFailure(Throwable throwable) {
+                log.error("发送消息（异步） failure! topic : {}, message: {}", topic, message);
+            }
+
+            @Override
+            public void onSuccess(SendResult<String, String> stringStringSendResult) {
+                if (log.isInfoEnabled()) {
+                    log.info("发送消息（异步） success!");
+                }
+            }
+        });
+    }
+}
\ No newline at end of file

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

@@ -29,7 +29,6 @@ import com.yeejoin.amos.boot.module.jyjc.biz.event.UseInfoSaveToDbEvent;
 import com.yeejoin.amos.boot.module.jyjc.biz.event.publisher.EventPublisher;
 import com.yeejoin.amos.boot.module.jyjc.biz.utils.JsonUtils;
 import com.yeejoin.amos.boot.module.ymt.api.entity.InspectionDetectionInfo;
-import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/application-dev.properties

@@ -56,4 +56,6 @@ tzsJg.feign.name=TZS-JG
 # rule config
 rule.definition.local-ip=172.16.10.243
 
-equip-hint=0 0 15 21 1 *
+equip-hint=0 0 15 21 1 *
\ No newline at end of file
+
+spring.kafka.bootstrap-servers=172.16.10.243:9092

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

@@ -8,9 +8,10 @@ import lombok.experimental.Accessors;
 
 import java.math.BigDecimal;
 
+
 /**
  * 安全追溯-锅炉
- * 
+ *
  * @author cpp
  * @date 2023-04-06 15:21:22
  */
@@ -24,165 +25,165 @@ public class EquipTechParamBoiler extends AbstractEquipBaseEntity {
 
 
 	/**
-  	 *  	 * $column.comments
-     *      */
+	 *  	 * $column.comments
+	 *      */
 
 
 	/**
-  	 *  	 * $column.comments
-     *      */
+	 *  	 * $column.comments
+	 *      */
 
-		@TableField(value ="\"INSTANCE_ID\"")
+	@TableField(value ="\"INSTANCE_ID\"")
 	private String instanceId;
 	/**
-  	 *  	 * $column.comments
-     *      */
+	 *  	 * $column.comments
+	 *      */
 
-		@TableField(value ="\"STATUS\"")
+	@TableField(value ="\"STATUS\"")
 	private String status;
 	/**
-  	 *  	 * 设备等级
-     *      */
+	 *  	 * 设备等级
+	 *      */
 
-		@TableField(value ="\"DEVICE_LEVEL\"")
+	@TableField(value ="\"DEVICE_LEVEL\"")
 	private String deviceLevel;
 	/**
-  	 *  	 * 额定蒸发量（热功率）
-     *      */
+	 *  	 * 额定蒸发量（热功率）
+	 *      */
 
-		@TableField(value ="\"RATED_EVAPORATION_CAPACITY_THERMAL_POWER\"")
+	@TableField(value ="\"RATED_EVAPORATION_CAPACITY_THERMAL_POWER\"")
 	private BigDecimal ratedEvaporationCapacityThermalPower;
 	/**
-  	 *  	 * 额定工作压力
-     *      */
+	 *  	 * 额定工作压力
+	 *      */
 
-		@TableField(value ="\"RATED_WORKING_PRESSURE\"")
+	@TableField(value ="\"RATED_WORKING_PRESSURE\"")
 	private BigDecimal ratedWorkingPressure;
 	/**
-  	 *  	 * 额定工作温度
-     *      */
+	 *  	 * 额定工作温度
+	 *      */
 
-		@TableField(value ="\"RATED_OPERATING_TEMPERATURE\"")
+	@TableField(value ="\"RATED_OPERATING_TEMPERATURE\"")
 	private BigDecimal ratedOperatingTemperature;
 	/**
-  	 *  	 * 设计热效率
-     *      */
+	 *  	 * 设计热效率
+	 *      */
 
-		@TableField(value ="\"DESIGN_THERMAL_EFFICIENCY\"")
+	@TableField(value ="\"DESIGN_THERMAL_EFFICIENCY\"")
 	private BigDecimal designThermalEfficiency;
 	/**
-  	 *  	 * 给水温度
-     *      */
+	 *  	 * 给水温度
+	 *      */
 
-		@TableField(value ="\"FEEDWATER_TEMPERATURE\"")
+	@TableField(value ="\"FEEDWATER_TEMPERATURE\"")
 	private BigDecimal feedwaterTemperature;
 	/**
-  	 *  	 * 额定出/回水(油)温度
-     *      */
+	 *  	 * 额定出/回水(油)温度
+	 *      */
 
-		@TableField(value ="\"RATED_OUTLET_RETURN_WATER_OIL_TEMPERATURE\"")
+	@TableField(value ="\"RATED_OUTLET_RETURN_WATER_OIL_TEMPERATURE\"")
 	private BigDecimal ratedOutletReturnWaterOilTemperature;
 	/**
-  	 *  	 * 锅炉本体水（油）容积
-     *      */
+	 *  	 * 锅炉本体水（油）容积
+	 *      */
 
-		@TableField(value ="\"WATER_OIL_VOLUME_OF_BOILER_PROPER\"")
+	@TableField(value ="\"WATER_OIL_VOLUME_OF_BOILER_PROPER\"")
 	private BigDecimal waterOilVolumeOfBoilerProper;
 	/**
-  	 *  	 * 整装锅炉本体液压试验介质/压力
-     *      */
+	 *  	 * 整装锅炉本体液压试验介质/压力
+	 *      */
 
-		@TableField(value ="\"HYDRAULIC_TEST_MEDIUM_PRESSURE_OF_PACKAGED_BOILER_BODY\"")
+	@TableField(value ="\"HYDRAULIC_TEST_MEDIUM_PRESSURE_OF_PACKAGED_BOILER_BODY\"")
 	private BigDecimal hydraulicTestMediumPressureOfPackagedBoilerBody;
 	/**
-  	 *  	 * 再热器进（出）口温度
-     *      */
+	 *  	 * 再热器进（出）口温度
+	 *      */
 
-		@TableField(value ="\"INLET_OUTLET_TEMPERATURE_OF_REHEATER\"")
+	@TableField(value ="\"INLET_OUTLET_TEMPERATURE_OF_REHEATER\"")
 	private BigDecimal inletOutletTemperatureOfReheater;
 	/**
-  	 *  	 * 再热器进（出）口压力
-     *      */
+	 *  	 * 再热器进（出）口压力
+	 *      */
 
-		@TableField(value ="\"REHEATER_INLET_OUTLET_PRESSURE\"")
+	@TableField(value ="\"REHEATER_INLET_OUTLET_PRESSURE\"")
 	private BigDecimal reheaterInletOutletPressure;
 	/**
-  	 *  	 * 再热蒸汽流量
-     *      */
+	 *  	 * 再热蒸汽流量
+	 *      */
 
-		@TableField(value ="\"REHEAT_STEAM_FLOW\"")
+	@TableField(value ="\"REHEAT_STEAM_FLOW\"")
 	private BigDecimal reheatSteamFlow;
 	/**
-  	 *  	 * 燃料（热源）种类
-     *      */
+	 *  	 * 燃料（热源）种类
+	 *      */
 
-		@TableField(value ="\"FUEL_TYPE\"")
+	@TableField(value ="\"FUEL_TYPE\"")
 	private String fuelType;
 	/**
-  	 *  	 * 受压部件名称
-     *      */
+	 *  	 * 受压部件名称
+	 *      */
 
-		@TableField(value ="\"NAME_OF_PRESSURE_PARTS\"")
+	@TableField(value ="\"NAME_OF_PRESSURE_PARTS\"")
 	private String nameOfPressureParts;
 	/**
-  	 *  	 * 受压部件材料
-     *      */
+	 *  	 * 受压部件材料
+	 *      */
 
-		@TableField(value ="\"MATERIAL_OF_PRESSURE_PARTS\"")
+	@TableField(value ="\"MATERIAL_OF_PRESSURE_PARTS\"")
 	private String materialOfPressureParts;
 	/**
-  	 *  	 * 受压部件壁厚
-     *      */
+	 *  	 * 受压部件壁厚
+	 *      */
 
-		@TableField(value ="\"WALL_THICKNESS_OF_PRESSURE_PARTS\"")
+	@TableField(value ="\"WALL_THICKNESS_OF_PRESSURE_PARTS\"")
 	private BigDecimal wallThicknessOfPressureParts;
 	/**
-  	 *  	 * 受压部件无损检测方法
-     *      */
+	 *  	 * 受压部件无损检测方法
+	 *      */
 
-		@TableField(value ="\"NON_DESTRUCTIVE_TESTING_METHODS_FOR_PRESSURE_PARTS\"")
+	@TableField(value ="\"NON_DESTRUCTIVE_TESTING_METHODS_FOR_PRESSURE_PARTS\"")
 	private String nonDestructiveTestingMethodsForPressureParts;
 	/**
-  	 *  	 * 受压部件无损检测比例
-     *      */
+	 *  	 * 受压部件无损检测比例
+	 *      */
 
-		@TableField(value ="\"PROPORTION_OF_NDT_FOR_PRESSURE_PARTS\"")
+	@TableField(value ="\"PROPORTION_OF_NDT_FOR_PRESSURE_PARTS\"")
 	private BigDecimal proportionOfNdtForPressureParts;
 	/**
-  	 *  	 * 受压部件热处理温度
-     *      */
+	 *  	 * 受压部件热处理温度
+	 *      */
 
-		@TableField(value ="\"HEAT_TREATMENT_TEMPERATURE_OF_PRESSURE_PARTS\"")
+	@TableField(value ="\"HEAT_TREATMENT_TEMPERATURE_OF_PRESSURE_PARTS\"")
 	private BigDecimal heatTreatmentTemperatureOfPressureParts;
 	/**
-  	 *  	 * 受压部件热处理时间
-     *      */
+	 *  	 * 受压部件热处理时间
+	 *      */
 
-		@TableField(value ="\"HEAT_TREATMENT_TIME_OF_PRESSURE_PARTS\"")
+	@TableField(value ="\"HEAT_TREATMENT_TIME_OF_PRESSURE_PARTS\"")
 	private BigDecimal heatTreatmentTimeOfPressureParts;
 	/**
-  	 *  	 * 受压部件水（耐）压试验介质
-     *      */
+	 *  	 * 受压部件水（耐）压试验介质
+	 *      */
 
-		@TableField(value ="\"HYDROSTATIC_TEST_MEDIUM\"")
+	@TableField(value ="\"HYDROSTATIC_TEST_MEDIUM\"")
 	private String hydrostaticTestMedium;
 	/**
-  	 *  	 * 受压部件水（耐）压试验压力
-     *      */
+	 *  	 * 受压部件水（耐）压试验压力
+	 *      */
 
-		@TableField(value ="\"HYDROSTATIC_TEST_PRESSURE\"")
+	@TableField(value ="\"HYDROSTATIC_TEST_PRESSURE\"")
 	private BigDecimal hydrostaticTestPressure;
 	/**
-  	 *  	 * 燃烧方式
-     *      */
+	 *  	 * 燃烧方式
+	 *      */
 
-		@TableField(value ="\"COMBUSTION_MODE\"")
+	@TableField(value ="\"COMBUSTION_MODE\"")
 	private String combustionMode;
 	/**
-  	 *  	 * 有机热载体锅炉气密试验介质/压力
-     *      */
+	 *  	 * 有机热载体锅炉气密试验介质/压力
+	 *      */
 
-		@TableField(value ="\"GL_AIRTIGHT_TEST\"")
+	@TableField(value ="\"GL_AIRTIGHT_TEST\"")
 	private BigDecimal glAirtightTest;
 
 

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

@@ -8,4 +8,11 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface EquipTechParamBoilerMapper extends BaseMapper<EquipTechParamBoiler> {
     EquipTechParamBoiler getBoilerByDefaultValue(@Param("record") String record);
+
+    /**
+     * 在用的最新需求整理的技术参数
+     * @param record 设备唯一标识
+     * @return EquipTechParamBoiler
+     */
+    EquipTechParamBoiler queryTechParamInUse(@Param("record") String record);
 }

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

@@ -6,4 +6,11 @@ import org.apache.ibatis.annotations.Param;
 
 public interface EquipTechParamElevatorMapper extends BaseMapper<EquipTechParamElevator> {
     EquipTechParamElevator getElevatorByDefaultValue(@Param("record") String record);
+
+    /**
+     * 在用的最新需求整理的技术参数
+     * @param record 设备唯一标识
+     * @return EquipTechParamElevator
+     */
+    EquipTechParamElevator queryTechParamInUse(@Param("record") String record);
 }

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

@@ -6,4 +6,12 @@ import org.apache.ibatis.annotations.Param;
 
 public interface EquipTechParamLiftingMapper extends BaseMapper<EquipTechParamLifting> {
     EquipTechParamLifting getLiftingByDefaultValue(@Param("record") String record);
+
+
+    /**
+     * 在用的最新需求整理的技术参数
+     * @param record 设备唯一标识
+     * @return EquipTechParamLifting
+     */
+    EquipTechParamLifting queryTechParamInUse(@Param("record") String record);
 }

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

@@ -6,4 +6,11 @@ import org.apache.ibatis.annotations.Param;
 
 public interface EquipTechParamPipelineMapper extends BaseMapper<EquipTechParamPipeline> {
     EquipTechParamPipeline getPipelineByDefaultValue(@Param("record") String record);
+
+    /**
+     * 在用的最新需求整理的技术参数--需求未出
+     * @param record 设备唯一标识
+     * @return EquipTechParamVessel
+     */
+    EquipTechParamPipeline queryTechParamInUse(@Param("record") String record);
 }

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

@@ -6,4 +6,10 @@ import org.apache.ibatis.annotations.Param;
 
 public interface EquipTechParamRidesMapper extends BaseMapper<EquipTechParamRides> {
     EquipTechParamRides getRidesByDefaultValue(@Param("record") String record);
+    /**
+     * 在用的最新需求整理的技术参数
+     * @param record 设备唯一标识
+     * @return EquipTechParamVessel
+     */
+    EquipTechParamRides queryTechParamInUse(@Param("record") String record);
 }

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

@@ -6,4 +6,11 @@ import org.apache.ibatis.annotations.Param;
 
 public interface EquipTechParamRopewayMapper extends BaseMapper<EquipTechParamRopeway> {
     EquipTechParamRopeway getRopewayByDefaultValue(@Param("record") String record);
+
+    /**
+     * 在用的最新需求整理的技术参数--需求未出
+     * @param record 设备唯一标识
+     * @return EquipTechParamVessel
+     */
+    EquipTechParamRopeway queryTechParamInUse(@Param("record") String record);
 }

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

@@ -6,4 +6,10 @@ import org.apache.ibatis.annotations.Param;
 
 public interface EquipTechParamVehicleMapper extends BaseMapper<EquipTechParamVehicle> {
     EquipTechParamVehicle getVehicleByDefaultValue(@Param("record") String record);
+    /**
+     * 在用的最新需求整理的技术参数
+     * @param record 设备唯一标识
+     * @return EquipTechParamVehicle
+     */
+    EquipTechParamVehicle queryTechParamInUse(@Param("record") String record);
 }

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

 package com.yeejoin.amos.boot.module.ymt.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamBoiler;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamVessel;
 import org.apache.ibatis.annotations.Param;
 
 public interface EquipTechParamVesselMapper extends BaseMapper<EquipTechParamVessel> {
     EquipTechParamVessel getVesselByDefaultValue(@Param("record") String record);
+
+    /**
+     * 在用的最新需求整理的技术参数
+     * @param record 设备唯一标识
+     * @return EquipTechParamVessel
+     */
+    EquipTechParamVessel queryTechParamInUse(@Param("record") String record);
 }

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

@@ -36,4 +36,34 @@
         FROM idx_biz_jg_tech_params_boiler
         WHERE RECORD = #{record}
     </select>
+    <select id="queryTechParamInUse"
+            resultType="com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamBoiler">
+        select
+            "DEVICE_LEVEL",
+            "RATED_EVAPORATION_CAPACITY_THERMAL_POWER",
+            "RATED_WORKING_PRESSURE",
+            "RATED_OPERATING_TEMPERATURE",,
+            "DESIGN_THERMAL_EFFICIENCY",
+            "FEEDWATER_TEMPERATURE",
+            "RATED_OUTLET_RETURN_WATER_OIL_TEMPERATURE",
+            "WATER_OIL_VOLUME_OF_BOILER_PROPER",
+            "HYDRAULIC_TEST_MEDIUM_PRESSURE_OF_PACKAGED_BOILER_BODY",
+            "INLET_OUTLET_TEMPERATURE_OF_REHEATER",
+            "REHEATER_INLET_OUTLET_PRESSURE",
+            "REHEAT_STEAM_FLOW",
+            "GL_AIRTIGHT_TEST",
+            "FUEL_TYPE",
+            "NAME_OF_PRESSURE_PARTS",
+            "MATERIAL_OF_PRESSURE_PARTS",
+            "WALL_THICKNESS_OF_PRESSURE_PARTS",
+            "NON_DESTRUCTIVE_TESTING_METHODS_FOR_PRESSURE_PARTS",
+            "PROPORTION_OF_NDT_FOR_PRESSURE_PARTS",
+            "HEAT_TREATMENT_TEMPERATURE_OF_PRESSURE_PARTS",
+            "HEAT_TREATMENT_TIME_OF_PRESSURE_PARTS",
+            "HYDROSTATIC_TEST_MEDIUM",
+            "HYDROSTATIC_TEST_PRESSURE",
+            "COMBUSTION_MODE"
+        FROM idx_biz_jg_tech_params_boiler
+        WHERE RECORD = #{record}
+    </select>
 </mapper>

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

@@ -76,8 +76,29 @@
             COALESCE("CONVEYING_CAPACITY", '') AS "conveyingCapacity",
             COALESCE("WORK_TYPE", '') AS "workType",
             COALESCE("WORK_ENVIRONMENT", '') AS "workEnvironment",
-            COALESCE("KZG_OPERATION_MODE", '') AS "kzgOperationMode",
-            COALESCE("JMWZ", '') AS "jmwz"
+            COALESCE("KZG_OPERATION_MODE", '') AS "kzgOperationMode"
+        FROM idx_biz_jg_tech_params_elevator
+        WHERE RECORD = #{record}
+    </select>
+    <select id="queryTechParamInUse"
+            resultType="com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamElevator">
+         SELECT
+            "RATED_SPEED_UP",
+            "RATED_SPEED_DOWN",
+            "RATED_SPEED",
+            "DOOR_POSITION",
+            "RATED_LOAD_CAPACITY",
+            "LIFTING_HEIGHT",
+            "STOREY",
+            "STAND",
+            "NUMBER_DOORS",
+            "CONTROL_MODE",
+            "NUMBER_CYLINDERS",
+            "JACKING_TYPE",
+            "EXPLOSIONPROOF_GRADE",
+            "EXPLOSIONPROOF_SIGN_COMPLETE",
+            "ANGLE_ROLL",
+            "USE_SECTION_LENGTH"
         FROM idx_biz_jg_tech_params_elevator
         WHERE RECORD = #{record}
     </select>

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

@@ -203,4 +203,43 @@
         FROM idx_biz_jg_tech_params_lifting
         WHERE RECORD = #{record}
     </select>
+    <select id="queryTechParamInUse"
+            resultType="com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamLifting">
+        SELECT
+            "EXPLOSIONPROOF_GRADE",
+            "EXPLOSIVE_SUBSTANCE",
+            "EXPLOSIONPROOF_SIGN_COMPLETE",
+            "CHECK_FINISHED_HEIGHT",
+            "HEIGHT_FREE_END",
+            "RATED_LIFTING_SPEED",
+            "RATED_LOAD_CAPACITY",
+            "WORK_STROKE_CAGE",
+            "RATED_LIFTING_CAPACITY",
+            "MAX_LIFTING_CAPACITY",
+            "MAX_LIFTING_TORQUE",
+            "SPAN_WORKING_RANGE",
+            "LIFTING_SPEED",
+            "LIFTING_HEIGHT",
+            "HEIGHT_FREE_END",
+            "WORK_LEVEL",
+            "RATED_LIFTING_TORQUE",
+            "NUMBER_STOREY",
+            "BIGCAR_RUN_SPEED",
+            "SMALLCARRUN_SPEED",
+            "STORAGE_CAPACITY",
+            "RATED_LIFT_SPEED",
+            "RATED_TRAVERSE_SPEED",
+            "BICYCLE_MAX_EXIT_TIME",
+            "STORAGE_CAPACITY",
+            "CANTILEVER_LENGTH",
+            "DERRICKING_SPEED",
+            "BICYCLE_MAX_COME_TIME",
+            "PARKING_VEHICLE_LENGTH",
+            "PARKING_VEHICLE_WEIGHT",
+            "PARKING_VEHICLE_HEIGHT",
+            "RUNNING_SPEED"
+        FROM
+            idx_biz_jg_tech_params_lifting
+        WHERE RECORD = #{record}
+    </select>
 </mapper>

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

@@ -27,4 +27,27 @@
         FROM idx_biz_jg_tech_params_pipeline
         WHERE RECORD = #{record}
     </select>
+    <select id="queryTechParamInUse"
+            resultType="com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamPipeline">
+            SELECT
+                "DEVICE_NAME",
+                "PIPELINE_CLASS",
+                "PIPE_NAME",
+                "PIPELINE_NUMBER",
+                "DEVICE_LEVEL",
+                "DESIGN_STANDARD",
+                "PIPE_DRAW_NUMBER",
+                "NOMINAL_DIAMETER",
+                "WALL_THICKNESS",
+                "PIPE_LENGTH",
+                "STARTE_POSITION",
+                "PRESSURE",
+                "TEMPERATURE",
+                "MEDIUM",
+                "REMARKS"
+            FROM
+                idx_biz_jg_tech_params_pipeline
+            WHERE
+                RECORD = #{record}
+    </select>
 </mapper>

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

@@ -63,4 +63,21 @@
         FROM idx_biz_jg_tech_params_rides
         WHERE RECORD = #{record}
     </select>
+    <select id="queryTechParamInUse" resultType="com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamRides">
+            SELECT
+                "TRACK_HEIGHT",
+                "RUNNING_SPEED",
+                "NUMBER_OF_PASSENGERS",
+                "SLIDE_LENGTH",
+                "NUMBER_OF_VEHICLES",
+                "OPERATING_HEIGHT",
+                "ROTARY_DIAMETER",
+                "UNILATERAL_SWING_ANGLE",
+                "DIP",
+                "SLEWING_SPEED",
+                "EQUIPMENT_HEIGHT"
+            FROM
+                idx_biz_jg_tech_params_rides
+                 WHERE RECORD = #{record}
+    </select>
 </mapper>

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

@@ -27,4 +27,27 @@
         FROM idx_biz_jg_tech_params_ropeway
         WHERE RECORD = #{record}
     </select>
+    <select id="queryTechParamInUse"
+            resultType="com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamRopeway">
+            SELECT
+                "HORIZONTAL_DISTANCE",
+                "SUPPORTS_COUNT",
+                "OBLIQUE_LENGTH",
+                "MAIN_MOTOR_MODEL_AND_POWER",
+                "ALTITUDE_DIFFERENCE",
+                "OIL_PRESSURE_HEAVY_HAMMER",
+                "OIL_PRESSURE_OIL_PRESSURE",
+                "FREIGHT_VOLUME",
+                "CARRIER_LINE",
+                "SPEED",
+                "BEARING_CABLE",
+                "CABLE_PITCH",
+                "NUMBER_AND_TYPE_OF_VEHICLES",
+                "TRACTION_ROPE",
+                "BALANCE_CABLE"
+            FROM
+                idx_biz_jg_tech_params_ropeway
+            WHERE
+                RECORD = #{record}
+    </select>
 </mapper>

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

@@ -57,4 +57,35 @@
         FROM idx_biz_jg_tech_params_vehicle
         WHERE RECORD = #{record}
     </select>
+    <select id="queryTechParamInUse"
+            resultType="com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamVehicle">
+            SELECT
+                "FRAME_NO",
+                "ENGINE_NO",
+                "LIFTING_CAPACITY",
+                "POWER_MODE",
+                "TRANSMISSION_MODE",
+                "FRAME_STRUCTURE",
+                "DRIVING_MODE",
+                "WEIGHT",
+                "CARRYING_IDLER_MAX_RUNNING_SPEED",
+                "MAX_LIFTING_HEIGHT",
+                "PROTECT_GRADE",
+                "GAS_GROUP",
+                "TEMPERATURE_GROUP",
+                "VEHICLE_MASS",
+                "PASSENGERS_NUMBER",
+                "MAX_RUNNING_SPEED",
+                "WHEEL_BASE",
+                "TRACK_WIDTH_FRONT",
+                "TRACK_WIDTH_BEHIND",
+                "CARS_NUMBER",
+                "SEAT_NUMBER",
+                "TRACTOR_SEAT_NUMBER",
+                "MAX_DRIVING_SLOPE"
+            FROM
+                idx_biz_jg_tech_params_vehicle
+            WHERE
+                RECORD = #{record}
+    </select>
 </mapper>

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

@@ -94,4 +94,91 @@
         FROM idx_biz_jg_tech_params_vessel
         where record = #{record}
     </select>
+    <select id="queryTechParamInUse"
+            resultType="com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamVessel">
+         SELECT
+            rated_quality,
+            ambient_temperature,
+            model_number,
+            num,
+            single_bottle_volume,
+            total_volume,
+            charging_medium,
+            specification,
+            outside_diameter,
+            wall_thickness,
+            length,
+            nominal_working_pressure,
+            bottle_body,
+            end_plug,
+            piping,
+            qp_lossless,
+            gl_lossless,
+            qp_ratio,
+            gl_ratio,
+            qp_pressure,
+            gl_pressure,
+            qp_air_tightness,
+            gl_air_tightness,
+            displacement_pressure,
+            oxygen,
+            heat_treatment_method,
+            qp_heat_treatment_temperature,
+            installation_position,
+            container_volume,
+            pressure_vessel_diameter,
+            height,
+            material_cylinder_shell,
+            pressure_material_head,
+            pressure_material_lining,
+            material_jacket,
+            thickness,
+            fixed_head,
+            fixed_lining,
+            fixed_jacket,
+            self_weight,
+            medium_weight,
+            pressure_housing_path,
+            pressure_pipe,
+            pressure_jacket,
+            temperature_shell,
+            temperature_pipe,
+            temperature_jacket,
+            max_pressure_shell,
+            max_pressure_pipe,
+            max_pressure_jacket,
+            medium_shell,
+            medium_pipe,
+            medium_jacket,
+            main_structure_type,
+            support,
+            installation,
+            insulation,
+            check_lossless,
+            withstand_voltage,
+            leakage,
+            withstand_pressure_test,
+            leak_pressure,
+            container,
+            car_num,
+            volume,
+            max_fill,
+            design_pressure,
+            design_temperature,
+            working_pressure,
+            work_temperature,
+            material_cylinder,
+            thickness_cylinder,
+            corrosion_margin,
+            medium,
+            oxygen_chamber,
+            rated_entry_capacity,
+            chamber_main,
+            chamber_pressure,
+            temperature,
+            pressure_medium,
+            per_capita_cabin_capacity
+        FROM idx_biz_jg_tech_params_vessel
+        where record = #{record}
+    </select>
 </mapper>