1.检验检测8大类技术参数整理

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

@@ -30,4 +30,11 @@ public interface JyjcBaseMapper {
     void updateBusinessData(String tableName, String assignee, String transferToUserIds, String instanceId, String nextTaskId,String key);
 
     List<TzsUserInfoDto> selectParentOrgUsers(@Param("parentOrgCodeList") Set<String> parentOrgCodeList);
+
+    /**
+     * 按照公司编码查询公司下的人
+     * @param companyCodes
+     * @return  List<TzsUserInfoDto>
+     */
+    List<TzsUserInfoDto> selectUserByCompanyCodes(@Param("companyCodes") List<String> companyCodes);
 }

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

@@ -52,6 +52,22 @@
         </foreach>
         GROUP BY c.org_code
     </select>
+    <select id="selectUserByCompanyCodes" resultType="com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto">
+        SELECT
+            group_concat(u.user_id) as amos_user_id,
+            c.company_code as  unitCode
+        FROM
+            "privilege_user_org_role" u,
+            "privilege_company" c
+        WHERE
+            u.company_seq = c.sequence_nbr
+        and
+            c.company_code in
+        <foreach collection="companyCodes" item="companyCode" open="(" close=")" separator=",">
+            #{companyCode}
+        </foreach>
+            GROUP BY c.company_code
+    </select>
 
 
 </mapper>

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

@@ -208,36 +208,36 @@ public class InspectionApplicationPushEventListener implements ApplicationListen
         EquipCategoryEnum productType = EquipCategoryEnum.of(Integer.parseInt(equList));
         Map<String, Object> echParamMap = new HashMap<>();
         switch (Objects.requireNonNull(productType)) {
-            // 锅炉 - 监管未调整
             case IDX_BIZ_JG_TECH_PARAMS_BOILER:
-                // 压力容器 - 监管未调整
+                // 锅炉-已确认
                 echParamMap = BeanUtil.beanToMap(equipTechParamBoilerMapper.queryTechParamInUse(record));
                 break;
             case IDX_BIZ_JG_TECH_PARAMS_VESSEL:
-                // 电梯
+                // 压力容器-待核对
                 echParamMap = BeanUtil.beanToMap(equipTechParamVesselMapper.queryTechParamInUse(record));
                 break;
             case IDX_BIZ_JG_TECH_PARAMS_ELEVATOR:
-                // 起重机械
+                // 电梯-已确认
                 echParamMap = BeanUtil.beanToMap(equipTechParamElevatorMapper.queryTechParamInUse(record));
                 break;
             case IDX_BIZ_JG_TECH_PARAMS_LIFTING:
-                // 场（厂）内专用机动车辆
+                // 起重机械-已确认
                 echParamMap = BeanUtil.beanToMap(equipTechParamLiftingMapper.queryTechParamInUse(record));
                 break;
             case IDX_BIZ_JG_TECH_PARAMS_VEHICLE:
-                // 大型游乐设施
+                // 场（厂）内专用机动车辆-已确认
                 echParamMap = BeanUtil.beanToMap(equipTechParamVehicleMapper.queryTechParamInUse(record));
                 break;
             case IDX_BIZ_JG_TECH_PARAMS_RIDES:
-                // 压力管道 - 监管未调整
+                // 大型游乐设施-已确认
                 echParamMap = BeanUtil.beanToMap(equipTechParamRidesMapper.queryTechParamInUse(record));
                 break;
             case IDX_BIZ_JG_TECH_PARAMS_PIPELINE:
-                // 客运索道
+                // 压力管道-已确认
                 echParamMap = BeanUtil.beanToMap(equipTechParamPipelineMapper.queryTechParamInUse(record));
                 break;
             case IDX_BIZ_JG_TECH_PARAMS_ROPEWAY:
+                // 客运索道-已确认
                 echParamMap = BeanUtil.beanToMap(equipTechParamRopewayMapper.queryTechParamInUse(record));
                 break;
             default:

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

@@ -2,13 +2,10 @@ package com.yeejoin.amos.boot.module.jyjc.biz.job;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcBaseMapper;
 import com.yeejoin.amos.boot.module.jyjc.api.model.NeedTipEquipInfo;
 import com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.dto.UseInfoModel;
-import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.TzsUserInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.UseInfoMapper;
@@ -20,7 +17,6 @@ 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;
 
 import java.util.*;
@@ -96,12 +92,14 @@ public class InspectionExpireRemindJob {
         // 使用单位
         List<String> allUnitCodes = needTipEquipList.stream().map(NeedTipEquipInfo::getUseUnitCreditCode).distinct().collect(Collectors.toList());
         // 查询使用单位下的人-数据库-批量查询
-        List<TzsUserInfo> useUnitUserList = this.getUseUnitUserList(allUnitCodes);
+        List<TzsUserInfoDto> useUnitUserList = this.getUseUnitUserList(allUnitCodes);
         // 查询管辖单位下的人-数据库-批量查询
         List<TzsUserInfoDto> superviseUnitUserList = this.getSuperviseUnitUserList(needTipEquipList);
         // 以设备为维度，把 需要发送消息的人进行合并
         needTipEquipList.forEach(e -> {
-            e.setReceiveUsers(useUnitUserList.stream().filter(u -> e.getUseUnitCreditCode().equals(u.getUnitCode())).map(TzsUserInfo::getAmosUserId).collect(Collectors.toSet()));
+            // 本使用单位下的人
+            e.setReceiveUsers(useUnitUserList.stream().filter(u -> e.getUseUnitCreditCode().equals(u.getUnitCode())).map(TzsUserInfoDto::getAmosUserId).collect(Collectors.toSet()));
+            // 父级的人(所、区县、地市、省)
             e.getReceiveUsers().addAll(superviseUnitUserList.stream().filter(u -> e.getParentOrgBranchCode().contains(u.getOrgCode())).map(TzsUserInfoDto::getAmosUserId).collect(Collectors.toSet()));
         });
         // 人员去重，字符串可能为:元素1：8551496,8551496,8551496，元素2：8551496,8551497，需要转为8551496、8551497
@@ -120,13 +118,8 @@ public class InspectionExpireRemindJob {
         return jyjcBaseMapper.selectParentOrgUsers(allParentOrgCodes);
     }
 
-    private List<TzsUserInfo> getUseUnitUserList(List<String> allUnitCodes) {
-        LambdaQueryWrapper<TzsUserInfo> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.select(TzsUserInfo::getAmosUserId, TzsUserInfo::getUnitCode);
-        queryWrapper.in(TzsUserInfo::getUnitCode, allUnitCodes);
-        queryWrapper.eq(BaseEntity::getIsDelete, false);
-        queryWrapper.isNotNull(TzsUserInfo::getAmosUserId);
-        return tzsUserInfoMapper.selectList(queryWrapper);
+    private List<TzsUserInfoDto> getUseUnitUserList(List<String> allUnitCodes) {
+        return jyjcBaseMapper.selectUserByCompanyCodes(allUnitCodes);
     }
 
     private List<NeedTipEquipInfo> buildTipEquipInfoList(List<UseInfoModel> needTipEquipList) {

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

 package com.yeejoin.amos.boot.module.jyjc.biz.util;
 
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * @author Administrator
  */
@@ -8,5 +11,5 @@ public class JyjcConstant {
     /**
      * 技术参数json类型字段
      */
-    public static final String TECH_PARAM_JSON_FIELDS = "safetyAccessoriesAndRelatedDevices,gasCylinderAccessories,pipeInfo";
+    public static final List<String> TECH_PARAM_JSON_FIELDS = Arrays.asList("safetyAccessoriesAndRelatedDevices", "gasCylinderAccessories", "pipeInfo");
 }

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

@@ -1044,5 +1044,17 @@ public class EquipTechParamLifting extends AbstractEquipBaseEntity {
     @TableField(value = "\"MAIN_PART\"")
     private String mainPart;
 
+    /**
+     * 整机防爆标志
+     */
+    @TableField("\"EXPLOSIONPROOF_SIGN_COMPLETE\"")
+    private String explosionproofSignComplete;
+
+    /**
+     * 燃爆物质
+     */
+    @TableField("\"EXPLOSIVE_SUBSTANCE\"")
+    private String explosiveSubstance;
+
 
 }

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

@@ -418,7 +418,7 @@ public class EquipTechParamVessel extends AbstractEquipBaseEntity {
     @TableField(value = "\"CONTAINER\"")
     private String container;
     /**
-     * * 罐车编号
+     * * 罐车编号/车牌号
      */
 
     @TableField(value = "\"CAR_NUM\"")

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

@@ -2,6 +2,7 @@ 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.EquipTechParamLifting;
+import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsLifting;
 import org.apache.ibatis.annotations.Param;
 
 public interface EquipTechParamLiftingMapper extends BaseMapper<EquipTechParamLifting> {
@@ -9,8 +10,9 @@ public interface EquipTechParamLiftingMapper extends BaseMapper<EquipTechParamLi
 
     /**
      * 在用的最新需求整理的技术参数
+     *
      * @param record 设备唯一标识
      * @return EquipTechParamLifting
      */
-    EquipTechParamLifting queryTechParamInUse(@Param("record") String record);
+    IdxBizJgTechParamsLifting queryTechParamInUse(@Param("record") String record);
 }

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

@@ -2,13 +2,12 @@
 <!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.EquipTechParamLiftingMapper">
     <select id="queryTechParamInUse"
-            resultType="com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamLifting">
+            resultType="com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgTechParamsLifting">
         SELECT
             "EXPLOSIONPROOF_GRADE",
             "EXPLOSIVE_SUBSTANCE",
             "EXPLOSIONPROOF_SIGN_COMPLETE",
             "CHECK_FINISHED_HEIGHT",
-            "HEIGHT_FREE_END",
             "RATED_LIFTING_SPEED",
             "RATED_LOAD_CAPACITY",
             "WORK_STROKE_CAGE",
@@ -28,7 +27,6 @@
             "RATED_LIFT_SPEED",
             "RATED_TRAVERSE_SPEED",
             "BICYCLE_MAX_EXIT_TIME",
-            "STORAGE_CAPACITY",
             "CANTILEVER_LENGTH",
             "DERRICKING_SPEED",
             "BICYCLE_MAX_COME_TIME",

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

@@ -6,19 +6,20 @@
             SELECT
                 "DEVICE_NAME",
                 "PIPELINE_CLASS",
-                "PIPE_NAME",
-                "PIPELINE_NUMBER",
-                "DEVICE_LEVEL",
-                "DESIGN_STANDARD",
-                "PIPE_DRAW_NUMBER",
+                "STARTE_POSITION",
+                "END_POSITION",
                 "NOMINAL_DIAMETER",
                 "WALL_THICKNESS",
                 "PIPE_LENGTH",
-                "STARTE_POSITION",
                 "PRESSURE",
                 "TEMPERATURE",
                 "MEDIUM",
-                "REMARKS"
+                "REMARKS",
+                "WORK_PRESSURE",
+                "WORK_TEMPERATURE",
+                "WORK_MEDIUM",
+                "WORK_REMARKS",
+                "PIPE_INFO"
             FROM
                 idx_biz_jg_tech_params_pipeline
             WHERE

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

@@ -10,16 +10,13 @@
                 "MAIN_MOTOR_MODEL",
                 "MAIN_MOTOR_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"
+                "OIL_PRESSURE_HEAVY_HAMMER",
+                "NUMBER_AND_TYPE_OF_VEHICLES"
             FROM
                 idx_biz_jg_tech_params_ropeway
             WHERE

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

@@ -4,6 +4,7 @@
     <select id="queryTechParamInUse"
             resultType="com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamVessel">
          SELECT
+            vin,
             rated_quality,
             ambient_temperature,
             model_number,
@@ -84,7 +85,9 @@
             chamber_pressure,
             temperature,
             pressure_medium,
-            per_capita_cabin_capacity
+            per_capita_cabin_capacity,
+            gas_cylinder_accessories,
+            gas_cylinder
         FROM idx_biz_jg_tech_params_vessel
         where record = #{record}
     </select>