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

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/controller/DataDictionaryController.java

@@ -186,7 +186,7 @@ public class DataDictionaryController extends BaseController {
 		}
 	}
 
-	@TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@RequestMapping(value = "/getDataDictionary/{type}", method = RequestMethod.GET)
 	@ApiOperation(httpMethod = "GET", value = "根据字典类型查询字典", notes = "根据字典类型查询字典")
 	public ResponseModel<Object> getDataDictionary(@PathVariable String type) throws Exception {

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

+package com.yeejoin.amos.api.openapi.controller;
+
+import com.yeejoin.amos.api.openapi.feign.TzsTcmServiceFeignClient;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+/**
+ * @author Administrator
+ */
+@RestController
+@RequestMapping(value = "/data-dict")
+public class DataDictionaryController {
+
+    @Autowired
+    TzsTcmServiceFeignClient tzsTcmServiceFeignClient;
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @GetMapping(value = "/{dictCode}/list")
+    @ApiOperation(httpMethod = "POST", value = "查询指定的字典列表", notes = "查询指定的字典列表")
+    public ResponseModel<Object> dictList(@PathVariable String dictCode) {
+        return tzsTcmServiceFeignClient.getDataDictionary(dictCode);
+    }
+
+
+}

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.api.openapi.feign;
 
 import com.yeejoin.amos.api.openapi.config.FeignConfiguration;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -21,4 +22,13 @@ public interface TzsTcmServiceFeignClient {
     @RequestMapping(value = "/baseEnterprise/getUnitLicenceMessage", method = RequestMethod.GET)
     ResponseModel<Object> getLicenceByUnitCode(@RequestParam String unitCode);
 
+
+    /**
+     * 字段列表查询
+     * @param dictCode 字段类型
+     * @return 列表
+     */
+    @RequestMapping(value = "/getDataDictionary/{dictCode}", method = RequestMethod.GET)
+    ResponseModel<Object> getDataDictionary(@PathVariable String dictCode);
+
 }

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

@@ -34,11 +34,23 @@ public class InspectionEquipData {
     @ApiModelProperty(value = "使用/施工地址")
     private String address;
 
-    @ApiModelProperty(value = "施工单位信用代码")
-    private String uscUnitCreditCode;
+    @ApiModelProperty(value = "使用/施工单位信用代码")
+    private String unitCreditCode;
 
-    @ApiModelProperty(value = "施工单位名称")
-    private String uscUnitCreditName;
+    @ApiModelProperty(value = "使用/施工单位名称")
+    private String unitCreditName;
+
+    @ApiModelProperty(value = "告知书编号")
+    private String informCode;
+
+    @ApiModelProperty(value = "告知书附件附件相对路径")
+    private String informFilePath;
+
+    @ApiModelProperty(value = "使用登记证编号")
+    private String useRegistrationCode;
+
+    @ApiModelProperty(value = "使用登记证附件相对路径")
+    private String useCertFilePath;
 
     @ApiModelProperty(value = "技术参数")
     private Map<String, Object> techParams;

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

@@ -26,6 +26,10 @@
             <groupId>org.springframework.kafka</groupId>
             <artifactId>spring-kafka</artifactId>
         </dependency>
+        <dependency>
+            <groupId>net.javacrumbs.shedlock</groupId>
+            <artifactId>shedlock-spring</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

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

 package com.yeejoin.amos;
 
 import com.yeejoin.amos.boot.biz.common.utils.oConvertUtils;
+import net.javacrumbs.shedlock.spring.annotation.EnableSchedulerLock;
 import org.mybatis.spring.annotation.MapperScan;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,7 +37,7 @@ import java.net.UnknownHostException;
 @EnableAsync
 @EnableSwagger2WebMvc
 @EnableEurekaClient
-//@EnableScheduling
+@EnableSchedulerLock(defaultLockAtMostFor = "10m")
 @MapperScan({"org.typroject.tyboot.demo.face.orm.dao*", "org.typroject.tyboot.face.*.orm.dao*",
         "org.typroject.tyboot.core.auth.face.orm.dao*", "org.typroject.tyboot.component.*.face.orm.dao*",
         "com.yeejoin.amos.boot.module.**.api.mapper", "com.yeejoin.amos.boot.biz.common.dao.mapper"})
@@ -45,6 +46,8 @@ public class AmosJyjcApplication {
     private static final Logger logger = LoggerFactory.getLogger(AmosJyjcApplication.class);
 
     public static void main(String[] args) throws UnknownHostException {
+
+        System.setProperty("java.security.auth.login.config", "classpath:kafka_jaas.conf");
         ConfigurableApplicationContext context = SpringApplication.run(AmosJyjcApplication.class, args);
         Environment env = context.getEnvironment();
         String ip = InetAddress.getLocalHost().getHostAddress();

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

@@ -175,7 +175,7 @@ public class CommonController extends BaseController {
 
     @ApiOperation(httpMethod = "PUT", value = "检验消息提醒", notes = "检验消息提醒")
     @PutMapping(value = "/test-tip")
-    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     public ResponseModel<String> testMsgTip(){
         regularlyRemindJob.sendReminderMessage();
         return ResponseHelper.buildResponse("succese");

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

@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.jyjc.biz.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
@@ -11,7 +10,6 @@ import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationRequstD
 import com.yeejoin.amos.boot.module.jyjc.biz.config.BaseException;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcOpeningApplicationServiceImpl;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
-import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
@@ -19,7 +17,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
@@ -268,30 +265,6 @@ public class JyjcOpeningApplicationController extends BaseController {
     }
 
 
-    /**
-     * 自动作废
-     *
-     * @param
-     * @return {@link  ResponseModel< List< TzBaseEnterpriseInfo>>}
-     * @throws
-     * @author yangyang
-     * @date 2023/12/22 16:13
-     */
-    @Scheduled(cron = "0 0 0 * * ?")
-    public void timingDiscard() {
-
-        List<Long> longs = jyjcOpeningApplicationServiceImpl.selectOverdueData();
-
-        if (CollectionUtils.isNotEmpty(longs)) {
-            for (Long aLong : longs) {
-                String remark = "到期作废";
-                jyjcOpeningApplicationServiceImpl.doDiscard(aLong, remark);
-
-            }
-        }
-    }
-
-
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/unit/list")
     @ApiOperation(httpMethod = "GET", value = "查询指定设备所在地的检测机构", notes = "查询指定设备所在地的检测机构")

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/job/InspectionExpireRemindJob.java

@@ -16,6 +16,10 @@ import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.MessageModel;
 import lombok.extern.slf4j.Slf4j;
+import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 
@@ -25,7 +29,8 @@ import java.util.stream.Collectors;
 /**
  * @author Administrator
  */
-@Service
+@EnableScheduling
+@Component
 @Slf4j
 public class InspectionExpireRemindJob {
 
@@ -65,7 +70,8 @@ public class InspectionExpireRemindJob {
         this.jyjcBaseMapper = jyjcBaseMapper;
     }
 
-
+    @Scheduled(cron = "${inspection.expire.remind.job.cron:0 0 8 * * ?}")
+    @SchedulerLock(name = "sendReminderMessageJob", lockAtMostFor = "PT1H")
     public void sendReminderMessage() {
         // 1.查询临期和超期的设备
         List<NeedTipEquipInfo> needTipEquipList = getNeedTipEquipList();
@@ -80,7 +86,7 @@ public class InspectionExpireRemindJob {
         // 查询需要进行消息提醒的设备集合
         List<String> statusList = new ArrayList<>();
         statusList.add(EquimentEnum.ZAIYONG.getCode().toString());
-        List<UseInfoModel> needTipEquipList = useInfoMapper.selecEquipInfotList(statusList, 30);
+        List<UseInfoModel> needTipEquipList = useInfoMapper.queryEquipOfExpireInspection(statusList, 30);
         // 对象转换及管辖机构集合填充
         return this.buildTipEquipInfoList(needTipEquipList);
     }
@@ -150,13 +156,19 @@ public class InspectionExpireRemindJob {
 
     private void createTask(List<NeedTipEquipInfo> needTipEquipList) {
         List<MessageModel> messageModels = new LinkedList<>();
-        needTipEquipList.parallelStream().forEach(e -> messageModels.add(this.buildTaskModel(e)));
+        needTipEquipList.forEach(e -> messageModels.add(this.buildTaskModel(e)));
+        String token = amosRequestContext.getToken();
+        String product = amosRequestContext.getProduct();
+        String appKey = amosRequestContext.getAppKey();
+        // 多线程messageModels.parallelStream().forEach平台无反应所以使用单线程
         messageModels.forEach(m -> {
-            RequestContext.setToken(amosRequestContext.getToken());
-            RequestContext.setProduct(amosRequestContext.getProduct());
-            RequestContext.setAppKey(amosRequestContext.getAppKey());
+            // 多线程时设置，单线程可提到外层
+            RequestContext.setToken(token);
+            RequestContext.setProduct(product);
+            RequestContext.setAppKey(appKey);
             log.info("开始调用平台创建消息：{}", JSONObject.toJSONString(m));
             Systemctl.messageClient.create(m);
+            log.info("结束调用平台创建消息");
         });
     }
 

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/job/OpenApplicationTimingDiscardJob.java

+package com.yeejoin.amos.boot.module.jyjc.biz.job;
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.JyjcOpeningApplicationServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import net.javacrumbs.shedlock.spring.annotation.SchedulerLock;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ */
+@EnableScheduling
+@Component
+@Slf4j
+public class OpenApplicationTimingDiscardJob {
+
+
+    private JyjcOpeningApplicationServiceImpl jyjcOpeningApplicationServiceImpl;
+
+    public OpenApplicationTimingDiscardJob(JyjcOpeningApplicationServiceImpl jyjcOpeningApplicationServiceImpl) {
+        this.jyjcOpeningApplicationServiceImpl = jyjcOpeningApplicationServiceImpl;
+    }
+
+    /**
+     * 自动作废
+     *
+     * @author yangyang
+     * @date 2023/12/22 16:13
+     */
+    @SchedulerLock(name = "timingDiscard", lockAtMostFor = "PT1H")
+    @Scheduled(cron = "0 0 0 * * ?")
+    public void timingDiscard() {
+
+        List<Long> longs = jyjcOpeningApplicationServiceImpl.selectOverdueData();
+
+        if (CollectionUtils.isNotEmpty(longs)) {
+            for (Long aLong : longs) {
+                String remark = "到期作废";
+                jyjcOpeningApplicationServiceImpl.doDiscard(aLong, remark);
+
+            }
+        }
+    }
+}

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;
@@ -17,7 +16,6 @@ public class KafkaProducer {
 
     private final KafkaTemplate<String, String> kafkaTemplate;
 
-    @Autowired
     public KafkaProducer(KafkaTemplate<String, String> kafkaTemplate) {
         this.kafkaTemplate = kafkaTemplate;
     }

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

@@ -18,11 +18,11 @@ eureka.client.service-url.defaultZone=http://172.16.10.243:10001/eureka/
 eureka.instance.prefer-ip-address=true
 management.endpoint.health.show-details=always
 management.endpoints.web.exposure.include=*
-eureka.instance.health-check-url=http://172.16.10.243:${server.port}${server.servlet.context-path}/actuator/health
+eureka.instance.health-check-url=http://172.16.3.20:${server.port}${server.servlet.context-path}/actuator/health
 eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
-eureka.instance.status-page-url=http://172.16.10.243:${server.port}${server.servlet.context-path}/actuator/info
-eureka.instance.metadata-map.management.api-docs=http://172.16.10.243:${server.port}${server.servlet.context-path}/doc.html
-eureka.instance.ip-address=172.16.10.243
+eureka.instance.status-page-url=http://172.16.3.20:${server.port}${server.servlet.context-path}/actuator/info
+eureka.instance.metadata-map.management.api-docs=http://172.16.3.20:${server.port}${server.servlet.context-path}/doc.html
+eureka.instance.ip-address=172.16.3.20
 
 #redis properties:
 spring.redis.database=1
@@ -54,8 +54,8 @@ process-definition-key.jyjc.openapplication=inspectionBusinessOpened
 tzsJg.feign.name=TZS-JG
 
 # rule config
-rule.definition.local-ip=172.16.10.243
-
-equip-hint=0 0 15 21 1 *
+rule.definition.local-ip=172.16.3.20
 
 spring.kafka.bootstrap-servers=172.16.10.243:9092
+spring.kafka.security.protocol=SASL_PLAINTEXT
+spring.kafka.properties.sasl.mechanism=PLAIN
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/kafka_jaas.conf

+KafkaClient {
+  org.apache.kafka.common.security.plain.PlainLoginModule required
+  username="admin"
+  password="admin-secret";
+};

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

 package com.yeejoin.amos.boot.module.ymt.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+
 import java.util.Date;
 
 /**
@@ -17,10 +17,10 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="IdxBizJgConstructionInfoDto", description="施工信息表")
-public class IdxBizJgConstructionInfoDto  extends BaseDto {
+@ApiModel(value = "IdxBizJgConstructionInfoDto", description = "施工信息表")
+public class IdxBizJgConstructionInfoDto extends BaseDto {
 
-   private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
     @TableField("RECORD")
     private String record;
@@ -32,23 +32,31 @@ public class IdxBizJgConstructionInfoDto  extends BaseDto {
     private String status;
 
     @ApiModelProperty(value = "施工类型")
-    @TableField("CONSTRUCTION_TYPE")
     private String constructionType;
 
     @ApiModelProperty(value = "施工单位统一社会信用代码")
-    @TableField("USC_UNIT_CREDIT_CODE")
     private String uscUnitCreditCode;
 
     @ApiModelProperty(value = "施工单位名称")
-    @TableField("USC_UNIT_NAME")
     private String uscUnitName;
 
     @ApiModelProperty(value = "施工时间")
-    @TableField("USC_DATE")
     private Date uscDate;
 
     @ApiModelProperty(value = "设备唯一标识")
-    @TableField("SEQUENCE_CODE")
     private String sequenceCode;
 
+
+    @ApiModelProperty(value = "告知业务id-告知作废时使用")
+    private String noticeId;
+
+
+    @ApiModelProperty(value = "告知书编号")
+    private String informCode;
+
+
+    @ApiModelProperty(value = "告知书路径")
+    private String informFilePath;
+
+
 }

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

 package com.yeejoin.amos.boot.module.ymt.api.dto;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.util.Date;
 
 /**
  * 注册登记信息表
@@ -17,99 +14,77 @@ import java.util.Date;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@ApiModel(value="IdxBizJgRegisterInfoDto", description="注册登记信息表")
-public class IdxBizJgRegisterInfoDto  extends BaseDto {
-
-   private static final long serialVersionUID = 1L;
-
+@ApiModel(value = "IdxBizJgRegisterInfoDto", description = "注册登记信息表")
+public class IdxBizJgRegisterInfoDto extends BaseDto {
 
+    private static final long serialVersionUID = 1L;
 
-
-    @TableField("RECORD")
     private String record;
 
 
-
-    @TableField("INSTANCE_ID")
     private String instanceId;
 
-    @TableField("STATUS")
     private String status;
 
     @ApiModelProperty(value = "登记机关组织机构代码")
-    @TableField("ORGANIZATION_CODE")
     private String organizationCode;
 
     @ApiModelProperty(value = "登记机关名称")
-    @TableField("ORGANIZATION_NAME")
     private String organizationName;
 
     @ApiModelProperty(value = "使用登记证编号")
-    @TableField("USE_ORG_CODE")
     private String useOrgCode;
 
     @ApiModelProperty(value = "注册状态")
-    @TableField("REGISTER_STATE")
     private String registerState;
 
     @ApiModelProperty(value = "设备代码")
-    @TableField("EQU_CODE")
     private String equCode;
 
     @ApiModelProperty(value = "设备种类")
-    @TableField("EQU_LIST")
     private String equList;
 
     @ApiModelProperty(value = "设备类别")
-    @TableField("EQU_CATEGORY")
     private String equCategory;
 
     @ApiModelProperty(value = "设备品种")
-    @TableField("EQU_DEFINE")
     private String equDefine;
 
     @ApiModelProperty(value = "产品名称")
-    @TableField("PRODUCT_NAME")
     private String productName;
 
     @ApiModelProperty(value = "品牌名称")
-    @TableField("BRAND_NAME")
     private String brandName;
 
     @ApiModelProperty(value = "设备型号")
-    @TableField("EQU_TYPE")
     private String equType;
 
     @ApiModelProperty(value = "设备总价值（万元）")
-    @TableField("EQU_PRICE")
     private String equPrice;
 
     @ApiModelProperty(value = "使用登记证")
-    @TableField("USE_REGISTRATION_CERTIFICATE")
     private String useRegistrationCertificate;
 
     @ApiModelProperty(value = "使用标志")
-    @TableField("USE_SIGN")
     private String useSign;
 
     @ApiModelProperty(value = "产品照片")
-    @TableField("PRODUCT_PHOTO")
     private String productPhoto;
 
     @ApiModelProperty(value = "车辆牌号")
-    @TableField("CAR_NUMBER")
     private String carNumber;
 
     @ApiModelProperty(value = "车架编号")
-    @TableField("FRAME_NUMBER")
     private String frameNumber;
 
     @ApiModelProperty(value = "发动机编号")
-    @TableField("ENGINE_NUMBER")
     private String engineNumber;
 
     @ApiModelProperty(value = "电动机编号")
-    @TableField("MOTOR_NUMBER")
     private String motorNumber;
 
+
+    @ApiModelProperty(value = "最新使用登记证路径")
+    private String lastUseCertFilePath;
+
 }

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

@@ -82,4 +82,17 @@ public class IdxBizJgConstructionInfo extends TzsBaseEntity {
     private String noticeId;
 
 
+    /**
+     * 告知书编号
+     */
+    @TableField(value = "\"INFORM_CODE\"")
+    private String informCode;
+
+    /**
+     * 告知书路径
+     */
+    @TableField(value = "\"INFORM_FILE_PATH\"")
+    private String informFilePath;
+
+
 }

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

@@ -185,5 +185,11 @@ public class IdxBizJgRegisterInfo extends TzsBaseEntity {
     @TableField("\"WHETHER_SKID_MOUNTED_PRESSURE_VESSEL\"")
     private String whetherSkidMountedPressureVessel;
 
+    /**
+     * 最新使用登记证路径
+     */
+
+    @TableField("\"LAST_USE_CERT_FILE_PATH\"")
+    private String lastUseCertFilePath;
 
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.bouncycastle.cms.PasswordRecipientId;
 
 import java.math.BigDecimal;
 
@@ -22,47 +23,46 @@ public class RegistrationInfo extends AbstractEquipBaseEntity {
     private static final long serialVersionUID = 1L;
 
 
-
     /**
      *  	 * $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 ="\"ORGANIZATION_CODE\"")
+    @TableField(value = "\"ORGANIZATION_CODE\"")
     private String organizationCode;
     /**
-     *  	 * 登记机关名称
-     *      */
+     * * 登记机关名称
+     */
 
-    @TableField(value ="\"ORGANIZATION_NAME\"")
+    @TableField(value = "\"ORGANIZATION_NAME\"")
     private String organizationName;
     /**
-     *  	 * 使用登记证编号
-     *      */
+     * * 使用登记证编号
+     */
 
-    @TableField(value ="\"USE_ORG_CODE\"")
+    @TableField(value = "\"USE_ORG_CODE\"")
     private String useOrgCode;
     /**
-     *  	 * 注册状态
-     *      */
+     * * 注册状态
+     */
 
-    @TableField(value ="\"REGISTER_STATE\"")
+    @TableField(value = "\"REGISTER_STATE\"")
     private String registerState;
 
 
@@ -72,94 +72,94 @@ public class RegistrationInfo extends AbstractEquipBaseEntity {
     @TableField("\"EQU_CODE_TYPE\"")
     private String equCodeType;
     /**
-     *  	 * 设备代码
-     *      */
+     * * 设备代码
+     */
 
-    @TableField(value ="\"EQU_CODE\"")
+    @TableField(value = "\"EQU_CODE\"")
     private String equCode;
     /**
-     *  	 * 设备种类
-     *      */
+     * * 设备种类
+     */
 
-    @TableField(value ="\"EQU_LIST\"")
+    @TableField(value = "\"EQU_LIST\"")
     private String equList;
     /**
-     *  	 * 设备类别
-     *      */
+     * * 设备类别
+     */
 
-    @TableField(value ="\"EQU_CATEGORY\"")
+    @TableField(value = "\"EQU_CATEGORY\"")
     private String equCategory;
     /**
-     *  	 * 设备品种
-     *      */
+     * * 设备品种
+     */
 
-    @TableField(value ="\"EQU_DEFINE\"")
+    @TableField(value = "\"EQU_DEFINE\"")
     private String equDefine;
     /**
-     *  	 * 产品名称
-     *      */
+     * * 产品名称
+     */
 
-    @TableField(value ="\"PRODUCT_NAME\"")
+    @TableField(value = "\"PRODUCT_NAME\"")
     private String productName;
     /**
-     *  	 * 品牌名称
-     *      */
+     * * 品牌名称
+     */
 
-    @TableField(value ="\"BRAND_NAME\"")
+    @TableField(value = "\"BRAND_NAME\"")
     private String brandName;
     /**
-     *  	 * 设备型号
-     *      */
+     * * 设备型号
+     */
 
-    @TableField(value ="\"EQU_TYPE\"")
+    @TableField(value = "\"EQU_TYPE\"")
     private String equType;
     /**
-     *  	 * 设备总价值（万元）
-     *      */
+     * * 设备总价值（万元）
+     */
 
-    @TableField(value ="\"EQU_PRICE\"")
+    @TableField(value = "\"EQU_PRICE\"")
     private BigDecimal equPrice;
     /**
-     *  	 * 使用登记证
-     *      */
+     * * 使用登记证
+     */
 
-    @TableField(value ="\"USE_REGISTRATION_CERTIFICATE\"")
+    @TableField(value = "\"USE_REGISTRATION_CERTIFICATE\"")
     private String useRegistrationCertificate;
     /**
-     *  	 * 使用标志
-     *      */
+     * * 使用标志
+     */
 
-    @TableField(value ="\"USE_SIGN\"")
+    @TableField(value = "\"USE_SIGN\"")
     private String useSign;
     /**
-     *  	 * 产品照片
-     *      */
+     * * 产品照片
+     */
 
-    @TableField(value ="\"PRODUCT_PHOTO\"")
+    @TableField(value = "\"PRODUCT_PHOTO\"")
     private String productPhoto;
     /**
-     *  	 * 车辆牌号
-     *      */
+     * * 车辆牌号
+     */
 
-    @TableField(value ="\"CAR_NUMBER\"")
+    @TableField(value = "\"CAR_NUMBER\"")
     private String carNumber;
     /**
-     *  	 * 车架编号
-     *      */
+     * * 车架编号
+     */
 
-    @TableField(value ="\"FRAME_NUMBER\"")
+    @TableField(value = "\"FRAME_NUMBER\"")
     private String frameNumber;
     /**
-     *  	 * 发动机编号
-     *      */
+     * * 发动机编号
+     */
 
-    @TableField(value ="\"ENGINE_NUMBER\"")
+    @TableField(value = "\"ENGINE_NUMBER\"")
     private String engineNumber;
     /**
-     *  	 * 电动机编号
-     *      */
+     * * 电动机编号
+     */
 
-    @TableField(value ="\"MOTOR_NUMBER\"")
+    @TableField(value = "\"MOTOR_NUMBER\"")
     private String motorNumber;
 
 
@@ -171,10 +171,18 @@ public class RegistrationInfo extends AbstractEquipBaseEntity {
 
     /**
      * 是否车用气瓶（特种气瓶用于区分“内装填料气瓶、纤维缠绕气瓶、低温绝热气瓶”和车用气瓶）
-     *  1：是
-     *  0：不是
+     * 1：是
+     * 0：不是
      */
     @TableField("\"WHETHER_VEHICLE_CYLINDER\"")
     private String whetherVehicleCylinder;
 
+
+    /**
+     * 最新使用登记证路径
+     */
+
+    @TableField("\"LAST_USE_CERT_FILE_PATH\"")
+    private String lastUseCertFilePath;
+
 }

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

@@ -7,8 +7,6 @@ import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface EquipTechParamBoilerMapper extends BaseMapper<EquipTechParamBoiler> {
-    EquipTechParamBoiler getBoilerByDefaultValue(@Param("record") String record);
-
     /**
      * 在用的最新需求整理的技术参数
      * @param 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

@@ -5,7 +5,6 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamElevator;
 import org.apache.ibatis.annotations.Param;
 
 public interface EquipTechParamElevatorMapper extends BaseMapper<EquipTechParamElevator> {
-    EquipTechParamElevator getElevatorByDefaultValue(@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

@@ -5,7 +5,6 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamLifting;
 import org.apache.ibatis.annotations.Param;
 
 public interface EquipTechParamLiftingMapper extends BaseMapper<EquipTechParamLifting> {
-    EquipTechParamLifting getLiftingByDefaultValue(@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

@@ -5,8 +5,6 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamPipeline;
 import org.apache.ibatis.annotations.Param;
 
 public interface EquipTechParamPipelineMapper extends BaseMapper<EquipTechParamPipeline> {
-    EquipTechParamPipeline getPipelineByDefaultValue(@Param("record") String record);
-
     /**
      * 在用的最新需求整理的技术参数--需求未出
      * @param 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

@@ -5,7 +5,6 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamRides;
 import org.apache.ibatis.annotations.Param;
 
 public interface EquipTechParamRidesMapper extends BaseMapper<EquipTechParamRides> {
-    EquipTechParamRides getRidesByDefaultValue(@Param("record") String record);
     /**
      * 在用的最新需求整理的技术参数
      * @param 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

@@ -2,15 +2,16 @@ 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.EquipTechParamRopeway;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsRopeway;
 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);
+    IdxBizJgTechParamsRopeway 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

@@ -5,7 +5,6 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamVehicle;
 import org.apache.ibatis.annotations.Param;
 
 public interface EquipTechParamVehicleMapper extends BaseMapper<EquipTechParamVehicle> {
-    EquipTechParamVehicle getVehicleByDefaultValue(@Param("record") String record);
     /**
      * 在用的最新需求整理的技术参数
      * @param 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

@@ -6,7 +6,6 @@ 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);
 
     /**
      * 在用的最新需求整理的技术参数

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

@@ -16,7 +16,13 @@ import java.util.List;
  */
 public interface UseInfoMapper extends BaseMapper<UseInfo> {
 
-  List<UseInfoModel> selecEquipInfotList(@Param("statusList") List<String> statusList, @Param("interval") int interval);
+  /**
+   * 查询检验临期及超期的设备
+   * @param statusList 设备状态
+   * @param interval 间隔天
+   * @return 使用信息
+   */
+  List<UseInfoModel> queryEquipOfExpireInspection(@Param("statusList") List<String> statusList, @Param("interval") int interval);
 
   void updateByRecord(String record, Date nextInspectDate, String lastInspectType, String lastInspectReportNo);
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/EquipTechParamBoilerMapper.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.ymt.api.mapper.EquipTechParamBoilerMapper">
-    <select id="getBoilerByDefaultValue" resultType="com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamBoiler">
-        SELECT
-            COALESCE("SEQUENCE_NBR", 'default_value') AS "sequenceNbr",
-            RECORD AS "record",
-            REC_DATE AS "recDate",
-            REC_USER_ID AS "recUserId",
-            INSTANCE_ID AS "instanceId",
-            STATUS AS "status",
-            COALESCE("DEVICE_LEVEL", '') AS "deviceLevel",
-            COALESCE("RATED_EVAPORATION_CAPACITY_THERMAL_POWER", 0) AS "ratedEvaporationCapacityThermalPower",
-            COALESCE("RATED_WORKING_PRESSURE", 0) AS "ratedWorkingPressure",
-            COALESCE("RATED_OPERATING_TEMPERATURE", 0) AS "ratedOperatingTemperature",
-            COALESCE("DESIGN_THERMAL_EFFICIENCY", 0) AS "designThermalEfficiency",
-            COALESCE("FEEDWATER_TEMPERATURE", 0) AS "feedwaterTemperature",
-            COALESCE("RATED_OUTLET_RETURN_WATER_OIL_TEMPERATURE", 0) AS "ratedOutletReturnWaterOilTemperature",
-            COALESCE("WATER_OIL_VOLUME_OF_BOILER_PROPER", 0) AS "waterOilVolumeOfBoilerProper",
-            COALESCE("HYDRAULIC_TEST_MEDIUM_PRESSURE_OF_PACKAGED_BOILER_BODY", 0) AS "hydraulicTestMediumPressureOfPackagedBoilerBody",
-            COALESCE("INLET_OUTLET_TEMPERATURE_OF_REHEATER", 0) AS "inletOutletTemperatureOfReheater",
-            COALESCE("REHEATER_INLET_OUTLET_PRESSURE", 0) AS "reheaterInletOutletPressure",
-            COALESCE("REHEAT_STEAM_FLOW", 0) AS "reheatSteamFlow",
-            COALESCE("GL_AIRTIGHT_TEST", 0) AS "glAirtightTest",
-            COALESCE("FUEL_TYPE", '') AS "fuelType",
-            COALESCE("NAME_OF_PRESSURE_PARTS", '') AS "nameOfPressureParts",
-            COALESCE("MATERIAL_OF_PRESSURE_PARTS", '') AS "materialOfPressureParts",
-            COALESCE("WALL_THICKNESS_OF_PRESSURE_PARTS", 0) AS "wallThicknessOfPressureParts",
-            COALESCE("NON_DESTRUCTIVE_TESTING_METHODS_FOR_PRESSURE_PARTS", '') AS "nonDestructiveTestingMethodsForPressureParts",
-            COALESCE("PROPORTION_OF_NDT_FOR_PRESSURE_PARTS", 0) AS "proportionOfNdtForPressureParts",
-            COALESCE("HEAT_TREATMENT_TEMPERATURE_OF_PRESSURE_PARTS", 0) AS "heatTreatmentTemperatureOfPressureParts",
-            COALESCE("HEAT_TREATMENT_TIME_OF_PRESSURE_PARTS", 0) AS "heatTreatmentTimeOfPressureParts",
-            COALESCE("HYDROSTATIC_TEST_MEDIUM", '') AS "hydrostaticTestMedium",
-            COALESCE("HYDROSTATIC_TEST_PRESSURE", 0) AS "hydrostaticTestPressure",
-            COALESCE("COMBUSTION_MODE", '') AS "combustionMode"
-        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",,
+            "RATED_OPERATING_TEMPERATURE",
             "DESIGN_THERMAL_EFFICIENCY",
             "FEEDWATER_TEMPERATURE",
             "RATED_OUTLET_RETURN_WATER_OIL_TEMPERATURE",

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/EquipTechParamElevatorMapper.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.ymt.api.mapper.EquipTechParamElevatorMapper">
-    <select id="getElevatorByDefaultValue" resultType="com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamElevator">
-        SELECT
-            SEQUENCE_NBR AS "sequenceNbr",
-            RECORD AS "record",
-            REC_DATE AS "recDate",
-            REC_USER_ID AS "recUserId",
-            INSTANCE_ID AS "instanceId",
-            STATUS AS "status",
-            COALESCE("RATED_SPEED_UP", 0) AS "ratedSpeedUp",
-            COALESCE("RATED_SPEED_DOWN", 0) AS "ratedSpeedDown",
-            COALESCE("RATED_LOAD_CAPACITY", 0) AS "ratedLoadCapacity",
-            COALESCE("CAR_SIZE", 0) AS "carSize",
-            COALESCE("LIFTING_HEIGHT", 0) AS "liftingHeight",
-            COALESCE("STOREY", 0) AS "storey",
-            COALESCE("STAND", 0) AS "stand",
-            COALESCE("NUMBER_DOORS", 0) AS "numberDoors",
-            COALESCE("CONTROL_MODE", '') AS "controlMode",
-            COALESCE("NUMBER_CYLINDERS", 0) AS "numberCylinders",
-            COALESCE("JACKING_TYPE", '') AS "jackingType",
-            COALESCE("RATED_PRESSURE", 0) AS "ratedPressure",
-            COALESCE("EXPLOSIONPROOF_TYPE", '') AS "explosionproofType",
-            COALESCE("EXPLOSIONPROOF_GRADE", '') AS "explosionproofGrade",
-            COALESCE("EXPLOSIVE_SUBSTANCE", '') AS "explosiveSubstance",
-            COALESCE("EXPLOSIONPROOF_SIGN_COMPLETE", '') AS "explosionproofSignComplete",
-            COALESCE("QDZJ_RATED_POWER", 0) AS "qdZjRatedPower",
-            COALESCE("QDZJ_RATED_SPEED", 0) AS "qdZjRatedSpeed",
-            COALESCE("QDZJ_REDUCTION_RATIO", 0) AS "qdZjReductionRatio",
-            COALESCE("YABZ_FULLLOAD_PRESSURE", 0) AS "yabzFullloadPressure",
-            COALESCE("XGXL_MEDIA_TYPE", '') AS "xgxlMediaType",
-            COALESCE("XGXL_MEDIA_NUMBER", 0) AS "xgxlMediaNumber",
-            COALESCE("XGXL_MEDIA_MODEL", '') AS "xgxlMediaModel",
-            COALESCE("XGXL_MEDIA_SPECIFICATION", '') AS "xgxlMediaSpecification",
-            COALESCE("QDZJ_MODEL", '') AS "qdZjModel",
-            COALESCE("QDZJ_PRODUCT_NO", '') AS "qdZjProductNo",
-            COALESCE("QDZJ_MANUFACTURER", '') AS "qdZjManufacturer",
-            COALESCE("KZG_MODEL", '') AS "kzgModel",
-            COALESCE("KZG_PRODUCT_NO", '') AS "kzgProductNo",
-            COALESCE("KZG_MANUFACTURER", '') AS "kzgManufacturer",
-            COALESCE("XSQ_MODEL", '') AS "xsqModel",
-            COALESCE("XSQ_PRODUCT_NO", '') AS "xsqProductNo",
-            COALESCE("XSQ_MANUFACTURER", '') AS "xsqManufacturer",
-            COALESCE("AQQ_MODEL", '') AS "aqqModel",
-            COALESCE("AQQ_PRODUCT_NO", '') AS "aqqProductNo",
-            COALESCE("AQQ_MANUFACTURER", '') AS "aqqManufacturer",
-            COALESCE("JXHCQ_MODEL", '') AS "jxhcqModel",
-            COALESCE("JXHCQ_PRODUCT_NO", '') AS "jxhcqProductNo",
-            COALESCE("JXHCQ_MANUFACTURER", '') AS "jxhcqManufacturer",
-            COALESCE("DCHCQ_MODEL", '') AS "dchcqModel",
-            COALESCE("DCHCQ_PRODUCT_NO", '') AS "dchcqProductNo",
-            COALESCE("DCHCQ_MANUFACTURER", '') AS "dchcqManufacturer",
-            COALESCE("CMMSZZ_MODEL", '') AS "cmmszzModel",
-            COALESCE("CMMSZZ_PRODUCT_NO", '') AS "cmmszzProductNo",
-            COALESCE("CMMSZZ_MANUFACTURER", '') AS "cmmszzManufacturer",
-            COALESCE("JMMSZZ_MODEL", '') AS "jmmszzModel",
-            COALESCE("JMMSZZ_PRODUCT_NO", '') AS "jmmszzProductNo",
-            COALESCE("JMMSZZ_MANUFACTURER", '') AS "jmmszzManufacturer",
-            COALESCE("SXCSBHZZ_MODEL", '') AS "sxcsbhzzModel",
-            COALESCE("SXCSBHZZ_PRODUCT_NO", '') AS "sxcsbhzzProductNo",
-            COALESCE("SXCSBHZZ_MANUFACTURER", '') AS "sxcsbhzzManufacturer",
-            COALESCE("JXYWYDBHZZ_MODEL", '') AS "jxywydbhzzModel",
-            COALESCE("JXYWYDBHZZ_PRODUCT_NO", '') AS "jxywydbhzzProductNo",
-            COALESCE("JXYWYDBHZZ_MANUFACTURER", '') AS "jxywydbhzzManufacturer",
-            COALESCE("YYBZ_MODEL", '') AS "yybzModel",
-            COALESCE("YYBZ_PRODUCT_NO", '') AS "yybzProductNo",
-            COALESCE("YYBZ_MANUFACTURER", '') AS "yybzManufacturer",
-            COALESCE("XSQDF_MODEL", '') AS "xsqdfModel",
-            COALESCE("XSQDF_PRODUCT_NO", '') AS "xsqdfProductNo",
-            COALESCE("XSQDF_MANUFACTURER", '') AS "xsqdfManufacturer",
-            COALESCE("NOMINAL_SPEED", 0) AS "nominalSpeed",
-            COALESCE("ANGLE_ROLL", 0) AS "angleRoll",
-            COALESCE("NOMINAL_WIDTH", 0) AS "nominalWidth",
-            COALESCE("USE_SECTION_LENGTH", 0) AS "useSectionLength",
-            COALESCE("CONVEYING_CAPACITY", '') AS "conveyingCapacity",
-            COALESCE("WORK_TYPE", '') AS "workType",
-            COALESCE("WORK_ENVIRONMENT", '') AS "workEnvironment",
-            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

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/EquipTechParamPipelineMapper.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.ymt.api.mapper.EquipTechParamPipelineMapper">
-    <select id="getPipelineByDefaultValue" resultType="com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamPipeline">
-        SELECT
-            "SEQUENCE_NBR" AS "sequenceNbr",
-            "RECORD" AS "record",
-            "REC_DATE" AS "recDate",
-            "REC_USER_ID" AS "recUserId",
-            "INSTANCE_ID" AS "instanceId",
-            "STATUS" AS "status",
-            COALESCE("DEVICE_NAME", '') AS "deviceName",
-            COALESCE("PIPELINE_CLASS", '') AS "pipelineClass",
-            COALESCE("PIPE_NAME", '') AS "pipeName",
-            COALESCE("PIPELINE_NUMBER", '') AS "pipelineNumber",
-            COALESCE("DEVICE_LEVEL", '') AS "deviceLevel",
-            COALESCE("DESIGN_STANDARD", '') AS "designStandard",
-            COALESCE("PIPE_DRAW_NUMBER", '') AS "pipeDrawNumber",
-            COALESCE("NOMINAL_DIAMETER", 0) AS "nominalDiameter",
-            COALESCE("WALL_THICKNESS", 0) AS "wallThickness",
-            COALESCE("PIPE_LENGTH", 0) AS "pipeLength",
-            COALESCE("STARTE_POSITION", '') AS "startePosition",
-            COALESCE("PRESSURE", 0) AS "pressure",
-            COALESCE("TEMPERATURE", 0) AS "temperature",
-            COALESCE("MEDIUM", '') AS "medium",
-            COALESCE("REMARKS", '') AS "remarks"
-        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

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/EquipTechParamRidesMapper.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.ymt.api.mapper.EquipTechParamRidesMapper">
-
-    <select id="getRidesByDefaultValue" resultType="com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamRides">
-        SELECT
-            SEQUENCE_NBR AS "sequenceNbr",
-            RECORD AS "record",
-            REC_DATE AS "recDate",
-            REC_USER_ID AS "recUserId",
-            INSTANCE_ID AS "instanceId",
-            STATUS AS "status",
-            COALESCE("DESIGN_LIFE", 0) AS "designLife",
-            COALESCE("SLIDE_LENGTH", 0) AS "slideLength",
-            COALESCE("SLIDE_HEIGHT", 0) AS "slideHeight",
-            COALESCE("MINIMUM_SLOPE_OF_SLIDE", 0) AS "minimumSlopeOfSlide",
-            COALESCE("AVERAGE_SLOPE_OF_SLIDE", 0) AS "averageSlopeOfSlide",
-            COALESCE("MAXIMUM_SLOPE_OF_THE_SLIDE_WITHOUT_JUMPING", 0) AS "maximumSlopeWithoutJumping",
-            COALESCE("MINIMUM_RADIUS_OF_CURVATURE_OF_SLIDEWAY", 0) AS "minimumRadiusOfCurvature",
-            COALESCE("NUMBER_OF_SLIDES", 0) AS "numberOfSlides",
-            COALESCE("MAIN_MATERIAL_OF_SLIDE", '') AS "mainMaterialOfSlide",
-            COALESCE("NUMBER_OF_PULLEYS", 0) AS "numberOfPulleys",
-            COALESCE("NUMBER_OF_PASSENGERS", 0) AS "numberOfPassengers",
-            COALESCE("ALTITUDE_DIFFERENCE", 0) AS "altitudeDifference",
-            COALESCE("HORIZONTAL_DISTANCE", 0) AS "horizontalDistance",
-            COALESCE("HEIGHT", 0) AS "height",
-            COALESCE("GLIDE_SPEED", 0) AS "glideSpeed",
-            COALESCE("COUNT_OF_PASSENGERS", 0) AS "countOfPassengers",
-            COALESCE("RUNNING_SPEED", 0) AS "runningSpeed",
-            COALESCE("NUMBER_OF_VEHICLES", 0) AS "numberOfVehicles",
-            COALESCE("POWER", 0) AS "power",
-            COALESCE("TRACK_HEIGHT", 0) AS "trackHeight",
-            COALESCE("NUMBER_OF_MEMBERS", 0) AS "numberOfMembers",
-            COALESCE("OPERATING_HEIGHT", 0) AS "operatingHeight",
-            COALESCE("DRIVE_POWER", 0) AS "drivePower",
-            COALESCE("ROTARY_DIAMETER", 0) AS "rotaryDiameter",
-            COALESCE("RATED_NUMBER_OF_PASSENGERS", 0) AS "ratedNumberOfPassengers",
-            COALESCE("NUMBER_OF_PODS", 0) AS "numberOfPods",
-            COALESCE("EQUIPMENT_HEIGHT", 0) AS "equipmentHeight",
-            COALESCE("RATED_LINEAR_SPEED", 0) AS "ratedLinearSpeed",
-            COALESCE("ROTARY_TABLE_SPEED", 0) AS "rotaryTableSpeed",
-            COALESCE("UNILATERAL_SWING_ANGLE", 0) AS "unilateralSwingAngle",
-            COALESCE("NUMBER_OF_CABINS", 0) AS "numberOfCabins",
-            COALESCE("MAXIMUM_OPERATING_HEIGHT", 0) AS "maximumOperatingHeight",
-            COALESCE("ROTATION_DIAMETER", 0) AS "rotationDiameter",
-            COALESCE("MAXIMUM_SPEED", 0) AS "maximumSpeed",
-            COALESCE("DIP", 0) AS "dip",
-            COALESCE("SLEWING_SPEED", 0) AS "slewingSpeed",
-            COALESCE("LIFTING_SPEED", 0) AS "liftingSpeed",
-            COALESCE("HEIGHT_DIFFERENCE", 0) AS "heightDifference",
-            COALESCE("MAIN_CABLE_DIAMETER", 0) AS "mainCableDiameter",
-            COALESCE("ANGLE_OF_CHORD", 0) AS "angleOfChord",
-            COALESCE("PASSENGER_NUM", 0) AS "passengerNum",
-            COALESCE("BOUNCE_HEIGHT", 0) AS "bounceHeight",
-            COALESCE("MAXIMUM_LOAD", 0) AS "maximumLoad",
-            COALESCE("EQUIPMENT_POWER", 0) AS "equipmentPower",
-            COALESCE("FLOOR_AREA", 0) AS "floorArea",
-            COALESCE("LIFTOFF_ALTITUDE", 0) AS "liftoffAltitude",
-            COALESCE("FIELD_DIAMETER", 0) AS "fieldDiameter",
-            COALESCE("SPHERE_DIAMETER", 0) AS "sphereDiameter",
-            COALESCE("SPHERE_VOLUME", 0) AS "sphereVolume",
-            COALESCE("OPERATOR_NUMBER", 0) AS "operatorNumber"
-        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",

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/EquipTechParamRopewayMapper.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.ymt.api.mapper.EquipTechParamRopewayMapper">
-    <select id="getRopewayByDefaultValue" resultType="com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamRopeway">
-        SELECT
-            "SEQUENCE_NBR" AS "sequenceNbr",
-            "RECORD" AS "record",
-            "REC_DATE" AS "recDate",
-            "REC_USER_ID" AS "recUserId",
-            "INSTANCE_ID" AS "instanceId",
-            "STATUS" AS "status",
-            COALESCE("HORIZONTAL_DISTANCE", 0) AS "horizontalDistance",
-            COALESCE("SUPPORTS_COUNT", 0) AS "supportsCount",
-            COALESCE("OBLIQUE_LENGTH", 0) AS "obliqueLength",
-            COALESCE("MAIN_MOTOR_MODEL_AND_POWER", 0) AS "mainMotorModelAndPower",
-            COALESCE("ALTITUDE_DIFFERENCE", 0) AS "altitudeDifference",
-            COALESCE("OIL_PRESSURE_HEAVY_HAMMER", 0) AS "oilPressureHeavyHammer",
-            COALESCE("OIL_PRESSURE_OIL_PRESSURE", 0) AS "oilPressureOilPressure",
-            COALESCE("FREIGHT_VOLUME", 0) AS "freightVolume",
-            COALESCE("CARRIER_LINE", '') AS "carrierLine",
-            COALESCE("SPEED", 0) AS "speed",
-            COALESCE("BEARING_CABLE", '') AS "bearingCable",
-            COALESCE("CABLE_PITCH", 0) AS "cablePitch",
-            COALESCE("NUMBER_AND_TYPE_OF_VEHICLES", '') AS "numberAndTypeOfVehicles",
-            COALESCE("TRACTION_ROPE", '') AS "tractionRope",
-            COALESCE("BALANCE_CABLE", '') AS "balanceCable"
-        FROM idx_biz_jg_tech_params_ropeway
-        WHERE RECORD = #{record}
-    </select>
     <select id="queryTechParamInUse"
-            resultType="com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamRopeway">
+            resultType="com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsRopeway">
             SELECT
                 "HORIZONTAL_DISTANCE",
                 "SUPPORTS_COUNT",
                 "OBLIQUE_LENGTH",
-                "MAIN_MOTOR_MODEL_AND_POWER",
+                "MAIN_MOTOR_MODEL",
+                "MAIN_MOTOR_POWER",
                 "ALTITUDE_DIFFERENCE",
                 "OIL_PRESSURE_HEAVY_HAMMER",
                 "OIL_PRESSURE_OIL_PRESSURE",

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/EquipTechParamVehicleMapper.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.ymt.api.mapper.EquipTechParamVehicleMapper">
-
-    <select id="getVehicleByDefaultValue" resultType="com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamVehicle">
-        SELECT
-            "SEQUENCE_NBR" AS "sequenceNbr",
-            "RECORD" AS "record",
-            "REC_DATE" AS "recDate",
-            "REC_USER_ID" AS "recUserId",
-            "INSTANCE_ID" AS "instanceId",
-            "STATUS" AS "status",
-            COALESCE("FRAME_NO", '') AS "frameNo",
-            COALESCE("ENGINE_NO", '') AS "engineNo",
-            COALESCE("POWER_MODE", '') AS "powerMode",
-            COALESCE("TRANSMISSION_MODE", '') AS "transmissionMode",
-            COALESCE("FRAME_STRUCTURE", '') AS "frameStructure",
-            COALESCE("DRIVING_MODE", '') AS "drivingMode",
-            COALESCE("WEIGHT", 0) AS "weight",
-            COALESCE("CARRYING_IDLER_MAX_RUNNING_SPEED", 0) AS "carryingIdlerMaxRunningSpeed",
-            COALESCE("MAX_LIFTING_SPEED", 0) AS "maxLiftingSpeed",
-            COALESCE("PROTECT_GRADE", '') AS "protectGrade",
-            COALESCE("GAS_GROUP", '') AS "gasGroup",
-            COALESCE("TEMPERATURE_GROUP", '') AS "temperatureGroup",
-            COALESCE("LIFTING_CAPACITY", 0) AS "liftingCapacity",
-            COALESCE("SYSTEM_VOLTAGE", 0) AS "systemVoltage",
-            COALESCE("LOAD_CENTER_DISTANCE", 0) AS "loadCenterDistance",
-            COALESCE("ENGINE_POWER", 0) AS "enginePower",
-            COALESCE("MAX_SPEED", 0) AS "maxSpeed",
-            COALESCE("EXPLOSIONPROOF_PLACE", '') AS "explosionproofPlace",
-            COALESCE("GANTRY_FORM", '') AS "gantryForm",
-            COALESCE("MAX_LIFTING_HEIGHT", 0) AS "maxLiftingHeight",
-            COALESCE("FREE_LIFTING_HEIGHT", 0) AS "freeLiftingHeight",
-            COALESCE("PORTAL_ANGLE_FRONT", 0) AS "portalAngleFront",
-            COALESCE("PORTAL_ANGLE_BEHIND", 0) AS "portalAngleBehind",
-            COALESCE("MAX_LIFTING_SPEED1", 0) AS "maxLiftingSpeed1",
-            COALESCE("MAX_LIFTING_SPEED2", 0) AS "maxLiftingSpeed2",
-            COALESCE("MAX_DESCENT_SPEED1", 0) AS "maxDescentSpeed1",
-            COALESCE("MAX_DESCENT_SPEED2", 0) AS "maxDescentSpeed2",
-            COALESCE("VEHICLE_MASS", 0) AS "vehicleMass",
-            COALESCE("PASSENGERS_NUMBER", 0) AS "passengersNumber",
-            COALESCE("MAX_RUNNING_SPEED", 0) AS "maxRunningSpeed",
-            COALESCE("WHEEL_BASE", 0) AS "wheelBase",
-            COALESCE("TRACK_WIDTH_FRONT", 0) AS "trackWidthFront",
-            COALESCE("TRACK_WIDTH_BEHIND", 0) AS "trackWidthBehind",
-            COALESCE("CARS_NUMBER", 0) AS "carsNumber",
-            COALESCE("SEAT_NUMBER", 0) AS "seatNumber",
-            COALESCE("TRACTOR_SEAT_NUMBER", 0) AS "tractorSeatNumber",
-            COALESCE("MAX_DRIVING_SLOPE", 0) AS "maxDrivingSlope",
-            COALESCE("BRAKING_DISTANCE", 0) AS "brakingDistance",
-            COALESCE("OVERALL_LENGTH", 0) AS "overallLength",
-            COALESCE("OVERALL_WIDTH", 0) AS "overallWidth",
-            COALESCE("OVERALL_ALTITUDE", 0) AS "overallAltitude",
-            COALESCE("MIN_GROUND_CLEARANCE", 0) AS "minGroundClearance",
-            COALESCE("MIN_TURNING_RADIUS", 0) AS "minTurningRadius",
-            COALESCE("MAIN_PARTS", '') AS "mainParts"
-        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

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/EquipTechParamVesselMapper.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.ymt.api.mapper.EquipTechParamVesselMapper">
-
-    <select id="getVesselByDefaultValue" resultType="com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamVessel">
-        SELECT
-            sequence_nbrAS sequenceNbr,
-            record AS record,
-            rec_date AS recDate,
-            rec_user_id AS recUserId,
-            instance_id AS instanceId,
-            status AS status,
-            COALESCE(rated_quality, 0) AS ratedQuality,
-            COALESCE(ambient_temperature, 0) AS ambientTemperature,
-            COALESCE(model_number, 0) AS modelNumber,
-            COALESCE(num, 0) AS num,
-            COALESCE(single_bottle_volume, 0) AS singleBottleVolume,
-            COALESCE(total_volume, 0) AS totalVolume,
-            COALESCE(charging_medium, 0) AS chargingMedium,
-            COALESCE(specification, 0) AS specification,
-            COALESCE(outside_diameter, 0) AS outsideDiameter,
-            COALESCE(wall_thickness, 0) AS wallThickness,
-            COALESCE(length, 0) AS length,
-            COALESCE(nominal_working_pressure, 0) AS nominalWorkingPressure,
-            COALESCE(bottle_body, 0) AS bottleBody,
-            COALESCE(end_plug, 0) AS endPlug,
-            COALESCE(piping, 0) AS piping,
-            COALESCE(qp_lossless, 0) AS qpLossless,
-            COALESCE(gl_lossless, 0) AS glLossless,
-            COALESCE(qp_ratio, 0) AS qpRatio,
-            COALESCE(gl_ratio, 0) AS glRatio,
-            COALESCE(qp_pressure, 0) AS qpPressure,
-            COALESCE(gl_pressure, 0) AS glPressure,
-            COALESCE(qp_air_tightness, 0) AS qpAirTightness,
-            COALESCE(gl_air_tightness, 0) AS glAirTightness,
-            COALESCE(displacement_pressure, 0) AS displacementPressure,
-            COALESCE(oxygen, 0) AS oxygen,
-            COALESCE(heat_treatment_method, 0) AS heatTreatmentMethod,
-            COALESCE(qp_heat_treatment_temperature, 0) AS qpHeatTreatmentTemperature,
-            COALESCE(installation_position, 0) AS installationPosition,
-            COALESCE(container_volume, 0) AS containerVolume,
-            COALESCE(pressure_vessel_diameter, 0) AS pressureVesselDiameter,
-            COALESCE(height, 0) AS height,
-            COALESCE(material_cylinder_shell, 0) AS materialCylinderShell,
-            COALESCE(pressure_material_head, 0) AS pressureMaterialHead,
-            COALESCE(pressure_material_lining, 0) AS pressureMaterialLining,
-            COALESCE(material_jacket, 0) AS materialJacket,
-            COALESCE(thickness, 0) AS thickness,
-            COALESCE(fixed_head, 0) AS fixedHead,
-            COALESCE(fixed_lining, 0) AS fixedLining,
-            COALESCE(fixed_jacket, 0) AS fixedJacket,
-            COALESCE(self_weight, 0) AS selfWeight,
-            COALESCE(medium_weight, 0) AS mediumWeight,
-            COALESCE(pressure_housing_path, 0) AS pressureHousingPath,
-            COALESCE(pressure_pipe, 0) AS pressurePipe,
-            COALESCE(pressure_jacket, 0) AS pressureJacket,
-            COALESCE(temperature_shell, 0) AS temperatureShell,
-            COALESCE(temperature_pipe, 0) AS temperaturePipe,
-            COALESCE(temperature_jacket, 0) AS temperatureJacket,
-            COALESCE(max_pressure_shell, 0) AS maxPressureShell,
-            COALESCE(max_pressure_pipe, 0) AS maxPressurePipe,
-            COALESCE(max_pressure_jacket, 0) AS maxPressureJacket,
-            COALESCE(medium_shell, 0) AS mediumShell,
-            COALESCE(medium_pipe, 0) AS mediumPipe,
-            COALESCE(medium_jacket, 0) AS mediumJacket,
-            COALESCE(main_structure_type, 0) AS mainStructureType,
-            COALESCE(support, 0) AS support,
-            COALESCE(installation, 0) AS installation,
-            COALESCE(insulation, 0) AS insulation,
-            COALESCE(check_lossless, 0) AS checkLossless,
-            COALESCE(withstand_voltage, 0) AS withstandVoltage,
-            COALESCE(leakage, 0) AS leakage,
-            COALESCE(withstand_pressure_test, 0) AS withstandPressureTest,
-            COALESCE(leak_pressure, 0) AS leakPressure,
-            COALESCE(container, 0) AS container,
-            COALESCE(car_num, 0) AS carNum,
-            COALESCE(volume, 0) AS volume,
-            COALESCE(max_fill, 0) AS maxFill,
-            COALESCE(design_pressure, 0) AS designPressure,
-            COALESCE(design_temperature, 0) AS designTemperature,
-            COALESCE(working_pressure, 0) AS workingPressure,
-            COALESCE(work_temperature, 0) AS workTemperature,
-            COALESCE(material_cylinder, 0) AS materialCylinder,
-            COALESCE(thickness_cylinder, 0) AS thicknessCylinder,
-            COALESCE(corrosion_margin, 0) AS corrosionMargin,
-            COALESCE(medium, 0) AS medium,
-            COALESCE(oxygen_chamber, 0) AS oxygenChamber,
-            COALESCE(rated_entry_capacity, 0) AS ratedEntryCapacity,
-            COALESCE(chamber_main, 0) AS chamberMain,
-            COALESCE(chamber_pressure, 0) AS chamberPressure,
-            COALESCE(temperature, 0) AS temperature,
-            COALESCE(pressure_medium, 0) AS pressureMedium,
-            COALESCE(per_capita_cabin_capacity, 0) AS perCapitaCabinCapacity
-        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

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

@@ -13,30 +13,38 @@
 
     </update>
 
-    <select id="selecEquipInfotList" resultType="com.yeejoin.amos.boot.module.ymt.api.dto.UseInfoModel">
-        SELECT
+    <select id="queryEquipOfExpireInspection" resultType="com.yeejoin.amos.boot.module.ymt.api.dto.UseInfoModel">
+        select
+            a.*,
+            CASE (NEXT_INSPECT_DATE > CURRENT_DATE)
+            WHEN  true  THEN 1
+            ELSE 2
+            END as status
+        from
+            (SELECT
             use.RECORD,
             use.USE_UNIT_CREDIT_CODE,
             register.EQU_CODE,
             register.EQU_LIST,
-            use.NEXT_INSPECT_DATE as nextInspectDate,
             supervision.ORG_BRANCH_CODE,
-            CASE (NEXT_INSPECT_DATE > CURRENT_DATE)
-            WHEN  true  THEN 1
-            ELSE 2
-            END as status
-        FROM
-        idx_biz_jg_use_info use
-        LEFT JOIN	idx_biz_jg_register_info register on register.RECORD = use.RECORD
-        LEFT JOIN	idx_biz_jg_supervision_info supervision on supervision.RECORD =   use.RECORD
-        <where>
+            (select date_format(di.NEXT_INSPECT_DATE, 'yyyy-mm-dd') from idx_biz_jg_inspection_detection_info di where di."RECORD" = register."RECORD" and di.NEXT_INSPECT_DATE is not null and di."INSPECT_TYPE" <![CDATA[<>]]> '' order by di.NEXT_INSPECT_DATE desc limit 1) as NEXT_INSPECT_DATE
+            FROM
+            idx_biz_jg_use_info use
+            LEFT JOIN	idx_biz_jg_register_info register on register.RECORD = use.RECORD
+            LEFT JOIN	idx_biz_jg_supervision_info supervision on supervision.RECORD =   use.RECORD
+            where
+            use."USE_UNIT_CREDIT_CODE" <![CDATA[<>]]>  ''
+            and register.EQU_CODE <![CDATA[<>]]>  ''
+            and supervision.ORG_BRANCH_CODE <![CDATA[<>]]>  ''
+            and use."DATA_SOURCE" = 'jg'
             <if test="statusList.size() > 0">
-                and  EQU_STATE in
+                and  use.EQU_STATE in
                 <foreach collection="statusList" item="item" open="(" close=")" separator=",">
                     #{item}
                 </foreach>
             </if>
-            and (NEXT_INSPECT_DATE - CURRENT_DATE  <![CDATA[<=]]> #{interval} or  NEXT_INSPECT_DATE > CURRENT_DATE)
-        </where>
+            ) a
+        where
+            NEXT_INSPECT_DATE - CURRENT_DATE  <![CDATA[<=]]> #{interval} or  NEXT_INSPECT_DATE > CURRENT_DATE
     </select>
 </mapper>