Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DPFilterParamDto.java

@@ -26,4 +26,14 @@ public class DPFilterParamDto {
      * 数据统计的结束日期
      */
     private String endDate;
+
+    /**
+     * 业务类型0告知管理，1使用登记，2变更登记，3停用启用，4注销报废
+     */
+    private String businessKey;
+
+    /**
+     * month , year
+     */
+    private String searchType;
 }

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

@@ -28,7 +28,9 @@ public enum DPMapStatisticsItemEnum {
     CONSTRUCTION_UNITS("安改维单位 (家)", "constructionUnits", ""),
     USERS_UNITS("使用单位 (家)", "usersUnits", ""),
     GAS_UNITS("充装单位 (家)", "gasUnits", ""),
-    OPERATORS("作业人员 (人)", "operators", "");
+    OPERATORS("作业人员 (人)", "operators", ""),
+    DEVICE_COUNT("已纳管设备数", "deviceCount", ""),
+    CERTIFICATE_COUNT("登记证总量", "certificateCount", "");
     private String label;
     private String code;
     private String category;

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

+package com.yeejoin.amos.boot.module.jg.api.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 问题状态
+ */
+
+public enum ProblemStatusEnum {
+    NORMAL("正常", "0", "已处理"),
+    ABNORMAL("异常", "1", "未处理");
+
+    private String name;
+
+    private String code;
+    private String desc;
+
+    ProblemStatusEnum(String name, String code, String desc) {
+        this.name = name;
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+
+    public static Map<String, String> getNameByCode = new HashMap<>();
+    public static Map<String, String> getCodeByName = new HashMap<>();
+    public static Map<String, String> getDescByCode = new HashMap<>();
+    public static Map<String, String> getNameByDesc = new HashMap<>();
+
+    static {
+        for (ProblemStatusEnum e : ProblemStatusEnum.values()) {
+            getNameByCode.put(e.code, e.name);
+            getNameByDesc.put(e.desc, e.name);
+            getDescByCode.put(e.code, e.desc);
+            getCodeByName.put(e.name, e.code);
+        }
+    }
+}
+

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

@@ -131,6 +131,6 @@ public interface CommonMapper extends BaseMapper<EquipmentCategory> {
      * @param dpFilterParamDto 过滤条件
      * @return 统计数量数组
      */
-    List<Long> countAllBizDataInFlowingForDP(@Param("orgCode")String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
+    List<Long> countAllInFlowingForDPNoFinishedBizData(@Param("orgCode")String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
 }
 

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

+package com.yeejoin.amos.boot.module.jg.api.mapper;
+
+import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+public interface DPStatisticsMapper {
+
+    List<Map<String, Object>> maintenanceCountTopTen(@Param("dpFilterParamDto") DPFilterParamDto dpFilterParamDto);
+    List<Map<String, Object>> maintenanceCount(@Param("dpFilterParamDto") DPFilterParamDto dpFilterParamDto);
+
+    List<Map<String, Object>> installCount(@Param("cityCode") String cityCode);
+
+    List<Map<String, Object>> maintenanceNoticeCount(@Param("cityCode") String cityCode);
+
+    List<Map<String, Object>> reformCount(@Param("cityCode") String cityCode);
+
+    List<Map<String, Object>> transferCount(@Param("cityCode") String cityCode);
+
+    List<Map<String, Object>> useCount(@Param("cityCode") String cityCode);
+
+    List<Map<String, Object>> vehicleCount(@Param("cityCode") String cityCode);
+
+    List<Map<String, Object>> changeNameCount(@Param("cityCode") String cityCode);
+
+    List<Map<String, Object>> changeReformCount(@Param("cityCode") String cityCode);
+
+    List<Map<String, Object>> changeTransferCount(@Param("cityCode") String cityCode);
+
+    List<Map<String, Object>> changeUnitCount(@Param("cityCode") String cityCode);
+
+    List<Map<String, Object>> changeVehicleCount(@Param("cityCode") String cityCode);
+
+    List<Map<String, Object>> disableCount(@Param("cityCode") String cityCode);
+
+    List<Map<String, Object>> cancelCount(@Param("cityCode") String cityCode);
+
+    List<Map<String, Object>> installEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
+
+    List<Map<String, Object>> maintenanceEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
+
+    List<Map<String, Object>> reformEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
+
+    List<Map<String, Object>> transferEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
+
+
+
+    List<Map<String, Object>> useEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
+
+    List<Map<String, Object>> changeReformEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
+
+    List<Map<String, Object>> changeTransferEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
+
+    List<Map<String, Object>> changeUnitEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
+
+    List<Map<String, Object>> vehicleEquCount(@Param("cityCode") String cityCode,@Param("startTime") String startTime);
+
+    List<Map<String, Object>> newRegEquCountByMonth(@Param("cityCode") String cityCode);
+
+    List<Map<String, Object>> newVehicleEquCountByMonth(@Param("cityCode") String cityCode);
+
+    List<Map<String, Object>> newRegEquCountByYear(@Param("cityCode") String cityCode);
+
+    List<Map<String, Object>> newVehicleEquCountByYear(@Param("cityCode") String cityCode);
+
+    String newVehicleCountByYear(@Param("cityCode") String cityCode);
+    String newVehicleCountByMonth(@Param("cityCode") String cityCode);
+}

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

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationReformDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationReform;
@@ -40,4 +41,6 @@ public interface JgChangeRegistrationReformMapper extends BaseMapper<JgChangeReg
     String getEquiplistNameByEquiplist(String code);
 
     List<Map<String, Object>> getDetailById(@Param("id") Long id);
+
+    List<CompanyEquipCountDto> queryForFlowingEquipList();
 }

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

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgEquipTransferDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgEquipTransfer;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import org.apache.ibatis.annotations.MapKey;
 import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 import java.util.Map;
 
@@ -23,4 +25,6 @@ public interface JgEquipTransferMapper extends CustomBaseMapper<JgEquipTransfer>
 
     @MapKey("sequenceNbr")
     List<Map<String, Object>> queryEquipInformation(Long sequenceNbr);
+
+    List<CompanyEquipCountDto> queryForFlowingEquipList();
 }

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

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintainNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintainNotice;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
@@ -44,4 +45,5 @@ public interface JgMaintainNoticeMapper extends CustomBaseMapper<JgMaintainNotic
 
     Map<String, Object> getEquipInfoByRecord(String record);
 
+    List<CompanyEquipCountDto> queryForFlowingEquipList();
 }

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

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgMaintenanceContractDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgMaintenanceContract;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
@@ -30,4 +31,6 @@ public interface JgMaintenanceContractMapper extends BaseMapper<JgMaintenanceCon
     void updatePromoter(@Param("id") Long id);
 
     List<Map<String, Object>> selectEquipList(@Param("id") Long id);
+
+    List<CompanyEquipCountDto> queryForFlowingEquipList();
 }

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

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgReformNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNotice;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
@@ -40,4 +41,6 @@ public interface JgReformNoticeMapper extends CustomBaseMapper<JgReformNotice> {
     List<Map<String, Object>> queryEquipInformation(@Param("sequenceNbr") long sequenceNbr);
 
     void updatePromoter(@Param("id") Long id);
+
+    List<CompanyEquipCountDto> queryForFlowingEquipList();
 }

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

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgTransferNoticeDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgTransferNotice;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
@@ -26,4 +27,6 @@ public interface JgTransferNoticeMapper extends CustomBaseMapper<JgTransferNotic
 
     @MapKey("sequenceNbr")
     List<Map<String, Object>> queryEquipInformation(@Param("sequenceNbr") long sequenceNbr);
+
+    List<CompanyEquipCountDto> queryForFlowingEquipList();
 }

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

 package com.yeejoin.amos.boot.module.jg.api.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgUseRegistrationManageDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
-import java.util.Map;
 
 
 /**
@@ -25,4 +23,6 @@ public interface JgUseRegistrationManageMapper extends BaseMapper<JgUseRegistrat
     Page<JgUseRegistrationManageDto> queryForPage(@Param("page") Page<JgUseRegistrationManageDto> page,
                                            @Param("dto") JgUseRegistrationManageDto dto,
                                            @Param("sort") SortVo sortMap);
+
+    Long countCertificateByReginCode(String orgCode);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/java/com/yeejoin/amos/boot/module/jg/api/service/IJgChangeRegistrationUnitService.java

@@ -33,7 +33,7 @@ public interface IJgChangeRegistrationUnitService {
      * @param noticeDto 安装告知
      * @param op        操作类型
      */
-    JgChangeRegistrationUnitDto updateInstallationNotice(String submitType, JgChangeRegistrationUnitDto noticeDto, String op);
+    JgChangeRegistrationUnitDto updateInstallationNotice(String submitType, JgChangeRegistrationUnitDto noticeDto, String op, ReginParams reginParams);
 
     /**
      * 分页查询

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

@@ -955,14 +955,14 @@
     <select id="countBizFinishedNumForDP" resultType="java.lang.Long">
         SELECT count(1) FROM "tzs_jg_installation_notice" where receive_company_org_code like CONCAT(#{orgCode}, '%') and notice_status = '6616' and date_ge(CAST(handle_date as date),#{dto.beginDate}) and date_le(CAST(handle_date as date),#{dto.endDate})
         union all
-        SELECT  count(1) FROM "tz_jyjc_inspection_application" a, tz_base_enterprise_info b where a.inspection_unit_code= b.use_unit_code and b.supervise_org_code like '50%' and a.status = '6616' and a.biz_type = 'supervise' and  date_ge(CAST(a.accept_date as date),#{dto.beginDate}) and date_le(CAST(a.accept_date as date),#{dto.endDate})
+        SELECT  count(1) FROM "tz_jyjc_inspection_application" a, tz_base_enterprise_info b where a.inspection_unit_code= b.use_unit_code and b.supervise_org_code like CONCAT(#{orgCode}, '%') and a.status = '6616' and a.biz_type = 'supervise' and  date_ge(CAST(a.accept_date as date),#{dto.beginDate}) and date_le(CAST(a.accept_date as date),#{dto.endDate})
         union all
         SELECT  count(1) FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status = '已完成' and date_ge(CAST(audit_pass_date as date),#{dto.beginDate}) and date_le(CAST(audit_pass_date as date),#{dto.endDate})
         union all
-        SELECT  count(1) FROM "tz_jyjc_inspection_application" a, tz_base_enterprise_info b where a.inspection_unit_code= b.use_unit_code and b.supervise_org_code like '50%' and a.status = '6616' and a.inspection_type = 'DQJY'  and  date_ge(CAST(a.accept_date as date),#{dto.beginDate}) and date_le(CAST(a.accept_date as date),#{dto.endDate})
+        SELECT  count(1) FROM "tz_jyjc_inspection_application" a, tz_base_enterprise_info b where a.inspection_unit_code= b.use_unit_code and b.supervise_org_code like CONCAT(#{orgCode}, '%') and a.status = '6616' and a.inspection_type = 'DQJY'  and  date_ge(CAST(a.accept_date as date),#{dto.beginDate}) and date_le(CAST(a.accept_date as date),#{dto.endDate})
         union all
         select sum(num) from (
-        select count(1) as num  from tzs_jg_change_registration_name a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like '50%' and a.audit_status = '已完成' and date_ge(CAST(a.audit_pass_date as date),#{dto.beginDate}) and date_le(CAST(a.audit_pass_date as date),#{dto.endDate})
+        select count(1) as num  from tzs_jg_change_registration_name a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status = '已完成' and date_ge(CAST(a.audit_pass_date as date),#{dto.beginDate}) and date_le(CAST(a.audit_pass_date as date),#{dto.endDate})
         union all
         SELECT count(1) as num FROM "tzs_jg_change_registration_reform" where receive_company_org_code like CONCAT(#{orgCode}, '%') and audit_status = '已完成' and date_ge(CAST(audit_pass_date as date),#{dto.beginDate}) and date_le(CAST(audit_pass_date as date),#{dto.endDate})
         union all
@@ -973,25 +973,25 @@
         union all
         select count(1) from tzs_jg_scrap_cancel a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status = '已完成' and date_ge(CAST(a.audit_pass_date as date),#{dto.beginDate}) and date_le(CAST(a.audit_pass_date as date),#{dto.endDate})
     </select>
-    <select id="countAllBizDataInFlowingForDP" resultType="java.lang.Long">
-        SELECT count(1) FROM "tzs_jg_installation_notice" where receive_company_org_code like CONCAT(#{orgCode}, '%') and notice_status != '6610' and notice_status != '6615' and notice_status != '6617' and date_ge(CAST(handle_date as date),#{dto.beginDate}) and date_le(CAST(handle_date as date),#{dto.endDate})
+    <select id="countAllInFlowingForDPNoFinishedBizData" resultType="java.lang.Long">
+        SELECT count(1) FROM "tzs_jg_installation_notice" where receive_company_org_code like CONCAT(#{orgCode}, '%') and notice_status != '6610' and notice_status != '6615' and notice_status != '6617' and notice_status != '6616' and date_ge(CAST(notice_date as date),#{dto.beginDate}) and date_le(CAST(notice_date as date),#{dto.endDate})
         union all
-        SELECT  count(1) FROM "tz_jyjc_inspection_application" a, tz_base_enterprise_info b where a.inspection_unit_code= b.use_unit_code and b.supervise_org_code like CONCAT(#{orgCode}, '%') and a.status != '6610'  and a.status != '6615'  and a.status != '6617' and a.biz_type = 'supervise' and date_ge(CAST(a.accept_date as date),#{dto.beginDate}) and date_le(CAST(a.accept_date as date),#{dto.endDate})
+        SELECT  count(1) FROM "tz_jyjc_inspection_application" a, tz_base_enterprise_info b where a.inspection_unit_code= b.use_unit_code and b.supervise_org_code like CONCAT(#{orgCode}, '%') and a.status != '6610'  and a.status != '6615'  and a.status != '6617' and a.status != '6616' and a.biz_type = 'supervise' and date_ge(CAST(a.application_date as date),#{dto.beginDate}) and date_le(CAST(a.application_date as date),#{dto.endDate})
         union all
-        SELECT  count(1) FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status != '使用单位待提交' and status != '使用单位已撤回' and status != '已作废'  and date_ge(CAST(audit_pass_date as date),#{dto.beginDate}) and date_le(CAST(audit_pass_date as date),#{dto.endDate})
+        SELECT  count(1) FROM "tzs_jg_use_registration" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status != '使用单位待提交' and status != '使用单位已撤回' and status != '已作废' and status = '已完成' and date_ge(CAST(reg_date as date),#{dto.beginDate}) and date_le(CAST(reg_date as date),#{dto.endDate})
         union all
-        SELECT  count(1) FROM "tz_jyjc_inspection_application" a, tz_base_enterprise_info b where a.inspection_unit_code= b.use_unit_code and b.supervise_org_code like CONCAT(#{orgCode}, '%') and a.status != '6610'  and a.status != '6615'  and a.status != '6617' and a.inspection_type = 'DQJY'  and date_ge(CAST(a.accept_date as date),#{dto.beginDate}) and date_le(CAST(a.accept_date as date),#{dto.endDate})
+        SELECT  count(1) FROM "tz_jyjc_inspection_application" a, tz_base_enterprise_info b where a.inspection_unit_code= b.use_unit_code and b.supervise_org_code like CONCAT(#{orgCode}, '%') and a.status != '6610'  and a.status != '6615'  and a.status != '6617' and a.status != '6616' and a.inspection_type = 'DQJY'  and date_ge(CAST(a.application_date as date),#{dto.beginDate}) and date_le(CAST(a.application_date as date),#{dto.endDate})
         union all
         select sum(num) from (
-        select count(1) as num  from tzs_jg_change_registration_name a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status != '使用单位已撤回' and a.audit_status != '使用单位待提交' and  a.audit_status !='已作废'  and date_ge(CAST(a.audit_pass_date as date),#{dto.beginDate}) and date_le(CAST(a.audit_pass_date as date),#{dto.endDate})
+        select count(1) as num  from tzs_jg_change_registration_name a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status != '使用单位已撤回' and a.audit_status != '使用单位待提交' and  a.audit_status !='已作废' and a.audit_status !='已完成' and date_ge(CAST(a.apply_date as date),#{dto.beginDate}) and date_le(CAST(a.apply_date as date),#{dto.endDate})
         union all
-        SELECT count(1) as num FROM "tzs_jg_change_registration_reform" where receive_company_org_code like CONCAT(#{orgCode}, '%') and audit_status != '使用单位待提交' and audit_status  != '使用单位已撤回' and audit_status  != '已作废' and date_ge(CAST(audit_pass_date as date),#{dto.beginDate}) and date_le(CAST(audit_pass_date as date),#{dto.endDate})
+        SELECT count(1) as num FROM "tzs_jg_change_registration_reform" where receive_company_org_code like CONCAT(#{orgCode}, '%') and audit_status != '使用单位待提交' and audit_status  != '使用单位已撤回' and audit_status  != '已作废' and date_ge(CAST(reg_date as date),#{dto.beginDate}) and date_le(CAST(reg_date as date),#{dto.endDate})
         union all
-        SELECT count(1) as num  FROM "tzs_jg_change_registration_transfer" where receive_company_org_code like CONCAT(#{orgCode}, '%') and audit_status != '使用单位待提交' and audit_status  != '使用单位已撤回' and audit_status  != '已作废' and  date_ge(CAST(audit_pass_date as date),#{dto.beginDate}) and date_le(CAST(audit_pass_date as date),#{dto.endDate})
+        SELECT count(1) as num  FROM "tzs_jg_change_registration_transfer" where receive_company_org_code like CONCAT(#{orgCode}, '%') and audit_status != '使用单位待提交' and audit_status  != '使用单位已撤回' and audit_status  != '已作废'  and audit_status  != '已完成' and  date_ge(CAST(reg_date as date),#{dto.beginDate}) and date_le(CAST(reg_date as date),#{dto.endDate})
         union all
-        SELECT count(1) as num  FROM "tzs_jg_change_registration_unit" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status  != '使用单位待提交' and status  != '使用单位已撤回' and status != '已作废' and date_ge(CAST(audit_pass_date as date),#{dto.beginDate}) and date_le(CAST(audit_pass_date as date),#{dto.endDate})
+        SELECT count(1) as num  FROM "tzs_jg_change_registration_unit" where receive_company_org_code like CONCAT(#{orgCode}, '%') and status  != '使用单位待提交' and status  != '使用单位已撤回' and status != '已作废' and status = '已完成' and date_ge(CAST(apply_date as date),#{dto.beginDate}) and date_le(CAST(apply_date as date),#{dto.endDate})
         )
         union all
-        select count(1) from tzs_jg_scrap_cancel a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status != '使用单位待提交' and a.audit_status  != '使用单位已撤回' and a.audit_status  != '已作废' and date_ge(CAST(a.audit_pass_date as date),#{dto.beginDate}) and date_le(CAST(a.audit_pass_date as date),#{dto.endDate})
+        select count(1) from tzs_jg_scrap_cancel a, privilege_company b where a.receive_org_code= b.company_code and b.org_code like CONCAT(#{orgCode}, '%') and a.audit_status != '使用单位待提交' and a.audit_status  != '使用单位已撤回' and a.audit_status  != '已作废' and a.audit_status  != '已完成' and date_ge(CAST(a.create_date as date),#{dto.beginDate}) and date_le(CAST(a.create_date as date),#{dto.endDate})
     </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/DPStatisticsMapper.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.jg.api.mapper.DPStatisticsMapper">
+
+    <select id="maintenanceCountTopTen" resultType="java.util.Map">
+        SELECT
+            COUNT(1),
+            pc.company_name AS companyName,
+            sr.region_name AS regionName
+        FROM
+            privilege_company pc
+                INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
+                INNER JOIN ( SELECT DISTINCT record, ME_UNIT_CREDIT_CODE FROM idx_biz_jg_maintenance_record_info ) AS jri ON jri.ME_UNIT_CREDIT_CODE = bi.use_unit_code
+                INNER JOIN systemctl_region sr ON pc.company_code = sr.region_code
+        WHERE
+                pc.company_code IN ( SELECT region_code :: VARCHAR FROM systemctl_region WHERE parent_region_code = #{dpFilterParamDto.cityCode} )
+        GROUP BY
+            sr.region_code
+        ORDER BY
+            COUNT DESC
+            LIMIT 10;
+    </select>
+
+    <select id="maintenanceCount" resultType="java.util.Map">
+        SELECT
+            COUNT(1),
+            pc.company_name AS companyName,
+            sr.region_name AS regionName
+        FROM
+            privilege_company pc
+                INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
+                INNER JOIN ( SELECT DISTINCT record, ME_UNIT_CREDIT_CODE FROM idx_biz_jg_maintenance_record_info ) AS jri ON jri.ME_UNIT_CREDIT_CODE = bi.use_unit_code
+                INNER JOIN systemctl_region sr ON pc.company_code = sr.region_code
+        WHERE
+                pc.company_code IN ( SELECT region_code :: VARCHAR FROM systemctl_region WHERE parent_region_code = #{dpFilterParamDto.cityCode} )
+        GROUP BY
+            sr.region_code
+    </select>
+    <select id="installCount" resultType="java.util.Map">
+        SELECT COUNT
+                   ( 1 ),
+               pc.company_name AS companyName,
+               sr.region_name AS regionName,
+               sr.region_code AS regionCode
+        FROM
+            privilege_company pc
+                INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
+                INNER JOIN tzs_jg_installation_notice T ON T.use_unit_credit_code = bi.use_unit_code and T.notice_status = 6616
+                INNER JOIN systemctl_region sr ON pc.company_code = sr.region_code
+        WHERE
+                pc.company_code IN ( SELECT region_code :: VARCHAR FROM systemctl_region WHERE parent_region_code = #{cityCode} )
+        GROUP BY
+            sr.region_code
+    </select>
+    <select id="maintenanceNoticeCount" resultType="java.util.Map">
+        SELECT COUNT
+                   ( 1 ),
+               pc.company_name AS companyName,
+               sr.region_name AS regionName,
+               sr.region_code
+        FROM
+            privilege_company pc
+                INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
+                INNER JOIN tzs_jg_maintain_notice mn ON mn.use_unit_credit_code = bi.use_unit_code
+                AND mn.notice_status = 6616
+                INNER JOIN systemctl_region sr ON pc.company_code = sr.region_code
+        WHERE
+                pc.company_code IN ( SELECT region_code :: VARCHAR FROM systemctl_region WHERE parent_region_code = #{cityCode} )
+        GROUP BY
+            sr.region_code
+    </select>
+    <select id="reformCount" resultType="java.util.Map">
+        SELECT COUNT
+                   ( 1 ),
+               pc.company_name AS companyName,
+               sr.region_name AS regionName,
+               sr.region_code
+        FROM
+            privilege_company pc
+                INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
+                INNER JOIN tzs_jg_reform_notice rm ON rm.use_unit_credit_code = bi.use_unit_code
+                AND rm.notice_status = 6616
+                INNER JOIN systemctl_region sr ON pc.company_code = sr.region_code
+        WHERE
+                pc.company_code IN ( SELECT region_code :: VARCHAR FROM systemctl_region WHERE parent_region_code = #{cityCode} )
+        GROUP BY
+            sr.region_code
+    </select>
+    <select id="transferCount" resultType="java.util.Map">
+        SELECT COUNT
+                   ( 1 ),
+               pc.company_name AS companyName,
+               sr.region_name AS regionName,
+               sr.region_code
+        FROM
+            privilege_company pc
+                INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
+                INNER JOIN tzs_jg_transfer_notice tn ON tn.use_unit_credit_code = bi.use_unit_code
+                AND tn.notice_status = 6616
+                INNER JOIN systemctl_region sr ON pc.company_code = sr.region_code
+        WHERE
+                pc.company_code IN ( SELECT region_code :: VARCHAR FROM systemctl_region WHERE parent_region_code = #{cityCode} )
+        GROUP BY
+            sr.region_code
+    </select>
+    <select id="useCount" resultType="java.util.Map">
+        SELECT COUNT
+                   ( 1 ),
+               pc.company_name AS companyName,
+               sr.region_name AS regionName,
+               sr.region_code
+        FROM
+            privilege_company pc
+                INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
+                INNER JOIN tzs_jg_use_registration ur ON ur.use_unit_credit_code = bi.use_unit_code
+                AND ur.audit_status = '已完成'
+                INNER JOIN systemctl_region sr ON pc.company_code = sr.region_code
+        WHERE
+                pc.company_code IN ( SELECT region_code :: VARCHAR FROM systemctl_region WHERE parent_region_code = #{cityCode} )
+        GROUP BY
+            sr.region_code
+    </select>
+    <select id="vehicleCount" resultType="java.util.Map">
+        SELECT COUNT
+                   ( 1 ),
+               pc.company_name AS companyName,
+               sr.region_name AS regionName,
+               sr.region_code
+        FROM
+            privilege_company pc
+                INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
+                INNER JOIN tzs_jg_vehicle_information vi ON vi.use_unit_credit_code = bi.use_unit_code
+                AND vi.status = '已完成'
+                INNER JOIN systemctl_region sr ON pc.company_code = sr.region_code
+        WHERE
+                pc.company_code IN ( SELECT region_code :: VARCHAR FROM systemctl_region WHERE parent_region_code = #{cityCode} )
+        GROUP BY
+            sr.region_code
+    </select>
+    <select id="changeNameCount" resultType="java.util.Map">
+        SELECT COUNT
+                   ( 1 ),
+               pc.company_name AS companyName,
+               sr.region_name AS regionName,
+               sr.region_code
+        FROM
+            privilege_company pc
+                INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
+                INNER JOIN tzs_jg_change_registration_name crn ON crn.use_unit_credit_code = bi.use_unit_code
+                AND crn.audit_status = '已完成'
+                INNER JOIN systemctl_region sr ON pc.company_code = sr.region_code
+        WHERE
+                pc.company_code IN ( SELECT region_code :: VARCHAR FROM systemctl_region WHERE parent_region_code = #{cityCode} )
+        GROUP BY
+            sr.region_code
+    </select>
+    <select id="changeReformCount" resultType="java.util.Map">
+        SELECT COUNT
+                   ( 1 ),
+               pc.company_name AS companyName,
+               sr.region_name AS regionName,
+               sr.region_code
+        FROM
+            privilege_company pc
+                INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
+                INNER JOIN tzs_jg_change_registration_reform t ON t.use_unit_credit_code = bi.use_unit_code
+                AND t.audit_status = '已完成'
+                INNER JOIN systemctl_region sr ON pc.company_code = sr.region_code
+        WHERE
+                pc.company_code IN ( SELECT region_code :: VARCHAR FROM systemctl_region WHERE parent_region_code = #{cityCode} )
+        GROUP BY
+            sr.region_code
+    </select>
+    <select id="changeTransferCount" resultType="java.util.Map">
+        SELECT COUNT
+                   ( 1 ),
+               pc.company_name AS companyName,
+               sr.region_name AS regionName,
+               sr.region_code
+        FROM
+            privilege_company pc
+                INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
+                INNER JOIN tzs_jg_change_registration_transfer t ON t.use_unit_credit_code = bi.use_unit_code
+                AND t.audit_status = '已完成'
+                INNER JOIN systemctl_region sr ON pc.company_code = sr.region_code
+        WHERE
+                pc.company_code IN ( SELECT region_code :: VARCHAR FROM systemctl_region WHERE parent_region_code = #{cityCode} )
+        GROUP BY
+            sr.region_code
+
+    </select>
+    <select id="changeUnitCount" resultType="java.util.Map">
+        SELECT COUNT
+                   ( 1 ),
+               pc.company_name AS companyName,
+               sr.region_name AS regionName,
+               sr.region_code
+        FROM
+            privilege_company pc
+                INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
+                INNER JOIN tzs_jg_change_registration_unit t ON t.use_unit_credit_code = bi.use_unit_code
+                AND t.status = '已完成'
+                INNER JOIN systemctl_region sr ON pc.company_code = sr.region_code
+        WHERE
+                pc.company_code IN ( SELECT region_code :: VARCHAR FROM systemctl_region WHERE parent_region_code = #{cityCode} )
+        GROUP BY
+            sr.region_code
+    </select>
+    <select id="changeVehicleCount" resultType="java.util.Map">
+        SELECT COUNT
+                   ( 1 ),
+               pc.company_name AS companyName,
+               sr.region_name AS regionName,
+               sr.region_code
+        FROM
+            privilege_company pc
+                INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
+                INNER JOIN tzs_jg_change_registration_unit t ON t.use_unit_credit_code = bi.use_unit_code
+                AND t.status = '已完成'
+                INNER JOIN systemctl_region sr ON pc.company_code = sr.region_code
+        WHERE
+                pc.company_code IN ( SELECT region_code :: VARCHAR FROM systemctl_region WHERE parent_region_code = #{cityCode} )
+        GROUP BY
+            sr.region_code
+
+    </select>
+    <select id="disableCount" resultType="java.util.Map">
+        SELECT COUNT
+                   ( 1 ),
+               pc.company_name AS companyName,
+               sr.region_name AS regionName,
+               sr.region_code
+        FROM
+            privilege_company pc
+                INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
+                INNER JOIN tzs_jg_enable_disable t ON t.use_unit_credit_code = bi.use_unit_code
+                AND t.audit_status = '已完成'
+                INNER JOIN systemctl_region sr ON pc.company_code = sr.region_code
+        WHERE
+                pc.company_code IN ( SELECT region_code :: VARCHAR FROM systemctl_region WHERE parent_region_code = #{cityCode} )
+        GROUP BY
+            sr.region_code
+    </select>
+
+    <select id="cancelCount" resultType="java.util.Map">
+        SELECT COUNT
+                   ( 1 ),
+               pc.company_name AS companyName,
+               sr.region_name AS regionName,
+               sr.region_code
+        FROM
+            privilege_company pc
+                INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
+                INNER JOIN tzs_jg_scrap_cancel t ON t.use_unit_code = bi.use_unit_code
+                AND t.audit_status = '已完成'
+                INNER JOIN systemctl_region sr ON pc.company_code = sr.region_code
+        WHERE
+                pc.company_code IN ( SELECT region_code :: VARCHAR FROM systemctl_region WHERE parent_region_code = #{cityCode} )
+        GROUP BY
+            sr.region_code
+    </select>
+    <select id="installEquCount" resultType="java.util.Map">
+        SELECT COUNT
+                   ( 1 ),
+               jri.equ_list AS equList,
+               jri.equ_category AS equCategory
+        FROM
+            privilege_company pc
+                INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
+                INNER JOIN tzs_jg_installation_notice T ON T.use_unit_credit_code = bi.use_unit_code
+                AND T.notice_status = 6616
+                INNER JOIN tzs_jg_installation_notice_eq te ON te.equip_transfer_id = T.sequence_nbr
+                INNER JOIN idx_biz_jg_register_info jri ON te.equ_id = jri.record
+        WHERE
+            pc.company_code = #{cityCode} and T.rec_date &gt;= #{startTime}
+        GROUP BY
+            jri.equ_category
+    </select>
+    <select id="maintenanceEquCount" resultType="java.util.Map">
+        SELECT COUNT
+                   ( 1 ),
+               jri.equ_list AS equList,
+               jri.equ_category AS equCategory
+        FROM
+            privilege_company pc
+                INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
+                INNER JOIN tzs_jg_maintain_notice tn ON tn.use_unit_credit_code = bi.use_unit_code
+                AND tn.notice_status = 6616
+                INNER JOIN tzs_jg_maintain_notice_eq te ON te.equip_transfer_id = tn.sequence_nbr
+                INNER JOIN idx_biz_jg_register_info jri ON te.equ_id = jri.record
+        WHERE
+            pc.company_code = #{cityCode} and tn.rec_date &gt;= #{startTime}
+        GROUP BY
+            jri.equ_category
+    </select>
+    <select id="reformEquCount" resultType="java.util.Map">
+        SELECT COUNT
+                   ( 1 ),
+               jri.equ_list AS equList,
+               jri.equ_category AS equCategory
+        FROM
+            privilege_company pc
+                INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
+                INNER JOIN tzs_jg_reform_notice tn ON tn.use_unit_credit_code = bi.use_unit_code
+                AND tn.notice_status = 6616
+                INNER JOIN tzs_jg_reform_notice_eq te ON te.equip_transfer_id = tn.sequence_nbr
+                INNER JOIN idx_biz_jg_register_info jri ON te.equ_id = jri.record
+        WHERE
+            pc.company_code = #{cityCode} and tn.rec_date &gt;= #{startTime}
+        GROUP BY
+            jri.equ_category
+    </select>
+    <select id="transferEquCount" resultType="java.util.Map">
+        SELECT COUNT
+                   ( 1 ),
+               jri.equ_list AS equList,
+               jri.equ_category AS equCategory
+        FROM
+            privilege_company pc
+                INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
+                INNER JOIN tzs_jg_transfer_notice tn ON tn.use_unit_credit_code = bi.use_unit_code
+                AND tn.notice_status = 6616
+                INNER JOIN tzs_jg_transfer_notice_eq te ON te.equip_transfer_id = tn.sequence_nbr
+                INNER JOIN idx_biz_jg_register_info jri ON te.equ_id = jri.record
+        WHERE
+            pc.company_code = #{cityCode} and tn.rec_date &gt;= #{startTime}
+        GROUP BY
+            jri.equ_category
+    </select>
+    <select id="useEquCount" resultType="java.util.Map">
+        SELECT COUNT
+                   ( 1 ),
+               jri.equ_list AS equList,
+               jri.equ_category AS equCategory
+        FROM
+            privilege_company pc
+                INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
+                INNER JOIN tzs_jg_use_registration ur ON ur.use_unit_credit_code = bi.use_unit_code
+                AND ur.audit_status = '已完成'
+                INNER JOIN tzs_jg_use_registration_eq te ON te.equip_transfer_id = ur.sequence_nbr
+                INNER JOIN idx_biz_jg_register_info jri ON te.equ_id = jri.record
+        WHERE
+            pc.company_code = #{cityCode} and ur.rec_date &gt;= #{startTime}
+        GROUP BY
+            jri.equ_category
+    </select>
+    <select id="changeReformEquCount" resultType="java.util.Map">
+        SELECT COUNT
+                   ( 1 ),
+               jri.equ_list AS equList,
+               jri.equ_category AS equCategory
+        FROM
+            privilege_company pc
+                INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
+                INNER JOIN tzs_jg_change_registration_reform ur ON ur.use_unit_credit_code = bi.use_unit_code
+                AND ur.audit_status = '已完成'
+                INNER JOIN tzs_jg_change_registration_reform_eq te ON te.equip_transfer_id = ur.sequence_nbr
+                INNER JOIN idx_biz_jg_register_info jri ON te.equ_id = jri.record
+        WHERE
+            pc.company_code = #{cityCode} and ur.rec_date &gt;= #{startTime}
+        GROUP BY
+            jri.equ_category
+
+    </select>
+    <select id="changeTransferEquCount" resultType="java.util.Map">
+        SELECT COUNT
+                   ( 1 ),
+               jri.equ_list AS equList,
+               jri.equ_category AS equCategory
+        FROM
+            privilege_company pc
+                INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
+                INNER JOIN tzs_jg_change_registration_transfer ur ON ur.use_unit_credit_code = bi.use_unit_code
+                AND ur.audit_status = '已完成'
+                INNER JOIN tzs_jg_change_registration_transfer_eq te ON te.equip_transfer_id = ur.sequence_nbr
+                INNER JOIN idx_biz_jg_register_info jri ON te.equ_id = jri.record
+        WHERE
+            pc.company_code = #{cityCode} and ur.rec_date &gt;= #{startTime}
+        GROUP BY
+            jri.equ_category
+    </select>
+    <select id="changeUnitEquCount" resultType="java.util.Map">
+        SELECT COUNT
+                   ( 1 ),
+               jri.equ_list AS equList,
+               jri.equ_category AS equCategory
+        FROM
+            privilege_company pc
+                INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
+                INNER JOIN tzs_jg_change_registration_unit ur ON ur.use_unit_credit_code = bi.use_unit_code
+                AND ur.status = '已完成'
+                INNER JOIN tzs_jg_change_registration_unit_eq te ON te.unit_change_registration_id = ur.sequence_nbr
+                INNER JOIN idx_biz_jg_register_info jri ON te.equ_id = jri.record
+        WHERE
+            pc.company_code = #{cityCode} and ur.rec_date &gt;= #{startTime}
+        GROUP BY
+            jri.equ_category
+
+    </select>
+    <select id="vehicleEquCount" resultType="java.util.Map">
+        SELECT COUNT
+                   ( 1 ),
+               jri.equ_list AS equList,
+               jri.equ_category AS equCategory
+        FROM
+            privilege_company pc
+                INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
+                INNER JOIN tzs_jg_vehicle_information ur ON ur.use_unit_credit_code = bi.use_unit_code
+                AND ur.audit_status = '已完成'
+                INNER JOIN tzs_jg_vehicle_information_eq te ON te.vehicle_id = ur.sequence_nbr
+                INNER JOIN idx_biz_jg_register_info jri ON te.equ_id = jri.record
+        WHERE
+            pc.company_code = #{cityCode} and ur.rec_date &gt;= #{startTime}
+        GROUP BY
+            jri.equ_category
+    </select>
+
+    <select id="newRegEquCountByMonth" resultType="java.util.Map">
+        SELECT COUNT
+                   ( 1 ) ,
+               DATE_FORMAT(ur.rec_date,'%Y-%m-%d')
+        FROM
+            privilege_company pc
+                INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
+                INNER JOIN tzs_jg_use_registration ur ON ur.use_unit_credit_code = bi.use_unit_code
+                AND ur.audit_status = '已完成'
+                INNER JOIN tzs_jg_use_registration_eq te ON te.equip_transfer_id = ur.sequence_nbr
+        WHERE
+            pc.company_code = #{cityCode}
+          AND ur.rec_date like concat('%',DATE_FORMAT(CURDATE(), '%Y-%m') ,'%')
+        GROUP BY
+            DATE_FORMAT(ur.rec_date,'%Y-%m-%d')
+        ORDER BY
+            ur.rec_date
+    </select>
+
+    <select id="newVehicleEquCountByMonth" resultType="java.util.Map">
+        SELECT COUNT
+                   ( 1 ) ,
+               DATE_FORMAT(ur.rec_date,'%Y-%m-%d')
+        FROM
+            privilege_company pc
+                INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
+                INNER JOIN tzs_jg_vehicle_information ur ON ur.use_unit_credit_code = bi.use_unit_code
+                AND ur.status = '已完成'
+                INNER JOIN tzs_jg_vehicle_information_eq te ON te.vehicle_id = ur.sequence_nbr
+        WHERE
+            pc.company_code = #{cityCode}
+          AND ur.rec_date like concat('%',DATE_FORMAT(CURDATE(), '%Y-%m') ,'%')
+        GROUP BY
+            DATE_FORMAT(ur.rec_date,'%Y-%m-%d')
+        ORDER BY
+            ur.rec_date
+    </select>
+
+    <select id="newRegEquCountByYear" resultType="java.util.Map">
+        SELECT COUNT
+                   ( 1 ) ,
+               DATE_FORMAT(ur.rec_date,'%Y-%m')
+        FROM
+            privilege_company pc
+                INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
+                INNER JOIN tzs_jg_use_registration ur ON ur.use_unit_credit_code = bi.use_unit_code
+                AND ur.audit_status = '已完成'
+                INNER JOIN tzs_jg_use_registration_eq te ON te.equip_transfer_id = ur.sequence_nbr
+        WHERE
+            pc.company_code = #{cityCode}
+          AND ur.rec_date like concat('%',DATE_FORMAT(CURDATE(), '%Y') ,'%')
+        GROUP BY
+            DATE_FORMAT(ur.rec_date,'%Y-%m')
+        ORDER BY
+            ur.rec_date
+    </select>
+
+    <select id="newVehicleEquCountByYear" resultType="java.util.Map">
+        SELECT COUNT
+                   ( 1 ) ,
+               DATE_FORMAT(ur.rec_date,'%Y-%m')
+        FROM
+            privilege_company pc
+                INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
+                INNER JOIN tzs_jg_vehicle_information ur ON ur.use_unit_credit_code = bi.use_unit_code
+                AND ur.status = '已完成'
+                INNER JOIN tzs_jg_vehicle_information_eq te ON te.vehicle_id = ur.sequence_nbr
+        WHERE
+            pc.company_code = #{cityCode}
+          AND ur.rec_date like concat('%',DATE_FORMAT(CURDATE(), '%Y') ,'%')
+        GROUP BY
+            DATE_FORMAT(ur.rec_date,'%Y-%m')
+        ORDER BY
+            ur.rec_date
+    </select>
+
+    <select id="newVehicleCountByYear" resultType="String">
+        SELECT COUNT
+                   ( 1 )
+        FROM
+            privilege_company pc
+                INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
+                INNER JOIN tzs_jg_vehicle_information ur ON ur.use_unit_credit_code = bi.use_unit_code
+                AND ur.status = '已完成'
+        WHERE
+            pc.company_code = #{cityCode}
+          AND ur.rec_date like concat('%',DATE_FORMAT(CURDATE(), '%Y') ,'%')
+        GROUP BY
+            DATE_FORMAT(ur.rec_date,'%Y')
+        ORDER BY
+            ur.rec_date
+    </select>
+
+    <select id="newVehicleCountByMonth" resultType="String">
+        SELECT COUNT
+                   ( 1 )
+        FROM
+            privilege_company pc
+                INNER JOIN tz_base_enterprise_info bi ON bi.supervise_org_code LIKE CONCAT ( pc.org_code, '%' )
+                INNER JOIN tzs_jg_vehicle_information ur ON ur.use_unit_credit_code = bi.use_unit_code
+                AND ur.status = '已完成'
+        WHERE
+            pc.company_code = #{cityCode}
+          AND ur.rec_date like concat('%',DATE_FORMAT(CURDATE(), '%Y-%m') ,'%')
+        GROUP BY
+            DATE_FORMAT(ur.rec_date,'%Y-%m')
+        ORDER BY
+            ur.rec_date
+    </select>
+</mapper>

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

@@ -204,5 +204,16 @@
         LEFT JOIN idx_biz_jg_use_info use on re.equ_id = use.RECORD
         where ur.sequence_nbr = #{id}
     </select>
-
+    <select id="queryForFlowingEquipList"
+            resultType="com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto">
+        select
+            a.use_unit_credit_code as companyCode,
+            group_concat(b.equ_id) as records
+        from
+            tzs_jg_change_registration_reform a,
+            tzs_jg_change_registration_reform_eq b
+        where
+            a.sequence_nbr = b.equip_transfer_id
+          and a.status not in('使用单位待提交','一级受理已驳回','使用单位已撤回','已作废','已完成')
+    </select>
 </mapper>

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

@@ -210,4 +210,14 @@
             jet.sequence_nbr = #{sequenceNbr}
         LIMIT 1
     </select>
+
+    <select id="queryForFlowingEquipList" resultType="com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto">
+        select a.use_unit_credit_code as companyCode,
+               group_concat(b.equ_id) as records
+        from tzs_jg_equip_transfer a,
+             tzs_jg_equip_transfer_eq b
+        where a.sequence_nbr = b.equip_transfer_id
+          and a.apply_status = '6612'
+        GROUP BY a.use_unit_credit_code
+    </select>
 </mapper>

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

@@ -274,5 +274,16 @@
          LEFT JOIN idx_biz_jg_factory_info fi ON fi.record = oi.record
         WHERE oi.record = #{record} ORDER BY oi."rec_date" DESC LIMIT 1
     </select>
-
+    <select id="queryForFlowingEquipList" resultType="com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto">
+        select
+            a.install_unit_credit_code as companyCode,
+            group_concat(b.equ_id) as records
+        from
+            tzs_jg_maintain_notice a,
+            tzs_jg_maintain_notice_eq b
+        where
+            a.sequence_nbr = b.equip_transfer_id
+          and a.notice_status not in('6614','6615','6610','6617','6616')
+        GROUP BY a.install_unit_credit_code
+    </select>
 </mapper>

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

@@ -155,4 +155,14 @@
                  left JOIN idx_biz_jg_register_info jri on mc.equ_id = jri.RECORD
         WHERE mc.equip_transfer_id = #{id}
     </select>
+
+    <select id="queryForFlowingEquipList" resultType="com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto">
+        select a.use_unit_code as companyCode,
+               group_concat(b.equ_id) as records
+        from tzs_jg_maintenance_contract a,
+             tzs_jg_maintenance_contract_eq b
+        where a.sequence_nbr = b.equip_transfer_id
+          and a.status in ('监管单位待受理','维保单位待受理')
+        GROUP BY a.use_unit_code
+    </select>
 </mapper>

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

@@ -203,4 +203,16 @@
         set promoter = null
         where sequence_nbr = #{id}
     </update>
+    <select id="queryForFlowingEquipList" resultType="com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto">
+        select
+            a.install_unit_credit_code as companyCode,
+            group_concat(b.equ_id) as records
+        from
+            tzs_jg_reform_notice a,
+            tzs_jg_reform_notice_eq b
+        where
+            a.sequence_nbr = b.equip_transfer_id
+          and a.notice_status not in('6614','6615','6610','6617','6616')
+        GROUP BY a.install_unit_credit_code
+    </select>
 </mapper>

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

@@ -217,4 +217,16 @@
             tjtn.sequence_nbr = #{sequenceNbr}
             LIMIT 1
     </select>
+    <select id="queryForFlowingEquipList" resultType="com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto">
+        select
+            a.install_unit_credit_code as companyCode,
+            group_concat(b.equ_id) as records
+        from
+            tzs_jg_transfer_notice a,
+            tzs_jg_transfer_notice_eq b
+        where
+            a.sequence_nbr = b.equip_transfer_id
+          and a.notice_status not in('6614','6615','6610','6617','6616')
+        GROUP BY a.install_unit_credit_code
+    </select>
 </mapper>

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

@@ -134,4 +134,16 @@
             tjurm.rec_date DESC
         </where>
     </select>
+    <select id="countCertificateByReginCode" resultType="java.lang.Long">
+        select
+            count(1)
+        from
+            tzs_jg_use_registration_manage tjurm
+        left join
+            privilege_company pc
+        on tjurm.receive_company_code = pc.company_code
+        where
+            pc.org_code like concat (#{reginCode},'%')
+            and tjurm.certificate_status = '已登记'
+    </select>
 </mapper>

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

@@ -451,9 +451,9 @@
             pp."TEMPERATURE" temperature,
             pp."MEDIUM" medium,
             pp."REMARKS" remarks,
-            (select INSPECT_ORG_NAME from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY INSPECT_DATE DESC limit 1) inspectOrgName,
-            (select name from cb_data_dictionary where type = 'JYJL' and code = (select INSPECT_CONCLUSION from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY INSPECT_DATE limit 1)) inspectConclusion,
-            to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY INSPECT_DATE DESC limit 1), 'YYYY-MM-DD') nextInspectDate
+            (select INSPECT_ORG_NAME from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY REC_DATE DESC limit 1) inspectOrgName,
+            (select name from cb_data_dictionary where type = 'JYJL' and code = (select INSPECT_CONCLUSION from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY REC_DATE limit 1)) inspectConclusion,
+            to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY REC_DATE DESC limit 1), 'YYYY-MM-DD') nextInspectDate
         FROM
             idx_biz_jg_use_info ui
             LEFT JOIN idx_biz_jg_register_info ri on ri."RECORD" = ui."RECORD"
@@ -523,8 +523,8 @@
             (select name from cb_data_dictionary where code = pv."CHARGING_MEDIUM" and type = 'FILLING_MEDIUM') chargingMedium,
             pv."NOMINAL_WORKING_PRESSURE" nominalWorkingPressure,
             pv."SINGLE_BOTTLE_VOLUME" singleBottleVolume,
-            to_char((select INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY INSPECT_DATE limit 1), 'YYYY-MM-DD') inspectDate,
-            to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY INSPECT_DATE limit 1), 'YYYY-MM-DD') nextInspectDate
+            to_char((select INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY REC_DATE DESC limit 1), 'YYYY-MM-DD') inspectDate,
+            to_char((select NEXT_INSPECT_DATE from idx_biz_jg_inspection_detection_info where "RECORD" = ui."RECORD" ORDER BY REC_DATE DESC limit 1), 'YYYY-MM-DD') nextInspectDate
         FROM
             idx_biz_jg_use_info ui
             LEFT JOIN idx_biz_jg_register_info ri on ri."RECORD" = ui."RECORD"
@@ -566,27 +566,6 @@
         ORDER BY ui.REC_DATE DESC
     </select>
 
-    <select id="queryForEquipUsedByVehiclePage" resultType="com.alibaba.fastjson.JSONObject">
-        <include refid="page-list-vessel"/>
-        WHERE
-        ri."EQU_DEFINE" = '23T0'
-        and ui."DATA_SOURCE" like 'jg%'
-        -- and ui."DATA_SOURCE" not like 'jg_his%'
-        and ri.whether_vehicle_cylinder = 1
-        -- 保证使用单位选择设备时（record为null） 能选择到本单位的设备 并且 监管单位在查看时（record 不为null）可以匹配到所有的设备
-        <if test="jsonObject.useUnitCreditCode != null and jsonObject.useUnitCreditCode != '' and jsonObject.record == null">
-            and ui."USE_UNIT_CREDIT_CODE" = #{jsonObject.useUnitCreditCode}
-        </if>
-        <if test="jsonObject.record != null and jsonObject.record != ''">
-            and ui."RECORD" = #{jsonObject.record}
-        </if>
-        <if test="jsonObject.record == null">
-            and not exists(SELECT 1 FROM tzs_jg_vehicle_information v, tzs_jg_vehicle_information_eq ve WHERE
-            v.sequence_nbr = ve.vehicle_id AND ve.equ_id = ui."RECORD" and v.status !='使用单位待提交' and v.status
-            !='一级受理已驳回' and v.status !='使用单位已撤回' and v.status !='已作废' )
-        </if>
-        ORDER BY ui.REC_DATE DESC
-    </select>
     <select id="queryForEquipUsedByVehiclePageHistory" resultType="com.alibaba.fastjson.JSONObject">
         <include refid="page-list-vessel"/>
         WHERE
@@ -642,11 +621,11 @@
             a.use_unit_credit_code as companyCode,
             group_concat(b.equ_id) as records
         from
-        tzs_jg_use_registration a,
-        tzs_jg_use_registration_eq b
+            tzs_jg_use_registration a,
+            tzs_jg_use_registration_eq b
         where
-        a.sequence_nbr = b.equip_transfer_id
-        and (a.status  <![CDATA[ <> ]]>  '使用单位待提交' and a.status  <![CDATA[ <> ]]> '一级受理已驳回' and a.status <![CDATA[ <> ]]> '使用单位已撤回' and a.status <![CDATA[ <> ]]> '已作废')
+            a.sequence_nbr = b.equip_transfer_id
+          and a.status not in('使用单位待提交','一级受理已驳回','使用单位已撤回','已作废')
     </select>
     <select id="getEquTypeByUseRegSeq" resultType="java.util.Map">
         select ur.sequence_nbr                                                                                   as sequenceNbr,

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

@@ -9,10 +9,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.FieldError;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
@@ -115,4 +112,135 @@ public class DPStatisticsController {
         }
         return ResponseHelper.buildResponse(statisticsService.queryBizCycleData(dpFilterParamDto));
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "监管大屏-左侧设备状态情况统计", notes = "监管大屏-左侧设备状态情况统计")
+    @PostMapping(value = "/equStateCount")
+    public ResponseModel<List<Map<String,Object>>> equStateCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.equStateCount(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "监管大屏-右侧停用、注销、报废设备状态情况统计", notes = "监管大屏-右侧停用、注销、报废设备状态情况统计")
+    @PostMapping(value = "/equStopStateCount")
+    public ResponseModel<Map<String,Object>> equStopStateCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.equStopStateCount(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "监管大屏-维保电梯数量TOP10", notes = "监管大屏-维保电梯数量TOP10")
+    @PostMapping(value = "/maintenanceCountTopTen")
+    public ResponseModel<List<Map<String,Object>>> maintenanceCountTopTen(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.maintenanceCountTopTen(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "监管大屏-维保电梯数量", notes = "监管大屏-维保电梯数量")
+    @PostMapping(value = "/maintenanceCount")
+    public ResponseModel<Map<String,Object>> maintenanceCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.maintenanceCount(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "监管大屏-左侧各地市业务办理平均时效", notes = "监管大屏-左侧各地市业务办理平均时效")
+    @PostMapping(value = "/cityBusinessCount")
+    public ResponseModel<Map<String,Object>> cityBusinessCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.cityBusinessCount(dpFilterParamDto));
+    }
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "监管大屏-左侧获取业务类型", notes = "监管大屏-左侧获取业务类型")
+    @PostMapping(value = "/getBusinessKey")
+    public ResponseModel<List<Map<String,Object>>> getBusinessKey(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.getBusinessKey(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "监管大屏-右侧施工告知的设备数办理情况统计", notes = "监管大屏-右侧施工告知的设备数办理情况统计")
+    @PostMapping(value = "/getNoticeEquCount")
+    public ResponseModel<Map<String,Object>> getNoticeEquCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.getNoticeEquCount(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "监管大屏-右侧使用办理的设备数量情况统计", notes = "监管大屏-右侧使用办理的设备数量情况统计")
+    @PostMapping(value = "/getRegEquCount")
+    public ResponseModel<Map<String,Object>> getRegEquCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.getRegEquCount(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "监管大屏-左侧新增情况", notes = "监管大屏-左侧新增情况")
+    @PostMapping(value = "/newRegEquCount")
+    public ResponseModel<Map<String,Object>> newRegEquCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.newRegEquCount(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "监管大屏-新增登记新增设备统计", notes = "监管大屏-新增登记新增设备统计")
+    @PostMapping(value = "/newRegCount")
+    public ResponseModel<List<Map<String,Object>>> newRegCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.newRegCount(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏监管-中屏-各地市数据统计", notes = "大屏监管-中屏-各地市数据统计")
+    @PostMapping(value = "/jg/centre/dataStatistic")
+    public ResponseModel<List<Map<String, Object>>> dataStatisticByReginCode(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.dataStatisticByReginCode(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏监管-中屏-当前区域数据统计", notes = "大屏监管-中屏-当前区域数据统计")
+    @PostMapping(value = "/jg/centre/dataStatisticCount")
+    public ResponseModel<Map<String, Object>> dataStatisticCountByReginCode(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.dataStatisticCountByReginCode(dpFilterParamDto));
+    }
 }

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

@@ -3,34 +3,30 @@ package com.yeejoin.amos.boot.module.jg.biz.controller;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.jg.api.dto.JgChangeRegistrationUnitDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgChangeRegistrationUnit;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.CommonServiceImpl;
-import io.swagger.annotations.ApiParam;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationUnitServiceImpl;
 import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
-import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgChangeRegistrationUnitServiceImpl;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-
 /**
  * 单位变更登记
  *
@@ -45,161 +41,165 @@ public class JgChangeRegistrationUnitController extends BaseController {
     @Autowired
     JgChangeRegistrationUnitServiceImpl jgChangeRegistrationUnitServiceImpl;
     @Autowired
-	CommonServiceImpl commonService;
-
-	/**
-	 * 新增
-	 *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增单位变更", notes = "新增单位变更")
-	public ResponseModel<String> save(@RequestParam String submitType, @RequestBody JSONObject model) {
-		ReginParams reginParams = getSelectedOrgInfo();
-
-		jgChangeRegistrationUnitServiceImpl.saveNotice(submitType, model, reginParams);
-		return ResponseHelper.buildResponse("");
-	}
-
-	/**
-	 * 根据sequenceNbr更新
-	 *
-	 * @param model 单位变更
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/update")
-	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新单位变更", notes = "根据sequenceNbr更新单位变更")
-	public ResponseModel<JgChangeRegistrationUnitDto> updateBySequenceNbrJgInstallationNotice(@RequestParam String submitType, @RequestBody Map<String, Object> model, @RequestParam(value = "op", required = false) String op) {
-		JgChangeRegistrationUnitDto jgChangeRegistrationUnitDto = BeanUtil.mapToBean(((LinkedHashMap) model.get("changeRegisInfo")), JgChangeRegistrationUnitDto.class, true);
-		if (Objects.isNull(jgChangeRegistrationUnitDto)) {
-			throw new IllegalArgumentException("参数installationInfo不能为空");
-		}
-		Object o = ((LinkedHashMap<?, ?>) model.get("changeRegisInfo")).get("changeCertificateList");
-		jgChangeRegistrationUnitDto.setChangeCertificateList((List<Map<String, Object>>) o);
-		return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.updateInstallationNotice(submitType,jgChangeRegistrationUnitDto, op));
-	}
-
-	/**
-	 * 根据sequenceNbr删除
-	 *
-	 * @param sequenceNbr 主键
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@DeleteMapping(value = "/delete")
-	@ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除单位变更", notes = "根据sequenceNbr删除单位变更")
-	public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
-		jgChangeRegistrationUnitServiceImpl.deleteForBatch(new Long[]{sequenceNbr});
-		return ResponseHelper.buildResponse(Boolean.TRUE);
-	}
-
-	/**
-	 * 根据sequenceNbr批量删除
-	 *
-	 * @param sequenceNbrs 主键
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@DeleteMapping(value = "/batchDelete")
-	@ApiOperation(value = "根据sequenceNbr删除维保合同备案", notes = "根据sequenceNbr删除维保合同备案")
-	public ResponseModel<Boolean> deleteForBatch(@RequestParam("sequenceNbrs") Long[] sequenceNbrs) {
-		try {
-			return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.deleteForBatch(sequenceNbrs));
-		} catch (Exception e) {
-			return CommonResponseUtil.failure(e.getMessage());
-		}
-	}
-
-	/**
-	 * 根据sequenceNbr查询
-	 *
-	 * @param sequenceNbr 主键
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/details")
-	@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个单位变更", notes = "根据sequenceNbr查询单个单位变更")
-	public ResponseModel<Map<String,
-			Map<String, Object>>> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
-		return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.queryBySequenceNbr(sequenceNbr));
-	}
-
-
-	/**
-	 * 列表分页查询
-	 *
-	 * @param current 当前页
-	 * @param current 每页大小
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/page")
-	@ApiOperation(httpMethod = "POST", value = "单位变更分页查询", notes = "单位变更分页查询")
-	public ResponseModel<Page<JgChangeRegistrationUnitDto>> queryForPage(
-			@ApiParam(value = "当前页码", required = true) @RequestParam(value = "current", defaultValue = "1") int current,
-			@ApiParam(value = "每页大小", required = true) @RequestParam(value = "size", defaultValue = "20") int size,
-			@ApiParam(value = "类型：enterprise-企业端、supervision-监管端", required = true) @RequestParam(value = "type", defaultValue = "enterprise") String type,
-			@ApiParam(value = "排序字段",required = false) @RequestParam(value = "sort",required = false) String sort,
-			@RequestBody(required = false) JgChangeRegistrationUnitDto model
-	) {
-		Page<JgChangeRegistrationUnit> page = new Page<>(current, size);
-		ReginParams reginParams = getSelectedOrgInfo();
-		 ReginParams info = getSelectedOrgInfo();
-		if (info.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)){
-			type = "enterprise";
-		}else {
-			type = "supervision";
-		}
-		return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.queryForJgChangeRegistrationUnitPage(page,sort, model, type, reginParams));
-	}
-
-	/**
-	 * 撤销
-	 *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/cancel")
-	@ApiOperation(httpMethod = "POST", value = "单位变更撤销", notes = "单位变更撤销")
-	public ResponseModel<JgChangeRegistrationUnitDto> cancel(@RequestBody Map<String, Object> model) {
-		JgChangeRegistrationUnitDto installationInfo = BeanUtil.mapToBean(((LinkedHashMap) model.get("changeRegisInfo")), JgChangeRegistrationUnitDto.class, true);
-		if (Objects.isNull(installationInfo)) {
-			throw new IllegalArgumentException("参数installationInfo不能为空");
-		}
-		jgChangeRegistrationUnitServiceImpl.cancel(installationInfo);
-		return ResponseHelper.buildResponse(installationInfo);
-	}
-
-	/**
-	 * 受理
-	 *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/accept")
-	@ApiOperation(httpMethod = "POST", value = "单位变更受理", notes = "单位变更受理")
-	public ResponseModel<JgChangeRegistrationUnitDto> accept(@RequestBody Map<String, Object> model, String op) {
-		// TODO 受理单位变更流程
-		LinkedHashMap model1 = (LinkedHashMap)model.get("changeRegisInfo");
-		String opinion = (String)model.get("opinion");
-		LinkedHashMap installationInfo = (LinkedHashMap)model1.get("changeRegisInfo");
-		JgChangeRegistrationUnitDto jgInstallationNoticeDto = JSON.parseObject(JSON.toJSONString(installationInfo), JgChangeRegistrationUnitDto.class);
-		jgInstallationNoticeDto.setProcessAdvice(opinion);
-		jgChangeRegistrationUnitServiceImpl.accept(jgInstallationNoticeDto,op);
-		return ResponseHelper.buildResponse(null);
-	}
-
-
-	/**
-	 * 导出使用登记证
-	 * @param response 返回
-	 * @param sequenceNbr 主键
-	 * @param printType 打印类型，0-正常打印，1-套打（默认0）
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/export")
-	@ApiOperation(httpMethod = "GET", value = "导出使用登记证", notes = "导出使用登记证")
-	public void exportImageZip(HttpServletResponse response, @RequestParam("sequenceNbr") String sequenceNbr,
-							   @RequestParam(value = "printType", defaultValue = "0") String printType) {
-		jgChangeRegistrationUnitServiceImpl.exportUseRegistrationCertificate(sequenceNbr, response, printType);
-	}
+    CommonServiceImpl commonService;
+
+    /**
+     * 新增
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增单位变更", notes = "新增单位变更")
+    public ResponseModel<String> save(@RequestParam String submitType, @RequestBody JSONObject model) {
+        ReginParams reginParams = getSelectedOrgInfo();
+
+        jgChangeRegistrationUnitServiceImpl.saveNotice(submitType, model, reginParams);
+        return ResponseHelper.buildResponse("");
+    }
+
+    /**
+     * 根据sequenceNbr更新
+     *
+     * @param model 单位变更
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/update")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新单位变更", notes = "根据sequenceNbr更新单位变更")
+    public ResponseModel<JgChangeRegistrationUnitDto> updateBySequenceNbrJgInstallationNotice(@RequestParam String submitType, @RequestBody Map<String, Object> model, @RequestParam(value = "op", required = false) String op) {
+        JgChangeRegistrationUnitDto jgChangeRegistrationUnitDto = BeanUtil.mapToBean(((LinkedHashMap) model.get("changeRegisInfo")), JgChangeRegistrationUnitDto.class, true);
+        if (Objects.isNull(jgChangeRegistrationUnitDto)) {
+            throw new IllegalArgumentException("参数installationInfo不能为空");
+        }
+        Object o = ((LinkedHashMap<?, ?>) model.get("changeRegisInfo")).get("changeCertificateList");
+        jgChangeRegistrationUnitDto.setChangeCertificateList((List<Map<String, Object>>) o);
+        ReginParams reginParams = getSelectedOrgInfo();
+
+        return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.updateInstallationNotice(submitType, jgChangeRegistrationUnitDto, op, reginParams));
+    }
+
+    /**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 主键
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/delete")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除单位变更", notes = "根据sequenceNbr删除单位变更")
+    public ResponseModel<Boolean> deleteBySequenceNbr(@RequestParam(value = "sequenceNbr") Long sequenceNbr) {
+        jgChangeRegistrationUnitServiceImpl.deleteForBatch(new Long[]{sequenceNbr});
+        return ResponseHelper.buildResponse(Boolean.TRUE);
+    }
+
+    /**
+     * 根据sequenceNbr批量删除
+     *
+     * @param sequenceNbrs 主键
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @DeleteMapping(value = "/batchDelete")
+    @ApiOperation(value = "根据sequenceNbr删除维保合同备案", notes = "根据sequenceNbr删除维保合同备案")
+    public ResponseModel<Boolean> deleteForBatch(@RequestParam("sequenceNbrs") Long[] sequenceNbrs) {
+        try {
+            return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.deleteForBatch(sequenceNbrs));
+        } catch (Exception e) {
+            return CommonResponseUtil.failure(e.getMessage());
+        }
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 主键
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/details")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个单位变更", notes = "根据sequenceNbr查询单个单位变更")
+    public ResponseModel<Map<String,
+            Map<String, Object>>> selectOne(@RequestParam("sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.queryBySequenceNbr(sequenceNbr));
+    }
+
+
+    /**
+     * 列表分页查询
+     *
+     * @param current 当前页
+     * @param current 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/page")
+    @ApiOperation(httpMethod = "POST", value = "单位变更分页查询", notes = "单位变更分页查询")
+    public ResponseModel<Page<JgChangeRegistrationUnitDto>> queryForPage(
+            @ApiParam(value = "当前页码", required = true) @RequestParam(value = "current", defaultValue = "1") int current,
+            @ApiParam(value = "每页大小", required = true) @RequestParam(value = "size", defaultValue = "20") int size,
+            @ApiParam(value = "类型：enterprise-企业端、supervision-监管端", required = true) @RequestParam(value = "type", defaultValue = "enterprise") String type,
+            @ApiParam(value = "排序字段", required = false) @RequestParam(value = "sort", required = false) String sort,
+            @RequestBody(required = false) JgChangeRegistrationUnitDto model
+    ) {
+        Page<JgChangeRegistrationUnit> page = new Page<>(current, size);
+        ReginParams reginParams = getSelectedOrgInfo();
+        if (reginParams.getCompany().getLevel().equals(BaseController.COMPANY_TYPE_COMPANY)) {
+            type = "enterprise";
+        } else {
+            type = "supervision";
+        }
+        return ResponseHelper.buildResponse(jgChangeRegistrationUnitServiceImpl.queryForJgChangeRegistrationUnitPage(page, sort, model, type, reginParams));
+    }
+
+    /**
+     * 撤销
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/cancel")
+    @ApiOperation(httpMethod = "POST", value = "单位变更撤销", notes = "单位变更撤销")
+    public ResponseModel<JgChangeRegistrationUnitDto> cancel(@RequestBody Map<String, Object> model) {
+        JgChangeRegistrationUnitDto installationInfo = BeanUtil.mapToBean(((LinkedHashMap) model.get("changeRegisInfo")), JgChangeRegistrationUnitDto.class, true);
+        if (Objects.isNull(installationInfo)) {
+            throw new IllegalArgumentException("参数installationInfo不能为空");
+        }
+        ReginParams reginParams = getSelectedOrgInfo();
+        jgChangeRegistrationUnitServiceImpl.cancel(installationInfo);
+        return ResponseHelper.buildResponse(installationInfo);
+    }
+
+    /**
+     * 受理
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping(value = "/accept")
+    @ApiOperation(httpMethod = "POST", value = "单位变更受理", notes = "单位变更受理")
+    public ResponseModel<JgChangeRegistrationUnitDto> accept(@RequestBody Map<String, Object> model, String op) {
+        // TODO 受理单位变更流程
+        LinkedHashMap model1 = (LinkedHashMap) model.get("changeRegisInfo");
+        String opinion = (String) model.get("opinion");
+        LinkedHashMap installationInfo = (LinkedHashMap) model1.get("changeRegisInfo");
+        JgChangeRegistrationUnitDto jgInstallationNoticeDto = JSON.parseObject(JSON.toJSONString(installationInfo), JgChangeRegistrationUnitDto.class);
+        jgInstallationNoticeDto.setProcessAdvice(opinion);
+        ReginParams reginParams = getSelectedOrgInfo();
+        jgChangeRegistrationUnitServiceImpl.accept(jgInstallationNoticeDto, op, reginParams);
+        return ResponseHelper.buildResponse(null);
+    }
+
+
+    /**
+     * 导出使用登记证
+     *
+     * @param response    返回
+     * @param sequenceNbr 主键
+     * @param printType   打印类型，0-正常打印，1-套打（默认0）
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/export")
+    @ApiOperation(httpMethod = "GET", value = "导出使用登记证", notes = "导出使用登记证")
+    public void exportImageZip(HttpServletResponse response, @RequestParam("sequenceNbr") String sequenceNbr,
+                               @RequestParam(value = "printType", defaultValue = "0") String printType) {
+        jgChangeRegistrationUnitServiceImpl.exportUseRegistrationCertificate(sequenceNbr, response, printType);
+    }
 
 }

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

 package com.yeejoin.amos.boot.module.jg.biz.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.api.common.BaseException;
+import com.yeejoin.amos.boot.module.jg.api.dto.JgEquipTransferDto;
+import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgEquipTransferServiceImpl;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
-import io.swagger.annotations.ApiParam;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
-import com.yeejoin.amos.boot.biz.common.controller.BaseController;
-import java.util.*;
-import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgEquipTransferServiceImpl;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.amos.boot.module.jg.api.dto.JgEquipTransferDto;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 设备移交
@@ -54,9 +53,9 @@ public class JgEquipTransferController extends BaseController {
     @PutMapping(value = "/update")
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新设备移交", notes = "根据sequenceNbr更新设备移交")
     public ResponseModel<Object> updateBySequenceNbr(@RequestParam("submitType") String submitType,
-                                                                 @RequestBody JgEquipTransferDto equipTransferDto,
-                                                                 @RequestParam(value = "op", required = false) String op) {
-        return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.updateEquipTransfer(submitType, equipTransferDto, op));
+                                                     @RequestBody JgEquipTransferDto equipTransferDto,
+                                                     @RequestParam(value = "op", required = false) String op) {
+        return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.updateEquipTransfer(submitType, equipTransferDto, op, getSelectedOrgInfo()));
     }
 
     /**
@@ -112,10 +111,10 @@ public class JgEquipTransferController extends BaseController {
     @ApiOperation(httpMethod = "POST", value = "设备移交分页查询", notes = "设备移交分页查询")
     public ResponseModel<Page<JgEquipTransferDto>> queryForPage(@RequestParam(value = "current") int current,
                                                                 @RequestParam(value = "size") int size,
-                                                                @RequestParam(value = "sort",required = false) String sort,
+                                                                @RequestParam(value = "sort", required = false) String sort,
                                                                 @RequestBody(required = false) JgEquipTransferDto dto) {
         Page<JgEquipTransferDto> page = new Page<>(current, size);
-        return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.queryForJgEquipTransferPage(page,sort, dto, getSelectedOrgInfo()));
+        return ResponseHelper.buildResponse(jgEquipTransferServiceImpl.queryForJgEquipTransferPage(page, sort, dto, getSelectedOrgInfo()));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

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

@@ -13,8 +13,6 @@ import com.yeejoin.amos.boot.module.jg.api.vo.JgMaintenanceContractVo;
 import com.yeejoin.amos.boot.module.jg.biz.service.impl.JgMaintenanceContractServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
@@ -23,6 +21,7 @@ import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
 import java.util.Map;
 
 /**
@@ -176,8 +175,8 @@ public class JgMaintenanceContractController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/cancelApplication")
     @ApiOperation(httpMethod = "POST", value = "维保备案作废", notes = "维保备案作废")
-    public ResponseModel<JgMaintenanceContract> cancelApplication(@RequestBody JgMaintenanceContractDto dto){
-        JgMaintenanceContract result = jgMaintenanceContractServiceImpl.cancelApplication(dto.getSequenceNbr(),dto.getCancelReason());
+    public ResponseModel<JgMaintenanceContract> cancelApplication(@RequestBody JgMaintenanceContractDto dto) {
+        JgMaintenanceContract result = jgMaintenanceContractServiceImpl.cancelApplication(dto.getSequenceNbr(), dto.getCancelReason());
         return ResponseHelper.buildResponse(result);
     }
 }

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

@@ -44,7 +44,7 @@ public class ChangeUnitEquipUsedCheckImpl extends BaseEquipUsedCheckService {
 
     @Override
     public void init() {
-        // 初始化已经完成或者在流程中安装告知的设备数据
+        // 初始化在流程中设备数据
         List<CompanyEquipCountDto> companyEquipCountDtos = changeRegistrationUnitMapper.queryForFlowingEquipList();
         companyEquipCountDtos.forEach(c -> {
             RBucket<Set<String>> rBucket = redissonClient.getBucket(getFlowingEquipRedisKey(c.getCompanyCode(), bizType));

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

@@ -2,7 +2,6 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import com.yeejoin.amos.boot.biz.common.dto.CountDto;
-import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.common.api.dto.LegendDataDto;
 import com.yeejoin.amos.boot.module.jg.api.dto.EquipBizCountDto;
@@ -10,10 +9,7 @@ import com.yeejoin.amos.boot.module.jg.api.dto.FourColorCountDataDto;
 import com.yeejoin.amos.boot.module.jg.api.enums.DPMapStatisticsItemEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.FourColorCountItemEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.FourColorEnum;
-import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
-import com.yeejoin.amos.boot.module.jg.api.mapper.JgEnableDisableMapper;
-import com.yeejoin.amos.boot.module.jg.api.mapper.JgScrapCancelMapper;
-import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
+import com.yeejoin.amos.boot.module.jg.api.mapper.*;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipTechParamPipelineMapper;
@@ -36,8 +32,11 @@ import org.elasticsearch.search.aggregations.AggregationBuilders;
 import org.elasticsearch.search.aggregations.bucket.terms.Terms;
 import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 
+import javax.annotation.Resource;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -88,7 +87,7 @@ public class DPStatisticsServiceImpl {
      */
     private final static String COMPANY_TYPE_FILLING = "充装单位";
 
-
+    @Autowired
     private EquipmentCategoryMapper equipmentCategoryMapper;
 
     private JgUseRegistrationMapper useRegistrationMapper;
@@ -109,14 +108,17 @@ public class DPStatisticsServiceImpl {
 
     private TzsUserInfoMapper userInfoMapper;
 
-    private RedisUtils redisUtils;
 
     private static Map<String, String> regionCodeOrgCodeMap = new ConcurrentHashMap<>();
 
     private static List<RegionModel> regionModels = new ArrayList<>();
+    @Resource
+    private DPStatisticsMapper dpStatisticsMapper;
 
+    @Autowired
+    private JgUseRegistrationManageMapper jgUseRegistrationManageMapper;
 
-    public DPStatisticsServiceImpl(EquipmentCategoryMapper equipmentCategoryMapper, JgUseRegistrationMapper useRegistrationMapper, EquipTechParamPipelineMapper techParamsPipelineMapper, JgEnableDisableMapper enableDisableMapper, JgScrapCancelMapper scrapCancelMapper, RestHighLevelClient restHighLevelClient, TzBaseEnterpriseInfoMapper enterpriseInfoMapper, CommonMapper commonMapper, TzsUserInfoMapper userInfoMapper, RedisUtils redisUtils, RedisUtils redisUtils1) {
+    public DPStatisticsServiceImpl(EquipmentCategoryMapper equipmentCategoryMapper, JgUseRegistrationMapper useRegistrationMapper, EquipTechParamPipelineMapper techParamsPipelineMapper, JgEnableDisableMapper enableDisableMapper, JgScrapCancelMapper scrapCancelMapper, RestHighLevelClient restHighLevelClient, TzBaseEnterpriseInfoMapper enterpriseInfoMapper, CommonMapper commonMapper, TzsUserInfoMapper userInfoMapper) {
         this.equipmentCategoryMapper = equipmentCategoryMapper;
         this.useRegistrationMapper = useRegistrationMapper;
         this.techParamsPipelineMapper = techParamsPipelineMapper;
@@ -126,7 +128,6 @@ public class DPStatisticsServiceImpl {
         this.enterpriseInfoMapper = enterpriseInfoMapper;
         this.commonMapper = commonMapper;
         this.userInfoMapper = userInfoMapper;
-        this.redisUtils = redisUtils1;
     }
 
     public void init() {
@@ -260,7 +261,7 @@ public class DPStatisticsServiceImpl {
             }
             regionCodeOrgCodeMap.put(dpFilterParamDto.getCityCode(), orgCode);
         }
-        Long num = userInfoMapper.countUserByPostAndAreaCode(orgCode, "6552");
+        Long num = userInfoMapper.countUserByPostAndAreaCode(orgCode, "6552", dpFilterParamDto.getCityCode());
         result.put(DPMapStatisticsItemEnum.OPERATORS.getCode(), num);
     }
 
@@ -291,7 +292,7 @@ public class DPStatisticsServiceImpl {
         // 设备类别精确查询气瓶
         boolMust.must(QueryBuilders.termsQuery("EQU_CATEGORY_CODE", EQU_CATEGORY_CYLINDER));
         // 纳管状态为已纳管
-        boolMust.must(QueryBuilders.termsQuery("IS_INTO_MANAGEMENT", true));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
         request.query(boolMust);
         try {
             CountResponse response = restHighLevelClient.count(request, RequestOptions.DEFAULT);
@@ -320,7 +321,7 @@ public class DPStatisticsServiceImpl {
         // 区域信息模糊查询
         boolMust.must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*" + dpFilterParamDto.getCityCode() + "*"));
         // 纳管状态为已纳管
-        boolMust.must(QueryBuilders.termsQuery("IS_INTO_MANAGEMENT", true));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
         SearchSourceBuilder builder = new SearchSourceBuilder();
         builder.query(boolMust);
         TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("count_by_equ_list_code").field("EQU_LIST_CODE");
@@ -633,15 +634,20 @@ public class DPStatisticsServiceImpl {
     private String calPercentForBizCycleData(DPFilterParamDto dpFilterParamDto, Long allFinishedCount) {
         Long allBizDataInFlowingCount = this.countAllBizDataInFlowing(dpFilterParamDto);
         BigDecimal finish = new BigDecimal(String.valueOf(allFinishedCount));
-        BigDecimal total = new BigDecimal(String.valueOf(allBizDataInFlowingCount));
-        BigDecimal result = finish.divide(total, 2, RoundingMode.HALF_UP);
-        BigDecimal percentage = result.multiply(new BigDecimal("100")).setScale(0, RoundingMode.HALF_UP);
-        return percentage.toPlainString();
+        BigDecimal flowing = new BigDecimal(String.valueOf(allBizDataInFlowingCount));
+        BigDecimal total = finish.add(flowing);
+        if(total.compareTo(BigDecimal.ZERO) > 0){
+            BigDecimal result = finish.divide(total, 2, RoundingMode.HALF_UP);
+            BigDecimal percentage = result.multiply(new BigDecimal("100")).setScale(0, RoundingMode.HALF_UP);
+            return percentage.toPlainString();
+        }  else {
+            return "0";
+        }
     }
 
     private Long countAllBizDataInFlowing(DPFilterParamDto dpFilterParamDto) {
         String orgCode = getAndSetOrgCode(dpFilterParamDto.getCityCode());
-        List<Long> inFlowingForDP = commonMapper.countAllBizDataInFlowingForDP(orgCode, dpFilterParamDto);
+        List<Long> inFlowingForDP = commonMapper.countAllInFlowingForDPNoFinishedBizData(orgCode, dpFilterParamDto);
         return inFlowingForDP.stream().mapToLong(e -> e).sum();
     }
 
@@ -665,4 +671,774 @@ public class DPStatisticsServiceImpl {
         }
         return orgCode;
     }
+
+    public List<Map<String,Object>> equStateCount(DPFilterParamDto dpFilterParamDto) {
+        List<Map<String,Object>> resultList = new ArrayList<>();
+        SearchRequest request = new SearchRequest();
+        request.indices("idx_biz_view_jg_all");
+        BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
+        // 区域信息模糊查询
+        boolMust.must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*" + dpFilterParamDto.getCityCode() + "*"));
+        // 纳管状态为已纳管
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
+        SearchSourceBuilder builder = new SearchSourceBuilder();
+        builder.query(boolMust);
+        TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("EQU_STATE_COUNT").field("EQU_STATE");
+        builder.aggregation(aggregationBuilder);
+        request.source(builder);
+        try {
+            SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
+            Terms terms = response.getAggregations().get("EQU_STATE_COUNT");
+            Map<String, Long> dataMap = new HashMap<>();
+            Long total = terms.getBuckets().stream().mapToLong(Terms.Bucket::getDocCount).sum();
+            for (Terms.Bucket bucket : terms.getBuckets()) {
+                String category = bucket.getKeyAsString(); // 或者使用 bucket.getKey() 对于非字符串类型
+                long docCount = bucket.getDocCount();
+                dataMap.put(category, docCount);
+            }
+            /**
+             * 3	报废
+             * 1	在用
+             * 2	停用
+             * 4	注销
+             * 0	未登记
+             */
+            for(int i = 0; i < 5; i++){
+                Map<String,Object> map = new HashMap();
+                if(i == 0){
+                    map.put("name", "未登记");
+                }else if(i == 1){
+                    map.put("name", "在用");
+                }else if(i == 2){
+                    map.put("name", "停用");
+                }else if(i == 3){
+                    map.put("name", "报废");
+                }else if(i == 4){
+                    map.put("name", "注销");
+                }
+                map.put("value", dataMap.getOrDefault(String.valueOf(i), 0L));
+                resultList.add(map);
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        return resultList;
+    }
+
+    public Map<String,Object> equStopStateCount(DPFilterParamDto dpFilterParamDto) {
+        SearchRequest request = new SearchRequest();
+        request.indices("idx_biz_view_jg_all");
+        BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
+        // 区域信息模糊查询
+        boolMust.must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*" + dpFilterParamDto.getCityCode() + "*"));
+        // 纳管状态为已纳管
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
+        SearchSourceBuilder builder = new SearchSourceBuilder();
+        builder.query(boolMust);
+        // 设备状态
+        TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("EQU_STATE_COUNT").field("EQU_STATE")
+                //设备类型
+                .subAggregation(AggregationBuilders.terms("EQU_LIST_CODE_COUNT").field("EQU_LIST_CODE"));
+        builder.aggregation(aggregationBuilder);
+        request.source(builder);
+        try{
+            SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
+            Terms terms = response.getAggregations().get("EQU_STATE_COUNT");
+            Map<String, Long> dataMap = new HashMap<>();
+            for (Terms.Bucket bucket : terms.getBuckets()) {
+                String category = bucket.getKeyAsString(); // 或者使用 bucket.getKey() 对于非字符串类型
+                Terms subTerms = bucket.getAggregations().get("EQU_LIST_CODE_COUNT");
+                for(Terms.Bucket subBucket :subTerms.getBuckets()){
+                    String subCategory = subBucket.getKeyAsString();
+                    long docCount = subBucket.getDocCount();
+                    dataMap.put(category+"#"+subCategory, docCount);
+                }
+            }
+            /**
+             * 2300 气瓶
+             * 3000	电梯
+             * 4000	起重机械
+             * 2000	压力容器
+             * 5000	场（厂）内专用机动车辆
+             * 1000	锅炉
+             * 8000	压力管道
+             * F000	安全附件
+             * 7000	压力管道元件
+             * 9000	客运索道
+             * 6000	大型游乐设施
+             */
+            /**
+             * 2	停用
+             * 4	注销
+             * 3	报废
+             */
+            List<Map<String,Object>> legendDataList = new ArrayList<>();
+            for(int i = 0; i < 3; i++){
+                Map<String,Object> map = new HashMap();
+                if(i == 0){
+                    map.put("dataKey","stop");
+                    map.put("name","停用");
+                }else if(i == 1){
+                    map.put("dataKey","logout");
+                    map.put("name","注销");
+                }else if(i == 2){
+                    map.put("dataKey","scrap");
+                    map.put("name","报废");
+                }
+                legendDataList.add(map);
+            }
+            List<String> xDataList = Arrays.asList("气瓶", "电梯", "压力容器", "锅炉", "起重机械", "场(厂)内专用", "大型游乐设施", "压力管道", "客运索道");
+            List<Object> stop = new ArrayList<>();
+            List<Object> logout = new ArrayList<>();
+            List<Object> scrap = new ArrayList<>();
+            for(int i = 0; i < 9; i++){
+                if(i == 0){
+                    stop.add(dataMap.getOrDefault("2#2300", 0L));
+                    logout.add(dataMap.getOrDefault("4#2300", 0L));
+                    scrap.add(dataMap.getOrDefault("3#2300", 0L));
+                }else if(i == 1){
+                    stop.add(dataMap.getOrDefault("2#3000", 0L));
+                    logout.add(dataMap.getOrDefault("4#3000", 0L));
+                    scrap.add(dataMap.getOrDefault("3#3000", 0L));
+                }else if(i == 2){
+                    stop.add(dataMap.getOrDefault("2#2000", 0L)-dataMap.getOrDefault("2#2300", 0L));
+                    logout.add(dataMap.getOrDefault("4#2000", 0L)-dataMap.getOrDefault("4#2300", 0L));
+                    scrap.add(dataMap.getOrDefault("3#2000", 0L)-dataMap.getOrDefault("3#2300", 0L));
+                }else if(i == 3){
+                    stop.add(dataMap.getOrDefault("2#1000", 0L));
+                    logout.add(dataMap.getOrDefault("4#1000", 0L));
+                    scrap.add(dataMap.getOrDefault("3#1000", 0L));
+                }else if(i == 4){
+                    stop.add(dataMap.getOrDefault("2#4000", 0L));
+                    logout.add(dataMap.getOrDefault("4#4000", 0L));
+                    scrap.add(dataMap.getOrDefault("3#4000", 0L));
+                }else if(i == 5){
+                    stop.add(dataMap.getOrDefault("2#5000", 0L));
+                    logout.add(dataMap.getOrDefault("4#5000", 0L));
+                    scrap.add(dataMap.getOrDefault("3#5000", 0L));
+                }else if(i == 6){
+                    stop.add(dataMap.getOrDefault("2#6000", 0L));
+                    logout.add(dataMap.getOrDefault("4#6000", 0L));
+                    scrap.add(dataMap.getOrDefault("3#6000", 0L));
+                }else if(i == 7){
+                    stop.add(dataMap.getOrDefault("2#8000", 0L));
+                    logout.add(dataMap.getOrDefault("4#8000", 0L));
+                    scrap.add(dataMap.getOrDefault("3#8000", 0L));
+                }else if(i == 8){
+                    stop.add(dataMap.getOrDefault("2#9000", 0L));
+                    logout.add(dataMap.getOrDefault("4#9000", 0L));
+                    scrap.add(dataMap.getOrDefault("3#9000", 0L));
+                }
+            }
+
+            Map<String,Object> returnMap = new HashMap<>();
+            returnMap.put("legendData", legendDataList);
+            returnMap.put("xdata", xDataList);
+            returnMap.put("stop",stop);
+            returnMap.put("logout",logout);
+            returnMap.put("scrap",scrap);
+
+            return returnMap;
+        }catch (Exception e){
+            throw new RuntimeException(e);
+        }
+    }
+
+    public List<Map<String,Object>> maintenanceCountTopTen(DPFilterParamDto dpFilterParamDto) {
+        List<Map<String,Object>> list = dpStatisticsMapper.maintenanceCountTopTen(dpFilterParamDto);
+        List<Map<String,Object>> resultList = new ArrayList<>();
+        for(int i = 0; i < list.size(); i++){
+            Map<String,Object> result = new HashMap<>();
+            result.put("key",i);
+            result.put("city",list.get(i).get("regionName"));
+            result.put("count",list.get(i).get("count"));
+            result.put("name",list.get(i).get("companyName"));
+            resultList.add(result);
+        }
+        return resultList;
+    }
+
+    public Map<String,Object> maintenanceCount(DPFilterParamDto dpFilterParamDto) {
+        List<Map<String,Object>> list = dpStatisticsMapper.maintenanceCount(dpFilterParamDto);
+        Map<String,Object> resultMap = new HashMap<>();
+        List xList = new ArrayList();
+        List yList = new ArrayList();
+        for(int i = 0; i < list.size(); i++){
+            xList.add(list.get(i).get("regionName"));
+            yList.add(list.get(i).get("count"));
+        }
+        resultMap.put("xdata",xList);
+        resultMap.put("ydata",yList);
+        return resultMap;
+    }
+
+    public Map<String,Object> cityBusinessCount(DPFilterParamDto dpFilterParamDto) {
+        Map<String,Object> resultMap = new HashMap<>();
+        /**
+         * 业务类型0告知管理，1使用登记，2变更登记，3停用启用，4注销报废
+         */
+        if("0".equals(dpFilterParamDto.getBusinessKey())){
+            resultMap = noticeCount(resultMap,dpFilterParamDto.getCityCode());
+        }else if("1".equals(dpFilterParamDto.getBusinessKey())){
+            resultMap = useCount(resultMap,dpFilterParamDto.getCityCode());
+        }else if("2".equals(dpFilterParamDto.getBusinessKey())){
+            resultMap = changeCount(resultMap,dpFilterParamDto.getCityCode());
+        }else if("3".equals(dpFilterParamDto.getBusinessKey())){
+            resultMap = disableCount(resultMap,dpFilterParamDto.getCityCode());
+        }else if("4".equals(dpFilterParamDto.getBusinessKey())){
+            resultMap = cancelCount(resultMap,dpFilterParamDto.getCityCode());
+        }
+
+        return resultMap;
+    }
+
+    private Map<String, Object> cancelCount(Map<String, Object> resultMap, String cityCode) {
+        Map<String,Integer> countMap = new HashMap<>();
+        //注销报废
+        List<Map<String,Object>> cancelList = dpStatisticsMapper.cancelCount(cityCode);
+        countByMap(countMap,cancelList);
+
+        List<Object> xDataList = new ArrayList<>();
+        List<Object> yDataList = new ArrayList<>();
+        countMap.forEach((k,v)->{
+            xDataList.add(k);
+            yDataList.add(v);
+        });
+        resultMap.put("xdata",xDataList);
+        resultMap.put("ydata",yDataList);
+        return resultMap;
+    }
+
+    private Map<String, Object> disableCount(Map<String, Object> resultMap, String cityCode) {
+        Map<String,Integer> countMap = new HashMap<>();
+        //启用停用
+        List<Map<String,Object>> disableList = dpStatisticsMapper.disableCount(cityCode);
+        countByMap(countMap,disableList);
+
+        List<Object> xDataList = new ArrayList<>();
+        List<Object> yDataList = new ArrayList<>();
+        countMap.forEach((k,v)->{
+            xDataList.add(k);
+            yDataList.add(v);
+        });
+        resultMap.put("xdata",xDataList);
+        resultMap.put("ydata",yDataList);
+        return resultMap;
+    }
+
+    private Map<String, Object> changeCount(Map<String, Object> resultMap, String cityCode) {
+        Map<String,Integer> countMap = new HashMap<>();
+        //更名变更登记
+        List<Map<String,Object>>changeNameList = dpStatisticsMapper.changeNameCount(cityCode);
+        countByMap(countMap,changeNameList);
+        //改造变更登记
+        List<Map<String,Object>> reformList = dpStatisticsMapper.changeReformCount(cityCode);
+        countByMap(countMap,reformList);
+        //移装变更登记
+        List<Map<String,Object>> transferList = dpStatisticsMapper.changeTransferCount(cityCode);
+        countByMap(countMap,transferList);
+        //单位变更登记
+        List<Map<String,Object>> unitList = dpStatisticsMapper.changeUnitCount(cityCode);
+        countByMap(countMap,unitList);
+        //单位变更登记
+        List<Map<String,Object>> vehicleList = dpStatisticsMapper.changeVehicleCount(cityCode);
+        countByMap(countMap,vehicleList);
+
+        List<Object> xDataList = new ArrayList<>();
+        List<Object> yDataList = new ArrayList<>();
+        countMap.forEach((k,v)->{
+            xDataList.add(k);
+            yDataList.add(v);
+        });
+        resultMap.put("xdata",xDataList);
+        resultMap.put("ydata",yDataList);
+        return resultMap;
+    }
+
+    private Map<String, Object> useCount(Map<String, Object> resultMap, String cityCode) {
+        Map<String,Integer> countMap = new HashMap<>();
+        //使用登记
+        List<Map<String,Object>> useList = dpStatisticsMapper.useCount(cityCode);
+        countByMap(countMap,useList);
+        //气瓶登记
+        List<Map<String,Object>> vehicleList = dpStatisticsMapper.vehicleCount(cityCode);
+        countByMap(countMap,vehicleList);
+
+        List<Object> xDataList = new ArrayList<>();
+        List<Object> yDataList = new ArrayList<>();
+        countMap.forEach((k,v)->{
+            xDataList.add(k);
+            yDataList.add(v);
+        });
+        resultMap.put("xdata",xDataList);
+        resultMap.put("ydata",yDataList);
+        return resultMap;
+    }
+
+    private Map<String, Object> noticeCount(Map<String, Object> resultMap, String cityCode) {
+        Map<String,Integer> countMap = new HashMap<>();
+        //安装告知
+        List<Map<String,Object>> installlist = dpStatisticsMapper.installCount(cityCode);
+        countByMap(countMap,installlist);
+        //维修告知
+        List<Map<String,Object>> maintenancelist = dpStatisticsMapper.maintenanceNoticeCount(cityCode);
+        countByMap(countMap,maintenancelist);
+        //改造告知
+        List<Map<String,Object>> reformlist = dpStatisticsMapper.reformCount(cityCode);
+        countByMap(countMap,reformlist);
+        //移装告知
+        List<Map<String,Object>> transferlist = dpStatisticsMapper.transferCount(cityCode);
+        countByMap(countMap,transferlist);
+        List<Object> xDataList = new ArrayList<>();
+        List<Object> yDataList = new ArrayList<>();
+        countMap.forEach((k,v)->{
+            xDataList.add(k);
+            yDataList.add(v);
+        });
+        resultMap.put("xdata",xDataList);
+        resultMap.put("ydata",yDataList);
+        return resultMap;
+    }
+
+    private void countByMap(Map<String,Integer> countMap, List<Map<String,Object>> list){
+        for(int i = 0; i < list.size(); i++){
+            if(null == countMap.get(list.get(i).get("regionName"))){
+                countMap.put(list.get(i).get("regionName").toString(),Integer.valueOf(list.get(i).get("count")+""));
+            }else{
+                countMap.put(list.get(i).get("regionName").toString(),countMap.get(list.get(i).get("regionName").toString())+Integer.valueOf(list.get(i).get("count")+""));
+            }
+        }
+    }
+
+    public List<Map<String,Object>> getBusinessKey(DPFilterParamDto dpFilterParamDto) {
+        List<Map<String,Object>> resultList = new ArrayList<>();
+        /**
+         * 告知管理、使用登记、变更登记、停用启用、注销报废
+         */
+        for(int i = 0; i < 5; i++){
+            Map<String,Object> result = new HashMap<>();
+            if(i == 0){
+                result.put("key",i+"");
+                result.put("name","告知管理");
+            }else if(i == 1){
+                result.put("key",i+"");
+                result.put("name","使用登记");
+            }else if(i == 2){
+                result.put("key",i+"");
+                result.put("name","变更登记");
+            }else if(i == 3){
+                result.put("key",i+"");
+                result.put("name","停用启用");
+            }else if(i == 4){
+                result.put("key",i+"");
+                result.put("name","注销报废");
+            }
+            resultList.add(result);
+
+        }
+
+        return resultList;
+    }
+
+    public Map<String,Object> getNoticeEquCount(DPFilterParamDto dpFilterParamDto) {
+        String startTime = LocalDate.now().minusDays(29).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        //安装告知
+        List<Map<String,Object>> installlist = dpStatisticsMapper.installEquCount(dpFilterParamDto.getCityCode(),startTime);
+        Map<String,Integer> installCountMap = new HashMap<>();
+        countNoticEquList(installCountMap,installlist);
+        //维修告知
+        List<Map<String,Object>> maintenancelist = dpStatisticsMapper.maintenanceEquCount(dpFilterParamDto.getCityCode(),startTime);
+        Map<String,Integer> maintenanceCountMap = new HashMap<>();
+        countNoticEquList(maintenanceCountMap,maintenancelist);
+        //改造告知
+        List<Map<String,Object>> reformlist = dpStatisticsMapper.reformEquCount(dpFilterParamDto.getCityCode(),startTime);
+        Map<String,Integer> reformCountMap = new HashMap<>();
+        countNoticEquList(reformCountMap,reformlist);
+        //移装告知
+        List<Map<String,Object>> transferlist = dpStatisticsMapper.transferEquCount(dpFilterParamDto.getCityCode(),startTime);
+        Map<String,Integer> transferCountMap = new HashMap<>();
+        countNoticEquList(transferCountMap,transferlist);
+
+        Map<String,Object> resultMap = new HashMap<>();
+        List legendData = new ArrayList<>();
+        for(int i = 0; i < 4; i++){
+            Map<String,String> map = new HashMap<>();
+            if(i == 0){
+                map.put("dataKey","installNotify");
+                map.put("value","安装告知");
+            }else if(i == 1){
+                map.put("dataKey","transformNotify");
+                map.put("value","改造告知");
+            }else if(i == 2){
+                map.put("dataKey","maintainNotify");
+                map.put("value","维修告知");
+            }else if(i == 3){
+                map.put("dataKey","transloadingNotify");
+                map.put("value","移装告知");
+            }
+            legendData.add(map);
+        }
+        resultMap.put("legendData",legendData);
+        List<String> xDataList = Arrays.asList("气瓶", "电梯", "压力容器", "锅炉", "起重机械", "场(厂)内专用", "大型游乐设施", "压力管道", "客运索道");
+        resultMap.put("xdata",xDataList);
+        List installNotify = new ArrayList<>();
+        List transformNotify = new ArrayList<>();
+        List maintainNotify = new ArrayList<>();
+        List transloadingNotify = new ArrayList<>();
+        /**
+         * 2300 气瓶
+         * 3000	电梯
+         * 2000	压力容器
+         * 1000	锅炉
+         * 4000	起重机械
+         * 5000	场（厂）内专用机动车辆
+         * 6000	大型游乐设施
+         * 8000	压力管道
+         * 9000	客运索道
+         */
+        for(int i = 0; i < xDataList.size(); i++){
+            if(i == 0){
+                installNotify.add(installCountMap.getOrDefault("2300",0));
+                transformNotify.add(reformCountMap.getOrDefault("2300",0));
+                maintainNotify.add(maintenanceCountMap.getOrDefault("2300",0));
+                transloadingNotify.add(transferCountMap.getOrDefault("2300",0));
+            }else if(i == 1){
+                installNotify.add(installCountMap.getOrDefault("3000",0));
+                transformNotify.add(reformCountMap.getOrDefault("3000",0));
+                maintainNotify.add(maintenanceCountMap.getOrDefault("3000",0));
+                transloadingNotify.add(transferCountMap.getOrDefault("3000",0));
+            }else if(i == 2){
+                installNotify.add(installCountMap.getOrDefault("2000",0));
+                transformNotify.add(reformCountMap.getOrDefault("2000",0));
+                maintainNotify.add(maintenanceCountMap.getOrDefault("2000",0));
+                transloadingNotify.add(transferCountMap.getOrDefault("2000",0));
+            }else if(i == 3){
+                installNotify.add(installCountMap.getOrDefault("1000",0));
+                transformNotify.add(reformCountMap.getOrDefault("1000",0));
+                maintainNotify.add(maintenanceCountMap.getOrDefault("1000",0));
+                transloadingNotify.add(transferCountMap.getOrDefault("1000",0));
+            }else if(i == 4){
+                installNotify.add(installCountMap.getOrDefault("4000",0));
+                transformNotify.add(reformCountMap.getOrDefault("4000",0));
+                maintainNotify.add(maintenanceCountMap.getOrDefault("4000",0));
+                transloadingNotify.add(transferCountMap.getOrDefault("4000",0));
+            }else if(i == 5){
+                installNotify.add(installCountMap.getOrDefault("5000",0));
+                transformNotify.add(reformCountMap.getOrDefault("5000",0));
+                maintainNotify.add(maintenanceCountMap.getOrDefault("5000",0));
+                transloadingNotify.add(transferCountMap.getOrDefault("5000",0));
+            }else if(i == 6){
+                installNotify.add(installCountMap.getOrDefault("6000",0));
+                transformNotify.add(reformCountMap.getOrDefault("6000",0));
+                maintainNotify.add(maintenanceCountMap.getOrDefault("6000",0));
+                transloadingNotify.add(transferCountMap.getOrDefault("6000",0));
+            }else if(i == 7){
+                installNotify.add(installCountMap.getOrDefault("8000",0));
+                transformNotify.add(reformCountMap.getOrDefault("8000",0));
+                maintainNotify.add(maintenanceCountMap.getOrDefault("8000",0));
+                transloadingNotify.add(transferCountMap.getOrDefault("8000",0));
+            }else if(i == 8){
+                installNotify.add(installCountMap.getOrDefault("9000",0));
+                transformNotify.add(reformCountMap.getOrDefault("9000",0));
+                maintainNotify.add(maintenanceCountMap.getOrDefault("9000",0));
+                transloadingNotify.add(transferCountMap.getOrDefault("9000",0));
+            }
+        }
+        resultMap.put("installNotify",installNotify);
+        resultMap.put("transformNotify",transformNotify);
+        resultMap.put("maintainNotify",maintainNotify);
+        resultMap.put("transloadingNotify",transloadingNotify);
+        return resultMap;
+    }
+
+    private void countNoticEquList(Map<String, Integer> countMap, List<Map<String, Object>> list) {
+        for(int i = 0; i < list.size(); i++){
+            if("2300".equals(list.get(i).get("equCategory"))){
+                if(null == countMap.get("2300")){
+                    countMap.put("2300",Integer.valueOf(list.get(i).get("count")+""));
+                }else{
+                    countMap.put("2300",countMap.get("2300")+Integer.valueOf(list.get(i).get("count")+""));
+                }
+            }else {
+                if(null == countMap.get(list.get(i).get("equList").toString())){
+                    countMap.put(list.get(i).get("equList").toString(),Integer.valueOf(list.get(i).get("count")+""));
+                }else{
+                    countMap.put(list.get(i).get("equList").toString(),countMap.get(list.get(i).get("equList").toString())+Integer.valueOf(list.get(i).get("count")+""));
+                }
+            }
+        }
+    }
+
+    public Map<String,Object> getRegEquCount(DPFilterParamDto dpFilterParamDto) {
+        Map<String,Object> resultMap = new HashMap<>();
+        String startTime = LocalDate.now().minusDays(29).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        //使用登记
+        List<Map<String,Object>> uselist = dpStatisticsMapper.useEquCount(dpFilterParamDto.getCityCode(),startTime);
+        Map<String,Integer> useCountMap = new HashMap<>();
+        countNoticEquList(useCountMap,uselist);
+        //气瓶使用登记
+        List<Map<String,Object>> vehicleList = dpStatisticsMapper.vehicleEquCount(dpFilterParamDto.getCityCode(),startTime);
+        Map<String,Integer> vehicleCountMap = new HashMap<>();
+        countNoticEquList(vehicleCountMap,vehicleList);
+        //改造变更登记
+        List<Map<String,Object>> changeReformList = dpStatisticsMapper.changeReformEquCount(dpFilterParamDto.getCityCode(),startTime);
+        Map<String,Integer> changeReformCountMap = new HashMap<>();
+        countNoticEquList(changeReformCountMap,changeReformList);
+        //移装变更登记
+        List<Map<String,Object>> changeTransferList = dpStatisticsMapper.changeTransferEquCount(dpFilterParamDto.getCityCode(),startTime);
+        Map<String,Integer> changeTransferCountMap = new HashMap<>();
+        countNoticEquList(changeTransferCountMap,changeTransferList);
+        //单位变更登记
+        List<Map<String,Object>> changeUnitList = dpStatisticsMapper.changeUnitEquCount(dpFilterParamDto.getCityCode(),startTime);
+        Map<String,Integer> changeUnitCountMap = new HashMap<>();
+        countNoticEquList(changeUnitCountMap,changeUnitList);
+
+        List legendData = new ArrayList<>();
+        for(int i = 0; i < 4; i++){
+            Map<String,String> map = new HashMap<>();
+            if(i == 0){
+                map.put("dataKey","useRegistration");
+                map.put("value","使用登记");
+            }else if(i == 1){
+                map.put("dataKey","modificateModifyRegistration");
+                map.put("value","改造变更登记");
+            }else if(i == 2){
+                map.put("dataKey","transloadingModifyRegistration");
+                map.put("value","移装变更登记");
+            }else if(i == 3){
+                map.put("dataKey","unitModifyRegistration");
+                map.put("value","单位变更登记");
+            }
+            legendData.add(map);
+        }
+        resultMap.put("legendData",legendData);
+        List<String> xDataList = Arrays.asList("气瓶", "电梯", "压力容器", "锅炉", "起重机械", "场(厂)内专用", "大型游乐设施", "压力管道", "客运索道");
+        resultMap.put("xdata",xDataList);
+        List useRegistration = new ArrayList<>();
+        List modificateModifyRegistration = new ArrayList<>();
+        List transloadingModifyRegistration = new ArrayList<>();
+        List unitModifyRegistration = new ArrayList<>();
+        for(int i = 0; i < xDataList.size(); i++){
+            if(i == 0){
+                useRegistration.add(vehicleCountMap.getOrDefault("2300",0));
+                modificateModifyRegistration.add(changeReformCountMap.getOrDefault("2300",0));
+                transloadingModifyRegistration.add(changeTransferCountMap.getOrDefault("2300",0));
+                unitModifyRegistration.add(changeUnitCountMap.getOrDefault("2300",0));
+            }else if(i == 1){
+                useRegistration.add(useCountMap.getOrDefault("3000",0));
+                modificateModifyRegistration.add(changeTransferCountMap.getOrDefault("3000",0));
+                transloadingModifyRegistration.add(changeTransferCountMap.getOrDefault("3000",0));
+                unitModifyRegistration.add(changeUnitCountMap.getOrDefault("3000",0));
+            }else if(i == 2){
+                useRegistration.add(useCountMap.getOrDefault("2000",0));
+                modificateModifyRegistration.add(changeTransferCountMap.getOrDefault("2000",0));
+                transloadingModifyRegistration.add(changeTransferCountMap.getOrDefault("2000",0));
+                unitModifyRegistration.add(changeUnitCountMap.getOrDefault("2000",0));
+            }else if(i == 3){
+                useRegistration.add(useCountMap.getOrDefault("1000",0));
+                modificateModifyRegistration.add(changeTransferCountMap.getOrDefault("1000",0));
+                transloadingModifyRegistration.add(changeTransferCountMap.getOrDefault("1000",0));
+                unitModifyRegistration.add(changeUnitCountMap.getOrDefault("1000",0));
+            }else if(i == 4){
+                useRegistration.add(useCountMap.getOrDefault("4000",0));
+                modificateModifyRegistration.add(changeTransferCountMap.getOrDefault("4000",0));
+                transloadingModifyRegistration.add(changeTransferCountMap.getOrDefault("4000",0));
+                unitModifyRegistration.add(changeUnitCountMap.getOrDefault("4000",0));
+            }else if(i == 5){
+                useRegistration.add(useCountMap.getOrDefault("5000",0));
+                modificateModifyRegistration.add(changeTransferCountMap.getOrDefault("5000",0));
+                transloadingModifyRegistration.add(changeTransferCountMap.getOrDefault("5000",0));
+                unitModifyRegistration.add(changeUnitCountMap.getOrDefault("5000",0));
+            }else if(i == 6){
+                useRegistration.add(useCountMap.getOrDefault("6000",0));
+                modificateModifyRegistration.add(changeTransferCountMap.getOrDefault("6000",0));
+                transloadingModifyRegistration.add(changeTransferCountMap.getOrDefault("6000",0));
+                unitModifyRegistration.add(changeUnitCountMap.getOrDefault("6000",0));
+            }else if(i == 7){
+                useRegistration.add(useCountMap.getOrDefault("8000",0));
+                modificateModifyRegistration.add(changeTransferCountMap.getOrDefault("8000",0));
+                transloadingModifyRegistration.add(changeTransferCountMap.getOrDefault("8000",0));
+                unitModifyRegistration.add(changeUnitCountMap.getOrDefault("8000",0));
+            }else if(i == 8){
+                useRegistration.add(useCountMap.getOrDefault("9000",0));
+                modificateModifyRegistration.add(changeTransferCountMap.getOrDefault("9000",0));
+                transloadingModifyRegistration.add(changeTransferCountMap.getOrDefault("9000",0));
+                unitModifyRegistration.add(changeUnitCountMap.getOrDefault("9000",0));
+            }
+        }
+        resultMap.put("useRegistration",useRegistration);
+        resultMap.put("modificateModifyRegistration",modificateModifyRegistration);
+        resultMap.put("transloadingModifyRegistration",transloadingModifyRegistration);
+        resultMap.put("unitModifyRegistration",unitModifyRegistration);
+
+        return resultMap;
+
+    }
+
+    public List<Map<String, Object>> dataStatisticByReginCode(DPFilterParamDto dpFilterParamDto) {
+        List<Map<String, Object>> result = regionModels.parallelStream().filter(e -> e.getParentRegionCode() != null && (e.getParentRegionCode().toString()).equals(dpFilterParamDto.getCityCode())).map(r -> {
+            DPFilterParamDto filterParamDto = new DPFilterParamDto();
+            filterParamDto.setCityCode(r.getRegionCode().toString());
+            Map<String, Object> itemResult = staticsCenterMapCountDataForRegin(filterParamDto);
+            if (itemResult == null) {
+                itemResult = new HashMap<>();
+            }
+            itemResult.put("regionCode", r.getRegionCode());
+            itemResult.put("regionName", r.getRegionName());
+            return itemResult;
+        }).collect(Collectors.toList());
+        return result;
+    }
+
+    private Map<String, Object> staticsCenterMapCountDataForRegin(DPFilterParamDto dpFilterParamDto) {
+        Map<String, Object> result = new HashMap<>();
+        String orgCode = regionCodeOrgCodeMap.get(dpFilterParamDto.getCityCode());
+        if (orgCode == null) {
+            orgCode = commonMapper.getOrgCodeByCompanyCode(dpFilterParamDto.getCityCode());
+            if (orgCode == null) {
+                result.put(DPMapStatisticsItemEnum.DEVICE_COUNT.getCode(), 0);
+                result.put(DPMapStatisticsItemEnum.CERTIFICATE_COUNT.getCode(), 0);
+                return result;
+            }
+            regionCodeOrgCodeMap.put(dpFilterParamDto.getCityCode(), orgCode);
+        }
+        Long certificateCount = jgUseRegistrationManageMapper.countCertificateByReginCode(orgCode);
+        Long deviceCount = equipmentCategoryMapper.countEquipByReginCode(orgCode);
+        result.put(DPMapStatisticsItemEnum.CERTIFICATE_COUNT.getCode(), certificateCount);
+        result.put(DPMapStatisticsItemEnum.DEVICE_COUNT.getCode(), deviceCount);
+        return result;
+    }
+
+    public Map<String, Object> dataStatisticCountByReginCode(DPFilterParamDto dpFilterParamDto) {
+        Map<String,Object> resultMap = new HashMap<>();
+        List<Map<String, Object>> mapList = this.dataStatisticByReginCode(dpFilterParamDto);
+        if(ObjectUtils.isEmpty(mapList)){
+            resultMap.put(DPMapStatisticsItemEnum.CERTIFICATE_COUNT.getCode(), 0);
+            resultMap.put(DPMapStatisticsItemEnum.DEVICE_COUNT.getCode(), 0);
+            return resultMap;
+        }
+        long certificateCount = mapList.stream().mapToLong(x -> (Long) x.get("certificateCount")).sum();
+        long deviceCount = mapList.stream().mapToLong(x -> (Long) x.get("deviceCount")).sum();
+        resultMap.put(DPMapStatisticsItemEnum.CERTIFICATE_COUNT.getCode(), certificateCount);
+        resultMap.put(DPMapStatisticsItemEnum.DEVICE_COUNT.getCode(), deviceCount);
+        return resultMap;
+    }
+
+    public Map<String,Object> newRegEquCount(DPFilterParamDto dpFilterParamDto) {
+        Map<String,Object> resultMap = new HashMap<>();
+        Map<String,Object> map = new HashMap<>();
+        map.put("dataKey","newRegisterEq");
+        map.put("value","新增登记设备");
+        List<Map<String,Object>> legendData = new ArrayList<>();
+        legendData.add(map);
+        resultMap.put("legendData",legendData);
+        List xDataList = new ArrayList<>();
+        List newRegisterEq = new ArrayList<>();
+        Map<String,Object> useCountMap = new HashMap<>();
+        Map<String,Object> vehicleCountMap = new HashMap<>();
+        if("month".equals(dpFilterParamDto.getSearchType())){
+            List<Map<String,Object>> useCountList = dpStatisticsMapper.newRegEquCountByMonth(dpFilterParamDto.getCityCode());
+            List<Map<String,Object>> vehicleCountList = dpStatisticsMapper.newVehicleEquCountByMonth(dpFilterParamDto.getCityCode());
+            for(int i = 0; i < useCountList.size(); i++){
+                useCountMap.put(useCountList.get(i).getOrDefault("date_format","")+"",Integer.valueOf(useCountList.get(i).getOrDefault("count",0)+""));
+            }
+            for(int i = 0; i < vehicleCountList.size(); i++){
+                vehicleCountMap.put(vehicleCountList.get(i).getOrDefault("date_format","")+"",Integer.valueOf(vehicleCountList.get(i).getOrDefault("count",0)+""));
+            }
+            for(int i = 0; i < LocalDate.now().getDayOfMonth(); i++){
+                xDataList.add(LocalDate.now().minusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+                newRegisterEq.add(Integer.valueOf(useCountMap.getOrDefault(LocalDate.now().minusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")),0)+"")
+                        +Integer.valueOf(vehicleCountMap.getOrDefault(LocalDate.now().minusDays(i).format(DateTimeFormatter.ofPattern("yyyy-MM-dd")),0)+""));
+            }
+
+        }else if("year".equals(dpFilterParamDto.getSearchType())){
+            List<Map<String,Object>> useCountList = dpStatisticsMapper.newRegEquCountByYear(dpFilterParamDto.getCityCode());
+            List<Map<String,Object>> vehicleCountList = dpStatisticsMapper.newVehicleEquCountByYear(dpFilterParamDto.getCityCode());
+            for(int i = 0; i < useCountList.size(); i++){
+                useCountMap.put(useCountList.get(i).getOrDefault("date_format","")+"",Integer.valueOf(useCountList.get(i).getOrDefault("count",0)+""));
+            }
+            for(int i = 0; i < vehicleCountList.size(); i++){
+                vehicleCountMap.put(vehicleCountList.get(i).getOrDefault("date_format","")+"",Integer.valueOf(vehicleCountList.get(i).getOrDefault("count",0)+""));
+            }
+            for (int i = 0; i < LocalDate.now().getMonth().getValue(); i++){
+                xDataList.add(LocalDate.now().minusMonths(i).format(DateTimeFormatter.ofPattern("yyyy-MM")));
+                newRegisterEq.add(Integer.valueOf(useCountMap.getOrDefault(LocalDate.now().minusMonths(i).format(DateTimeFormatter.ofPattern("yyyy-MM")),0)+"")
+                        +Integer.valueOf(vehicleCountMap.getOrDefault(LocalDate.now().minusMonths(i).format(DateTimeFormatter.ofPattern("yyyy-MM")),0)+""));
+            }
+
+        }
+        Collections.reverse(xDataList);
+        Collections.reverse(newRegisterEq);
+        resultMap.put("xdata",xDataList);
+        resultMap.put("newRegisterEq",newRegisterEq);
+        return resultMap;
+    }
+
+    public List<Map<String,Object>> newRegCount(DPFilterParamDto dpFilterParamDto) {
+        List<Map<String,Object>> resultList = new ArrayList<>();
+        //年使用登记设备
+        List<Map<String,Object>> useEquCountListYear = dpStatisticsMapper.newRegEquCountByYear(dpFilterParamDto.getCityCode());
+        //年气瓶使用登记设备
+        List<Map<String,Object>> vehicleEquCountListYear = dpStatisticsMapper.newVehicleEquCountByYear(dpFilterParamDto.getCityCode());
+        //月使用登记设备
+        List<Map<String,Object>> useEquCountListMonth = dpStatisticsMapper.newRegEquCountByMonth(dpFilterParamDto.getCityCode());
+        //月气瓶使用登记设备
+        List<Map<String,Object>> vehicleEquCountListMonth = dpStatisticsMapper.newVehicleEquCountByMonth(dpFilterParamDto.getCityCode());
+        //年气瓶使用登记
+        String vehicleCountYear = dpStatisticsMapper.newVehicleCountByYear(dpFilterParamDto.getCityCode());
+        //月气瓶使用登记
+        String vehicleCountListMonth = dpStatisticsMapper.newVehicleCountByMonth(dpFilterParamDto.getCityCode());
+        /**
+         * [ { "name": "本年新增登记", "value": 52 }, { "name": "本年新增设备", "value": 83 },
+         * { "name": "本月新增登记", "value": 16 }, { "name": "本月新增设备", "value": 50 } ]
+         */
+        int useYear = 0;
+        int useMonth = 0;
+        int usrEqYear = 0;
+        int usrEqMonth = 0;
+        //本年新增登记
+        for(int i = 0 ; i < useEquCountListYear.size() ; i++){
+            useYear += Integer.valueOf(useEquCountListYear.get(i).getOrDefault("count",0)+"");
+            usrEqYear += Integer.valueOf(useEquCountListYear.get(i).getOrDefault("count",0)+"");
+        }
+        useYear += StringUtils.isBlank(vehicleCountYear)?0:Integer.valueOf(vehicleCountYear);
+
+        //本年新增设备
+        for(int i = 0 ; i < vehicleEquCountListYear.size() ; i++){
+            usrEqYear += Integer.valueOf(vehicleEquCountListYear.get(i).getOrDefault("count",0)+"");
+        }
+
+        //本月新增登记
+        for(int i = 0 ; i < useEquCountListMonth.size() ; i++){
+            useMonth += Integer.valueOf(useEquCountListMonth.get(i).getOrDefault("count",0)+"");
+            usrEqMonth += Integer.valueOf(useEquCountListMonth.get(i).getOrDefault("count",0)+"");
+        }
+        useMonth += StringUtils.isBlank(vehicleCountListMonth)?0:Integer.valueOf(vehicleCountListMonth);
+        //本月新增设备
+        for(int i = 0 ; i < vehicleEquCountListMonth.size() ; i++){
+            usrEqMonth += Integer.valueOf(vehicleEquCountListMonth.get(i).getOrDefault("count",0)+"");
+        }
+
+
+        for(int i=0 ; i < 4 ; i++){
+            Map<String,Object> map = new HashMap<>();
+            if(i == 0){
+                map.put("name","本年新增登记");
+                map.put("value",useYear);
+            }else if(i == 1){
+                map.put("name","本年新增设备");
+                map.put("value",usrEqYear);
+            }else if(i == 2){
+                map.put("name","本月新增登记");
+                map.put("value",useMonth);
+            }else if(i == 3){
+                map.put("name","本月新增设备");
+                map.put("value",usrEqMonth);
+            }
+            resultList.add(map);
+        }
+
+        return resultList;
+    }
 }

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgEquipTransferMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RBucket;
+import org.redisson.api.RedissonClient;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * @author Administrator
+ */
+@Component
+@Slf4j
+public class EquipTransferEquipUsedCheckImpl extends BaseEquipUsedCheckService {
+
+    private RedissonClient redissonClient;
+
+    private String bizType = "equipmentHandover";
+
+    private JgEquipTransferMapper equipTransferMapper;
+
+    public EquipTransferEquipUsedCheckImpl(RedissonClient redissonClient, JgEquipTransferMapper equipTransferMapper) {
+        this.redissonClient = redissonClient;
+        this.equipTransferMapper = equipTransferMapper;
+    }
+
+
+    @Override
+    public RedissonClient getRedisClient() {
+        return redissonClient;
+    }
+
+    @Override
+    public String getApplyBizType() {
+        return bizType;
+    }
+
+
+    @Override
+    public void init() {
+        // 初始化在流程中的设备数据
+        List<CompanyEquipCountDto> companyEquipCountDtos = equipTransferMapper.queryForFlowingEquipList();
+        companyEquipCountDtos.forEach(c -> {
+            RBucket<Set<String>> rBucket = redissonClient.getBucket(getFlowingEquipRedisKey(c.getCompanyCode(), bizType));
+            rBucket.set(Arrays.stream(c.getRecords().split(",")).collect(Collectors.toSet()));
+        });
+    }
+}

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

@@ -28,10 +28,12 @@ import com.yeejoin.amos.boot.module.jg.api.dto.EquipmentInfoDto;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgCertificateChangeRecord;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgCertificateChangeRecordEq;
 import com.yeejoin.amos.boot.module.jg.api.entity.JgUseRegistrationManage;
+import com.yeejoin.amos.boot.module.jg.api.entity.SafetyProblemTracing;
 import com.yeejoin.amos.boot.module.jg.api.enums.*;
 import com.yeejoin.amos.boot.module.jg.api.mapper.CommonMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgVehicleInformationMapper;
+import com.yeejoin.amos.boot.module.jg.api.mapper.SafetyProblemTracingMapper;
 import com.yeejoin.amos.boot.module.jg.biz.config.PressureVesselListener;
 import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
@@ -654,7 +656,8 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         }
         return objMap;
     }
-
+@Autowired
+private SafetyProblemTracingMapper safetyProblemTracingMapper;
     /**
      * 查询设备基本信息
      *
@@ -669,6 +672,17 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         String county = "";
         String street = "";
         String fullAddress = "";
+
+        // 设备问题信息（大屏二级页面使用）
+        LambdaQueryWrapper<SafetyProblemTracing> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(SafetyProblemTracing::getSourceId, record);
+        lambdaQueryWrapper.orderByDesc(SafetyProblemTracing::getRecDate);
+        List<SafetyProblemTracing> safetyProblemTracings = safetyProblemTracingMapper.selectList(lambdaQueryWrapper);
+        if (!ObjectUtils.isEmpty(safetyProblemTracings)) {
+            objMap.put("problemStatus", ProblemStatusEnum.getNameByDesc.get(safetyProblemTracings.get(0).getProblemStatus()));
+            objMap.put("problemTime", safetyProblemTracings.get(0).getProblemTime());
+        }
+
         // 使用信息
         IdxBizJgUseInfo useInfo = idxBizJgUseInfoService.getOneData(record);
         if (!ValidationUtil.isEmpty(useInfo)) {
@@ -738,12 +752,14 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
                     useInfoMap.put("FULLADDRESS", fullAddress);
                 }
                 useInfoMap.put("USEINFO_SEQ", useInfo.getSequenceNbr());
+                useInfoMap.put("USE_PLACE", useInfo.getUsePlace());
                 if (!ValidationUtil.isEmpty(useInfo.getLongitudeLatitude())) {
                     useInfoMap.put("LONGITUDE_LATITUDE", JSON.parseObject(useInfo.getLongitudeLatitude()));
                     useInfoMap.put("USE_LONGITUDE_LATITUDE", JSON.parseObject(useInfo.getLongitudeLatitude()));
                 }
                 if (!ValidationUtil.isEmpty(useInfo.getAddress())) {
                     useInfoMap.put("USE_ADDRESS", useInfo.getAddress());
+                    useInfoMap.put("FULL_ADDRESS", useInfo.getAddress());
                 }
             }
             if (!useInfoMap.isEmpty()) {
@@ -2041,7 +2057,18 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         String dataSource = OPERATESAVE.equals(operateType) ? ("new".equals(equipSource) ? "jg" : "jg_his") : equipmentInfoForm.get("DATA_SOURCE").toString();
         if (isCopy) {
             String sourceRecord = equipmentClassForm.get(RECORD).toString();
-            dataSource = "new".equals(equipSource) ? ("jg_" + sourceRecord) : ("jg_his_" + sourceRecord);
+//            dataSource = "new".equals(equipSource) ? ("jg_" + sourceRecord) : ("jg_his_" + sourceRecord);
+            // bug-21203
+            if (equipmentInfoForm.containsKey("DATA_SOURCE")){
+                String dataSourceCopy = equipmentInfoForm.get("DATA_SOURCE").toString();
+                if (dataSourceCopy.startsWith("jg_his")){
+                    dataSource = "jg_his_" + sourceRecord;
+                }else {
+                    dataSource = "jg_" + sourceRecord;
+                }
+            }else {
+                throw new BadRequest("数据异常,请联系管理员");
+            }
         }
         record = OPERATESAVE.equals(operateType) ? UUID.randomUUID().toString() : equipmentInfoForm.get(RECORD).toString();
 
@@ -2170,17 +2197,18 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         }
         iIdxBizJgOtherInfoService.saveOrUpdateData(otherInfo);
 
-        // 检验检测
-        IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgInspectionDetectionInfo.class);
-        List<Map<String, Object>> inspectionAndTestingInstitutions = commonMapper.getUnitListByType(INSPECTION_AND_TESTING_INSTITUTIONS);
-        Optional<Map<String, Object>> optional = inspectionAndTestingInstitutions.stream().filter(x -> x.get("useCode").equals(inspectionDetectionInfo.getInspectOrgCode())).findFirst();
-        Map<String, Object> mapOrDefault = optional.orElse(Collections.emptyMap());
-        inspectionDetectionInfo.setInspectOrgName((String) mapOrDefault.getOrDefault("useUnit", inspectionDetectionInfo.getInspectOrgName()));
-        inspectionDetectionInfo.setRecord(record);
-        inspectionDetectionInfo.setRecDate(date);
-        inspectionDetectionInfo.setInspectConclusion(null);
-        inspectionDetectionInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("INSPECTIONDETECTIONINFO_SEQ")));
-        iIdxBizJgInspectionDetectionInfoService.saveOrUpdateData(inspectionDetectionInfo);
+        if(CylinderTypeEnum.CYLINDER.getCode().equals(equCategory) || "2100".equals(equCategory)){
+            IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = JSON.parseObject(JSON.toJSONString(equipmentInfoForm), IdxBizJgInspectionDetectionInfo.class);
+            List<Map<String, Object>> inspectionAndTestingInstitutions = commonMapper.getUnitListByType(INSPECTION_AND_TESTING_INSTITUTIONS);
+            Optional<Map<String, Object>> optional = inspectionAndTestingInstitutions.stream().filter(x -> x.get("useCode").equals(inspectionDetectionInfo.getInspectOrgCode())).findFirst();
+            Map<String, Object> mapOrDefault = optional.orElse(Collections.emptyMap());
+            inspectionDetectionInfo.setInspectOrgName((String) mapOrDefault.getOrDefault("useUnit", inspectionDetectionInfo.getInspectOrgName()));
+            inspectionDetectionInfo.setRecord(record);
+            inspectionDetectionInfo.setRecDate(date);
+            inspectionDetectionInfo.setInspectConclusion(null);
+            inspectionDetectionInfo.setSequenceNbr(OPERATESAVE.equals(operateType) ? null : String.valueOf(equipmentInfoForm.get("INSPECTIONDETECTIONINFO_SEQ")));
+            iIdxBizJgInspectionDetectionInfoService.saveOrUpdateData(inspectionDetectionInfo);
+        }
 
         // 八大类技术参数和主要零部件和安全附件表
         List<IdxBizJgMainParts> mainPartsList = new ArrayList<>();

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationReformEqMapper;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgChangeRegistrationReformMapper;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RBucket;
+import org.redisson.api.RedissonClient;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * @author Administrator
+ */
+@Component
+@Slf4j
+public class JgChangeRegistrationEquipUsedCheckImpl extends BaseEquipUsedCheckService {
+
+    private RedissonClient redissonClient;
+
+    private String bizType = "changeRegistration";
+
+    private JgChangeRegistrationReformMapper mapper;
+
+    public JgChangeRegistrationEquipUsedCheckImpl(RedissonClient redissonClient, JgChangeRegistrationReformMapper mapper) {
+        this.redissonClient = redissonClient;
+        this.mapper = mapper;
+    }
+
+
+    @Override
+    public RedissonClient getRedisClient() {
+        return redissonClient;
+    }
+
+    @Override
+    public String getApplyBizType() {
+        return bizType;
+    }
+
+
+    @Override
+    public void init() {
+        // 初始化已经完成或者在流程中使用登记的设备数据
+        List<CompanyEquipCountDto> companyEquipCountDtos = mapper.queryForFlowingEquipList();
+        companyEquipCountDtos.forEach(c -> {
+            RBucket<Set<String>> rBucket = redissonClient.getBucket(this.getFlowingEquipRedisKey(c.getCompanyCode(), bizType));
+            rBucket.set(Arrays.stream(c.getRecords().split(",")).collect(Collectors.toSet()));
+        });
+    }
+
+}

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

@@ -18,6 +18,9 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.*;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationReformService;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgChangeRegistrationTransferService;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
+import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
+import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
+import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.*;
 import com.yeejoin.amos.boot.module.ymt.api.entity.*;
@@ -27,7 +30,6 @@ import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgRegisterInfoMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgTechParamsElevatorMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper;
-import com.yeejoin.amos.boot.module.ymt.api.service.ITzsJgRegistrationInfoService;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
@@ -52,9 +54,9 @@ import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistrationServiceImpl.getAuditPassedDate;
+import static java.util.stream.Collectors.toList;
 
 /**
  * 改造变更登记服务实现类
@@ -65,7 +67,10 @@ import static com.yeejoin.amos.boot.module.jg.biz.service.impl.JgUseRegistration
 @Service
 public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeRegistrationReformDto, JgChangeRegistrationReform, JgChangeRegistrationReformMapper> implements IJgChangeRegistrationReformService {
 
-    private final static String bussinessType = "改造登记";
+    private final List<String> NOT_FLOWING_STATE = Arrays.asList("使用单位待提交", "一级受理已驳回", "使用单位已撤回", "已作废", "已完成");
+
+    private final static String BUSINESS_TYPE = "改造登记";
+    private final static String BUSINESS_TYPE_KEY = "changeRegistration";
     @Autowired
     TzsServiceFeignClient tzsServiceFeignClient;
     @Autowired
@@ -145,156 +150,182 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
      * @param roleIds 当前登陆人的角色id值
      * @return
      */
-    public Page<Map<String, Object>> getList(JgChangeRegistrationReformDto dto,String sort, Page<Map<String, Object>> page, List<String> roleIds) {
+    public Page<Map<String, Object>> getList(JgChangeRegistrationReformDto dto, String sort, Page<Map<String, Object>> page, List<String> roleIds) {
         SortVo sortMap = commonServiceImpl.sortFieldConversion(sort);
-        Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page,sortMap, dto, roleIds, RequestContext.getExeUserId());
+        Page<Map<String, Object>> listPage = this.baseMapper.getListPage(page, sortMap, dto, roleIds, RequestContext.getExeUserId());
         return listPage;
     }
 
-    @Transactional(rollbackFor = Exception.class)
-    @GlobalTransactional(rollbackFor = Exception.class)
-    public List<Map<String, Object>> save(JSONObject map) {
-        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        UseInfo useInfo = new UseInfo();
-        String equipId = map.get("record").toString();
-        LambdaQueryWrapper<UseInfo> lambda = new QueryWrapper<UseInfo>().lambda();
-        lambda.eq(UseInfo::getRecord, equipId);
-        // 使用登记信息
-        JgChangeRegistrationReform jgChangeRegistrationReform = new JgChangeRegistrationReform();
-        LambdaQueryWrapper<OtherInfo> otherLambda = new QueryWrapper<OtherInfo>().lambda();
-        otherLambda.eq(OtherInfo::getRecord, equipId);
-        OtherInfo otherInfo = otherInfoMapper.selectOne(otherLambda);
-        String supervisoryCode = otherInfo.getSupervisoryCode();
-        jgChangeRegistrationReform.setSupervisoryCode(supervisoryCode);
-        jgChangeRegistrationReform.setUseUnitName(ObjectUtils.isEmpty(useInfo.getUseUnitName()) ? reginParams.getCompany().getCompanyName() : useInfo.getUseUnitName());
-        jgChangeRegistrationReform.setUseUnitCreditCode(ObjectUtils.isEmpty(useInfo.getUseUnitCreditCode()) ? reginParams.getCompany().getCompanyCode() : useInfo.getUseUnitCreditCode());
-        if(!ObjectUtils.isEmpty(map.get("otherAccessories"))){
-            jgChangeRegistrationReform.setOtherAccessories(JSONObject.toJSONString(map.get("otherAccessories")));
-        }
+    private void rollBackForDelRedisData() {
+        FlowingEquipRedisContext.getContext().forEach(e -> EquipUsedCheckStrategyContext.getUsedStrategy(BUSINESS_TYPE_KEY).delDataForCheckWithKey(e.getData(), e.getRedisKey()));
+    }
 
-        if (!ObjectUtils.isEmpty(map.get("transformationQualityCertificate"))) {
-            jgChangeRegistrationReform.setTransformationQualityCertificate(JSONObject.toJSONString(map.get("transformationQualityCertificate")));
-        }
-        if (!ObjectUtils.isEmpty(map.get("renovationSupervisioninspectionCertificate"))) {
-            jgChangeRegistrationReform.setRenovationSupervisioninspectionCertificate(JSONObject.toJSONString(map.get("renovationSupervisioninspectionCertificate")));
-        }
-        // 使用单位提交
-        jgChangeRegistrationReform.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
-        if (!ObjectUtils.isEmpty(map.get("inspectUnitCreditCode"))) {
-            jgChangeRegistrationReform.setInspectUnitCreditCode(map.get("inspectUnitCreditCode").toString());
-        } else {
-            jgChangeRegistrationReform.setInspectUnitCreditCode(reginParams.getCompany().getCompanyCode());
+    private void checkForRepeatUsedEquip(JSONObject map, String equId, ReginParams reginParams) {
+        if (!ObjectUtils.isEmpty(map.get("submit"))) {
+            EquipUsedCheckStrategyContext.getUsedStrategy(BUSINESS_TYPE_KEY)
+                    .equipRepeatUsedCheck(equId, reginParams.getCompany().getCompanyCode());
         }
-        if (!ObjectUtils.isEmpty(map.get("inspectOrgName"))) {
-            jgChangeRegistrationReform.setInspectUnitName(map.get("inspectOrgName").toString());
-        } else {
-            jgChangeRegistrationReform.setInspectUnitName(reginParams.getCompany().getCompanyName());
+    }
+
+    private void clearDataForCheckEquipRepeatUsed(JgChangeRegistrationReform data) {
+        // 新查询原因 useRegistration 数据状态是旧的
+        JgChangeRegistrationReform dbData = this.getById(data.getSequenceNbr());
+        LambdaQueryWrapper<JgChangeRegistrationReformEq> lambda = new QueryWrapper<JgChangeRegistrationReformEq>().lambda();
+        lambda.eq(JgChangeRegistrationReformEq::getEquipTransferId, data.getSequenceNbr());
+        lambda.select(JgChangeRegistrationReformEq::getEquId);
+        List<JgChangeRegistrationReformEq> eqList = jgChangeRegistrationReformEqMapper.selectList(lambda);
+        // 在使用单位待提交、一级受理已驳回、使用单位已撤回后清除关联的设备，保证可以再次新提单子选择相同的设备进行提交及原有单子的提交校验数据准备
+        if (NOT_FLOWING_STATE.contains(dbData.getStatus())) {
+            List<String> records = eqList.stream().map(JgChangeRegistrationReformEq::getEquId).collect(toList());
+            EquipUsedCheckStrategyContext.getUsedStrategy(BUSINESS_TYPE_KEY)
+                    .delDataForCheckEquipRepeatUsed(records, data.getUseUnitCreditCode());
         }
-        if (map.containsKey("receiveCompanyCode")) {
-            String receiveCompanyCode = String.valueOf(map.getString("receiveCompanyCode"));
-//            jgChangeRegistrationReform.setReceiveCompanyCode(receiveCompanyCode);
-            String[] receiveCompany = receiveCompanyCode.split("_");
-            if (!ValidationUtil.isEmpty(receiveCompany)) {
-                jgChangeRegistrationReform.setReceiveCompanyCode(receiveCompanyCode.split("_")[0]);
-                jgChangeRegistrationReform.setReceiveOrgCode(receiveCompanyCode.split("_")[0]);
-                if (receiveCompany.length > 1) {
-                    jgChangeRegistrationReform.setReceiveOrgName(receiveCompanyCode.split("_")[1]);
-                } else {
-                    jgChangeRegistrationReform.setReceiveOrgName(String.valueOf(map.get("receiveOrgName")));
-                }
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @GlobalTransactional(rollbackFor = Exception.class)
+    public List<Map<String, Object>> save(JSONObject map) {
+        try {
+            ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+            UseInfo useInfo = new UseInfo();
+            String equipId = map.get("record").toString();
+            LambdaQueryWrapper<UseInfo> lambda = new QueryWrapper<UseInfo>().lambda();
+            lambda.eq(UseInfo::getRecord, equipId);
+            // 提交时进行校验设备是否在流程中使用（并发及同时打开多个相同的页面时才会出现此种情况）
+            this.checkForRepeatUsedEquip(map, equipId, reginParams);
+            // 使用登记信息
+            JgChangeRegistrationReform jgChangeRegistrationReform = new JgChangeRegistrationReform();
+            LambdaQueryWrapper<OtherInfo> otherLambda = new QueryWrapper<OtherInfo>().lambda();
+            otherLambda.eq(OtherInfo::getRecord, equipId);
+            OtherInfo otherInfo = otherInfoMapper.selectOne(otherLambda);
+            String supervisoryCode = otherInfo.getSupervisoryCode();
+            jgChangeRegistrationReform.setSupervisoryCode(supervisoryCode);
+            jgChangeRegistrationReform.setUseUnitName(ObjectUtils.isEmpty(useInfo.getUseUnitName()) ? reginParams.getCompany().getCompanyName() : useInfo.getUseUnitName());
+            jgChangeRegistrationReform.setUseUnitCreditCode(ObjectUtils.isEmpty(useInfo.getUseUnitCreditCode()) ? reginParams.getCompany().getCompanyCode() : useInfo.getUseUnitCreditCode());
+            if (!ObjectUtils.isEmpty(map.get("otherAccessories"))) {
+                jgChangeRegistrationReform.setOtherAccessories(JSONObject.toJSONString(map.get("otherAccessories")));
             }
 
-        } else {
-            jgChangeRegistrationReform.setReceiveCompanyCode("610000");
-        }
-        // 统计用
-        CompanyBo companyBo = commonServiceImpl.getOneCompany(jgChangeRegistrationReform.getReceiveCompanyCode());
-        jgChangeRegistrationReform.setReceiveCompanyOrgCode(companyBo.getOrgCode());
-        JgRegistrationHistory jgRegistrationHistory = new JgRegistrationHistory();
-        //使用登记编号
-        jgRegistrationHistory.setUseRegistrationCode(idxBizJgRegisterInfoMapper.getUseOrgCodeByEquip(equipId));
-        //登记类别
-        jgRegistrationHistory.setRegistrationClass(bussinessType);
-        //设备id
-        jgRegistrationHistory.setEquId(equipId);
-        //修改数据
-        jgRegistrationHistory.setChangeData(JSONObject.toJSONString(map));
-        //保存历史数据
-//        IdxBizJgTechParamsElevator idxBizJgTechParamsElevator = idxBizJgTechParamsElevatorMapper.selectOne(new QueryWrapper<IdxBizJgTechParamsElevator>().eq("RECORD", equipId));
-//        jgRegistrationHistory.setOldData(JSONObject.toJSONString(idxBizJgTechParamsElevator));
-        //设备监管码
-        jgRegistrationHistory.setSupervisoryCode(supervisoryCode);
-        //数据状态
-        jgChangeRegistrationReform.setUseRegistrationCode(jgRegistrationHistory.getUseRegistrationCode());
-        String equipListName = Optional.ofNullable(map.get("equListDesc")).orElse("无").toString();
-        jgChangeRegistrationReform.setEquipListName(equipListName);
-        jgChangeRegistrationReform.setCreateUserId(reginParams.getUserModel().getUserId());
-        jgChangeRegistrationReform.setCreateUserName(reginParams.getUserModel().getRealName());
-        jgChangeRegistrationReform.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
-        jgRegistrationHistory.setStatus("new");
-        if (map.containsKey("type") && "edit".equals(String.valueOf(map.get("type")))) {
-            jgChangeRegistrationReform.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
-            this.getBaseMapper().updateById(jgChangeRegistrationReform);
-            jgChangeRegistrationReform = this.getBaseMapper().selectById(jgChangeRegistrationReform.getSequenceNbr());
-            JgChangeRegistrationReformEq jgChangeRegistrationReformEq = jgChangeRegistrationReformEqMapper.selectOne(new QueryWrapper<JgChangeRegistrationReformEq>().eq("equip_transfer_id", jgChangeRegistrationReform.getSequenceNbr()));
-            jgChangeRegistrationReformEq.setEquId(equipId);
-            jgChangeRegistrationReformEqMapper.updateById(jgChangeRegistrationReformEq);
-            jgRegistrationHistory.setSequenceNbr(jgRegistrationHistoryMapper.getSequenceNbrByRegistratioClassAndDocumentId(bussinessType, String.valueOf(map.get("applyNo"))));
-            jgRegistrationHistoryMapper.updateById(jgRegistrationHistory);
-        } else {
-            //暂存处理
-            // 业务管理设备信息保存
-            JgChangeRegistrationReformEq jgChangeRegistrationReformEq = new JgChangeRegistrationReformEq();
-            jgChangeRegistrationReformEq.setEquId(equipId);
-            ResponseModel<List<String>> result = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.GZBG.getCode(), 1);
-            if (!result.getResult().isEmpty()) {
-                jgChangeRegistrationReform.setApplyNo(result.getResult().get(0));
+            if (!ObjectUtils.isEmpty(map.get("transformationQualityCertificate"))) {
+                jgChangeRegistrationReform.setTransformationQualityCertificate(JSONObject.toJSONString(map.get("transformationQualityCertificate")));
+            }
+            if (!ObjectUtils.isEmpty(map.get("renovationSupervisioninspectionCertificate"))) {
+                jgChangeRegistrationReform.setRenovationSupervisioninspectionCertificate(JSONObject.toJSONString(map.get("renovationSupervisioninspectionCertificate")));
+            }
+            // 使用单位提交
+            jgChangeRegistrationReform.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
+            if (!ObjectUtils.isEmpty(map.get("inspectUnitCreditCode"))) {
+                jgChangeRegistrationReform.setInspectUnitCreditCode(map.get("inspectUnitCreditCode").toString());
             } else {
-                throw new BadRequest("申请单编号生成失败,请稍后重试!");
+                jgChangeRegistrationReform.setInspectUnitCreditCode(reginParams.getCompany().getCompanyCode());
             }
-            jgChangeRegistrationReform.setRegDate(new Date());
-            jgChangeRegistrationReform.setStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass());
-            jgChangeRegistrationReform.setAuditStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass());
-            this.save(jgChangeRegistrationReform);
-            jgChangeRegistrationReformEq.setEquipTransferId(jgChangeRegistrationReform.getSequenceNbr().toString());
-            jgChangeRegistrationReformEqMapper.insert(jgChangeRegistrationReformEq);
-            //当前单据id
-            jgRegistrationHistory.setCurrentDocumentId(jgChangeRegistrationReform.getApplyNo());
-            jgRegistrationHistoryMapper.insert(jgRegistrationHistory);
-            //暂存时生成待办数据
-            List<TaskModelDto> taskModelDtoList = Arrays.asList(getTaskModelDtoList(jgChangeRegistrationReform, null));
-            commonServiceImpl.buildTaskModel(taskModelDtoList);
-
-        }
+            if (!ObjectUtils.isEmpty(map.get("inspectOrgName"))) {
+                jgChangeRegistrationReform.setInspectUnitName(map.get("inspectOrgName").toString());
+            } else {
+                jgChangeRegistrationReform.setInspectUnitName(reginParams.getCompany().getCompanyName());
+            }
+            if (map.containsKey("receiveCompanyCode")) {
+                String receiveCompanyCode = String.valueOf(map.getString("receiveCompanyCode"));
+                String[] receiveCompany = receiveCompanyCode.split("_");
+                if (!ValidationUtil.isEmpty(receiveCompany)) {
+                    jgChangeRegistrationReform.setReceiveCompanyCode(receiveCompanyCode.split("_")[0]);
+                    jgChangeRegistrationReform.setReceiveOrgCode(receiveCompanyCode.split("_")[0]);
+                    if (receiveCompany.length > 1) {
+                        jgChangeRegistrationReform.setReceiveOrgName(receiveCompanyCode.split("_")[1]);
+                    } else {
+                        jgChangeRegistrationReform.setReceiveOrgName(String.valueOf(map.get("receiveOrgName")));
+                    }
+                }
 
-        if (!ObjectUtils.isEmpty(map.get("submit"))) {
-            String instanceId = "";
-            if (!ObjectUtils.isEmpty(jgChangeRegistrationReform.getSequenceNbr()) && !ObjectUtils.isEmpty(jgChangeRegistrationReform.getInstanceId())) {
-                // 如果是旧流程则执行一步
-                flowExecute(jgChangeRegistrationReform.getSequenceNbr(), jgChangeRegistrationReform.getInstanceId(), "0", "", jgChangeRegistrationReform.getNextTaskId());
-//                updateExecuteIds(instanceId, jgChangeRegistrationReform.getSequenceNbr(), "0");
             } else {
-                // 如果是新启动的流程开启自动访问
-                jgChangeRegistrationReform.setAuditStatus(WorkFlowStatusEnum.CHANGE_RECEIVE.getPass());
-                jgChangeRegistrationReform.setStatus(WorkFlowStatusEnum.CHANGE_RECEIVE.getPass());
-                ProcessTaskDTO processTaskDTO = startByVariable(jgChangeRegistrationReform);
-                updateExecuteIds(instanceId, jgChangeRegistrationReform, "startWorkfow", processTaskDTO);
-                List<TaskModelDto> taskModelDtoList = Arrays.asList(getTaskModelDtoList(jgChangeRegistrationReform, processTaskDTO));
-                //启动之前删除暂存生成的待办
-                commonServiceImpl.deleteTasksByRelationId(String.valueOf(jgChangeRegistrationReform.getSequenceNbr()));
-                //重新生成新的待办数据
+                jgChangeRegistrationReform.setReceiveCompanyCode("610000");
+            }
+            // 统计用
+            CompanyBo companyBo = commonServiceImpl.getOneCompany(jgChangeRegistrationReform.getReceiveCompanyCode());
+            jgChangeRegistrationReform.setReceiveCompanyOrgCode(companyBo.getOrgCode());
+            JgRegistrationHistory jgRegistrationHistory = new JgRegistrationHistory();
+            //使用登记编号
+            jgRegistrationHistory.setUseRegistrationCode(idxBizJgRegisterInfoMapper.getUseOrgCodeByEquip(equipId));
+            //登记类别
+            jgRegistrationHistory.setRegistrationClass(BUSINESS_TYPE);
+            //设备id
+            jgRegistrationHistory.setEquId(equipId);
+            //修改数据
+            jgRegistrationHistory.setChangeData(JSONObject.toJSONString(map));
+            //设备监管码
+            jgRegistrationHistory.setSupervisoryCode(supervisoryCode);
+            //数据状态
+            jgChangeRegistrationReform.setUseRegistrationCode(jgRegistrationHistory.getUseRegistrationCode());
+            String equipListName = Optional.ofNullable(map.get("equListDesc")).orElse("无").toString();
+            jgChangeRegistrationReform.setEquipListName(equipListName);
+            jgChangeRegistrationReform.setCreateUserId(reginParams.getUserModel().getUserId());
+            jgChangeRegistrationReform.setCreateUserName(reginParams.getUserModel().getRealName());
+            jgChangeRegistrationReform.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
+            jgRegistrationHistory.setStatus("new");
+            if (map.containsKey("type") && "edit".equals(String.valueOf(map.get("type")))) {
+                jgChangeRegistrationReform.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
+                this.getBaseMapper().updateById(jgChangeRegistrationReform);
+                jgChangeRegistrationReform = this.getBaseMapper().selectById(jgChangeRegistrationReform.getSequenceNbr());
+                JgChangeRegistrationReformEq jgChangeRegistrationReformEq = jgChangeRegistrationReformEqMapper.selectOne(new QueryWrapper<JgChangeRegistrationReformEq>().eq("equip_transfer_id", jgChangeRegistrationReform.getSequenceNbr()));
+                jgChangeRegistrationReformEq.setEquId(equipId);
+                jgChangeRegistrationReformEqMapper.updateById(jgChangeRegistrationReformEq);
+                jgRegistrationHistory.setSequenceNbr(jgRegistrationHistoryMapper.getSequenceNbrByRegistratioClassAndDocumentId(BUSINESS_TYPE, String.valueOf(map.get("applyNo"))));
+                jgRegistrationHistoryMapper.updateById(jgRegistrationHistory);
+            } else {
+                //暂存处理
+                // 业务管理设备信息保存
+                JgChangeRegistrationReformEq jgChangeRegistrationReformEq = new JgChangeRegistrationReformEq();
+                jgChangeRegistrationReformEq.setEquId(equipId);
+                ResponseModel<List<String>> result = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.GZBG.getCode(), 1);
+                if (!result.getResult().isEmpty()) {
+                    jgChangeRegistrationReform.setApplyNo(result.getResult().get(0));
+                } else {
+                    throw new BadRequest("申请单编号生成失败,请稍后重试!");
+                }
+                jgChangeRegistrationReform.setRegDate(new Date());
+                jgChangeRegistrationReform.setStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass());
+                jgChangeRegistrationReform.setAuditStatus(WorkFlowStatusEnum.CHANGE_SUBMIT.getPass());
+                this.save(jgChangeRegistrationReform);
+                jgChangeRegistrationReformEq.setEquipTransferId(jgChangeRegistrationReform.getSequenceNbr().toString());
+                jgChangeRegistrationReformEqMapper.insert(jgChangeRegistrationReformEq);
+                //当前单据id
+                jgRegistrationHistory.setCurrentDocumentId(jgChangeRegistrationReform.getApplyNo());
+                jgRegistrationHistoryMapper.insert(jgRegistrationHistory);
+                //暂存时生成待办数据
+                List<TaskModelDto> taskModelDtoList = Arrays.asList(getTaskModelDtoList(jgChangeRegistrationReform, null));
                 commonServiceImpl.buildTaskModel(taskModelDtoList);
             }
-
-
-//            if (!ObjectUtils.isEmpty(instanceId)) {
-//                // 执行流程
-//                flowExecute(jgChangeRegistrationReform.getSequenceNbr(), instanceId, "0", "");
-//                updateExecuteIds(instanceId, jgChangeRegistrationReform.getSequenceNbr(), "0");
-//            }
+            if (!ObjectUtils.isEmpty(map.get("submit"))) {
+                String instanceId = "";
+                if (!ObjectUtils.isEmpty(jgChangeRegistrationReform.getSequenceNbr()) && !ObjectUtils.isEmpty(jgChangeRegistrationReform.getInstanceId())) {
+                    // 如果是旧流程则执行一步
+                    flowExecute(jgChangeRegistrationReform.getSequenceNbr(), jgChangeRegistrationReform.getInstanceId(), "0", "", jgChangeRegistrationReform.getNextTaskId());
+                } else {
+                    // 如果是新启动的流程开启自动访问
+                    jgChangeRegistrationReform.setAuditStatus(WorkFlowStatusEnum.CHANGE_RECEIVE.getPass());
+                    jgChangeRegistrationReform.setStatus(WorkFlowStatusEnum.CHANGE_RECEIVE.getPass());
+                    ProcessTaskDTO processTaskDTO = startByVariable(jgChangeRegistrationReform);
+                    updateExecuteIds(instanceId, jgChangeRegistrationReform, "startWorkfow", processTaskDTO);
+                    List<TaskModelDto> taskModelDtoList = Arrays.asList(getTaskModelDtoList(jgChangeRegistrationReform, processTaskDTO));
+                    //启动之前删除暂存生成的待办
+                    commonServiceImpl.deleteTasksByRelationId(String.valueOf(jgChangeRegistrationReform.getSequenceNbr()));
+                    //重新生成新的待办数据
+                    commonServiceImpl.buildTaskModel(taskModelDtoList);
+                }
+            }
+            return this.getBaseMapper().getDetailById(jgChangeRegistrationReform.getSequenceNbr());
+        } catch (BadRequest |
+                 LocalBadRequest e) {
+            log.error(e.getMessage(), e);
+            this.rollBackForDelRedisData();
+            throw e;
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            this.rollBackForDelRedisData();
+            throw new BadRequest("使用登记保存失败！");
+        } finally {
+            FlowingEquipRedisContext.clean();
         }
-
-        return this.getBaseMapper().getDetailById(jgChangeRegistrationReform.getSequenceNbr());
     }
 
     public ProcessTaskDTO startByVariable(JgChangeRegistrationReform jgChangeRegistrationReform) {
@@ -386,9 +417,6 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             jgChangeRegistrationReform.setAuditStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
             jgChangeRegistrationReform.setStatus(FlowStatusEnum.TO_BE_FINISHED.getName());
             JgChangeRegistrationReformEq jgChangeRegistrationReformEq = jgChangeRegistrationReformEqMapper.selectOne(new QueryWrapper<JgChangeRegistrationReformEq>().eq("equip_transfer_id", jgChangeRegistrationReform.getSequenceNbr()));
-//            String newUseRegistrationCertificateNumber = getCode(jgChangeRegistrationReform.getSupervisoryCode());
-//            String newUseRegistrationCertificateNumber = commonServiceImpl.generateRegistrationCode(jgChangeRegistrationReformEq.getEquId(), jgChangeRegistrationReform.getSupervisoryCode(), jgChangeRegistrationReform.getReceiveCompanyCode());
-//            jgChangeRegistrationReform.setUseRegistrationCode(newUseRegistrationCertificateNumber);
             updateTechparamsByEquIdAndCurrentDoucumentId(jgChangeRegistrationReformEq.getEquId(), jgChangeRegistrationReform.getSequenceNbr().toString(), null, jgChangeRegistrationReform.getApplyNo());
             HashMap<String, Object> map = new HashMap<>();
             map.put("taskStatus", FlowStatusEnum.TO_BE_FINISHED.getCode());
@@ -408,12 +436,12 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         this.getBaseMapper().updateById(jgChangeRegistrationReform);
     }
 
-    public void saveRecord(String equipId, JgChangeRegistrationReform jgChangeRegistrationReform, TaskV2Model taskV2Model){
+    public void saveRecord(String equipId, JgChangeRegistrationReform jgChangeRegistrationReform, TaskV2Model taskV2Model) {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>()
                 .eq("equ_id", equipId)
                 .eq("current_document_id", jgChangeRegistrationReform.getApplyNo())
-                .eq("registration_class", bussinessType));
+                .eq("registration_class", BUSINESS_TYPE));
 
         JSONObject object = JSONObject.parseObject(jgRegistrationHistory.getChangeData());
         // 更新使用登记证信息
@@ -425,10 +453,10 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         jgCertificateChangeRecord.setApplyNo(jgChangeRegistrationReform.getApplyNo());
         jgCertificateChangeRecord.setReceiveOrgName(jgChangeRegistrationReform.getReceiveOrgName());
         jgCertificateChangeRecord.setAuditPassDate(new Date());
-        jgCertificateChangeRecord.setRegType(bussinessType);
+        jgCertificateChangeRecord.setRegType(BUSINESS_TYPE);
         jgCertificateChangeRecord.setRegDate(jgChangeRegistrationReform.getCreateDate());
-        jgCertificateChangeRecord.setChangeContent(jgChangeRegistrationReform.getCreateUserName() + "办理了【" + bussinessType + "】," + "单号【" + jgChangeRegistrationReform.getApplyNo() +
-                "】"  + ",办理日期" + sdf.format(jgChangeRegistrationReform.getAuditPassDate()));
+        jgCertificateChangeRecord.setChangeContent(jgChangeRegistrationReform.getCreateUserName() + "办理了【" + BUSINESS_TYPE + "】," + "单号【" + jgChangeRegistrationReform.getApplyNo() +
+                "】" + ",办理日期" + sdf.format(jgChangeRegistrationReform.getAuditPassDate()));
         jgCertificateChangeRecord.setRecUserId(jgChangeRegistrationReform.getRecUserId());
         jgCertificateChangeRecord.setRecDate(new Date());
         jgCertificateChangeRecord.setCreateDate(new Date());
@@ -471,7 +499,6 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             }
             // 流程执行时，状态及权限校验
             commonServiceImpl.checkForExecuteFlow(nextTaskId, instanceId);
-
             ProcessTaskDTO processTaskDTO;
             JgChangeRegistrationReform jgChangeRegistrationReform = this.getBaseMapper().selectById(id);
             String taskId = jgChangeRegistrationReform.getNextTaskId();
@@ -492,6 +519,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             processTaskDTO = iCmWorkflowService.completeOrReject(taskId, dto, operate);
             // 更新下一步执行人
             updateExecuteIds(instanceId, jgChangeRegistrationReform, operate, processTaskDTO);
+            this.clearDataForCheckEquipRepeatUsed(jgChangeRegistrationReform);
         } catch (InterruptedException e) {
             e.printStackTrace();
         } finally {
@@ -515,7 +543,6 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             }
             // 流程执行时，状态及权限校验
             commonServiceImpl.checkForRevocationFlow(nextTaskId, instanceId);
-
             ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
             JgChangeRegistrationReform jgChangeRegistrationReform = this.getBaseMapper().selectOne(new QueryWrapper<JgChangeRegistrationReform>().eq("instance_id", instanceId));
             ProcessTaskDTO processTaskDTO = iCmWorkflowService.rollBack(instanceId);
@@ -544,13 +571,13 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             }
             jsonObject.put("model", conveterTaskMessageDTO(jgChangeRegistrationReform));
             commonServiceImpl.rollbackTask(instanceId, jsonObject);
-
             // redis流程实时数据更新
             commonServiceImpl.saveExecuteFlowData2Redis(instanceId, this.buildInstanceRuntimeData(jgChangeRegistrationReform));
+            this.clearDataForCheckEquipRepeatUsed(jgChangeRegistrationReform);
         } catch (InterruptedException e) {
             e.printStackTrace();
         } finally {
-            if(lock.isHeldByCurrentThread()){
+            if (lock.isHeldByCurrentThread()) {
                 lock.unlock();
             }
         }
@@ -563,7 +590,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         ids.forEach(id -> {
             JgChangeRegistrationReform registrationReform = this.baseMapper.selectById(id);
             // 删除代办 + 流程流程
-            commonServiceImpl.deleteTaskModel(String.valueOf(id),registrationReform.getInstanceId());
+            commonServiceImpl.deleteTaskModel(String.valueOf(id), registrationReform.getInstanceId());
             // 删除单子
             this.baseMapper.deleteById(id);
             // 删除单子对应eq
@@ -586,13 +613,13 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         Map<String, Object> originalDataOther = new HashMap<>();
 
 //        if (!("已完成".equals(jgChangeRegistrationReform.getStatus()) || !"流程结束".equals(jgChangeRegistrationReform.getStatus()))) {
-            // 完成时显示历史数据
-            JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>()
-                    .eq("equ_id", equipId)
-                    .eq("current_document_id", jgChangeRegistrationReform.getApplyNo())
-                    .eq("registration_class", bussinessType));
-            originalData = JSONObject.parseObject(jgRegistrationHistory.getChangeData(), Map.class);
-            detail.putAll(originalData);
+        // 完成时显示历史数据
+        JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>()
+                .eq("equ_id", equipId)
+                .eq("current_document_id", jgChangeRegistrationReform.getApplyNo())
+                .eq("registration_class", BUSINESS_TYPE));
+        originalData = JSONObject.parseObject(jgRegistrationHistory.getChangeData(), Map.class);
+        detail.putAll(originalData);
 //        } else {
 //            // 完成显示最新数据
 //            originalData = idxBizJgRegisterInfoService.getDetailByRecord(equipId);
@@ -644,7 +671,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         JgRegistrationHistory jgRegistrationHistory = jgRegistrationHistoryMapper.selectOne(new QueryWrapper<JgRegistrationHistory>()
                 .eq("equ_id", equipId)
                 .eq("current_document_id", applyNo)
-                .eq("registration_class", bussinessType));
+                .eq("registration_class", BUSINESS_TYPE));
 
         if (!ObjectUtils.isEmpty(jgRegistrationHistory)) {
             //当前数据
@@ -659,7 +686,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
 
                 IdxBizJgTechParamsElevator elevator = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsElevator.class);
                 if (!ValidationUtil.isEmpty(elevator)) {
-                    if (!ObjectUtils.isEmpty(techInfo.get("ELEVATOR_SEQ"))){
+                    if (!ObjectUtils.isEmpty(techInfo.get("ELEVATOR_SEQ"))) {
                         elevator.setSequenceNbr(String.valueOf(techInfo.get("ELEVATOR_SEQ")));
                     }
                     iIdxBizJgTechParamsElevatorService.saveOrUpdateData(elevator);
@@ -669,7 +696,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             else if (EquipmentClassifityEnum.CC.getCode().equals(equList)) {
                 IdxBizJgTechParamsVehicle vehicle = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsVehicle.class);
                 if (!ValidationUtil.isEmpty(vehicle)) {
-                    if (!ObjectUtils.isEmpty(techInfo.get("VEHICLE_SEQ"))){
+                    if (!ObjectUtils.isEmpty(techInfo.get("VEHICLE_SEQ"))) {
                         vehicle.setSequenceNbr(String.valueOf(techInfo.get("VEHICLE_SEQ")));
                     }
                     iIdxBizJgTechParamsVehicleService.saveOrUpdateData(vehicle);
@@ -686,7 +713,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             else if (EquipmentClassifityEnum.KYSD.getCode().equals(equList)) {
                 IdxBizJgTechParamsRopeway ropeway = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsRopeway.class);
                 if (!ValidationUtil.isEmpty(ropeway)) {
-                    if (!ObjectUtils.isEmpty(techInfo.get("ROPEWAY_SEQ"))){
+                    if (!ObjectUtils.isEmpty(techInfo.get("ROPEWAY_SEQ"))) {
                         ropeway.setSequenceNbr(String.valueOf(techInfo.get("ROPEWAY_SEQ")));
                     }
                     ropeway.setSequenceNbr(String.valueOf(techInfo.get("ROPEWAY_SEQ")));
@@ -703,7 +730,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             else if (EquipmentClassifityEnum.YLSS.getCode().equals(equList)) {
                 IdxBizJgTechParamsRides rides = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsRides.class);
                 if (!ValidationUtil.isEmpty(rides)) {
-                    if (!ObjectUtils.isEmpty(techInfo.get("RIDES_SEQ"))){
+                    if (!ObjectUtils.isEmpty(techInfo.get("RIDES_SEQ"))) {
                         rides.setSequenceNbr(String.valueOf(techInfo.get("RIDES_SEQ")));
                     }
                     iIdxBizJgTechParamsRidesService.saveOrUpdateData(rides);
@@ -713,7 +740,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             else if (EquipmentClassifityEnum.GL.getCode().equals(equList)) {
                 IdxBizJgTechParamsBoiler boiler = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsBoiler.class);
                 if (!ValidationUtil.isEmpty(boiler)) {
-                    if (!ObjectUtils.isEmpty(techInfo.get("BOILER_SEQ"))){
+                    if (!ObjectUtils.isEmpty(techInfo.get("BOILER_SEQ"))) {
                         boiler.setSequenceNbr(String.valueOf(techInfo.get("BOILER_SEQ")));
                     }
                     iIdxBizJgTechParamsBoilerService.saveOrUpdateData(boiler);
@@ -728,7 +755,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             else if (EquipmentClassifityEnum.YLRQ.getCode().equals(equList)) {
                 IdxBizJgTechParamsVessel vessel = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsVessel.class);
                 if (!ValidationUtil.isEmpty(vessel)) {
-                    if (!ObjectUtils.isEmpty(techInfo.get("VESSEL_SEQ"))){
+                    if (!ObjectUtils.isEmpty(techInfo.get("VESSEL_SEQ"))) {
                         vessel.setSequenceNbr(String.valueOf(techInfo.get("VESSEL_SEQ")));
                     }
                     iIdxBizJgTechParamsVesselService.saveOrUpdateData(vessel);
@@ -749,7 +776,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             else if (EquipmentClassifityEnum.YLGD.getCode().equals(equList)) {
                 IdxBizJgTechParamsPipeline pipeline = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsPipeline.class);
                 if (!ValidationUtil.isEmpty(pipeline)) {
-                    if (!ObjectUtils.isEmpty(techInfo.get("PIPELINE_SEQ"))){
+                    if (!ObjectUtils.isEmpty(techInfo.get("PIPELINE_SEQ"))) {
                         pipeline.setSequenceNbr(String.valueOf(techInfo.get("PIPELINE_SEQ")));
                     }
                     iIdxBizJgTechParamsPipelineService.saveOrUpdateData(pipeline);
@@ -765,7 +792,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             else if (EquipmentClassifityEnum.QZJX.getCode().equals(equList)) {
                 IdxBizJgTechParamsLifting lifting = JSON.parseObject(JSON.toJSONString(techInfo), IdxBizJgTechParamsLifting.class);
                 if (!ValidationUtil.isEmpty(lifting)) {
-                    if (!ObjectUtils.isEmpty(techInfo.get("LIFTING_SEQ"))){
+                    if (!ObjectUtils.isEmpty(techInfo.get("LIFTING_SEQ"))) {
                         lifting.setSequenceNbr(String.valueOf(techInfo.get("LIFTING_SEQ")));
                     }
                     iIdxBizJgTechParamsLiftingService.saveOrUpdateData(lifting);
@@ -797,7 +824,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
             jgRegistrationHistory.setChangeData(newData);
             jgRegistrationHistory.setStatus("history");
             jgRegistrationHistoryMapper.updateById(jgRegistrationHistory);
- //         makeEquipmentsInvalid(equipId, currentDocumentId);
+            //         makeEquipmentsInvalid(equipId, currentDocumentId);
             //更新使用注册登记证编号
             // 改造变更登记使用登记证不变
             //idxBizJgRegisterInfoMapper.updateUseOrgCodeByEquip(equipId, newUseRegistrationCertificateNumber);
@@ -958,7 +985,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         if ("0".equals(printType)) {
             //调用生成使用登记证
             commonServiceImpl.generateCertificateReport(exportParamsMap, response);
-        }else{
+        } else {
             //套打
             commonServiceImpl.generatePdfPrint(exportParamsMap, response);
         }
@@ -970,7 +997,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
      */
     public String getSummaryInfo(JgChangeRegistrationReform jgChangeRegistrationReform) {
         String result = "发起【%s】的业务申请，【申请单号：%s】";
-        return String.format(result, bussinessType, jgChangeRegistrationReform.getApplyNo());
+        return String.format(result, BUSINESS_TYPE, jgChangeRegistrationReform.getApplyNo());
     }
 
     /**
@@ -1101,10 +1128,10 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
         return jgChangeRegistrationReform.getReceiveCompanyCode();
     }
 
-    public Map<String, Object> getEquDetail(String useRegistrationCode){
+    public Map<String, Object> getEquDetail(String useRegistrationCode) {
         IdxBizJgRegisterInfo registerInfo = jgRegisterInfoService.lambdaQuery().eq(IdxBizJgRegisterInfo::getUseOrgCode, useRegistrationCode).one();
         HashMap<String, Object> detail = new HashMap<>();
-        if (!ObjectUtils.isEmpty(registerInfo)){
+        if (!ObjectUtils.isEmpty(registerInfo)) {
             Map<String, Object> originalData = idxBizJgRegisterInfoService.getDetailByRecord(registerInfo.getRecord());
             Map<String, Object> originalDataOther = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(registerInfo.getRecord());
             detail.putAll(originalDataOther);
@@ -1112,11 +1139,11 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
 //            return jgChangeRegistrationTransferService.getDetailFieldCamelCase(registerInfo.getRecord());
 //
         }
-            return detail;
+        return detail;
     }
 
     public Page<JgUseRegistrationManageDto> getUseRegistrationCodeData(Page<JgUseRegistrationManageDto> page,
-                                                                       JgUseRegistrationManageDto dto){
+                                                                       JgUseRegistrationManageDto dto) {
         return jgUseRegistrationManageService.queryForJgUseRegistrationManagePage(page, dto, null);
     }
 }
\ No newline at end of file

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

@@ -29,7 +29,6 @@ import com.yeejoin.amos.boot.module.ymt.api.entity.*;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
-import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.Workflow;
 import com.yeejoin.amos.feign.workflow.model.*;
@@ -68,6 +67,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
     private static final String SUBMIT_TYPE_FLOW = "1";
     private static final String PROCESS_DEFINITION_KEY = "unitChange";
     private static final String TABLE_PAGE_ID = "1734141426742095873";
+    private final List<String> NOT_FLOWING_STATE = Arrays.asList("使用单位待提交", "一级受理已驳回", "使用单位已撤回", "已作废", "已完成");
 
 
     @Autowired
@@ -246,7 +246,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
      * @param noticeDto 单位变更
      */
     @GlobalTransactional(rollbackFor = Exception.class)
-    public JgChangeRegistrationUnitDto updateInstallationNotice(String submitType, JgChangeRegistrationUnitDto noticeDto, String op) {
+    public JgChangeRegistrationUnitDto updateInstallationNotice(String submitType, JgChangeRegistrationUnitDto noticeDto, String op, ReginParams reginParams) {
         if (Objects.isNull(noticeDto) || StringUtils.isEmpty(submitType)) {
             throw new IllegalArgumentException("参数不能为空");
         }
@@ -273,7 +273,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         ArrayList<String> roleListAll = new ArrayList<>();
         ArrayList<String> roleListNext = new ArrayList<>();
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
-            AjaxResult ajaxResult;
             // 发起流程
             if (!StringUtils.hasText(noticeDto.getInstanceId())) {
                 List<ProcessTaskDTO> processTasks = new ArrayList<>();
@@ -295,12 +294,9 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
 
                 JgChangeRegistrationUnit notice = new JgChangeRegistrationUnit();
-                //    JgChangeRegistrationUnit noticeOld = JgChangeRegistrationUnitMapper.selectById(noticeDto.getSequenceNbr());
                 BeanUtils.copyProperties(noticeDto, notice);
-                //         boolean submit = submit(notice, op);
                 notice.setChangeCertificate(noticeDto.getChangeCertificate());
                 notice.setRemark(noticeDto.getRemark());
-                //  notice.setStatus(taskName[0]);
                 if (!ObjectUtils.isEmpty(notice.getInstanceStatus())) {
                     notice.setInstanceStatus(notice.getInstanceStatus() + "," + roleListAll);
                 } else {
@@ -368,7 +364,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             BeanUtils.copyProperties(noticeDto, bean);
             JgChangeRegistrationUnitMapper.updateById(bean);
         }
-//        updateHistorySingle(noticeDto.getSequenceNbr());
         List<JgChangeRegistrationUnitEq> jgRelationEquipList = new ArrayList<>();
         deviceList.forEach(device -> {
             JgChangeRegistrationUnitEq unitEq = new JgChangeRegistrationUnitEq();
@@ -396,14 +391,13 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         registrationHistoryService.getBaseMapper().delete(new LambdaQueryWrapper<JgRegistrationHistory>()
                 .eq(JgRegistrationHistory::getCurrentDocumentId, noticeDto.getApplyNo()));
         registrationHistoryService.save(jgRegistrationHistory);
-        return noticeDto;
-    }
 
-    private void updateHistorySingle(Long seq) {
-        QueryWrapper<JgChangeRegistrationUnitEq> wrapper = new QueryWrapper<>();
-        wrapper.lambda().eq(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId, seq);
-        List<JgChangeRegistrationUnitEq> eqs = jgChangeRegistrationUnitEqMapper.selectList(wrapper);
-        this.updateHistoryAsync(eqs);
+        if (SUBMIT_TYPE_FLOW.equals(submitType)) {
+            //如果是提交，用于校验设备是否已经在流程中，如果不在标记设备已经在流程中
+            deviceList.forEach(jsonObject -> EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
+                    .equipRepeatUsedCheck(String.valueOf(jsonObject.get("SEQUENCE_NBR")), reginParams.getCompany().getCompanyCode()));
+        }
+        return noticeDto;
     }
 
 
@@ -421,7 +415,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                                                                                   JgChangeRegistrationUnitDto model,
                                                                                   String type,
                                                                                   ReginParams reginParams) {
-
         String orgCode;
         orgCode = reginParams.getCompany().getCompanyCode();
         String companyType = reginParams.getCompany().getCompanyType();
@@ -529,7 +522,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
     }
 
     @Override
-//    @Transactional(rollbackFor = Exception.class)
     @GlobalTransactional(rollbackFor = Exception.class)
     public List<JgChangeRegistrationUnitDto> saveNotice(String submitType, JSONObject map, ReginParams reginParams) {
         JgChangeRegistrationUnitDto model = BeanUtil.toBeanIgnoreError(map.get("changeRegisInfo"), JgChangeRegistrationUnitDto.class);
@@ -563,11 +555,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             throw new BadRequest("使用登记证下无设备");
         }
 
-        for (JSONObject jsonObject : deviceList) {
-            EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
-                    .equipRepeatUsedCheck(String.valueOf(jsonObject.get("SEQUENCE_NBR")), reginParams.getCompany().getCompanyCode());
-        }
-
         // 获取单位变更单号
         ResponseModel<List<String>> listResponseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.DWBG.getCode(), 1);
         List<String> applyNoList = listResponseModel.getResult();
@@ -576,7 +563,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             return new ArrayList<>();
         }
         ArrayList<String> roleListFirst = new ArrayList<>();
-//        ArrayList<String> roleListSecond = new ArrayList<>();
         List<String> instanceIdList = new ArrayList<>();
         List<String> nextExecutorUserIds = new ArrayList<>();
         List<String> taskIds = new ArrayList<>();
@@ -585,18 +571,14 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         // 判断当前是否为提交
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
             //发起流程
-            // ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
             ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
             List<ActWorkflowStartDTO> list = new ArrayList<>();
-//            for (int i = 0; i < deviceList.size(); i++
-//            ) {
             ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
             dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
             dto.setBusinessKey(String.valueOf(new Date().getTime()));
             dto.setNextExecuteUserCompanyCode(model.getReceiveCompanyCode());
             dto.setCompleteFirstTask(true);
             list.add(dto);
-//            }
             actWorkflowBatchDTO.setProcess(list);
             List<ProcessTaskDTO> processTaskDTOS = cmWorkflowService.startBatch(actWorkflowBatchDTO);
             workflowResultDtos = commonServiceImpl.buildWorkFlowInfo(processTaskDTOS);
@@ -608,14 +590,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             }
         }
 
-//        List<JgChangeRegistrationUnit> list = new ArrayList<>();
-//        List<JgChangeRegistrationUnitEq> equipList = new ArrayList<>();
         String finalNextExecutorRoleIds = nextExecutorRoleIds;
         CompanyBo companyBo = commonServiceImpl.getOneCompany(model.getReceiveCompanyCode());
-//        deviceList.forEach(obj -> {
-//            JgChangeRegistrationUnitEq jgRelationEquip = new JgChangeRegistrationUnitEq();
-//            int i = deviceList.indexOf(obj);
-//            String applyNo = applyNoList.get(i);
         model.setApplyNo(applyNoList.get(0));
         model.setReceiveCompanyOrgCode(companyBo.getOrgCode());
         model.setCreateUserId(RequestContext.getExeUserId());
@@ -628,15 +604,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         }
         model.setNewUseUnitName(reginParams.getCompany().getCompanyName());
         model.setNewUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
-//            dto.setEquType((String.valueOf(obj.get("EQU_CATEGORY"))));
-//            dto.setProductNameB((String.valueOf(obj.get("PRODUCT_NAME"))));
-//            dto.setEquCodeB((String.valueOf(obj.get("EQU_CODE"))));
-//            dto.setUseInnerCode(ValidationUtil.isEmpty(obj.get("USE_INNER_CODE")) ? "" : String.valueOf(obj.get("USE_INNER_CODE")));
-//            dto.setEquAddress((String.valueOf(obj.get("ADDRESS"))));
-//            dto.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE")));
-//            dto.setEquList(String.valueOf(obj.get("EQU_LIST")));
-//            jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
-//            jgRelationEquip.setUnitChangeRegistrationId(applyNo);
         if (!CollectionUtils.isEmpty(nextExecutorUserIds)) {
             model.setNextExecuteUserIds(nextExecutorUserIds.get(0));
         }
@@ -649,11 +616,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         if (!CollectionUtils.isEmpty(taskIds)) {
             model.setNextTaskId(taskIds.get(0));
         }
-//            list.add(dto);
-//            equipList.add(jgRelationEquip);
-//        });
-
-//        WorkflowResultDto workDto = new WorkflowResultDto();
         model.setSequenceNbr(sequence.nextId());
         model.setCreateDate(new Date());
         model.setCreateUserName(reginParams.getUserModel().getRealName());
@@ -665,9 +627,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
 
         List<TaskModelDto> modelDtos = new ArrayList<>();
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
-//            for (JgChangeRegistrationUnit obj : list) {
             TaskModelDto taskModelDto = new TaskModelDto();
-
             TaskMessageDto ta = new TaskMessageDto();
             ta.setInstanceId(registrationUnit.getInstanceId());
             ta.setStatus(registrationUnit.getStatus());
@@ -676,7 +636,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             ta.setSequenceNbr(registrationUnit.getSequenceNbr());
             ta.setNextTaskId(registrationUnit.getNextTaskId());
             taskModelDto.setModel(ta);
-            // dto.setModel(obj);
             taskModelDto.setFlowCreateDate(new Date());
             taskModelDto.setTaskName(workflowResultDtos.get(0).getNextTaskName());
             taskModelDto.setFlowCode(registrationUnit.getNextTaskId());
@@ -695,9 +654,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             taskModelDto.setStartDate(new Date());
             taskModelDto.setNextExecuteUser(workflowResultDtos.get(0).getNextExecutorRoleIds());
             modelDtos.add(taskModelDto);
-//            }
         } else {
-//            for (JgChangeRegistrationUnit obj : list) {
             TaskModelDto taskModelDto = new TaskModelDto();
             //行数据
             taskModelDto.setModel(registrationUnit);
@@ -712,11 +669,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             modelDtos.add(taskModelDto);
 //            }
         }
-
-//        for(JgChangeRegistrationUnit obj : list) {
         commonServiceImpl.saveExecuteFlowData2Redis(registrationUnit.getInstanceId(), buildInstanceRuntimeData(registrationUnit));
-//        }
-
         commonServiceImpl.buildTaskModel(modelDtos);
 
         List<JgChangeRegistrationUnitEq> jgRelationEquipList = new ArrayList<>();
@@ -738,12 +691,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         jgRegistrationHistory.setCurrentDocumentId(registrationUnit.getApplyNo());
         //使用登记证历史数据
         jgRegistrationHistory.setChangeData(JSONObject.toJSONString(registrationList));
-//        List<JgChangeRegistrationUnitEq> jgRelationEquipList = equipList.stream().map(jgRelationEquip -> {
-//            List<JgChangeRegistrationUnit> collect = list.stream().filter(jgChangeRegistrationUnit -> jgRelationEquip.getUnitChangeRegistrationId().equals(jgChangeRegistrationUnit.getApplyNo())).collect(Collectors.toList());
-//            Long sequenceNbr = collect.get(0).getSequenceNbr();
-//            insertOrUpdateHis(JSON.parseObject(JSONObject.toJSONString(collect.get(0))), jgRelationEquip.getEquId());
-//            return jgRelationEquip.setUnitChangeRegistrationId(String.valueOf(sequenceNbr));
-//        }).collect(Collectors.toList());
         //先删除之前设备关系数据，在插入最新设备关系数据
         registrationUnitEqService.getBaseMapper().delete(new LambdaQueryWrapper<JgChangeRegistrationUnitEq>()
                 .eq(JgChangeRegistrationUnitEq::getUnitChangeRegistrationId, registrationUnit.getSequenceNbr()));
@@ -752,6 +699,12 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         registrationHistoryService.getBaseMapper().delete(new LambdaQueryWrapper<JgRegistrationHistory>()
                 .eq(JgRegistrationHistory::getCurrentDocumentId, registrationUnit.getApplyNo()));
         registrationHistoryService.save(jgRegistrationHistory);
+
+        if (SUBMIT_TYPE_FLOW.equals(submitType)) {//放在最后面防止前面有异常
+            //如果是提交，用于校验设备是否已经在流程中，如果不在标记设备已经在流程中
+            deviceList.forEach(jsonObject -> EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
+                    .equipRepeatUsedCheck(String.valueOf(jsonObject.get("SEQUENCE_NBR")), reginParams.getCompany().getCompanyCode()));
+        }
         return Collections.singletonList(model);
     }
 
@@ -776,25 +729,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
     }
 
 
-    void getNext(ArrayList<String> roleListFirst, String instanceId, String[] taskName) {
-        AjaxResult aj = Workflow.taskClient.getTaskNoAuth(instanceId);
-        JSONObject taskNoAuth = JSON.parseObject(JSON.toJSONString(aj.get("data")));
-        if (!ObjectUtils.isEmpty(taskNoAuth)) {
-            String nextTaskId = taskNoAuth.getString("id");
-            FeignClientResult<JSONObject> nodeInfo = workFlowFeginService.getNodeInfo(nextTaskId);
-            JSONObject result = nodeInfo.getResult();
-            Map<String, Object> taskInfo = (Map<String, Object>) result.get("taskInfo");
-            taskName[0] = String.valueOf(taskInfo.get("taskDefinitionKey"));
-            AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(nextTaskId);
-            JSONArray data = JSON.parseArray(JSON.toJSONString(taskGroupName.get("data")));
-            for (Object datum : data) {
-                if (((Map) datum).containsKey("groupId")) {
-                    roleListFirst.add(((Map) datum).get("groupId").toString());
-                }
-            }
-        }
-    }
-
     private void convertField(JgChangeRegistrationUnitDto model) {
         // 处理图片
         if (!ValidationUtil.isEmpty(model.getChangeCertificateList())) {
@@ -834,38 +768,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         }
     }
 
-//    private String convertImageUrl(List<Map<String, String>> urlList) {
-//        String urls = "";
-//        if (!CollectionUtils.isEmpty(urlList)) {
-//            urls = urlList.stream().map(map -> map.get("url")).collect(Collectors.joining(","));
-//        }
-//        return urls;
-//    }
-//
-//    public void insertOrUpdateHis(JSONObject map, String equipId) {
-//        JgRegistrationHistory jgRegistrationHistory = new JgRegistrationHistory();
-//        //使用登记编号
-//        jgRegistrationHistory.setUseRegistrationCode(idxBizJgRegisterInfoMapper.getUseOrgCodeByEquip(equipId));
-//        //登记类别
-//        jgRegistrationHistory.setRegistrationClass("单位变更登记");
-//        //设备id
-//        jgRegistrationHistory.setEquId(equipId);
-//        //修改数据
-//        jgRegistrationHistory.setChangeData(JSONObject.toJSONString(map));
-//        //设备监管码
-//        LambdaQueryWrapper<OtherInfo> queryWrapper1 = new LambdaQueryWrapper<>();
-//        queryWrapper1.eq(OtherInfo::getRecord, equipId);
-//        OtherInfo tzsJgOtherInfo = tzsJgOtherInfoMapper.selectOne(queryWrapper1);
-//        jgRegistrationHistory.setSupervisoryCode(tzsJgOtherInfo.getSupervisoryCode());
-//        if (map.containsKey("type") && "edit".equals(String.valueOf(map.get("type")))) {
-//            jgRegistrationHistory.setSequenceNbr(jgRegistrationHistoryMapper.getSequenceNbrByEquidAndDocumentId(equipId, String.valueOf(map.get("sequenceNbr"))));
-//            jgRegistrationHistoryMapper.updateById(jgRegistrationHistory);
-//        } else {
-//            //当前单据id
-//            jgRegistrationHistory.setCurrentDocumentId(map.get("applyNo").toString());
-//            jgRegistrationHistoryMapper.insert(jgRegistrationHistory);
-//        }
-//    }
 
     @GlobalTransactional(rollbackFor = Exception.class)
     public boolean submit(JgChangeRegistrationUnit notice, String op) {
@@ -925,24 +827,25 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
 
             // 待调整
             taskCode = processTaskDTO.getNextTask().get(0).getKey();
-            JgChangeRegistrationUnit jgChangeRegistrationUnit = this.baseMapper.selectById(noticeDto.getSequenceNbr());
-            jgChangeRegistrationUnit.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getRollBack());
-            jgChangeRegistrationUnit.setPromoter("");
-            jgChangeRegistrationUnit.setNextTaskId(nextTaskId);
-            jgChangeRegistrationUnit.setNextExecuteUserIds(workflowResultDtos.get(0).getNextExecutorUserIds());
-            jgChangeRegistrationUnit.setNextExecutorIds(String.join(",", roleListNext));
-            JgChangeRegistrationUnitMapper.updateById(jgChangeRegistrationUnit);
-            JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(jgChangeRegistrationUnit));
-            jsonObject.put("nextTaskId", jgChangeRegistrationUnit.getNextTaskId());
-            jsonObject.put("nextExecuteUser", jgChangeRegistrationUnit.getNextExecutorIds());
+            JgChangeRegistrationUnit changeUnit = this.baseMapper.selectById(noticeDto.getSequenceNbr());
+            changeUnit.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getRollBack());
+            changeUnit.setPromoter("");
+            changeUnit.setNextTaskId(nextTaskId);
+            changeUnit.setNextExecuteUserIds(workflowResultDtos.get(0).getNextExecutorUserIds());
+            changeUnit.setNextExecutorIds(String.join(",", roleListNext));
+            JgChangeRegistrationUnitMapper.updateById(changeUnit);
+            JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(changeUnit));
+            jsonObject.put("nextTaskId", changeUnit.getNextTaskId());
+            jsonObject.put("nextExecuteUser", changeUnit.getNextExecutorIds());
             jsonObject.put("taskType", BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getCode());
-            jsonObject.put("flowStatus", this.getTaskCodeByName(jgChangeRegistrationUnit.getStatus()));
-            jsonObject.put("flowStatusLabel", jgChangeRegistrationUnit.getStatus());
+            jsonObject.put("flowStatus", this.getTaskCodeByName(changeUnit.getStatus()));
+            jsonObject.put("flowStatusLabel", changeUnit.getStatus());
 
             commonServiceImpl.rollbackTask(noticeDto.getInstanceId(), jsonObject);
 
             // redis流程实时数据更新
-            commonServiceImpl.saveExecuteFlowData2Redis(noticeDto.getInstanceId(), this.buildInstanceRuntimeData(jgChangeRegistrationUnit));
+            commonServiceImpl.saveExecuteFlowData2Redis(noticeDto.getInstanceId(), this.buildInstanceRuntimeData(changeUnit));
+            this.delRepeatUseEquipData(changeUnit.getApplyNo(), changeUnit.getStatus(), changeUnit.getNewUseUnitCreditCode());
         } catch (InterruptedException e) {
             e.printStackTrace();
         } finally {
@@ -960,9 +863,16 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                 .build();
     }
 
-    //    @Transactional(rollbackFor = Exception.class)
+    /**
+     * @param dto
+     * @param op          void
+     * @param reginParams
+     * @description 执行流程
+     * @author wangguo
+     * @date 2024/7/18 11:00
+     **/
     @GlobalTransactional(rollbackFor = Exception.class)
-    public void accept(JgChangeRegistrationUnitDto dto, String op) {
+    public void accept(JgChangeRegistrationUnitDto dto, String op, ReginParams reginParams) {
         String lockKey = CommonServiceImpl.buildJgExecuteLockKey(dto.getInstanceId());
         RLock lock = redissonClient.getLock(lockKey);
         try {
@@ -979,12 +889,8 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
             String taskId = dto.getNextTaskId();
             JgChangeRegistrationUnit registration = this.JgChangeRegistrationUnitMapper.selectById(dto.getSequenceNbr());
             registration.setProcessAdvice(dto.getProcessAdvice());
-            List<String> roleListNext = new ArrayList<>();
             List<String> roleListAll = new ArrayList<>();
             ArrayList<String> roleList = new ArrayList<>();
-//        boolean submit = submit(jgChangeRegistrationUnit, op);
-//        if (submit) {
-            // getNext(roleList, dto.getInstanceId(), taskName);
 
             //组装信息
             TaskResultDTO task = new TaskResultDTO();
@@ -1033,23 +939,14 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
                             LambdaQueryWrapper<UseInfo> queryWrapper2 = new LambdaQueryWrapper<>();
                             queryWrapper2.eq(UseInfo::getRecord, equipId);
                             UseInfo useInfo = useInfoMapper.selectOne(queryWrapper2);
-//                            String code = commonServiceImpl.generateRegistrationCode(equipId, tzsJgOtherInfo.getSupervisoryCode(), dto.getReceiveCompanyCode());
                             if (ObjectUtils.isNotEmpty(useInfo)) {
                                 useInfo.setUseUnitName(registration.getNewUseUnitName());
                                 useInfo.setUseUnitCreditCode(registration.getNewUseUnitCreditCode());
-//                                if (ValidationUtil.isEmpty(code)) {
-//                                    log.error("生成新的使用登记证编号失败");
-//                                    return;
-//                                }
                                 useInfoMapper.updateById(useInfo);
-//                        jgChangeRegistrationUnit.setUseRegistCode(code);
                             }
-                            //更新使用注册登记证编号
-//                            idxBizJgRegisterInfoMapper.updateUseOrgCodeByEquip(equipId, code);
                             //es中的编号信息
                             Map<String, Map<String, Object>> resultMap = new HashMap<>();
                             Map<String, Object> map1 = new HashMap<>();
-//                            map1.put("USE_ORG_CODE", code);
                             map1.put("USE_UNIT_CREDIT_CODE", registration.getNewUseUnitCreditCode());
                             map1.put("USE_UNIT_NAME", registration.getNewUseUnitName());
                             resultMap.put(equipId, map1);
@@ -1106,6 +1003,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
 
             // redis流程实时数据更新
             commonServiceImpl.saveExecuteFlowData2Redis(dto.getInstanceId(), this.buildInstanceRuntimeData(registration));
+            this.delRepeatUseEquipData(registration.getApplyNo(), registration.getStatus(), registration.getNewUseUnitCreditCode());
         } catch (InterruptedException e) {
             e.printStackTrace();
             throw new BadRequest("数据异常，请联系管理员");
@@ -1116,6 +1014,43 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         }
     }
 
+    /**
+     * 删除 redis校验重复引用设备的数据
+     */
+    private void delRepeatUseEquipData(String applyNo, String status, String companyCode) {
+        JgRegistrationHistory history = registrationHistoryService.lambdaQuery().eq(JgRegistrationHistory::getCurrentDocumentId, applyNo).one();
+        // 获取使用登记证列表
+        JSONArray registrationList = JSON.parseArray(history.getChangeData());
+        if (CollectionUtils.isEmpty(registrationList)) {
+            return;
+        }
+        List<Long> registrationIdList = new ArrayList<>();
+        //根据使用登记证查询设备
+        for (Object o : registrationList) {
+            JSONObject parseObject = JSON.parseObject(o.toString());
+            if (parseObject.containsKey("sequenceNbr") && ObjectUtils.isNotEmpty(parseObject.get("sequenceNbr")) &&
+                    canConvertToLong(parseObject.get("sequenceNbr").toString())) {
+                registrationIdList.add(Long.parseLong(parseObject.get("sequenceNbr").toString()));
+            }
+        }
+        if (CollectionUtils.isEmpty(registrationIdList)) {
+            return;
+        }
+        List<JSONObject> equList = registrationManageService.queryEquByCertificateSeqList(registrationIdList);
+        // 获取单位变更设备列表
+        if (CollectionUtils.isEmpty(equList)) {
+            return;
+        }
+        List<String> records = new ArrayList<>();
+        for (JSONObject jsonObject : equList) {
+            records.add(jsonObject.getString("SEQUENCE_NBR"));
+        }
+        if (NOT_FLOWING_STATE.contains(status)) {
+            EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
+                    .delDataForCheckEquipRepeatUsed(records, companyCode);
+        }
+    }
+
     private Integer getTaskCodeByName(String auditStatus) {
         return commonServiceImpl.getDictionaryCodeByName(auditStatus);
     }
@@ -1181,12 +1116,7 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         queryWrapper1.eq(OtherInfo::getRecord, jgChangeRegistrationUnitEq.getEquId());
         OtherInfo tzsJgOtherInfo = tzsJgOtherInfoMapper.selectOne(queryWrapper1);
         exportParamsMap.put("supervisoryCode", tzsJgOtherInfo.getSupervisoryCode());
-
         getAuditPassedDate(transfer.getAuditPassDate(), exportParamsMap);
-
-        //设备使用地址
-
-
         //查询设备注册信息
         IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoService.getOne(new QueryWrapper<IdxBizJgRegisterInfo>().eq("RECORD", jgChangeRegistrationUnitEq.getEquId()));
         if (!ValidationUtil.isEmpty(registerInfo)) {
@@ -1300,34 +1230,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         });
     }
 
-//    private void executeOneStep(JgChangeRegistrationUnit jgChangeRegistrationName, String taskName, String nextUserIds, String operate) {
-//        // 先更新之前的待办
-//        TaskV2Model taskV2Model = updateTaskModel(jgChangeRegistrationName, operate);
-//        TaskModelDto taskModelDto = new TaskModelDto();
-//        taskModelDto.setTaskDesc("");
-//        taskModelDto.setTaskContent(this.buildTaskContent(jgChangeRegistrationName));
-//        taskV2Model.setTaskName(taskName);
-//        taskModelDto.setTaskDesc("");
-//        taskModelDto.setTaskCode(jgChangeRegistrationName.getApplyNo());
-//        taskV2Model.setExecuteUserIds(nextUserIds);
-//        taskV2Model.setRelationId(jgChangeRegistrationName.getInstanceId());
-//        taskV2Model.setTaskStatus(this.getTaskStatusByName(jgChangeRegistrationName.getAuditStatus()));
-//        taskV2Model.setTaskStatusLabel(jgChangeRegistrationName.getAuditStatus());
-//        taskV2Model.setTaskType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getCode());
-//        taskModelDto.setStartUser(jgChangeRegistrationName.getCreateUserName());
-//        taskV2Model.setTaskTypeLabel(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName());
-//        taskModelDto.setStartDate(jgChangeRegistrationName.getCreateDate());
-//        taskModelDto.setStartUserId(jgChangeRegistrationName.getCreateUserId());
-//        taskModelDto.setStartUserCompanyName(jgChangeRegistrationName.getUseUnitName());
-//        taskModelDto.setExecuteUserIds(nextUserIds);
-//        TaskModelDto modelDto = new TaskModelDto();
-//        BeanUtil.copyProperties(taskV2Model,modelDto);
-//        modelDto.setNextExecuteUser(jgChangeRegistrationName.getNextExecutorIds());
-//        modelDto.setModel(jgChangeRegistrationName);
-//        // 再插入新代办、数据待定
-//        commonServiceImpl.buildTaskModel(Collections.singletonList(modelDto));
-//    }
-
     private void executeOneStep(JgChangeRegistrationUnit jgChangeRegistrationName, String taskName, String nextUserIds, String operate) {
         // 先更新之前的待办
         TaskV2Model taskV2Model = updateTaskModel(jgChangeRegistrationName, operate);
@@ -1342,12 +1244,6 @@ public class JgChangeRegistrationUnitServiceImpl extends BaseService<JgChangeReg
         taskV2Model.setTaskStatusLabel(jgChangeRegistrationName.getStatus());
         taskV2Model.setFlowStatus(this.getTaskStatusByName(jgChangeRegistrationName.getStatus()));
         taskV2Model.setFlowStatusLabel(jgChangeRegistrationName.getStatus());
-        //  taskV2Model.setTaskType(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getCode());
-        //  taskV2Model.setStartUser(jgChangeRegistrationName.getCreateUserName());
-        //  taskV2Model.setTaskTypeLabel(BusinessTypeEnum.JG_COMPANY_CHANGE_REGISTRATION.getName());
-        //  taskV2Model.setStartDate(jgChangeRegistrationName.getCreateDate());
-        //  taskV2Model.setStartUserId(jgChangeRegistrationName.getCreateUserId());
-        //  taskV2Model.setStartUserCompanyName(jgChangeRegistrationName.getUseUnitName());
         taskV2Model.setExecuteUserIds(nextUserIds);
         TaskModelDto modelDto = new TaskModelDto();
         BeanUtil.copyProperties(taskV2Model, modelDto);

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

@@ -24,6 +24,7 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.JgRegistrationHistoryMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgEquipTransferService;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
+import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
 import com.yeejoin.amos.boot.module.ymt.api.common.BaseException;
@@ -69,8 +70,11 @@ import java.util.stream.Stream;
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto, JgEquipTransfer, JgEquipTransferMapper> implements IJgEquipTransferService {
     private static final String EQUIP_TRANSFER_PROCESS_KEY = "equipmentHandover";
+    private final List<String> NOT_FLOWING_STATE = Arrays.asList("6610", "6614", "6615", "6617", "6616");
+
     private static final String SUBMIT_TYPE_FLOW = "1";
     private final JgEquipTransferEqMapper jgEquipTransferEqMapper;
+    private final JgEquipTransferEqServiceImpl equipTransferEqService;
     private final RedisUtils redisUtils;
     private final TzsServiceFeignClient tzsServiceFeignClient;
 
@@ -148,17 +152,39 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
         this.updateRedisBatch(transferList);
         // 创建历史数据
         this.saveOrUpdateHisDataBatch(jgEquipTransferEqList);
+        if (SUBMIT_TYPE_FLOW.equals(submitType)) {//放在最后面防止前面有异常
+            //如果是提交，用于校验设备是否已经在流程中，如果不在标记设备已经在流程中
+            jgEquipTransferEqList.forEach(equipTransferEq -> EquipUsedCheckStrategyContext.getUsedStrategy(EQUIP_TRANSFER_PROCESS_KEY)
+                    .equipRepeatUsedCheck(equipTransferEq.getEquId(), reginParams.getCompany().getCompanyCode()));
+        }
         return transferList;
     }
 
+    /**
+     * 删除 redis校验重复引用设备的数据
+     */
+    private void delRepeatUseEquipData(Long id, String status, String companyCode) {
+        List<JgEquipTransferEq> list = equipTransferEqService.lambdaQuery().eq(JgEquipTransferEq::getEquipTransferId, id).list();
+        // 获取单位变更设备列表
+        if (CollectionUtils.isEmpty(list)) {
+            return;
+        }
+        List<String> records = list.stream().map(JgEquipTransferEq::getEquId).collect(Collectors.toList());
+        if (NOT_FLOWING_STATE.contains(status)) {
+            EquipUsedCheckStrategyContext.getUsedStrategy(EQUIP_TRANSFER_PROCESS_KEY)
+                    .delDataForCheckEquipRepeatUsed(records, companyCode);
+        }
+    }
+
     private void saveOrUpdateHisDataBatch(List<JgEquipTransferEq> jgEquipTransferEqList) {
-        jgEquipTransferEqList.forEach(j->{
-            commonService.saveOrUpdateHistory(BusinessTypeEnum.JG_EQUIPMENT_HANDOVER.getName(),getEquipInfoJson(j.getEquId()) , j.getEquId(), j.getEquipTransferId());
+        jgEquipTransferEqList.forEach(j -> {
+            commonService.saveOrUpdateHistory(BusinessTypeEnum.JG_EQUIPMENT_HANDOVER.getName(), getEquipInfoJson(j.getEquId()), j.getEquId(), j.getEquipTransferId());
         });
     }
 
     private JSON getEquipInfoJson(String record) {
-        Map<String, Object> equipMap = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(record);;
+        Map<String, Object> equipMap = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(record);
+        ;
         equipMap.remove("useUnitCreditCode");
         return new JSONObject(equipMap);
     }
@@ -289,10 +315,11 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
      * @param submitType       保存或保存并提交
      * @param equipTransferDto 设备移交和设备信息
      * @param op
+     * @param reginParams
      * @return 设备信息
      */
     @Transactional(rollbackFor = {Exception.class, BaseException.class})
-    public JgEquipTransferDto updateEquipTransfer(String submitType, JgEquipTransferDto equipTransferDto, String op) {
+    public JgEquipTransferDto updateEquipTransfer(String submitType, JgEquipTransferDto equipTransferDto, String op, ReginParams reginParams) {
         if (Objects.isNull(equipTransferDto) || StringUtils.isEmpty(submitType)) {
             throw new IllegalArgumentException("参数不能为空");
         }
@@ -375,14 +402,17 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
             BeanUtils.copyProperties(equipTransferDto, equipTransfer);
             updateById(equipTransfer);
         }
-        this.updateHistorySingle(equipTransferDto.getSequenceNbr());
+        List<JgEquipTransferEq> jgEquipTransferEqList = jgEquipTransferEqMapper.selectList(new LambdaQueryWrapper<JgEquipTransferEq>().eq(JgEquipTransferEq::getEquipTransferId, equipTransferDto.getSequenceNbr()));
+        this.saveOrUpdateHisDataBatch(jgEquipTransferEqList);
+        if (SUBMIT_TYPE_FLOW.equals(submitType)) {//放在最后面防止前面有异常
+            //如果是提交，用于校验设备是否已经在流程中，如果不在标记设备已经在流程中
+            jgEquipTransferEqList.forEach(equipTransferEq -> EquipUsedCheckStrategyContext.getUsedStrategy(EQUIP_TRANSFER_PROCESS_KEY)
+                    .equipRepeatUsedCheck(equipTransferEq.getEquId(), reginParams.getCompany().getCompanyCode()));
+        }
         return equipTransferDto;
     }
 
-    private void updateHistorySingle(Long seq){
-        List<JgEquipTransferEq> eqs = jgEquipTransferEqMapper.selectList(new LambdaQueryWrapper<JgEquipTransferEq>().eq(JgEquipTransferEq::getEquipTransferId,seq));
-        this.saveOrUpdateHisDataBatch(eqs);
-    }
+
     /**
      * 通过和驳回
      *
@@ -476,6 +506,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
             }
             updateById(jgEquipTransfer);
             commonService.saveExecuteFlowData2Redis(instanceId, this.buildInstanceRuntimeData(jgEquipTransfer));
+            this.delRepeatUseEquipData(jgEquipTransfer.getSequenceNbr(), jgEquipTransfer.getApplyStatus(), jgEquipTransfer.getUseUnitCreditCode());
         } catch (InterruptedException e) {
             e.printStackTrace();
         } finally {
@@ -531,6 +562,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
             jsonObject.put("flowStatusLabel", FlowStatusEnum.ROLLBACK.getName());
             commonService.rollbackTask(equipTransfer.getInstanceId(), jsonObject);
             commonService.saveExecuteFlowData2Redis(instanceId, this.buildInstanceRuntimeData(equipTransfer));
+            this.delRepeatUseEquipData(equipTransfer.getSequenceNbr(), equipTransfer.getApplyStatus(), equipTransfer.getUseUnitCreditCode());
         } catch (InterruptedException e) {
             e.printStackTrace();
         } finally {
@@ -559,7 +591,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
             }
         }
         SortVo sortMap = commonService.sortFieldConversion(sort);
-        Page<JgEquipTransferDto> equipTransferPage = this.baseMapper.queryForPage(page,sortMap, dto, reginParams.getUserModel().getUserId());
+        Page<JgEquipTransferDto> equipTransferPage = this.baseMapper.queryForPage(page, sortMap, dto, reginParams.getUserModel().getUserId());
         equipTransferPage.getRecords().forEach(transfer -> {
             if (Objects.nonNull(transfer.getApplyStatus())) {
                 transfer.setApplyStatusDesc(FlowStatusEnum.getNameByType(Long.valueOf(transfer.getApplyStatus())));
@@ -575,12 +607,12 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
             return null;
         }
         Map<String, Object> equipTransferInfo = createEquipTransferInfo(equipTransfer);
-        if(FlowStatusEnum.TO_BE_FINISHED.getCode() == Integer.parseInt(equipTransfer.getApplyStatus())){
+        if (FlowStatusEnum.TO_BE_FINISHED.getCode() == Integer.parseInt(equipTransfer.getApplyStatus())) {
             // 已完成状态显示历史数据
             // 1.设备历史信息
             JSONObject his = commonService.queryHistoryData(sequenceNbr);
             // 兼容老数据
-            if(his == null){
+            if (his == null) {
                 // 1.设备信息
                 Map<String, Object> equipMap = getEquipInfonNew(sequenceNbr);
                 // 2.移交业务字段信息
@@ -595,7 +627,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
         } else {
             Map<String, Object> equipMap = getEquipInfonNew(sequenceNbr);
             return Stream.concat(equipTransferInfo.entrySet().stream(),
-                    equipMap.entrySet().stream())
+                            equipMap.entrySet().stream())
                     .filter(entry -> entry.getValue() != null)
                     .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (existing, replacement) -> existing));
         }
@@ -741,7 +773,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
     }
 
     private Map<String, Object> createEquipTransferInfo(JgEquipTransfer equipTransfer) {
-        Map<String, Object> equipTransferInfo = new HashMap<>(BeanUtil.beanToMap(equipTransfer ,false , true));
+        Map<String, Object> equipTransferInfo = new HashMap<>(BeanUtil.beanToMap(equipTransfer, false, true));
         equipTransferInfo.put("installUnitCreditCode", equipTransfer.getInstallUnitCreditCode() + "_" + equipTransfer.getInstallUnitName());
         return equipTransferInfo;
     }
@@ -751,7 +783,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
         Collection<JgEquipTransfer> jgEquipTransfers = this.listByIds(Arrays.asList(ids));
         for (JgEquipTransfer notice : jgEquipTransfers) {
             // 删除代办 + 中止流程
-            commonService.deleteTaskModel(String.valueOf(notice.getSequenceNbr()),notice.getInstanceId());
+            commonService.deleteTaskModel(String.valueOf(notice.getSequenceNbr()), notice.getInstanceId());
             // 删除单子
             this.baseMapper.deleteById(notice.getSequenceNbr());
             // 删除对应eq

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

@@ -96,6 +96,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
 
     private static final String SUBMIT_TYPE_FLOW = "1";
     private static final String PROCESS_DEFINITION_KEY = "installationNotificationNew";
+    private static final String PROCESS_INSTALL_NOTICE_KEY = "installNotice";
+
     private static final String TABLE_PAGE_ID = "1734141426742095873";
     private static final String CONSTRUCTION_TYPE = "SGLX";
     private static final String CONSTRUCTION_TYPE_NAME = "安装";
@@ -115,6 +117,8 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
     @Autowired
     JgUseRegistrationMapper jgUseRegistrationMapper;
     @Autowired
+    IdxBizJgUseInfoServiceImpl idxBizJgUseInfoService;
+    @Autowired
     IdxBizJgRegisterInfoServiceImpl idxBizJgRegisterInfoService;
     @Autowired
     IdxBizJgRegisterInfoMapper tzsJgRegistrationInfoMapper;
@@ -429,7 +433,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
             LambdaQueryWrapper<JgInstallationNoticeEq> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(JgInstallationNoticeEq::getEquipTransferId, jgInstallationNotice.getSequenceNbr());
             JgInstallationNoticeEq jgRelationEquip = jgInstallationNoticeEqMapper.selectOne(queryWrapper);
-            EquipUsedCheckStrategyContext.getUsedStrategy("installNotice").equipRepeatUsedCheck(jgRelationEquip.getEquId(), jgInstallationNotice.getInstallUnitCreditCode());
+            EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_INSTALL_NOTICE_KEY).equipRepeatUsedCheck(jgRelationEquip.getEquId(), jgInstallationNotice.getInstallUnitCreditCode());
         }
     }
 
@@ -646,12 +650,12 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
 
     private void rollBackForDelRedisData() {
         FlowingEquipRedisContext.getContext().forEach(e -> {
-            EquipUsedCheckStrategyContext.getUsedStrategy("installNotice").delDataForCheckWithKey(e.getData(), e.getRedisKey());
+            EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_INSTALL_NOTICE_KEY).delDataForCheckWithKey(e.getData(), e.getRedisKey());
         });
     }
 
     private void repeatUsedEquipCheck(List<Map<String, Object>> equipList, String companyCode) {
-        equipList.forEach(equipMap -> EquipUsedCheckStrategyContext.getUsedStrategy("installNotice").equipRepeatUsedCheck(String.valueOf(equipMap.get("SEQUENCE_NBR")), companyCode));
+        equipList.forEach(equipMap -> EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_INSTALL_NOTICE_KEY).equipRepeatUsedCheck(String.valueOf(equipMap.get("SEQUENCE_NBR")), companyCode));
     }
 
     private void updateRedisBatch(List<JgInstallationNotice> jgInstallationNotices) {
@@ -953,7 +957,7 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         LambdaQueryWrapper<JgInstallationNoticeEq> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(JgInstallationNoticeEq::getEquipTransferId, jgInstallationNotice.getSequenceNbr());
         JgInstallationNoticeEq jgRelationEquip = jgInstallationNoticeEqMapper.selectOne(queryWrapper);
-        EquipUsedCheckStrategyContext.getUsedStrategy("installNotice").delDataForCheckEquipRepeatUsed(Collections.singletonList(jgRelationEquip.getEquId()), jgInstallationNotice.getInstallUnitCreditCode());
+        EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_INSTALL_NOTICE_KEY).delDataForCheckEquipRepeatUsed(Collections.singletonList(jgRelationEquip.getEquId()), jgInstallationNotice.getInstallUnitCreditCode());
     }
 
     @GlobalTransactional(rollbackFor = Exception.class)
@@ -1394,6 +1398,28 @@ public class JgInstallationNoticeServiceImpl extends BaseService<JgInstallationN
         this.updateById(installationNotice);
         // 2.更新关联的业务
         this.processElseDataByStatus(Objects.requireNonNull(FlowStatusEnum.getEumByCode(Integer.parseInt(oldNoticeStatus))), installationNotice);
+        // 3.更新ES、IdxBizJgUseInfo中关联设备为未纳管
+        Map<String, Map<String, Object>> objMap = new HashMap<>();
+        LambdaQueryWrapper<JgInstallationNoticeEq> lambdaQueryWrapper = new LambdaQueryWrapper();
+        lambdaQueryWrapper.eq(JgInstallationNoticeEq::getEquipTransferId, installationNotice.getSequenceNbr());
+        List<JgInstallationNoticeEq> jgInstallationNoticeEqs = jgInstallationNoticeEqMapper.selectList(lambdaQueryWrapper);
+        if (!ObjectUtils.isEmpty(jgInstallationNoticeEqs) && jgInstallationNoticeEqs.size() > 0) {
+            for (JgInstallationNoticeEq jgInstallationNoticeEq : jgInstallationNoticeEqs) {
+                // 组装修改es条件及数据
+                Map<String, Object> map = new HashMap<>();
+                map.put("IS_INTO_MANAGEMENT", Boolean.FALSE);
+                objMap.put(jgInstallationNoticeEq.getEquId(), map);
+            }
+        }
+        // 组装更新IdxBizJgUseInfo条件
+        LambdaQueryWrapper<IdxBizJgUseInfo> jgUseInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        jgUseInfoLambdaQueryWrapper.in(IdxBizJgUseInfo::getRecord, jgInstallationNoticeEqs.stream().map(JgInstallationNoticeEq::getEquId).collect(Collectors.toList()));
+        List<IdxBizJgUseInfo> list = idxBizJgUseInfoMapper.selectList(jgUseInfoLambdaQueryWrapper);
+        for (IdxBizJgUseInfo useInfo : list) {
+            useInfo.setIsIntoManagement(Boolean.FALSE);
+        }
+        idxBizJgUseInfoService.saveOrUpdateBatch(list);
+        tzsServiceFeignClient.commonUpdateEsDataByIds(objMap);
         return installationNotice;
     }
 

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

@@ -25,6 +25,9 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.JgRegistrationHistoryMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgMaintainNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
+import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
+import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
+import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
 import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
@@ -156,11 +159,11 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         if (!ValidationUtil.isEmpty(notice.getStreet()) && !ValidationUtil.isEmpty(notice.getStreetName())) {
             maintainInfo.put("street", notice.getStreet() + "_" + notice.getStreetName());
         }
-        if(Integer.parseInt(notice.getNoticeStatus()) == FlowStatusEnum.TO_BE_FINISHED.getCode()){
+        if (Integer.parseInt(notice.getNoticeStatus()) == FlowStatusEnum.TO_BE_FINISHED.getCode()) {
             // 完成时显示历史数据
             JSONObject hisData = commonService.queryHistoryData(notice.getSequenceNbr());
             // 兼容老数据
-            if(hisData == null){
+            if (hisData == null) {
                 // 老数据逻辑
                 setNewEquipInfo(sequenceNbr, maintainInfo);
                 return new HashMap<String, Map<String, Object>>() {{
@@ -182,6 +185,38 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         }
     }
 
+    private void checkRepeatUsed(String submitType, JgMaintainNotice notice) {
+        if (SUBMIT_TYPE_FLOW.equals(submitType)) {
+            // 流程中校验
+            LambdaQueryWrapper<JgMaintainNoticeEq> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(JgMaintainNoticeEq::getEquipTransferId, notice.getSequenceNbr());
+            JgMaintainNoticeEq noticeEq = jgMaintainNoticeEqMapper.selectOne(queryWrapper);
+            EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
+                    .equipRepeatUsedCheck(noticeEq.getEquId(), notice.getInstallUnitCreditCode());
+        }
+    }
+
+    private void repeatUsedEquipCheck(List<Map<String, Object>> equipList, String companyCode) {
+        equipList.forEach(equipMap -> EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY).equipRepeatUsedCheck(String.valueOf(equipMap.get("SEQUENCE_NBR")), companyCode));
+    }
+    /**
+     * 删除 redis校验重复引用设备的数据
+     */
+    private void delRepeatUseEquipData(JgMaintainNotice notice) {
+        LambdaQueryWrapper<JgMaintainNoticeEq> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(JgMaintainNoticeEq::getEquipTransferId, notice.getSequenceNbr());
+        JgMaintainNoticeEq noticeEq = jgMaintainNoticeEqMapper.selectOne(queryWrapper);
+        EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
+                .delDataForCheckEquipRepeatUsed(Collections.singletonList(noticeEq.getEquId()), notice.getInstallUnitCreditCode());
+    }
+
+    private void rollBackForDelRedisData() {
+        FlowingEquipRedisContext.getContext().forEach(e -> {
+            EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
+                    .delDataForCheckWithKey(e.getData(), e.getRedisKey());
+        });
+    }
+
     private void setNewEquipInfo(Long sequenceNbr, Map<String, Object> maintainInfo) {
         JgMaintainNoticeEq jgMaintainNoticeEq = jgMaintainNoticeEqMapper.selectOne(new LambdaQueryWrapper<JgMaintainNoticeEq>().eq(JgMaintainNoticeEq::getEquipTransferId, sequenceNbr));
         Map<String, Object> map = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(jgMaintainNoticeEq.getEquId());
@@ -201,113 +236,127 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     @SuppressWarnings({"rawtypes", "Duplicates"})
     @Transactional
     public JgMaintainNoticeDto updateMaintainNotice(String submitType, JgMaintainNoticeDto noticeDto, String op) {
-        if (Objects.isNull(noticeDto) || StringUtils.isEmpty(submitType)) {
-            throw new IllegalArgumentException("参数不能为空");
-        }
-        // 字段转换
-        this.convertField(noticeDto);
-        JgMaintainNotice notice = jgMaintainNoticeMapper.selectById(noticeDto.getSequenceNbr());
-        //  submitType=1为流程提交否则仅为保存业务数据
-        if (SUBMIT_TYPE_FLOW.equals(submitType)) {
-            ProcessTaskDTO processTaskDTO = new ProcessTaskDTO();
-            WorkflowResultDto workflowResultDto = new WorkflowResultDto();
-            // 如果没有实例ID，说明是启动并执行一步
-            // 直接调用工作流 启动并执行API  -  可以拿到两个节点的信息，用于填充业务字段
-            // 如果有实例ID，为撤回或者驳回后重新提交
-            if (!StringUtils.hasText(noticeDto.getInstanceId())) {
-                // 发起流程
-                ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
-                List<ActWorkflowStartDTO> list = new ArrayList<>();
-                ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
-                dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
-                dto.setBusinessKey(String.valueOf(noticeDto.getSequenceNbr()));
-                dto.setCompleteFirstTask(Boolean.TRUE);
-                //下一节点执行人单位（下节点接收机构code）
-                dto.setNextExecuteUserCompanyCode(notice.getReceiveCompanyCode());
-                list.add(dto);
-                actWorkflowBatchDTO.setProcess(list);
-                processTaskDTO = cmWorkflowService.startBatch(actWorkflowBatchDTO).get(0);
-                // 提取节点等信息
-                workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
-                BeanUtils.copyProperties(noticeDto, notice);
-                if (!ObjectUtils.isEmpty(notice.getInstanceStatus())) {
-                    notice.setInstanceStatus(notice.getInstanceStatus() + "," + workflowResultDto.getNextExecutorRoleIds());
-                } else {
-                    notice.setInstanceStatus(workflowResultDto.getNextExecutorRoleIds());
-                }
-                notice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
-                notice.setPromoter(RequestContext.getExeUserId());
-                notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
-                notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
-                notice.setInstanceId(workflowResultDto.getInstanceId());
-                notice.setNextTaskId(workflowResultDto.getNextTaskId());
-                jgMaintainNoticeMapper.updateById(notice);
-                // 如果为保存并提交，则创建代办
-                buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.TRUE);
-            } else {
-                // 只调用执行API，返回下个节点信息，用于填充业务字段
-                //组装信息
-                TaskResultDTO dto = new TaskResultDTO();
-                dto.setResultCode("approvalStatus");
-                dto.setTaskId(notice.getNextTaskId());
-                HashMap<String, Object> commMap = new HashMap<>();
-                if (notice.getNoticeStatus().equals("6614") || notice.getNoticeStatus().equals("6615")) {
-                    commMap.put("approvalStatus", "提交");
-                } else {
-                    commMap.put("approvalStatus", op);
-                }
-                //下一节点执行人单位（下节点接收机构code）
-                dto.setNextExecuteUserCompanyCode(notice.getReceiveCompanyCode());
-                dto.setVariable(commMap);
-                processTaskDTO = cmWorkflowService.completeOrReject(notice.getNextTaskId(), dto, op);
-                // 提取节点等信息
-                workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
-                BeanUtils.copyProperties(noticeDto, notice);
-                if (!ObjectUtils.isEmpty(notice.getInstanceStatus())) {
-                    notice.setInstanceStatus(notice.getInstanceStatus() + "," + workflowResultDto.getNextExecutorRoleIds());
-                } else {
-                    notice.setInstanceStatus(workflowResultDto.getNextExecutorRoleIds());
-                }
-                notice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
-                notice.setPromoter(RequestContext.getExeUserId());
-                notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
-                notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
-                notice.setNextTaskId(workflowResultDto.getNextTaskId());
-                jgMaintainNoticeMapper.updateById(notice);
-                // 上个代办改为已办
-                HashMap<String, Object> map = new HashMap<>();
-                map.put("taskStatus", FlowStatusEnum.TO_BE_PROCESSED.getCode());
-                map.put("taskStatusLabel", FlowStatusEnum.TO_BE_PROCESSED.getName());
-                map.put("relationId", notice.getInstanceId());
-                map.put("flowStatus", FlowStatusEnum.TO_BE_PROCESSED.getCode());
-                map.put("flowStatusLabel", FlowStatusEnum.TO_BE_PROCESSED.getName());
-                TaskV2Model taskV2Model = commonService.updateTaskModel(map);
-                if (ObjectUtils.isEmpty(taskV2Model)) {
+
+        try {
+            if (Objects.isNull(noticeDto) || StringUtils.isEmpty(submitType)) {
+                throw new IllegalArgumentException("参数不能为空");
+            }
+            // 字段转换
+            this.convertField(noticeDto);
+            JgMaintainNotice notice = jgMaintainNoticeMapper.selectById(noticeDto.getSequenceNbr());
+            this.checkRepeatUsed(submitType, notice);
+            //  submitType=1为流程提交否则仅为保存业务数据
+            if (SUBMIT_TYPE_FLOW.equals(submitType)) {
+                ProcessTaskDTO processTaskDTO = new ProcessTaskDTO();
+                WorkflowResultDto workflowResultDto = new WorkflowResultDto();
+                // 如果没有实例ID，说明是启动并执行一步
+                // 直接调用工作流 启动并执行API  -  可以拿到两个节点的信息，用于填充业务字段
+                // 如果有实例ID，为撤回或者驳回后重新提交
+                if (!StringUtils.hasText(noticeDto.getInstanceId())) {
+                    // 发起流程
+                    ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
+                    List<ActWorkflowStartDTO> list = new ArrayList<>();
+                    ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
+                    dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
+                    dto.setBusinessKey(String.valueOf(noticeDto.getSequenceNbr()));
+                    dto.setCompleteFirstTask(Boolean.TRUE);
+                    //下一节点执行人单位（下节点接收机构code）
+                    dto.setNextExecuteUserCompanyCode(notice.getReceiveCompanyCode());
+                    list.add(dto);
+                    actWorkflowBatchDTO.setProcess(list);
+                    processTaskDTO = cmWorkflowService.startBatch(actWorkflowBatchDTO).get(0);
+                    // 提取节点等信息
+                    workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
+                    BeanUtils.copyProperties(noticeDto, notice);
+                    if (!ObjectUtils.isEmpty(notice.getInstanceStatus())) {
+                        notice.setInstanceStatus(notice.getInstanceStatus() + "," + workflowResultDto.getNextExecutorRoleIds());
+                    } else {
+                        notice.setInstanceStatus(workflowResultDto.getNextExecutorRoleIds());
+                    }
+                    notice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+                    notice.setPromoter(RequestContext.getExeUserId());
+                    notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
+                    notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
+                    notice.setInstanceId(workflowResultDto.getInstanceId());
+                    notice.setNextTaskId(workflowResultDto.getNextTaskId());
+                    jgMaintainNoticeMapper.updateById(notice);
                     // 如果为保存并提交，则创建代办
-                    buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.FALSE);
+                    buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.TRUE);
                 } else {
-                    TaskModelDto taskModelDto = new TaskModelDto();
-                    BeanUtils.copyProperties(taskV2Model, taskModelDto);
-                    // 创建新的代办
-                    TaskMessageDto taskMessageDto = new TaskMessageDto();
-                    BeanUtils.copyProperties(notice, taskMessageDto);
-                    taskModelDto.setModel(taskMessageDto);
-                    taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
-                    taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
-                    taskModelDto.setFlowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
-                    taskModelDto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
-                    taskModelDto.setFlowCode(notice.getNextTaskId());
-                    taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
-                    commonService.buildTaskModel(Collections.singletonList(taskModelDto));
+                    // 只调用执行API，返回下个节点信息，用于填充业务字段
+                    //组装信息
+                    TaskResultDTO dto = new TaskResultDTO();
+                    dto.setResultCode("approvalStatus");
+                    dto.setTaskId(notice.getNextTaskId());
+                    HashMap<String, Object> commMap = new HashMap<>();
+                    if (notice.getNoticeStatus().equals("6614") || notice.getNoticeStatus().equals("6615")) {
+                        commMap.put("approvalStatus", "提交");
+                    } else {
+                        commMap.put("approvalStatus", op);
+                    }
+                    //下一节点执行人单位（下节点接收机构code）
+                    dto.setNextExecuteUserCompanyCode(notice.getReceiveCompanyCode());
+                    dto.setVariable(commMap);
+                    processTaskDTO = cmWorkflowService.completeOrReject(notice.getNextTaskId(), dto, op);
+                    // 提取节点等信息
+                    workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
+                    BeanUtils.copyProperties(noticeDto, notice);
+                    if (!ObjectUtils.isEmpty(notice.getInstanceStatus())) {
+                        notice.setInstanceStatus(notice.getInstanceStatus() + "," + workflowResultDto.getNextExecutorRoleIds());
+                    } else {
+                        notice.setInstanceStatus(workflowResultDto.getNextExecutorRoleIds());
+                    }
+                    notice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+                    notice.setPromoter(RequestContext.getExeUserId());
+                    notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
+                    notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
+                    notice.setNextTaskId(workflowResultDto.getNextTaskId());
+                    jgMaintainNoticeMapper.updateById(notice);
+                    // 上个代办改为已办
+                    HashMap<String, Object> map = new HashMap<>();
+                    map.put("taskStatus", FlowStatusEnum.TO_BE_PROCESSED.getCode());
+                    map.put("taskStatusLabel", FlowStatusEnum.TO_BE_PROCESSED.getName());
+                    map.put("relationId", notice.getInstanceId());
+                    map.put("flowStatus", FlowStatusEnum.TO_BE_PROCESSED.getCode());
+                    map.put("flowStatusLabel", FlowStatusEnum.TO_BE_PROCESSED.getName());
+                    TaskV2Model taskV2Model = commonService.updateTaskModel(map);
+                    if (ObjectUtils.isEmpty(taskV2Model)) {
+                        // 如果为保存并提交，则创建代办
+                        buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.FALSE);
+                    } else {
+                        TaskModelDto taskModelDto = new TaskModelDto();
+                        BeanUtils.copyProperties(taskV2Model, taskModelDto);
+                        // 创建新的代办
+                        TaskMessageDto taskMessageDto = new TaskMessageDto();
+                        BeanUtils.copyProperties(notice, taskMessageDto);
+                        taskModelDto.setModel(taskMessageDto);
+                        taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
+                        taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+                        taskModelDto.setFlowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
+                        taskModelDto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
+                        taskModelDto.setFlowCode(notice.getNextTaskId());
+                        taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+                        commonService.buildTaskModel(Collections.singletonList(taskModelDto));
+                    }
                 }
+                commonService.saveExecuteFlowData2Redis(notice.getInstanceId(), this.buildInstanceRuntimeData(notice));
+            } else {
+                JgMaintainNotice bean = new JgMaintainNotice();
+                BeanUtils.copyProperties(noticeDto, bean);
+                jgMaintainNoticeMapper.updateById(bean);
             }
-            commonService.saveExecuteFlowData2Redis(notice.getInstanceId(),this.buildInstanceRuntimeData(notice));
-        } else {
-            JgMaintainNotice bean = new JgMaintainNotice();
-            BeanUtils.copyProperties(noticeDto, bean);
-            jgMaintainNoticeMapper.updateById(bean);
+            return noticeDto;
+        } catch (BadRequest | LocalBadRequest e) {
+            log.error(e.getMessage(), e);
+            this.rollBackForDelRedisData();
+            throw e;
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            this.rollBackForDelRedisData();
+            throw new BadRequest("安装告知保存失败！");
+        } finally {
+            FlowingEquipRedisContext.clean();
         }
-        return noticeDto;
     }
 
 
@@ -319,14 +368,14 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
      * @return 维修告知列表
      */
     @Override
-    public Page<Map<String,Object>> queryForJgMaintainNoticePage(Page<JgMaintainNotice> page, String sort, JgMaintainNoticeDto model, ReginParams reginParams) {
+    public Page<Map<String, Object>> queryForJgMaintainNoticePage(Page<JgMaintainNotice> page, String sort, JgMaintainNoticeDto model, ReginParams reginParams) {
         String orgCode = reginParams.getCompany().getCompanyCode();
         String type = reginParams.getCompany().getLevel();
         String userId = reginParams.getUserModel().getUserId();
         SortVo sortMap = commonService.sortFieldConversion(sort);
         List<DataDictionary> dictionaries = dataDictionaryService.getByType("WXLX");
-        Page<Map<String,Object>> noticePage = jgMaintainNoticeMapper.queryForPage(page,sortMap, model, type, orgCode, userId);
-        
+        Page<Map<String, Object>> noticePage = jgMaintainNoticeMapper.queryForPage(page, sortMap, model, type, orgCode, userId);
+
         List<Map<String, Object>> mappedRecords = noticePage.getRecords().stream().peek(notice -> {
             Optional<Long> noticeStatusOpt = Optional.ofNullable((String) notice.get("noticeStatus")).map(Long::valueOf);
             noticeStatusOpt.ifPresent(status -> {
@@ -364,7 +413,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         if (Objects.isNull(JgMaintainNotice) || CollectionUtils.isEmpty(informationList)) {
             throw new IllegalArgumentException("维修告知单不存在");
         }
-        Map<String, Object> placeholders = jgInstallationNoticeService.fullFillTemplateObj(informationList, BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION.getName().substring(0,2));
+        Map<String, Object> placeholders = jgInstallationNoticeService.fullFillTemplateObj(informationList, BusinessTypeEnum.JG_MAINTENANCE_NOTIFICATION.getName().substring(0, 2));
 
         String tempFileName = "维修告知单_" + System.currentTimeMillis() + "_temp";
         // String url = WordTemplateUtils.templateToPdf(tempFileName, "installation-notification-report.ftl", placeholders);
@@ -380,7 +429,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         for (Long sequenceNbr : sequenceNbrs) {
             JgMaintainNotice jgMaintainNotice = this.baseMapper.selectById(sequenceNbr);
             // 删除待办 + 中止流程
-            commonService.deleteTaskModel(sequenceNbr + "",jgMaintainNotice.getInstanceId());
+            commonService.deleteTaskModel(sequenceNbr + "", jgMaintainNotice.getInstanceId());
             // 删除业务单
             this.baseMapper.deleteById(sequenceNbr);
             // 删除对应equ
@@ -397,87 +446,102 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
     @SuppressWarnings({"Duplicates", "rawtypes"})
     @Transactional(rollbackFor = Exception.class)
     public List<JgMaintainNotice> saveNotice(String submitType, Map<String, Object> jgMaintainNoticeDtoMap, ReginParams reginParams) {
+        try {
+            JgMaintainNoticeDto model = JSON.parseObject(JSONObject.toJSONString(jgMaintainNoticeDtoMap.get(TABLE_PAGE_ID)), JgMaintainNoticeDto.class);
+
+            // 字段转换
+            convertField(model);
+            // 获取告知设备列表
+            List<Map<String, Object>> deviceList = model.getDeviceList();
+            if (CollectionUtils.isEmpty(deviceList)) {
+                throw new BadRequest("请选择设备");
+            }
 
-        JgMaintainNoticeDto model = JSON.parseObject(JSONObject.toJSONString(jgMaintainNoticeDtoMap.get(TABLE_PAGE_ID)), JgMaintainNoticeDto.class);
-
-        // 字段转换
-        convertField(model);
-        // 获取告知设备列表
-        List<Map<String, Object>> deviceList = model.getDeviceList();
-        if (CollectionUtils.isEmpty(deviceList)) {
-            throw new BadRequest("请选择设备");
-        }
-
-        // 获取告知单号
-        ResponseModel<List<String>> applyNoResult = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.WXGZ.getCode(), deviceList.size());
+            // 提交时对设备状态进行校验（处理并发问题，一个未被使用的设备同时被多个使用这打开，同时提交发起申请）
+            if (SUBMIT_TYPE_FLOW.equals(submitType)) {
+                this.repeatUsedEquipCheck(deviceList, reginParams.getCompany().getCompanyCode());
+            }
+            // 获取告知单号
+            ResponseModel<List<String>> applyNoResult = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.WXGZ.getCode(), deviceList.size());
 
-        if (CollectionUtils.isEmpty(applyNoResult.getResult())) {
-            log.error(" 获取告知单号失败");
-            throw new RuntimeException();
-        }
-        List<String> applyNoList = applyNoResult.getResult();
-
-        List<WorkflowResultDto> workflowResultDtoList = workFlowInfo(submitType, deviceList, model.getReceiveCompanyCode());
-
-        List<JgMaintainNotice> list = new ArrayList<>();
-        List<JgMaintainNoticeEq> equipList = new ArrayList<>();
-        CompanyBo companyBo = commonService.getOneCompany(model.getReceiveCompanyCode());
-        deviceList.forEach(obj -> {
-            JgMaintainNoticeEq jgRelationEquip = new JgMaintainNoticeEq();
-            JgMaintainNotice dto = new JgMaintainNotice();
-            BeanUtils.copyProperties(model, dto);
-            int i = deviceList.indexOf(obj);
-            String applyNo = applyNoList.get(i);
-            dto.setApplyNo(applyNo);
-            // 统计使用
-            dto.setReceiveCompanyOrgCode(companyBo.getOrgCode());
-            dto.setNoticeDate(new Date());
-            dto.setEquCategory(String.valueOf(obj.get("EQU_CATEGORY")));
-            dto.setEquListCode(String.valueOf(obj.get("EQU_LIST_CODE")));
-            dto.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
+            if (CollectionUtils.isEmpty(applyNoResult.getResult())) {
+                log.error(" 获取告知单号失败");
+                throw new RuntimeException();
+            }
+            List<String> applyNoList = applyNoResult.getResult();
+
+            List<WorkflowResultDto> workflowResultDtoList = workFlowInfo(submitType, deviceList, model.getReceiveCompanyCode());
+
+            List<JgMaintainNotice> list = new ArrayList<>();
+            List<JgMaintainNoticeEq> equipList = new ArrayList<>();
+            CompanyBo companyBo = commonService.getOneCompany(model.getReceiveCompanyCode());
+            deviceList.forEach(obj -> {
+                JgMaintainNoticeEq jgRelationEquip = new JgMaintainNoticeEq();
+                JgMaintainNotice dto = new JgMaintainNotice();
+                BeanUtils.copyProperties(model, dto);
+                int i = deviceList.indexOf(obj);
+                String applyNo = applyNoList.get(i);
+                dto.setApplyNo(applyNo);
+                // 统计使用
+                dto.setReceiveCompanyOrgCode(companyBo.getOrgCode());
+                dto.setNoticeDate(new Date());
+                dto.setEquCategory(String.valueOf(obj.get("EQU_CATEGORY")));
+                dto.setEquListCode(String.valueOf(obj.get("EQU_LIST_CODE")));
+                dto.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
+                if (SUBMIT_TYPE_FLOW.equals(submitType)) {
+                    dto.setNextExecuteIds(workflowResultDtoList.get(i).getNextExecutorRoleIds());
+                    dto.setInstanceStatus(workflowResultDtoList.get(i).getNextExecutorRoleIds() + "," + workflowResultDtoList.get(i).getExecutorRoleIds());
+                    dto.setPromoter(reginParams.getUserModel().getUserId());
+                    dto.setNextExecuteUserIds(workflowResultDtoList.get(i).getNextExecutorUserIds());
+                    dto.setNextTaskId(workflowResultDtoList.get(i).getNextTaskId());
+                    dto.setInstanceId(workflowResultDtoList.get(i).getInstanceId());
+                    dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
+                } else {
+                    dto.setNextExecuteUserIds(reginParams.getUserModel().getUserId());
+                    dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
+                }
+                dto.setEquList(String.valueOf(obj.get("EQU_LIST")));
+                dto.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE")));
+                dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
+                dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
+
+                jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
+                jgRelationEquip.setEquipTransferId(applyNo);
+
+                dto.setCreateUserName(reginParams.getUserModel().getRealName());
+                dto.setCreateUserId(reginParams.getUserModel().getUserId());
+                DataDictionary dictionary = iDataDictionaryService.getByCode(dto.getMaintainType(), "WXLX");
+                dto.setMaintainTypeDesc(dictionary.getName());
+                dto.setFullAddress(dto.getProvinceName() + dto.getCityName() + dto.getCountyName() + dto.getStreetName() + dto.getAddress());
+                list.add(dto);
+                equipList.add(jgRelationEquip);
+            });
+            jgMaintainNoticeMapper.insertBatchSomeColumn(list);
             if (SUBMIT_TYPE_FLOW.equals(submitType)) {
-                dto.setNextExecuteIds(workflowResultDtoList.get(i).getNextExecutorRoleIds());
-                dto.setInstanceStatus(workflowResultDtoList.get(i).getNextExecutorRoleIds() + "," + workflowResultDtoList.get(i).getExecutorRoleIds());
-                dto.setPromoter(reginParams.getUserModel().getUserId());
-                dto.setNextExecuteUserIds(workflowResultDtoList.get(i).getNextExecutorUserIds());
-                dto.setNextTaskId(workflowResultDtoList.get(i).getNextTaskId());
-                dto.setInstanceId(workflowResultDtoList.get(i).getInstanceId());
-                dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
+                buildTask(list, workflowResultDtoList, Boolean.TRUE);
             } else {
-                dto.setNextExecuteUserIds(reginParams.getUserModel().getUserId());
-                dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
+                // 暂存任务
+                buildTaskDraft(list);
             }
-            dto.setEquList(String.valueOf(obj.get("EQU_LIST")));
-            dto.setSupervisoryCode(String.valueOf(obj.get("SUPERVISORY_CODE")));
-            dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
-            dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
-
-            jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
-            jgRelationEquip.setEquipTransferId(applyNo);
-
-            dto.setCreateUserName(reginParams.getUserModel().getRealName());
-            dto.setCreateUserId(reginParams.getUserModel().getUserId());
-            DataDictionary dictionary = iDataDictionaryService.getByCode(dto.getMaintainType(), "WXLX");
-            dto.setMaintainTypeDesc(dictionary.getName());
-            dto.setFullAddress(dto.getProvinceName() + dto.getCityName() + dto.getCountyName() + dto.getStreetName() + dto.getAddress());
-            list.add(dto);
-            equipList.add(jgRelationEquip);
-        });
-        jgMaintainNoticeMapper.insertBatchSomeColumn(list);
-        if (SUBMIT_TYPE_FLOW.equals(submitType)) {
-            buildTask(list, workflowResultDtoList, Boolean.TRUE);
-        } else {
-            // 暂存任务
-            buildTaskDraft(list);
+            List<JgMaintainNoticeEq> jgRelationEquipList = equipList.stream().map(jgRelationEquip -> {
+                List<JgMaintainNotice> collect = list.stream().filter(JgMaintainNotice -> jgRelationEquip.getEquipTransferId().equals(JgMaintainNotice.getApplyNo())).collect(Collectors.toList());
+                Long sequenceNbr = collect.get(0).getSequenceNbr();
+                return jgRelationEquip.setEquipTransferId(String.valueOf(sequenceNbr));
+            }).collect(Collectors.toList());
+            jgMaintainNoticeEqMapper.insertBatchSomeColumn(jgRelationEquipList);
+            this.updateRedisBatch(list);
+            return list;
+        } catch (BadRequest | LocalBadRequest e) {
+            log.error(e.getMessage(), e);
+            this.rollBackForDelRedisData();
+            throw e;
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            this.rollBackForDelRedisData();
+            throw new BadRequest("安装告知保存失败！");
+        } finally {
+            FlowingEquipRedisContext.clean();
         }
-        List<JgMaintainNoticeEq> jgRelationEquipList = equipList.stream().map(jgRelationEquip -> {
-            List<JgMaintainNotice> collect = list.stream().filter(JgMaintainNotice -> jgRelationEquip.getEquipTransferId().equals(JgMaintainNotice.getApplyNo())).collect(Collectors.toList());
-            Long sequenceNbr = collect.get(0).getSequenceNbr();
-            return jgRelationEquip.setEquipTransferId(String.valueOf(sequenceNbr));
-        }).collect(Collectors.toList());
-        jgMaintainNoticeEqMapper.insertBatchSomeColumn(jgRelationEquipList);
-        this.updateRedisBatch(list);
-        return list;
     }
 
     private void updateRedisBatch(List<JgMaintainNotice> jgMaintainNotices) {
@@ -542,7 +606,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
             taskMessageDto.setNextTaskId(item.getNextTaskId());
             taskModelDto.setModel(taskMessageDto);
             taskModelDto.setNextExecuteUser(item.getNextExecuteIds());
-            taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(),  StringUtils.isEmpty(item.getSupervisoryCode()) ? "" : item.getSupervisoryCode(), item.getApplyNo()));
+            taskModelDto.setTaskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), StringUtils.isEmpty(item.getSupervisoryCode()) ? "" : item.getSupervisoryCode(), item.getApplyNo()));
             taskModelDtoList.add(taskModelDto);
             if (bool) {
                 // 删除暂存时生成的待办
@@ -574,7 +638,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
         }
         return new ArrayList<>();
     }
-    
+
 
     private void convertField(JgMaintainNoticeDto model) {
         if (null == model) {
@@ -722,6 +786,7 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
 
             commonService.rollbackTask(jgMaintainNotice.getInstanceId(), jsonObject);
             commonService.saveExecuteFlowData2Redis(instanceId, this.buildInstanceRuntimeData(jgMaintainNotice));
+            this.delRepeatUseEquipData(jgMaintainNotice);
         } catch (InterruptedException e) {
             e.printStackTrace();
         } finally {
@@ -864,10 +929,10 @@ public class JgMaintainNoticeServiceImpl extends BaseService<JgMaintainNoticeDto
                 taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
                 taskModelDto.setPageType("edit");
                 commonService.buildTaskModel(Collections.singletonList(taskModelDto));
-
                 jgMaintainNotice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
                 jgMaintainNotice.setNextTaskId(workflowResultDto.getNextTaskId());
                 jgMaintainNoticeMapper.updateById(jgMaintainNotice);
+                this.delRepeatUseEquipData(jgMaintainNotice);
             }
             commonService.saveExecuteFlowData2Redis(instanceId, this.buildInstanceRuntimeData(jgMaintainNotice));
         } catch (InterruptedException e) {

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

@@ -25,6 +25,7 @@ import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgMaintenanceContractService;
 import com.yeejoin.amos.boot.module.jg.api.vo.JgMaintenanceContractVo;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
+import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgUseInfoService;
@@ -72,6 +73,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
     public static final String SUBMIT_DATA = "0";
     public static final String SUBMIT_TYPE_FLOW = "1";
     public static final String WB_PROCESS_DEFINITION_KEY = "maintenanceFiling";
+    private final List<String> NOT_FLOWING_STATE = Arrays.asList("使用单位待提交", "维保单位已驳回", "使用单位已撤回", "已作废", "已完成");
 
     @Autowired
     TzsServiceFeignClient tzsServiceFeignClient;
@@ -211,6 +213,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             ProcessTaskDTO complete = workflowService.completeOrReject(taskId, dto, operate);
             // 更新下一步执行人、创建待办
             updateExecuteIds(instanceId, id, operate, complete);
+            this.delRepeatUseEquipData(contract.getSequenceNbr(), contract.getStatus(), contract.getUseUnitCode());
         } catch (InterruptedException e) {
             e.printStackTrace();
         } finally {
@@ -220,6 +223,22 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         }
     }
 
+    /**
+     * 删除 redis校验重复引用设备的数据
+     */
+    private void delRepeatUseEquipData(Long id, String status, String companyCode) {
+        List<JgMaintenanceContractEq> list = jgMaintenanceContractEqService.lambdaQuery().eq(JgMaintenanceContractEq::getEquipTransferId, id).list();
+        // 获取单位变更设备列表
+        if (CollectionUtils.isEmpty(list)) {
+            return;
+        }
+        List<String> records = list.stream().map(JgMaintenanceContractEq::getEquId).collect(Collectors.toList());
+        if (NOT_FLOWING_STATE.contains(status)) {
+            EquipUsedCheckStrategyContext.getUsedStrategy(WB_PROCESS_DEFINITION_KEY)
+                    .delDataForCheckEquipRepeatUsed(records, companyCode);
+        }
+    }
+
     public InstanceRuntimeData buildInstanceRuntimeData(JgMaintenanceContract jgMaintenanceContract) {
         return InstanceRuntimeData.builder()
                 .nextExecuteUserIds(jgMaintenanceContract.getNextExecuteUserIds())
@@ -256,7 +275,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         list.forEach(seq -> {
             JgMaintenanceContract jgMaintenanceContract = this.baseMapper.selectById(seq);
             // 删除待办 及 中止流程
-            commonService.deleteTaskModel(String.valueOf(jgMaintenanceContract.getSequenceNbr()),jgMaintenanceContract.getInstanceId());
+            commonService.deleteTaskModel(String.valueOf(jgMaintenanceContract.getSequenceNbr()), jgMaintenanceContract.getInstanceId());
             // 删除业务单
             this.baseMapper.deleteById(seq);
             // 删除对应eq
@@ -370,6 +389,7 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
 
             // redis流程实时数据更新
             commonService.saveExecuteFlowData2Redis(instanceId, this.buildInstanceRuntimeData(contract));
+            this.delRepeatUseEquipData(contract.getSequenceNbr(), contract.getStatus(), contract.getUseUnitCode());
         } catch (InterruptedException e) {
             e.printStackTrace();
         } finally {
@@ -441,9 +461,9 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
             jgMaintenanceContractEqService.getBaseMapper().delete(lambda);
         }
         // 更新关联设备信息
+        List<JgMaintenanceContractEq> equipList = new ArrayList<>();
         if (!CollectionUtils.isEmpty(equipmentLists)) {
             contract.setEquNum(equipmentLists.size());
-            List<JgMaintenanceContractEq> equipList = new ArrayList<>();
             equipmentLists.forEach(x -> {
                 JgMaintenanceContractEq equip = new JgMaintenanceContractEq();
                 equip.setEquId(String.valueOf(x.get("SEQUENCE_NBR")));
@@ -546,6 +566,11 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         updateById(contract);
         // 设备数据存历史数据，在流程完成时使用
         commonService.saveOrUpdateHistory(BusinessTypeEnum.JG_MAINTENANCE_RECORD.getName(), JSON.parseArray(JSON.toJSONString(equipmentLists)), null, contract.getSequenceNbr().toString());
+        if (SUBMIT_TYPE_FLOW.equals(submit)) {//放在最后面防止前面有异常
+            //如果是提交，用于校验设备是否已经在流程中，如果不在标记设备已经在流程中
+            equipList.forEach(equip -> EquipUsedCheckStrategyContext.getUsedStrategy(WB_PROCESS_DEFINITION_KEY)
+                    .equipRepeatUsedCheck(String.valueOf(equip.getEquId()), reginParams.getCompany().getCompanyCode()));
+        }
         return Collections.singletonList(contract);
     }
 
@@ -784,37 +809,39 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         return null;
     }
 
-    private void processElseDataByStatus(FlowStatusEnum oldNoticeStatus, JgMaintenanceContract maintenanceContract) {
+    private void processElseDataByStatus(FlowStatusEnum oldNoticeStatus, JgMaintenanceContract contract) {
         switch (oldNoticeStatus) {
             case TO_BE_SUBMITTED:
                 // 1.写入历史表
-                this.saveHisDataBeforeUpdate(maintenanceContract);
+                this.saveHisDataBeforeUpdate(contract);
                 // 2.删除暂存时生成的待办
-                commonService.deleteTasksAndStopProcess(maintenanceContract.getInstanceId(),"监管单位主动作废");
+                commonService.deleteTasksAndStopProcess(contract.getInstanceId(), "监管单位主动作废");
                 break;
             case TO_BE_FINISHED:
                 // 1.回退表单
-                updateIdxBizJgRegisterInfo(maintenanceContract);
+                updateIdxBizJgRegisterInfo(contract);
                 break;
             default:
                 // 流程中（驳回、撤回等）
                 // 1.待办任务更新为已完成
-                this.finishedTask(maintenanceContract);
+                this.finishedTask(contract);
                 // 2.终止流程-工作流报错暂时注释掉
-                iCmWorkflowService.stopProcess(maintenanceContract.getInstanceId(), maintenanceContract.getCancelReason());
+                iCmWorkflowService.stopProcess(contract.getInstanceId(), contract.getCancelReason());
                 // 3.写入历史表
-                this.saveHisDataBeforeUpdate(maintenanceContract);
+                this.saveHisDataBeforeUpdate(contract);
+                // 4、释放流程中设备
+                this.delRepeatUseEquipData(contract.getSequenceNbr(), contract.getStatus(), contract.getUseUnitCode());
+
         }
     }
 
 
-
     private void updateIdxBizJgRegisterInfo(JgMaintenanceContract maintenanceContract) {
         LambdaQueryWrapper<JgMaintenanceContractEq> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(JgMaintenanceContractEq::getEquipTransferId, maintenanceContract.getSequenceNbr());
         List<JgMaintenanceContractEq> equipmentLists = maintenanceContractEqMapper.selectList(queryWrapper);
-        if(!CollectionUtils.isEmpty(equipmentLists)){
-            List<String> list = equipmentLists.stream().filter(t->t.getEquId() != null).map(JgMaintenanceContractEq::getEquId).collect(Collectors.toList());
+        if (!CollectionUtils.isEmpty(equipmentLists)) {
+            List<String> list = equipmentLists.stream().filter(t -> t.getEquId() != null).map(JgMaintenanceContractEq::getEquId).collect(Collectors.toList());
             maintenanceContractEqMapper.updateIdxBizJgRegisterInfo(list);
         }
     }

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

@@ -13,22 +13,26 @@ import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.jg.api.dto.*;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNotice;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNoticeEq;
-import com.yeejoin.amos.boot.module.jg.api.entity.JgRegistrationHistory;
+import com.yeejoin.amos.boot.module.jg.api.entity.*;
 import com.yeejoin.amos.boot.module.jg.api.enums.BusinessTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgReformNoticeEqMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgReformNoticeMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgRegistrationHistoryMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgReformNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
+import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
+import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
+import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgRegisterInfoService;
 import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
 import com.yeejoin.amos.boot.module.ymt.api.entity.RegistrationInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
-import com.yeejoin.amos.boot.module.ymt.api.mapper.*;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.OtherInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.RegistrationInfoMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.SupervisoryCodeInfoMapper;
 import com.yeejoin.amos.feign.systemctl.model.TaskV2Model;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowBatchDTO;
 import com.yeejoin.amos.feign.workflow.model.ActWorkflowStartDTO;
@@ -175,86 +179,99 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
      */
     @SuppressWarnings({"rawtypes", "Duplicates"})
     public JgReformNoticeDto updateInstallationNotice(String submitType, JgReformNoticeDto noticeDto, String op) {
-        if (Objects.isNull(noticeDto) || StringUtils.isEmpty(submitType)) {
-            throw new IllegalArgumentException("参数不能为空");
-        }
-        // 字段转换
-        this.convertField(noticeDto);
-        JgReformNotice notice = this.getById(noticeDto.getSequenceNbr());
-        if (SUBMIT_TYPE_FLOW.equals(submitType)) {
-            // 发起流程
-            if (!StringUtils.hasText(noticeDto.getInstanceId())) {
-                ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
-                List<ActWorkflowStartDTO> list = new ArrayList<>();
-                ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
-                dto.setBusinessKey(noticeDto.getSequenceNbr().toString());
-                dto.setCompleteFirstTask(Boolean.TRUE);
-                dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
-                dto.setNextExecuteUserCompanyCode(noticeDto.getReceiveCompanyCode());
-                list.add(dto);
-                actWorkflowBatchDTO.setProcess(list);
-                ProcessTaskDTO processTaskDTO = cmWorkflowService.startBatch(actWorkflowBatchDTO).get(0);
-                // 提取节点等信息
-                WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
-                BeanUtils.copyProperties(noticeDto, notice);
-                if (!ObjectUtils.isEmpty(notice.getInstanceStatus())) {
-                    notice.setInstanceStatus(notice.getInstanceStatus() + "," + workflowResultDto.getNextExecutorRoleIds());
+        try {
+            if (Objects.isNull(noticeDto) || StringUtils.isEmpty(submitType)) {
+                throw new IllegalArgumentException("参数不能为空");
+            }
+            // 字段转换
+            this.convertField(noticeDto);
+            JgReformNotice notice = this.getById(noticeDto.getSequenceNbr());
+            this.checkRepeatUsed(submitType, notice);
+            if (SUBMIT_TYPE_FLOW.equals(submitType)) {
+                // 发起流程
+                if (!StringUtils.hasText(noticeDto.getInstanceId())) {
+                    ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
+                    List<ActWorkflowStartDTO> list = new ArrayList<>();
+                    ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
+                    dto.setBusinessKey(noticeDto.getSequenceNbr().toString());
+                    dto.setCompleteFirstTask(Boolean.TRUE);
+                    dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
+                    dto.setNextExecuteUserCompanyCode(noticeDto.getReceiveCompanyCode());
+                    list.add(dto);
+                    actWorkflowBatchDTO.setProcess(list);
+                    ProcessTaskDTO processTaskDTO = cmWorkflowService.startBatch(actWorkflowBatchDTO).get(0);
+                    // 提取节点等信息
+                    WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
+                    BeanUtils.copyProperties(noticeDto, notice);
+                    if (!ObjectUtils.isEmpty(notice.getInstanceStatus())) {
+                        notice.setInstanceStatus(notice.getInstanceStatus() + "," + workflowResultDto.getNextExecutorRoleIds());
+                    } else {
+                        notice.setInstanceStatus(workflowResultDto.getNextExecutorRoleIds());
+                    }
+                    notice.setPromoter(RequestContext.getExeUserId());
+                    notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
+                    notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
+                    notice.setInstanceId(workflowResultDto.getInstanceId());
+                    notice.setNextTaskId(workflowResultDto.getNextTaskId());
+                    notice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+
+                    jgReformNoticeMapper.updateById(notice);
+                    // 删除暂存
+                    commonService.deleteTasksByRelationId(notice.getSequenceNbr() + "");
+                    // 如果为保存并提交，则创建代办
+                    this.buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto));
                 } else {
-                    notice.setInstanceStatus(workflowResultDto.getNextExecutorRoleIds());
+                    TaskResultDTO dto = new TaskResultDTO();
+                    dto.setResultCode("approvalStatus");
+                    dto.setTaskId(notice.getNextTaskId());
+                    HashMap<String, Object> commMap = new HashMap<>();
+                    if (notice.getNoticeStatus().equals("6614") || notice.getNoticeStatus().equals("6615")) {
+                        commMap.put("approvalStatus", "提交");
+                    } else {
+                        commMap.put("approvalStatus", op);
+                    }
+                    dto.setNextExecuteUserCompanyCode(notice.getReceiveCompanyCode());
+                    dto.setVariable(commMap);
+                    ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(notice.getNextTaskId(), dto, op);
+                    // 提取节点等信息
+                    WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
+                    BeanUtils.copyProperties(noticeDto, notice);
+
+                    if (!org.apache.commons.lang3.ObjectUtils.isEmpty(notice.getInstanceStatus())) {
+                        notice.setInstanceStatus(notice.getInstanceStatus() + "," + workflowResultDto.getNextExecutorRoleIds());
+                    } else {
+                        notice.setInstanceStatus(workflowResultDto.getNextExecutorRoleIds());
+                    }
+                    notice.setPromoter(RequestContext.getExeUserId());
+                    notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
+                    notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
+                    notice.setNextTaskId(workflowResultDto.getNextTaskId());
+                    notice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+
+                    updateById(notice);
+                    // 上个代办改为已办
+                    TaskV2Model taskV2Model = this.updateLastTodo(notice, FlowStatusEnum.TO_BE_PROCESSED);
+                    // 创建新的代办
+                    this.createNewTodo(notice, workflowResultDto, taskV2Model, FlowStatusEnum.TO_BE_PROCESSED);
                 }
-                notice.setPromoter(RequestContext.getExeUserId());
-                notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
-                notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
-                notice.setInstanceId(workflowResultDto.getInstanceId());
-                notice.setNextTaskId(workflowResultDto.getNextTaskId());
-                notice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
-
-                jgReformNoticeMapper.updateById(notice);
-                // 删除暂存
-                commonService.deleteTasksByRelationId(notice.getSequenceNbr() + "");
-                // 如果为保存并提交，则创建代办
-                this.buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto));
+                commonService.saveExecuteFlowData2Redis(notice.getInstanceId(), this.buildInstanceRuntimeData(notice));
             } else {
-                TaskResultDTO dto = new TaskResultDTO();
-                dto.setResultCode("approvalStatus");
-                dto.setTaskId(notice.getNextTaskId());
-                HashMap<String, Object> commMap = new HashMap<>();
-                if (notice.getNoticeStatus().equals("6614") || notice.getNoticeStatus().equals("6615")) {
-                    commMap.put("approvalStatus", "提交");
-                } else {
-                    commMap.put("approvalStatus", op);
-                }
-                dto.setNextExecuteUserCompanyCode(notice.getReceiveCompanyCode());
-                dto.setVariable(commMap);
-                ProcessTaskDTO processTaskDTO = cmWorkflowService.completeOrReject(notice.getNextTaskId(), dto, op);
-                // 提取节点等信息
-                WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
-                BeanUtils.copyProperties(noticeDto, notice);
-
-                if (!org.apache.commons.lang3.ObjectUtils.isEmpty(notice.getInstanceStatus())) {
-                    notice.setInstanceStatus(notice.getInstanceStatus() + "," + workflowResultDto.getNextExecutorRoleIds());
-                } else {
-                    notice.setInstanceStatus(workflowResultDto.getNextExecutorRoleIds());
-                }
-                notice.setPromoter(RequestContext.getExeUserId());
-                notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
-                notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
-                notice.setNextTaskId(workflowResultDto.getNextTaskId());
-                notice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
-
-                updateById(notice);
-                // 上个代办改为已办
-                TaskV2Model taskV2Model = this.updateLastTodo(notice, FlowStatusEnum.TO_BE_PROCESSED);
-                // 创建新的代办
-                this.createNewTodo(notice, workflowResultDto, taskV2Model, FlowStatusEnum.TO_BE_PROCESSED);
+                JgReformNotice bean = new JgReformNotice();
+                BeanUtils.copyProperties(noticeDto, bean);
+                jgReformNoticeMapper.updateById(bean);
             }
-            commonService.saveExecuteFlowData2Redis(notice.getInstanceId(), this.buildInstanceRuntimeData(notice));
-        } else {
-            JgReformNotice bean = new JgReformNotice();
-            BeanUtils.copyProperties(noticeDto, bean);
-            jgReformNoticeMapper.updateById(bean);
+            return noticeDto;
+        } catch (BadRequest | LocalBadRequest e) {
+            log.error(e.getMessage(), e);
+            this.rollBackForDelRedisData();
+            throw e;
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            this.rollBackForDelRedisData();
+            throw new BadRequest("安装告知保存失败！");
+        } finally {
+            FlowingEquipRedisContext.clean();
         }
-        return noticeDto;
     }
 
 
@@ -307,7 +324,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
         Collection<JgReformNotice> JgReformNotices = this.listByIds(Arrays.asList(sequenceNbrs));
         JgReformNotices.forEach(notice -> {
             // 删除代办 + 中止流程
-            commonService.deleteTaskModel(String.valueOf(notice.getSequenceNbr()),notice.getInstanceId());
+            commonService.deleteTaskModel(String.valueOf(notice.getSequenceNbr()), notice.getInstanceId());
             // 删除单子
             this.baseMapper.deleteById(notice.getSequenceNbr());
             // 删除对应eq
@@ -354,94 +371,139 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
     @SuppressWarnings({"Duplicates", "rawtypes"})
     @Transactional(rollbackFor = Exception.class)
     public List<JgReformNotice> saveNotice(String submitType, Map<String, Object> JgReformNoticeDtoMap, ReginParams reginParams) {
-        JgReformNoticeDto model = JSON.parseObject(JSONObject.toJSONString(JgReformNoticeDtoMap.get(TABLE_PAGE_ID)), JgReformNoticeDto.class);
-        convertField(model);
-        // 获取告知设备列表
-        List<Map<String, Object>> deviceList = model.getDeviceList();
-        if (CollectionUtils.isEmpty(deviceList)) {
-            throw new BadRequest("请选择设备!");
-        }
-        // 获取告知单号
-        ResponseModel<List<String>> codeResult = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.GZGZ.getCode(), deviceList.size());
-        List<String> applyNoList = null;
-        if (codeResult != null && !ValidationUtil.isEmpty(codeResult.getResult())) {
-            applyNoList = codeResult.getResult();
-        }
-
-        if (CollectionUtils.isEmpty(applyNoList)) {
-            throw new BadRequest("申请单编号生成失败,请稍后重试!");
-        }
-
-        // 启动工作流
-        List<WorkflowResultDto> workflowResultList = this.startWorkFlow(model.getReceiveCompanyCode(), submitType, deviceList);
-
-        List<JgReformNotice> list = new ArrayList<>();
-        List<JgReformNoticeEq> equipList = new ArrayList<>();
-        List<String> finalApplyNoList = applyNoList;
-        CompanyBo companyBo = commonService.getOneCompany(model.getReceiveCompanyCode());
-
-        deviceList.forEach(obj -> {
-            JgReformNoticeEq jgRelationEquip = new JgReformNoticeEq();
-            JgReformNotice dto = new JgReformNotice();
-            BeanUtils.copyProperties(model, dto);
-            int i = deviceList.indexOf(obj);
-            String applyNo = finalApplyNoList.get(i);
-            dto.setApplyNo(applyNo);
-            dto.setNoticeDate(new Date());
-            dto.setCreateUserName(reginParams.getUserModel().getRealName());
-            dto.setCreateUserId(reginParams.getUserModel().getUserId());
-            dto.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
-            dto.setEquCategory(Objects.toString(obj.get("EQU_CATEGORY"), ""));
-            dto.setEquListCode(Objects.toString(obj.get("EQU_DEFINE"), ""));
-            dto.setSupervisoryCode(Objects.toString(obj.get("SUPERVISORY_CODE"), ""));
-            dto.setEquList(Objects.toString(obj.get("EQU_LIST"), ""));
-            dto.setFullAddress(Objects.toString(obj.get("ADDRESS"), ""));
-            // 统计用
-            dto.setReceiveCompanyOrgCode(companyBo.getOrgCode());
-
+        try {
+            JgReformNoticeDto model = JSON.parseObject(JSONObject.toJSONString(JgReformNoticeDtoMap.get(TABLE_PAGE_ID)), JgReformNoticeDto.class);
+            convertField(model);
+            // 获取告知设备列表
+            List<Map<String, Object>> deviceList = model.getDeviceList();
+            if (CollectionUtils.isEmpty(deviceList)) {
+                throw new BadRequest("请选择设备!");
+            }
+            // 提交时对设备状态进行校验（处理并发问题，一个未被使用的设备同时被多个使用这打开，同时提交发起申请） todo 回滚异常未写
             if (SUBMIT_TYPE_FLOW.equals(submitType)) {
-                WorkflowResultDto workflowResult = workflowResultList.get(i);
-                dto.setNextExecuteIds(workflowResult.getNextExecutorRoleIds());
-                dto.setInstanceStatus(workflowResult.getNextExecutorRoleIds() + "," + workflowResult.getExecutorRoleIds());
-                dto.setPromoter(reginParams.getUserModel().getUserId());
-                dto.setNextTaskId(workflowResult.getNextTaskId());
-                dto.setNextExecuteUserIds(workflowResult.getNextExecutorUserIds());
-            } else {
-                dto.setNextExecuteUserIds(RequestContext.getExeUserId());
+                this.repeatUsedEquipCheck(deviceList, reginParams.getCompany().getCompanyCode());
             }
-            dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
-            dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
-            dto.setEntrustingUnitName(reginParams.getCompany().getCompanyName());
-            dto.setEntrustingUnitCreditCode(reginParams.getCompany().getCompanyCode());
-            jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
-            jgRelationEquip.setEquipTransferId(applyNo);
-            if (!CollectionUtils.isEmpty(workflowResultList)) {
-                dto.setInstanceId(workflowResultList.get(i).getInstanceId());
-                dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
-            } else {
-                dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
+            // 获取告知单号
+            ResponseModel<List<String>> codeResult = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.GZGZ.getCode(), deviceList.size());
+            List<String> applyNoList = null;
+            if (codeResult != null && !ValidationUtil.isEmpty(codeResult.getResult())) {
+                applyNoList = codeResult.getResult();
             }
 
-            dto.setCreateUserId(reginParams.getUserModel().getUserId());
-            list.add(dto);
-            equipList.add(jgRelationEquip);
-        });
+            if (CollectionUtils.isEmpty(applyNoList)) {
+                throw new BadRequest("申请单编号生成失败,请稍后重试!");
+            }
+
+            // 启动工作流
+            List<WorkflowResultDto> workflowResultList = this.startWorkFlow(model.getReceiveCompanyCode(), submitType, deviceList);
+
+            List<JgReformNotice> list = new ArrayList<>();
+            List<JgReformNoticeEq> equipList = new ArrayList<>();
+            List<String> finalApplyNoList = applyNoList;
+            CompanyBo companyBo = commonService.getOneCompany(model.getReceiveCompanyCode());
+
+            deviceList.forEach(obj -> {
+                JgReformNoticeEq jgRelationEquip = new JgReformNoticeEq();
+                JgReformNotice dto = new JgReformNotice();
+                BeanUtils.copyProperties(model, dto);
+                int i = deviceList.indexOf(obj);
+                String applyNo = finalApplyNoList.get(i);
+                dto.setApplyNo(applyNo);
+                dto.setNoticeDate(new Date());
+                dto.setCreateUserName(reginParams.getUserModel().getRealName());
+                dto.setCreateUserId(reginParams.getUserModel().getUserId());
+                dto.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
+                dto.setEquCategory(Objects.toString(obj.get("EQU_CATEGORY"), ""));
+                dto.setEquListCode(Objects.toString(obj.get("EQU_DEFINE"), ""));
+                dto.setSupervisoryCode(Objects.toString(obj.get("SUPERVISORY_CODE"), ""));
+                dto.setEquList(Objects.toString(obj.get("EQU_LIST"), ""));
+                dto.setFullAddress(Objects.toString(obj.get("ADDRESS"), ""));
+                // 统计用
+                dto.setReceiveCompanyOrgCode(companyBo.getOrgCode());
+
+                if (SUBMIT_TYPE_FLOW.equals(submitType)) {
+                    WorkflowResultDto workflowResult = workflowResultList.get(i);
+                    dto.setNextExecuteIds(workflowResult.getNextExecutorRoleIds());
+                    dto.setInstanceStatus(workflowResult.getNextExecutorRoleIds() + "," + workflowResult.getExecutorRoleIds());
+                    dto.setPromoter(reginParams.getUserModel().getUserId());
+                    dto.setNextTaskId(workflowResult.getNextTaskId());
+                    dto.setNextExecuteUserIds(workflowResult.getNextExecutorUserIds());
+                } else {
+                    dto.setNextExecuteUserIds(RequestContext.getExeUserId());
+                }
+                dto.setInstallUnitName(reginParams.getCompany().getCompanyName());
+                dto.setInstallUnitCreditCode(reginParams.getCompany().getCompanyCode());
+                dto.setEntrustingUnitName(reginParams.getCompany().getCompanyName());
+                dto.setEntrustingUnitCreditCode(reginParams.getCompany().getCompanyCode());
+                jgRelationEquip.setEquId(String.valueOf(obj.get("SEQUENCE_NBR")));
+                jgRelationEquip.setEquipTransferId(applyNo);
+                if (!CollectionUtils.isEmpty(workflowResultList)) {
+                    dto.setInstanceId(workflowResultList.get(i).getInstanceId());
+                    dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
+                } else {
+                    dto.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getCode()));
+                }
+
+                dto.setCreateUserId(reginParams.getUserModel().getUserId());
+                list.add(dto);
+                equipList.add(jgRelationEquip);
+            });
 
-        jgReformNoticeMapper.insertBatchSomeColumn(list);
+            jgReformNoticeMapper.insertBatchSomeColumn(list);
 
+            if (SUBMIT_TYPE_FLOW.equals(submitType)) {
+                this.buildTask(list, workflowResultList);
+            } else {
+                this.saveTempReformNotice(list);
+            }
+            List<JgReformNoticeEq> jgRelationEquipList = equipList.stream().map(jgRelationEquip -> {
+                List<JgReformNotice> collect = list.stream().filter(JgReformNotice -> jgRelationEquip.getEquipTransferId().equals(JgReformNotice.getApplyNo())).collect(Collectors.toList());
+                Long sequenceNbr = collect.get(0).getSequenceNbr();
+                return jgRelationEquip.setEquipTransferId(String.valueOf(sequenceNbr));
+            }).collect(Collectors.toList());
+            jgReformNoticeEqMapper.insertBatchSomeColumn(jgRelationEquipList);
+            this.updateRedisBatch(list);
+            return list;
+        } catch (BadRequest | LocalBadRequest e) {
+            log.error(e.getMessage(), e);
+            this.rollBackForDelRedisData();
+            throw e;
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            this.rollBackForDelRedisData();
+            throw new BadRequest("安装告知保存失败！");
+        } finally {
+            FlowingEquipRedisContext.clean();
+        }
+    }
+    private void repeatUsedEquipCheck(List<Map<String, Object>> equipList, String companyCode) {
+        equipList.forEach(equipMap -> EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY).equipRepeatUsedCheck(String.valueOf(equipMap.get("SEQUENCE_NBR")), companyCode));
+    }
+    private void checkRepeatUsed(String submitType, JgReformNotice jgReformNotice) {
         if (SUBMIT_TYPE_FLOW.equals(submitType)) {
-            this.buildTask(list, workflowResultList);
-        } else {
-            this.saveTempReformNotice(list);
+            // 流程中校验
+            LambdaQueryWrapper<JgReformNoticeEq> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(JgReformNoticeEq::getEquipTransferId, jgReformNotice.getSequenceNbr());
+            JgReformNoticeEq jgRelationEquip = jgReformNoticeEqMapper.selectOne(queryWrapper);
+            EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
+                    .equipRepeatUsedCheck(jgRelationEquip.getEquId(), jgReformNotice.getInstallUnitCreditCode());
         }
-        List<JgReformNoticeEq> jgRelationEquipList = equipList.stream().map(jgRelationEquip -> {
-            List<JgReformNotice> collect = list.stream().filter(JgReformNotice -> jgRelationEquip.getEquipTransferId().equals(JgReformNotice.getApplyNo())).collect(Collectors.toList());
-            Long sequenceNbr = collect.get(0).getSequenceNbr();
-            return jgRelationEquip.setEquipTransferId(String.valueOf(sequenceNbr));
-        }).collect(Collectors.toList());
-        jgReformNoticeEqMapper.insertBatchSomeColumn(jgRelationEquipList);
-        this.updateRedisBatch(list);
-        return list;
+    }
+    /**
+     * 删除 redis校验重复引用设备的数据
+     */
+    private void delRepeatUseEquipData(JgReformNotice notice) {
+        LambdaQueryWrapper<JgReformNoticeEq> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(JgReformNoticeEq::getEquipTransferId, notice.getSequenceNbr());
+        JgReformNoticeEq jgRelationEquip = jgReformNoticeEqMapper.selectOne(queryWrapper);
+        EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
+                .delDataForCheckEquipRepeatUsed(Collections.singletonList(jgRelationEquip.getEquId()), notice.getInstallUnitCreditCode());
+    }
+    private void rollBackForDelRedisData() {
+        FlowingEquipRedisContext.getContext().forEach(e -> {
+            EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
+                    .delDataForCheckWithKey(e.getData(), e.getRedisKey());
+        });
     }
 
     private void updateRedisBatch(List<JgReformNotice> jgReformNotices) {
@@ -680,6 +742,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
             jsonObject.put("flowStatusLabel", FlowStatusEnum.ROLLBACK.getName());
             commonService.rollbackTask(notice.getInstanceId(), jsonObject);
             commonService.saveExecuteFlowData2Redis(instanceId, this.buildInstanceRuntimeData(notice));
+            this.delRepeatUseEquipData(notice);
         } catch (InterruptedException e) {
             e.printStackTrace();
         } finally {
@@ -788,6 +851,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
                 taskV2Model = this.updateLastTodo(jgReformNotice, FlowStatusEnum.REJECTED);
                 this.createNewTodo(jgReformNotice, workflowResultDto, taskV2Model, FlowStatusEnum.REJECTED);
                 jgReformNoticeMapper.updateById(jgReformNotice);
+                this.delRepeatUseEquipData(jgReformNotice);
             }
             commonService.saveExecuteFlowData2Redis(instanceId, this.buildInstanceRuntimeData(jgReformNotice));
         } catch (InterruptedException e) {

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

@@ -24,6 +24,9 @@ import com.yeejoin.amos.boot.module.jg.api.mapper.JgTransferNoticeMapper;
 import com.yeejoin.amos.boot.module.jg.api.mapper.JgUseRegistrationMapper;
 import com.yeejoin.amos.boot.module.jg.api.service.IJgTransferNoticeService;
 import com.yeejoin.amos.boot.module.jg.api.vo.SortVo;
+import com.yeejoin.amos.boot.module.jg.biz.config.LocalBadRequest;
+import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext;
+import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICmWorkflowService;
 import com.yeejoin.amos.boot.module.jg.biz.utils.WordTemplateUtils;
@@ -141,7 +144,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
                     transferNotice.put("constructionContractList", ObjectUtils.isEmpty(transferNotice.get(s)) ? new JSONArray() : JSON.parseArray(transferNotice.get(s).toString()));
                 } else if ("otherAccessories".equalsIgnoreCase(s)) {
                     transferNotice.put("otherAccessoriesList", ObjectUtils.isEmpty(transferNotice.get(s)) ? new JSONArray() : JSON.parseArray(transferNotice.get(s).toString()));
-                }else {
+                } else {
                     transferNotice.put(s, ObjectUtils.isEmpty(transferNotice.get(s)) ? new JSONArray() : JSON.parseArray(transferNotice.get(s).toString()));
                 }
             }
@@ -172,6 +175,39 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
 
     }
 
+    private void checkRepeatUsed(String submitType, JgTransferNotice notice) {
+        if (SUBMIT_TYPE_FLOW.equals(submitType)) {
+            // 流程中校验
+            LambdaQueryWrapper<JgTransferNoticeEq> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(JgTransferNoticeEq::getEquipTransferId, notice.getSequenceNbr());
+            JgTransferNoticeEq noticeEq = jgTransferNoticeEqMapper.selectOne(queryWrapper);
+            EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
+                    .equipRepeatUsedCheck(noticeEq.getEquId(), notice.getInstallUnitCreditCode());
+        }
+    }
+
+    private void repeatUsedEquipCheck(List<Map<String, Object>> equipList, String companyCode) {
+        equipList.forEach(equipMap -> EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY).equipRepeatUsedCheck(String.valueOf(equipMap.get("SEQUENCE_NBR")), companyCode));
+    }
+
+    /**
+     * 删除 redis校验重复引用设备的数据
+     */
+    private void delRepeatUseEquipData(JgTransferNotice notice) {
+        LambdaQueryWrapper<JgTransferNoticeEq> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(JgTransferNoticeEq::getEquipTransferId, notice.getSequenceNbr());
+        JgTransferNoticeEq noticeEq = jgTransferNoticeEqMapper.selectOne(queryWrapper);
+        EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
+                .delDataForCheckEquipRepeatUsed(Collections.singletonList(noticeEq.getEquId()), notice.getInstallUnitCreditCode());
+    }
+
+    private void rollBackForDelRedisData() {
+        FlowingEquipRedisContext.getContext().forEach(e -> {
+            EquipUsedCheckStrategyContext.getUsedStrategy(PROCESS_DEFINITION_KEY)
+                    .delDataForCheckWithKey(e.getData(), e.getRedisKey());
+        });
+    }
+
     private Map<String, Object> getEquipInfoNew(String companyLevel, Map<String, Object> transferNotice, List<Map<String, Object>> equipmentInfos) {
         Map<String, Object> detail = equipmentInfos.get(0);
         Map<String, Object> equInfo = idxBizJgRegisterInfoService.getDetailFieldCamelCaseByRecord(detail.get("equId").toString());
@@ -199,7 +235,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
         for (Long sequenceNbr : sequenceNbrs) {
             // 删除待办 及 中止流程
             JgTransferNotice jgTransferNotice = this.getBaseMapper().selectById(sequenceNbr);
-            commonService.deleteTaskModel(String.valueOf(sequenceNbr),jgTransferNotice.getInstanceId());
+            commonService.deleteTaskModel(String.valueOf(sequenceNbr), jgTransferNotice.getInstanceId());
             // 删除业务单
             this.getBaseMapper().deleteById(sequenceNbr);
             // 删除对应eq
@@ -251,126 +287,138 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     @SuppressWarnings({"rawtypes", "Duplicates"})
     @Transactional
     public JgTransferNoticeDto updateTransferNotice(String submitType, JgTransferNoticeDto noticeDto, String op) {
-        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        if (Objects.isNull(noticeDto) || StringUtils.isEmpty(submitType)) {
-            throw new IllegalArgumentException("参数不能为空");
-        }
-        // 字段转换
-        this.convertField(noticeDto);
-        noticeDto.setPromoter(reginParams.getUserModel().getUserId());
-
-        JgTransferNotice notice = this.getById(noticeDto.getSequenceNbr());
-        if (SUBMIT_TYPE_FLOW.equals(submitType)) {
-            if (!StringUtils.hasText(noticeDto.getInstanceId())) {
-                // 发起流程
-                ProcessTaskDTO processTaskDTO = new ProcessTaskDTO();
-                WorkflowResultDto workflowResultDto = new WorkflowResultDto();
-                // 如果没有实例ID，说明是启动并执行一步
-                // 直接调用工作流 启动并执行API  -  可以拿到两个节点的信息，用于填充业务字段
-                ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
-                List<ActWorkflowStartDTO> list = new ArrayList<>();
-                ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
-                dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
-                dto.setBusinessKey(String.valueOf(noticeDto.getSequenceNbr()));
-                dto.setCompleteFirstTask(Boolean.TRUE);
-                //下一节点执行人单位（下节点接收机构code）
-                dto.setNextExecuteUserCompanyCode(notice.getReceiveOrgCode());
-                list.add(dto);
-                actWorkflowBatchDTO.setProcess(list);
-                processTaskDTO = iCmWorkflowService.startBatch(actWorkflowBatchDTO).get(0);
-                // 提取节点等信息
-                workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
-                BeanUtils.copyProperties(noticeDto, notice);
-                if (!ObjectUtils.isEmpty(notice.getInstanceStatus())) {
-                    notice.setInstanceStatus(notice.getInstanceStatus() + "," + workflowResultDto.getNextExecutorRoleIds());
-                } else {
-                    notice.setInstanceStatus(workflowResultDto.getNextExecutorRoleIds());
-                }
-                notice.setPromoter(RequestContext.getExeUserId());
-                notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
-                notice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
-                notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
-                notice.setNextTaskId(workflowResultDto.getNextTaskId());
-                notice.setInstanceId(workflowResultDto.getInstanceId());
-                jgTransferNoticeMapper.updateById(notice);
-                // 如果为保存并提交，则创建代办
-                buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.TRUE);
-            } else {
-                ProcessTaskDTO processTaskDTO = new ProcessTaskDTO();
-                WorkflowResultDto workflowResultDto = new WorkflowResultDto();
-                // 只调用执行API，返回下个节点信息，用于填充业务字段
-                //组装信息
-                TaskResultDTO dto = new TaskResultDTO();
-                dto.setResultCode("approvalStatus");
-                dto.setTaskId(notice.getNextTaskId());
-                HashMap<String, Object> commMap = new HashMap<>();
-                if (notice.getNoticeStatus().equals("6614") || notice.getNoticeStatus().equals("6615")) {
-                    commMap.put("approvalStatus", "提交");
-                } else {
-                    commMap.put("approvalStatus", op);
-                }
-                dto.setVariable(commMap);
-                dto.setNextExecuteUserCompanyCode(notice.getReceiveOrgCode());
-                processTaskDTO = iCmWorkflowService.completeOrReject(notice.getNextTaskId(), dto, op);
-                // 提取节点等信息
-                workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
-                BeanUtils.copyProperties(noticeDto, notice);
-                if (!ObjectUtils.isEmpty(notice.getInstanceStatus())) {
-                    notice.setInstanceStatus(notice.getInstanceStatus() + "," + workflowResultDto.getNextExecutorRoleIds());
-                } else {
-                    notice.setInstanceStatus(workflowResultDto.getNextExecutorRoleIds());
-                }
-                notice.setPromoter(RequestContext.getExeUserId());
-                notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
-                notice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
-                notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
-                notice.setNextTaskId(workflowResultDto.getNextTaskId());
-                jgTransferNoticeMapper.updateById(notice);
-                // 上个代办改为已办
-                HashMap<String, Object> map = new HashMap<>();
-                map.put("taskStatus", FlowStatusEnum.TO_BE_PROCESSED.getCode());
-                map.put("taskStatusLabel", FlowStatusEnum.TO_BE_PROCESSED.getName());
-                map.put("relationId", notice.getInstanceId());
-                map.put("flowStatus", FlowStatusEnum.TO_BE_PROCESSED.getCode());
-                map.put("flowStatusLabel", FlowStatusEnum.TO_BE_PROCESSED.getName());
-                TaskV2Model taskV2Model = commonService.updateTaskModel(map);
-                if (ObjectUtils.isEmpty(taskV2Model)) {
+        try {
+            ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+            if (Objects.isNull(noticeDto) || StringUtils.isEmpty(submitType)) {
+                throw new IllegalArgumentException("参数不能为空");
+            }
+            // 字段转换
+            this.convertField(noticeDto);
+            noticeDto.setPromoter(reginParams.getUserModel().getUserId());
+            JgTransferNotice notice = this.getById(noticeDto.getSequenceNbr());
+            this.checkRepeatUsed(submitType, notice);//校验设备是否在流程中
+            if (SUBMIT_TYPE_FLOW.equals(submitType)) {
+                if (!StringUtils.hasText(noticeDto.getInstanceId())) {
+                    // 发起流程
+                    ProcessTaskDTO processTaskDTO = new ProcessTaskDTO();
+                    WorkflowResultDto workflowResultDto = new WorkflowResultDto();
+                    // 如果没有实例ID，说明是启动并执行一步
+                    // 直接调用工作流 启动并执行API  -  可以拿到两个节点的信息，用于填充业务字段
+                    ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
+                    List<ActWorkflowStartDTO> list = new ArrayList<>();
+                    ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
+                    dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
+                    dto.setBusinessKey(String.valueOf(noticeDto.getSequenceNbr()));
+                    dto.setCompleteFirstTask(Boolean.TRUE);
+                    //下一节点执行人单位（下节点接收机构code）
+                    dto.setNextExecuteUserCompanyCode(notice.getReceiveOrgCode());
+                    list.add(dto);
+                    actWorkflowBatchDTO.setProcess(list);
+                    processTaskDTO = iCmWorkflowService.startBatch(actWorkflowBatchDTO).get(0);
+                    // 提取节点等信息
+                    workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
+                    BeanUtils.copyProperties(noticeDto, notice);
+                    if (!ObjectUtils.isEmpty(notice.getInstanceStatus())) {
+                        notice.setInstanceStatus(notice.getInstanceStatus() + "," + workflowResultDto.getNextExecutorRoleIds());
+                    } else {
+                        notice.setInstanceStatus(workflowResultDto.getNextExecutorRoleIds());
+                    }
+                    notice.setPromoter(RequestContext.getExeUserId());
+                    notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
+                    notice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+                    notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
+                    notice.setNextTaskId(workflowResultDto.getNextTaskId());
+                    notice.setInstanceId(workflowResultDto.getInstanceId());
+                    jgTransferNoticeMapper.updateById(notice);
                     // 如果为保存并提交，则创建代办
-                    buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.FALSE);
+                    buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.TRUE);
                 } else {
-                    TaskModelDto taskModelDto = new TaskModelDto();
-                    BeanUtils.copyProperties(taskV2Model, taskModelDto);
-                    // 创建新的代办
-                    taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
-                    taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
-                    taskModelDto.setFlowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
-                    taskModelDto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
-                    taskModelDto.setFlowCode(notice.getNextTaskId());
-                    taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
-                    TaskMessageDto taskMessageDto = new TaskMessageDto();
-                    BeanUtils.copyProperties(notice, taskMessageDto);
-                    taskModelDto.setModel(taskMessageDto);
-                    commonService.buildTaskModel(Collections.singletonList(taskModelDto));
+                    ProcessTaskDTO processTaskDTO = new ProcessTaskDTO();
+                    WorkflowResultDto workflowResultDto = new WorkflowResultDto();
+                    // 只调用执行API，返回下个节点信息，用于填充业务字段
+                    //组装信息
+                    TaskResultDTO dto = new TaskResultDTO();
+                    dto.setResultCode("approvalStatus");
+                    dto.setTaskId(notice.getNextTaskId());
+                    HashMap<String, Object> commMap = new HashMap<>();
+                    if (notice.getNoticeStatus().equals("6614") || notice.getNoticeStatus().equals("6615")) {
+                        commMap.put("approvalStatus", "提交");
+                    } else {
+                        commMap.put("approvalStatus", op);
+                    }
+                    dto.setVariable(commMap);
+                    dto.setNextExecuteUserCompanyCode(notice.getReceiveOrgCode());
+                    processTaskDTO = iCmWorkflowService.completeOrReject(notice.getNextTaskId(), dto, op);
+                    // 提取节点等信息
+                    workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
+                    BeanUtils.copyProperties(noticeDto, notice);
+                    if (!ObjectUtils.isEmpty(notice.getInstanceStatus())) {
+                        notice.setInstanceStatus(notice.getInstanceStatus() + "," + workflowResultDto.getNextExecutorRoleIds());
+                    } else {
+                        notice.setInstanceStatus(workflowResultDto.getNextExecutorRoleIds());
+                    }
+                    notice.setPromoter(RequestContext.getExeUserId());
+                    notice.setNextExecuteIds(String.join(",", workflowResultDto.getNextExecutorRoleIds()));
+                    notice.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+                    notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
+                    notice.setNextTaskId(workflowResultDto.getNextTaskId());
+                    jgTransferNoticeMapper.updateById(notice);
+                    // 上个代办改为已办
+                    HashMap<String, Object> map = new HashMap<>();
+                    map.put("taskStatus", FlowStatusEnum.TO_BE_PROCESSED.getCode());
+                    map.put("taskStatusLabel", FlowStatusEnum.TO_BE_PROCESSED.getName());
+                    map.put("relationId", notice.getInstanceId());
+                    map.put("flowStatus", FlowStatusEnum.TO_BE_PROCESSED.getCode());
+                    map.put("flowStatusLabel", FlowStatusEnum.TO_BE_PROCESSED.getName());
+                    TaskV2Model taskV2Model = commonService.updateTaskModel(map);
+                    if (ObjectUtils.isEmpty(taskV2Model)) {
+                        // 如果为保存并提交，则创建代办
+                        buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto), Boolean.FALSE);
+                    } else {
+                        TaskModelDto taskModelDto = new TaskModelDto();
+                        BeanUtils.copyProperties(taskV2Model, taskModelDto);
+                        // 创建新的代办
+                        taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
+                        taskModelDto.setExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
+                        taskModelDto.setFlowStatus(FlowStatusEnum.TO_BE_PROCESSED.getCode());
+                        taskModelDto.setFlowStatusLabel(FlowStatusEnum.TO_BE_PROCESSED.getName());
+                        taskModelDto.setFlowCode(notice.getNextTaskId());
+                        taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
+                        TaskMessageDto taskMessageDto = new TaskMessageDto();
+                        BeanUtils.copyProperties(notice, taskMessageDto);
+                        taskModelDto.setModel(taskMessageDto);
+                        commonService.buildTaskModel(Collections.singletonList(taskModelDto));
+                    }
                 }
+                commonService.saveExecuteFlowData2Redis(notice.getInstanceId(), this.buildInstanceRuntimeData(notice));
+            } else {
+                JgTransferNotice bean = new JgTransferNotice();
+                BeanUtils.copyProperties(noticeDto, bean);
+                jgTransferNoticeMapper.updateById(bean);
             }
-            commonService.saveExecuteFlowData2Redis(notice.getInstanceId(), this.buildInstanceRuntimeData(notice));
-        } else {
-            JgTransferNotice bean = new JgTransferNotice();
-            BeanUtils.copyProperties(noticeDto, bean);
-            jgTransferNoticeMapper.updateById(bean);
+            return noticeDto;
+        } catch (BadRequest | LocalBadRequest e) {
+            log.error(e.getMessage(), e);
+            this.rollBackForDelRedisData();
+            throw e;
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            this.rollBackForDelRedisData();
+            throw new BadRequest("安装告知保存失败！");
+        } finally {
+            FlowingEquipRedisContext.clean();
         }
-        return noticeDto;
     }
 
     /**
      * 分页查询
      */
     @Override
-    public Page<Map<String,Object>> queryForJgTransferNoticePage(Page<JgTransferNotice> page,String sort, JgTransferNoticeDto model, String type, ReginParams reginParams) {
+    public Page<Map<String, Object>> queryForJgTransferNoticePage(Page<JgTransferNotice> page, String sort, JgTransferNoticeDto model, String type, ReginParams reginParams) {
         String orgCode = reginParams.getCompany().getCompanyCode();
         SortVo sortMap = commonService.sortFieldConversion(sort);
         model.setTransferToUserIds(reginParams.getUserModel().getUserId());
-        Page<Map<String,Object>> noticePage = jgTransferNoticeMapper.queryForPage(page,sortMap, model, type, orgCode);
+        Page<Map<String, Object>> noticePage = jgTransferNoticeMapper.queryForPage(page, sortMap, model, type, orgCode);
 
         List<Map<String, Object>> mappedRecords = noticePage.getRecords().stream().peek(notice -> {
             Optional<Long> noticeStatusOpt = Optional.ofNullable((String) notice.get("noticeStatus")).map(Long::valueOf);
@@ -388,41 +436,57 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
     @SuppressWarnings({"Duplicates", "rawtypes"})
     @Transactional(rollbackFor = Exception.class)
     public List<JgTransferNotice> saveNotice(String submitType, Map<String, Object> jgTransferNoticeDtoMap, ReginParams reginParams) {
-        JgTransferNoticeDto model = JSON.parseObject(JSONObject.toJSONString(jgTransferNoticeDtoMap.get(TABLE_PAGE_ID)), JgTransferNoticeDto.class);
-        // 字段转换
-        convertField(model);
-        // 获取告知设备列表
-        List<Map<String, Object>> deviceList = model.getDeviceList();
-        if (CollectionUtils.isEmpty(deviceList)) {
-            return new ArrayList<>();
-        }
-        // 获取告知单号
-        ResponseModel<List<String>> responseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.YZGZ.getCode(), deviceList.size());
-        if (CollectionUtils.isEmpty(responseModel.getResult())) {
-            return new ArrayList<>();
-        }
-        // 启动工作流并返回信息
-        List<WorkflowResultDto> workflowResultList = workFlowInfo(submitType, deviceList, model.getReceiveCompanyCode());
-        List<JgTransferNotice> list = new ArrayList<>();
-        List<JgTransferNoticeEq> equipList = new ArrayList<>();
-        //业务数据组装等
-        businessData(submitType, reginParams, model, deviceList, responseModel, workflowResultList, list, equipList);
-        jgTransferNoticeMapper.insertBatchSomeColumn(list);
-        // 如果为保存并提交，则创建代办
-        if (SUBMIT_TYPE_FLOW.equals(submitType)) {
-            buildTask(list, workflowResultList, Boolean.TRUE);
-        } else {
-            // 暂存任务
-            buildTaskDraft(list);
+        try {
+            JgTransferNoticeDto model = JSON.parseObject(JSONObject.toJSONString(jgTransferNoticeDtoMap.get(TABLE_PAGE_ID)), JgTransferNoticeDto.class);
+            // 字段转换
+            convertField(model);
+            // 获取告知设备列表
+            List<Map<String, Object>> deviceList = model.getDeviceList();
+            if (CollectionUtils.isEmpty(deviceList)) {
+                return new ArrayList<>();
+            }
+            // 提交时对设备状态进行校验（处理并发问题，一个未被使用的设备同时被多个使用这打开，同时提交发起申请）
+            if (SUBMIT_TYPE_FLOW.equals(submitType)) {
+                this.repeatUsedEquipCheck(deviceList, reginParams.getCompany().getCompanyCode());
+            }
+            // 获取告知单号
+            ResponseModel<List<String>> responseModel = tzsServiceFeignClient.applicationFormCode(ApplicationFormTypeEnum.YZGZ.getCode(), deviceList.size());
+            if (CollectionUtils.isEmpty(responseModel.getResult())) {
+                return new ArrayList<>();
+            }
+            // 启动工作流并返回信息
+            List<WorkflowResultDto> workflowResultList = workFlowInfo(submitType, deviceList, model.getReceiveCompanyCode());
+            List<JgTransferNotice> list = new ArrayList<>();
+            List<JgTransferNoticeEq> equipList = new ArrayList<>();
+            //业务数据组装等
+            businessData(submitType, reginParams, model, deviceList, responseModel, workflowResultList, list, equipList);
+            jgTransferNoticeMapper.insertBatchSomeColumn(list);
+            // 如果为保存并提交，则创建代办
+            if (SUBMIT_TYPE_FLOW.equals(submitType)) {
+                buildTask(list, workflowResultList, Boolean.TRUE);
+            } else {
+                // 暂存任务
+                buildTaskDraft(list);
+            }
+            List<JgTransferNoticeEq> jgRelationEquipList = equipList.stream().map(jgRelationEquip -> {
+                List<JgTransferNotice> collect = list.stream().filter(JgTransferNotice -> jgRelationEquip.getEquipTransferId().equals(JgTransferNotice.getApplyNo())).collect(Collectors.toList());
+                Long sequenceNbr = collect.get(0).getSequenceNbr();
+                return jgRelationEquip.setEquipTransferId(String.valueOf(sequenceNbr));
+            }).collect(Collectors.toList());
+            jgTransferNoticeEqMapper.insertBatchSomeColumn(jgRelationEquipList);
+            this.updateRedisBatch(list);
+            return list;
+        } catch (BadRequest | LocalBadRequest e) {
+            log.error(e.getMessage(), e);
+            this.rollBackForDelRedisData();
+            throw e;
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            this.rollBackForDelRedisData();
+            throw new BadRequest("安装告知保存失败！");
+        } finally {
+            FlowingEquipRedisContext.clean();
         }
-        List<JgTransferNoticeEq> jgRelationEquipList = equipList.stream().map(jgRelationEquip -> {
-            List<JgTransferNotice> collect = list.stream().filter(JgTransferNotice -> jgRelationEquip.getEquipTransferId().equals(JgTransferNotice.getApplyNo())).collect(Collectors.toList());
-            Long sequenceNbr = collect.get(0).getSequenceNbr();
-            return jgRelationEquip.setEquipTransferId(String.valueOf(sequenceNbr));
-        }).collect(Collectors.toList());
-        jgTransferNoticeEqMapper.insertBatchSomeColumn(jgRelationEquipList);
-        this.updateRedisBatch(list);
-        return list;
     }
 
     private void updateRedisBatch(List<JgTransferNotice> jgTransferNotices) {
@@ -685,6 +749,7 @@ public class JgTransferNoticeServiceImpl extends BaseService<JgTransferNoticeDto
             jsonObject.put("nextTaskId", jgTransferNotice.getNextTaskId());
             commonService.rollbackTask(jgTransferNotice.getInstanceId(), jsonObject);
             commonService.saveExecuteFlowData2Redis(instanceId, this.buildInstanceRuntimeData(jgTransferNotice));
+            this.delRepeatUseEquipData(jgTransferNotice);
         } catch (InterruptedException e) {
             e.printStackTrace();
         } finally {

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

 package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.map.MapBuilder;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -33,6 +34,7 @@ import com.yeejoin.amos.boot.module.jg.biz.context.EquipUsedCheckStrategyContext
 import com.yeejoin.amos.boot.module.jg.biz.context.FlowingEquipRedisContext;
 import com.yeejoin.amos.boot.module.jg.biz.feign.TzsServiceFeignClient;
 import com.yeejoin.amos.boot.module.jg.biz.service.ICommonService;
+import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgInspectionDetectionInfoService;
 import com.yeejoin.amos.boot.module.jg.biz.utils.CodeUtil;
 import com.yeejoin.amos.boot.module.jg.flc.api.fegin.WorkFlowFeignService;
 import com.yeejoin.amos.boot.module.ymt.api.common.StringUtil;
@@ -113,6 +115,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     @Autowired
     IdxBizJgRegisterInfoMapper idxBizJgRegisterInfoMapper;
     @Autowired
+    IdxBizJgDesignInfoMapper idxBizJgDesignInfoMapper;
+    @Autowired
+    IdxBizJgDesignInfoServiceImpl idxBizJgDesignInfoService;
+    @Autowired
     TzsUserInfoMapper userInfoMapper;
     @Autowired
     ICommonService commonService;
@@ -152,6 +158,10 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
     @Autowired
     private IdxBizJgFactoryInfoServiceImpl idxBizJgFactoryInfoService;
     @Autowired
+    private IdxBizJgFactoryInfoMapper idxBizJgFactoryInfoMapper;
+    @Autowired
+    IIdxBizJgInspectionDetectionInfoService iIdxBizJgInspectionDetectionInfoService;
+    @Autowired
     private IdxBizJgMaintenanceRecordInfoServiceImpl idxBizJgMaintenanceRecordInfoService;
     @Autowired
     private RedissonClient redissonClient;
@@ -605,14 +615,14 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
 
     private void rollBackForDelRedisData() {
         FlowingEquipRedisContext.getContext().forEach(e -> {
-            EquipUsedCheckStrategyContext.getUsedStrategy("useRegister").delDataForCheckWithKey(e.getData(), e.getRedisKey());
+            EquipUsedCheckStrategyContext.getUsedStrategy(DEFINITION_KEY).delDataForCheckWithKey(e.getData(), e.getRedisKey());
         });
     }
 
     private void checkForRepeatUsedEquip(JSONObject map, CompanyBo company) {
         if (!ObjectUtils.isEmpty(map.get("submit"))) {
             // 流程中或已完成
-            EquipUsedCheckStrategyContext.getUsedStrategy("useRegister").equipRepeatUsedCheck(map.get("equipId").toString(), company.getCompanyCode());
+            EquipUsedCheckStrategyContext.getUsedStrategy(DEFINITION_KEY).equipRepeatUsedCheck(map.get("equipId").toString(), company.getCompanyCode());
         }
     }
 
@@ -620,11 +630,25 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         if (!ObjectUtils.isEmpty(map.get("submit"))) {
             equList.forEach(equip -> {
                 // 流程中或已完成
-                EquipUsedCheckStrategyContext.getUsedStrategy("useRegister").equipRepeatUsedCheck(equip.get("record").toString(), reginParams.getCompany().getCompanyCode());
+                EquipUsedCheckStrategyContext.getUsedStrategy(DEFINITION_KEY).equipRepeatUsedCheck(equip.get("record").toString(), reginParams.getCompany().getCompanyCode());
             });
         }
     }
 
+    private void clearDataForCheckEquipRepeatUsed(JgUseRegistration data) {
+        // 新查询原因 useRegistration 数据状态是旧的
+        JgUseRegistration useRegistrationDb = this.getById(data.getSequenceNbr());
+        LambdaQueryWrapper<JgUseRegistrationEq> lambda = new QueryWrapper<JgUseRegistrationEq>().lambda();
+        lambda.eq(JgUseRegistrationEq::getEquipTransferId, data.getSequenceNbr());
+        lambda.select(JgUseRegistrationEq::getEquId);
+        List<JgUseRegistrationEq> eqList = jgRelationEquipMapper.selectList(lambda);
+        // 在使用单位待提交、一级受理已驳回、使用单位已撤回后清除关联的设备，保证可以再次新提单子选择相同的设备进行提交及原有单子的提交校验数据准备
+        if (NOT_FLOWING_STATE.contains(useRegistrationDb.getStatus())) {
+            List<String> records = eqList.stream().map(JgUseRegistrationEq::getEquId).collect(toList());
+            EquipUsedCheckStrategyContext.getUsedStrategy(DEFINITION_KEY)
+                    .delDataForCheckEquipRepeatUsed(records, data.getUseUnitCreditCode());
+        }
+    }
     /**
      * 按单位办理
      *
@@ -1525,19 +1549,6 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         }
     }
 
-    private void clearDataForCheckEquipRepeatUsed(JgUseRegistration useRegistration) {
-        // 新查询原因 useRegistration 数据状态是旧的
-        JgUseRegistration useRegistrationDb = this.getById(useRegistration.getSequenceNbr());
-        LambdaQueryWrapper<JgUseRegistrationEq> lambda = new QueryWrapper<JgUseRegistrationEq>().lambda();
-        lambda.eq(JgUseRegistrationEq::getEquipTransferId, useRegistration.getSequenceNbr());
-        lambda.select(JgUseRegistrationEq::getEquId);
-        List<JgUseRegistrationEq> eqList = jgRelationEquipMapper.selectList(lambda);
-        // 在使用单位待提交、一级受理已驳回、使用单位已撤回后清除关联的设备，保证可以再次新提单子选择相同的设备进行提交及原有单子的提交校验数据准备
-        if (NOT_FLOWING_STATE.contains(useRegistrationDb.getStatus())) {
-            List<String> records = eqList.stream().map(JgUseRegistrationEq::getEquId).collect(toList());
-            EquipUsedCheckStrategyContext.getUsedStrategy("useRegister").delDataForCheckEquipRepeatUsed(records, useRegistration.getUseUnitCreditCode());
-        }
-    }
 
     @Transactional(rollbackFor = Exception.class)
     public void deleteBatch(List<Long> ids) {
@@ -2671,14 +2682,50 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 lambdaReg.eq(IdxBizJgRegisterInfo::getRecord, jgRelationEquip.getEquId());
                 IdxBizJgRegisterInfo registerInfo = idxBizJgRegisterInfoMapper.selectOne(lambdaReg);
                 registerInfo.setUseOrgCode(jgUseRegistration.getUseRegistrationCode());
-                String equCode = this.getEquCode(registerInfo, jgUseRegistration.getReceiveCompanyCode());
+                registerInfo.setEquCodeType(String.valueOf(map.get("equCodeType")));
+                String equCode = ObjectUtils.isEmpty(map.get("equCode")) ? this.getEquCode(registerInfo, jgUseRegistration.getReceiveCompanyCode()) : String.valueOf(map.get("equCode"));
                 registerInfo.setEquCode(equCode);// 设备代码
+                registerInfo.setEquPrice(String.valueOf(map.get("equPrice")));
+                registerInfo.setProductPhoto(JSONObject.toJSONString(map.get("productPhoto")));
+                registerInfo.setOtherAccessoriesReg(JSONObject.toJSONString(map.get("otherAccessoriesReg")));
                 idxBizJgRegisterInfoMapper.updateById(registerInfo);
 
-                // 查询设备制造信息
+                // 设计信息
+                LambdaQueryWrapper<IdxBizJgDesignInfo> lambdaDes = new QueryWrapper<IdxBizJgDesignInfo>().lambda();
+                lambdaDes.eq(IdxBizJgDesignInfo::getRecord, jgRelationEquip.getEquId());
+                IdxBizJgDesignInfo designInfo = idxBizJgDesignInfoService.getOne(lambdaDes);
+                designInfo.setDesignUnitCreditCode(String.valueOf(map.get("designUnitCreditCode")));
+                designInfo.setDesignUnitName(String.valueOf(map.get("designUnitName")));
+                designInfo.setDesignLicenseNum(String.valueOf(map.get("designLicenseNum")));
+                designInfo.setDesignUseDate(String.valueOf(map.get("designUseDate")));
+                designInfo.setDesignDate(DateUtil.parse(String.valueOf(map.get("designDate")), "yyyy-MM-dd"));
+                designInfo.setDrawingDo(String.valueOf(map.get("drawingDo")));
+                designInfo.setAppraisalUnit(String.valueOf(map.get("appraisalUnit")));
+                designInfo.setAppraisalDate(String.valueOf(map.get("appraisalDate")));
+                designInfo.setDesignDoc(JSONObject.toJSONString(map.get("designDoc")));
+                designInfo.setDesignStandard(JSONObject.toJSONString(map.get("designStandard")));
+                designInfo.setOtherAccessoriesDes(JSONObject.toJSONString(map.get("otherAccessoriesDes")));
+                idxBizJgDesignInfoMapper.updateById(designInfo);
+
+
+                // 制造信息
                 LambdaQueryWrapper<IdxBizJgFactoryInfo> factoryInfoWrapper = new LambdaQueryWrapper<>();
                 factoryInfoWrapper.eq(IdxBizJgFactoryInfo::getRecord, jgRelationEquip.getEquId());
                 IdxBizJgFactoryInfo idxBizJgFactoryInfo = idxBizJgFactoryInfoService.getOne(factoryInfoWrapper);
+                idxBizJgFactoryInfo.setProduceUnitCreditCode(String.valueOf(map.get("produceUnitCreditCode")));
+                idxBizJgFactoryInfo.setProduceUnitName(String.valueOf(map.get("produceUnitName")));
+                idxBizJgFactoryInfo.setFactoryNum(String.valueOf(map.get("factoryNum")));
+                idxBizJgFactoryInfo.setProduceLicenseNum(String.valueOf(map.get("produceLicenseNum")));
+                idxBizJgFactoryInfo.setProduceDate(DateUtil.parse(String.valueOf(map.get("produceDate")), "yyyy-MM-dd"));
+                idxBizJgFactoryInfo.setImported(String.valueOf(map.get("imported")));
+                idxBizJgFactoryInfo.setProduceCountry(String.valueOf(map.get("produceCountry")));
+                idxBizJgFactoryInfo.setOtherAccessoriesFact(JSONObject.toJSONString(map.get("otherAccessoriesFact")));
+                idxBizJgFactoryInfo.setProductQualityYieldProve(JSONObject.toJSONString(map.get("productQualityYieldProve")));
+                idxBizJgFactoryInfo.setInsUseMaintainExplain(JSONObject.toJSONString(map.get("insUseMaintainExplain")));
+                idxBizJgFactoryInfo.setFactoryStandard(JSONObject.toJSONString(map.get("factoryStandard")));
+                idxBizJgFactoryInfo.setFactSupervisionInspectionReport(JSONObject.toJSONString(map.get("factSupervisionInspectionReport")));
+                idxBizJgFactoryInfo.setBoilerEnergyEfficiencyCertificate(JSONObject.toJSONString(map.get("boilerEnergyEfficiencyCertificate")));
+                idxBizJgFactoryInfoMapper.updateById(idxBizJgFactoryInfo);
 
                 // 使用信息
                 LambdaQueryWrapper<IdxBizJgUseInfo> lambda = new QueryWrapper<IdxBizJgUseInfo>().lambda();
@@ -2699,6 +2746,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 useInfo.setIsNotXiXian(String.valueOf(map.get("isXixian")));
                 useInfo.setEstateUnitCreditCode(String.valueOf(map.get("estateUnitName")).split("_")[0]);
                 useInfo.setEstateUnitName(String.valueOf(map.get("estateUnitName")).split("_")[1]);
+                useInfo.setPhone(String.valueOf(map.get("safetyManager")).split("_")[0]);
+                useInfo.setSafetyManager(String.valueOf(map.get("safetyManager")).split("_")[1]);
+                useInfo.setUseDate(String.valueOf(map.get("useDate")));
                 String usePlace = useInfo.getProvinceName() + "/" + useInfo.getCityName() + "/" + useInfo.getCountyName()  +"/" + useInfo.getStreetName();
                 useInfoMapper.updateById(useInfo);
 
@@ -2706,6 +2756,21 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 otherLambda.eq(IdxBizJgOtherInfo::getRecord, map.get("equipId"));
                 IdxBizJgOtherInfo otherInfo = otherInfoMapper.selectOne(otherLambda);
 
+                // 检验检测【一对多，暂时只取最新一条数据】
+                IdxBizJgInspectionDetectionInfo inspectionDetectionInfo = iIdxBizJgInspectionDetectionInfoService.queryNewestDetailByRecord(String.valueOf(map.get("equipId")));
+                if (ObjectUtils.isEmpty(inspectionDetectionInfo)) {
+                    inspectionDetectionInfo = new IdxBizJgInspectionDetectionInfo();
+                }
+                inspectionDetectionInfo.setInspectOrgCode(String.valueOf(map.get("inspectOrgCode")));
+                inspectionDetectionInfo.setInspectOrgName(String.valueOf(map.get("inspectOrgName")));
+                inspectionDetectionInfo.setInspectConclusion(String.valueOf(map.get("inspectConclusion")));
+                inspectionDetectionInfo.setInspectType(String.valueOf(map.get("inspectType")));
+                inspectionDetectionInfo.setInspectDate(DateUtil.parse(String.valueOf(map.get("inspectDate")), "yyyy-MM-dd"));
+                inspectionDetectionInfo.setInspectStaff(String.valueOf(map.get("inspectStaff")));
+                inspectionDetectionInfo.setNextInspectDate(DateUtil.parse(String.valueOf(map.get("nextInspectDate")), "yyyy-MM-dd"));
+                inspectionDetectionInfo.setInspectReport(JSONObject.toJSONString(map.get("inspectReport")));
+                iIdxBizJgInspectionDetectionInfoService.saveOrUpdateData(inspectionDetectionInfo);
+
                 // 生成监管码 96333码
                 this.createCode(map, jgUseRegistration, registerInfo, useInfo, otherInfo);
                 map.put("equCode", equCode);

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintainNoticeMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RBucket;
+import org.redisson.api.RedissonClient;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * @author Administrator
+ */
+@Component
+@Slf4j
+public class MaintainNoticeEquipUsedCheckImpl extends BaseEquipUsedCheckService {
+
+    private RedissonClient redissonClient;
+
+    private String bizType = "maintainNotice";
+
+    private JgMaintainNoticeMapper maintainNoticeMapper;
+
+    public MaintainNoticeEquipUsedCheckImpl(RedissonClient redissonClient, JgMaintainNoticeMapper maintainNoticeMapper) {
+        this.redissonClient = redissonClient;
+        this.maintainNoticeMapper = maintainNoticeMapper;
+    }
+
+
+    @Override
+    public RedissonClient getRedisClient() {
+        return redissonClient;
+    }
+
+    @Override
+    public String getApplyBizType() {
+        return bizType;
+    }
+
+
+    @Override
+    public void init() {
+        // 初始化已经完成或者在流程中安装告知的设备数据
+        List<CompanyEquipCountDto> companyEquipCountDtos = maintainNoticeMapper.queryForFlowingEquipList();
+        companyEquipCountDtos.forEach(c -> {
+            RBucket<Set<String>> rBucket = redissonClient.getBucket(getFlowingEquipRedisKey(c.getCompanyCode(), bizType));
+            rBucket.set(Arrays.stream(c.getRecords().split(",")).collect(Collectors.toSet()));
+        });
+    }
+}

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintenanceContractMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RBucket;
+import org.redisson.api.RedissonClient;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * @author Administrator
+ */
+@Component
+@Slf4j
+public class MaintenanceContractEquipUsedCheckImpl extends BaseEquipUsedCheckService {
+
+    private RedissonClient redissonClient;
+
+    private String bizType = "maintenanceFiling";
+
+    private JgMaintenanceContractMapper maintenanceContractMapper;
+
+    public MaintenanceContractEquipUsedCheckImpl(RedissonClient redissonClient, JgMaintenanceContractMapper maintenanceContractMapper) {
+        this.redissonClient = redissonClient;
+        this.maintenanceContractMapper = maintenanceContractMapper;
+    }
+
+
+    @Override
+    public RedissonClient getRedisClient() {
+        return redissonClient;
+    }
+
+    @Override
+    public String getApplyBizType() {
+        return bizType;
+    }
+
+
+    @Override
+    public void init() {
+        // 初始化在流程中的设备数据
+        List<CompanyEquipCountDto> companyEquipCountDtos = maintenanceContractMapper.queryForFlowingEquipList();
+        companyEquipCountDtos.forEach(c -> {
+            RBucket<Set<String>> rBucket = redissonClient.getBucket(getFlowingEquipRedisKey(c.getCompanyCode(), bizType));
+            rBucket.set(Arrays.stream(c.getRecords().split(",")).collect(Collectors.toSet()));
+        });
+    }
+}

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgReformNoticeMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RBucket;
+import org.redisson.api.RedissonClient;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * @author Administrator
+ */
+@Component
+@Slf4j
+public class ReformNoticeEquipUsedCheckImpl extends BaseEquipUsedCheckService {
+
+    private RedissonClient redissonClient;
+
+    private String bizType = "renovationNoticeNew";
+
+    private JgReformNoticeMapper reformNoticeMapper;
+
+    public ReformNoticeEquipUsedCheckImpl(RedissonClient redissonClient, JgReformNoticeMapper reformNoticeMapper) {
+        this.redissonClient = redissonClient;
+        this.reformNoticeMapper = reformNoticeMapper;
+    }
+
+
+    @Override
+    public RedissonClient getRedisClient() {
+        return redissonClient;
+    }
+
+    @Override
+    public String getApplyBizType() {
+        return bizType;
+    }
+
+
+    @Override
+    public void init() {
+        // 初始化已经完成或者在流程中安装告知的设备数据
+        List<CompanyEquipCountDto> companyEquipCountDtos = reformNoticeMapper.queryForFlowingEquipList();
+        companyEquipCountDtos.forEach(c -> {
+            RBucket<Set<String>> rBucket = redissonClient.getBucket(getFlowingEquipRedisKey(c.getCompanyCode(), bizType));
+            rBucket.set(Arrays.stream(c.getRecords().split(",")).collect(Collectors.toSet()));
+        });
+    }
+}

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

+package com.yeejoin.amos.boot.module.jg.biz.service.impl;
+
+import com.yeejoin.amos.boot.module.jg.api.dto.CompanyEquipCountDto;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgMaintainNoticeMapper;
+import com.yeejoin.amos.boot.module.jg.api.mapper.JgTransferNoticeMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RBucket;
+import org.redisson.api.RedissonClient;
+import org.springframework.stereotype.Component;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * @author Administrator
+ */
+@Component
+@Slf4j
+public class TransferNoticeEquipUsedCheckImpl extends BaseEquipUsedCheckService {
+
+    private RedissonClient redissonClient;
+
+    private String bizType = "transferNotice";
+
+    private JgTransferNoticeMapper noticeMapper;
+
+    public TransferNoticeEquipUsedCheckImpl(RedissonClient redissonClient, JgTransferNoticeMapper noticeMapper) {
+        this.redissonClient = redissonClient;
+        this.noticeMapper = noticeMapper;
+    }
+
+
+    @Override
+    public RedissonClient getRedisClient() {
+        return redissonClient;
+    }
+
+    @Override
+    public String getApplyBizType() {
+        return bizType;
+    }
+
+
+    @Override
+    public void init() {
+        // 初始化已经完成或者在流程中安装告知的设备数据
+        List<CompanyEquipCountDto> companyEquipCountDtos = noticeMapper.queryForFlowingEquipList();
+        companyEquipCountDtos.forEach(c -> {
+            RBucket<Set<String>> rBucket = redissonClient.getBucket(getFlowingEquipRedisKey(c.getCompanyCode(), bizType));
+            rBucket.set(Arrays.stream(c.getRecords().split(",")).collect(Collectors.toSet()));
+        });
+    }
+}

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/superviseBusinessCategory.json

@@ -31,7 +31,7 @@
       "name": "移装告知",
       "code": "GZ_YZ",
       "image": "upload/tzs/common/image/移装告知.png",
-      "disabled": true
+      "disabled": false
     }
   ],
   "DJGL": [
@@ -49,7 +49,7 @@
       "name": "移装变更登记",
       "code": "DJ_YZ",
       "image": "upload/tzs/common/image/移装变更登记.png",
-      "disabled": true
+      "disabled": false
     },
     {
       "name": "单位变更登记",
@@ -88,16 +88,16 @@
       "image": "upload/tzs/common/image/注销报废.png"
     },
     {
-      "name": "设备启用",
+      "name": "启用",
       "code": "SB_QY",
       "image": "upload/tzs/common/image/设备启用.png",
-      "disabled": true
+      "disabled": false
     },
     {
-      "name": "设备停用",
+      "name": "停用",
       "code": "SB_TY",
       "image": "upload/tzs/common/image/设备停用.png",
-      "disabled": true
+      "disabled": false
     }
   ],
   "XZSB": [

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/dto/InspectionTimelinesDto.java

+package com.yeejoin.amos.boot.module.jyjc.api.dto;
+
+import lombok.Data;
+
+/**
+ * 机构进行检验时效统计对象
+ *
+ * @author Administrator
+ */
+@Data
+public class InspectionTimelinesDto {
+
+    private String city;
+
+    private String name;
+
+    private String unitCode;
+
+    private Long count;
+}

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/dto/PublicityInspectOrgInfoDto.java

+package com.yeejoin.amos.boot.module.jyjc.api.dto;
+
+import lombok.Data;
+
+/**
+ * 检验机构公示
+ *
+ * @author Administrator
+ */
+@Data
+public class PublicityInspectOrgInfoDto {
+
+    /**
+     * 单位名称
+     */
+    private String unitName;
+
+    /**
+     * 单位编码
+     */
+    private String unitCode;
+
+    /**
+     * 核准代码
+     */
+    private String approvalNumber;
+
+    /**
+     * 核准有效期
+     */
+    private String aapprovalDeadline;
+
+    /**
+     * 业务有限期
+     */
+    private String businessDeadline;
+
+}

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

@@ -219,6 +219,12 @@ public class JyjcInspectionApplication extends BaseEntity {
     private JSONObject planData;
 
     /**
+     * 计划下发日期,统计办理时效使用
+     */
+    @TableField(value = "plan_create_date")
+    private Date planCreateDate;
+
+    /**
      * 是否必须处理： true-必须处理，false-可不予受理
      */
     @TableField(value = "is_must_accept")

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

@@ -215,4 +215,11 @@ public class JyjcInspectionResult extends BaseEntity {
      */
     @TableField(value = "safety_level")
     private String safetyLevel;
+
+
+    /**
+     * 计划下发日期，,统计办理时效使用"
+     */
+    @TableField(value = "plan_create_date")
+    private Date planCreateDate;
 }

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

@@ -19,12 +19,12 @@ public enum JYJCTypeEnum {
     /**
      * 检验检测类型
      */
-    DTJC("DTJC", "电梯检测", "jc", BizTypeEnum.DETECTION.getCode()),
-    DQJY("DQJY", "定期检验", "jy", BizTypeEnum.FIRST_INSPECTION.getCode()),
-    SCJY("SCJY", "首次检验", "jy", BizTypeEnum.FIRST_INSPECTION.getCode()),
-    WXJDJY("WXJDJY", "维修监督检验", "jy", BizTypeEnum.SUPERVISE.getCode()),
+    AZJDJY("AZJDJY", "安装监督检验", "jy", BizTypeEnum.SUPERVISE.getCode()),
     GZJDJY("GZJDJY", "改造监督检验", "jy", BizTypeEnum.SUPERVISE.getCode()),
-    AZJDJY("AZJDJY", "安装监督检验", "jy", BizTypeEnum.SUPERVISE.getCode());
+    WXJDJY("WXJDJY", "维修监督检验", "jy", BizTypeEnum.SUPERVISE.getCode()),
+    SCJY("SCJY", "首次检验", "jy", BizTypeEnum.FIRST_INSPECTION.getCode()),
+    DQJY("DQJY", "定期检验", "jy", BizTypeEnum.FIRST_INSPECTION.getCode()),
+    DTJC("DTJC", "电梯检测", "jc", BizTypeEnum.DETECTION.getCode());
 
     private final String code;
     private final String name;

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

@@ -42,4 +42,6 @@ public interface JyjcBaseMapper {
     List<TzsUserInfoDto> selectUserByCompanyCodes(@Param("companyCodes") List<String> companyCodes);
 
     CompanyModel selectOneCompanyByCode(String companyCode);
+
+    String getOrgCodeByCompanyCode(String companyCode);
 }

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

@@ -2,11 +2,13 @@ package com.yeejoin.amos.boot.module.jyjc.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.dto.CountDto;
+import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionApplication;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipDto;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationEquipModel;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionApplicationModel;
-import org.springframework.data.repository.query.Param;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Set;
@@ -44,5 +46,41 @@ public interface JyjcInspectionApplicationMapper extends BaseMapper<JyjcInspecti
     * @param equips 需要判断的设备
     * @return 在流程中的设备records
     */
-    List<String> queryRecordListInFlowing(@org.apache.ibatis.annotations.Param("equips") List<JyjcInspectionApplicationEquipDto> equips);
+    List<String> queryRecordListInFlowing(@Param("equips") List<JyjcInspectionApplicationEquipDto> equips);
+
+    /**
+     * 按照检验类型、机构、时间统计检验数量(流程中及已完成的)
+     *
+     * @param orgCode 区域对应公司orgCode
+     * @param dpFilterParamDto 过滤条件
+     * @return 统计信息
+     */
+    List<CountDto> queryAllFlowingAndFinishedInspectApp(@Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
+
+    /**
+     * 查询待出结果的报检单据数量
+     *
+     * @param orgCode 区域对应公司orgCode
+     * @param dpFilterParamDto 过滤条件
+     * @return 统计信息
+     */
+    List<CountDto> queryAllPendingResultInspectApp(@Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
+
+    /**
+     * 按照8大类，查询指定区域下的报检数量、待检数量
+     * @param orgCode 指定区域对应的公司
+     * @param dpFilterParamDto 时间过滤条件
+     * @return List<CountDto>
+     */
+    List<CountDto> queryAppByEquListForDP(@Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
+
+    /**
+     * 按照8大类，统计
+     * @param orgCode 指定区域对应的公司
+     * @param dpFilterParamDto 时间过滤条件
+     * @return CountDto
+     */
+    CountDto queryAppByEquListForReporting(@Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
 }
+
+

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

@@ -2,10 +2,14 @@ package com.yeejoin.amos.boot.module.jyjc.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
+import com.yeejoin.amos.boot.module.jyjc.api.dto.InspectionTimelinesDto;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcInspectionResult;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcInspectionResultModel;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 业务开通申请表 Mapper 接口
  *
@@ -18,4 +22,5 @@ public interface JyjcInspectionResultMapper extends BaseMapper<JyjcInspectionRes
 
     Page<JyjcInspectionResultModel> selectForPage(@Param("page") Page<JyjcInspectionResultModel> page, @Param("jyjcInspectionResultModel") JyjcInspectionResultModel jyjcInspectionResultModel,@Param("identity") String identity);
 
+    List<InspectionTimelinesDto> queryInspectionTimelinessTopXX(@Param("top") String top, @Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
 }

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

 package com.yeejoin.amos.boot.module.jyjc.api.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
+import com.yeejoin.amos.boot.module.jyjc.api.dto.PublicityInspectOrgInfoDto;
 import com.yeejoin.amos.boot.module.jyjc.api.model.JyjcOpeningApplicationModel;
 import com.yeejoin.amos.boot.module.jyjc.api.entity.JyjcOpeningApplication;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -26,4 +28,12 @@ public interface JyjcOpeningApplicationMapper extends BaseMapper<JyjcOpeningAppl
     void updatePromoter(@Param("id") Long id);
 
     List<Long> selectOverdueData();
+
+    /**
+     * 检验机构公示
+     * @param orgCode 区域对应的orgCode
+     * @param dpFilterParamDto 过滤条件
+     * @return List<PublicityInspectOrgInfoDto>
+     */
+    List<PublicityInspectOrgInfoDto> queryInspectionOrgListForPublicity(@Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
 }

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

@@ -166,6 +166,9 @@ public class JyjcInspectionApplicationModel extends BaseModel {
     @ApiModelProperty(value = "是否已经进行计划排期")
     private Boolean isExistPlanData;
 
+    @ApiModelProperty(value = "计划下发日期,统计办理时效使用，来源JyjcInspectionApplication.planCreateDate")
+    private Date planCreateDate;
+
     /**
      * 是否必须处理： true-必须处理，false-可不予受理
      */

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

@@ -150,6 +150,11 @@ public class JyjcInspectionResultModel extends BaseModel {
     @ApiModelProperty(value = "监管码")
     private String supervisoryCode;
 
+    @ApiModelProperty(value = "计划下发日期,统计办理时效使用")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date planCreateDate;
+
+
     /**
      * 校验检验系统唯一流水号,排查问题，跟踪问题使用
      */

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

@@ -85,6 +85,9 @@
         WHERE
              c.company_code =#{companyCode}
     </select>
+    <select id="getOrgCodeByCompanyCode" resultType="java.lang.String">
+    select org_code from privilege_company where company_code = #{companyCode} limit 1
+    </select>
 
 
 </mapper>

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

@@ -216,4 +216,83 @@
         UPDATE tz_jyjc_inspection_application set promoter = null
         where sequence_nbr = #{id}
     </update>
+    <select id="queryAllFlowingAndFinishedInspectApp" resultType="com.yeejoin.amos.boot.biz.common.dto.CountDto">
+        SELECT
+            count(1) as longValue,
+            a.inspection_type as keyStr
+        FROM
+            "tz_jyjc_inspection_application" a,
+            tz_base_enterprise_info b
+         where
+            a.inspection_unit_code= b.use_unit_code
+            and ((b.supervise_org_code != '50' and b.supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (b.supervise_org_code = '50' and b.office_region LIKE CONCAT ('%', #{dto.cityCode}, '%')))
+            and a.status != '6610'  and a.status != '6615'
+            and date_ge(CAST(a.application_date as date),#{dto.beginDate})
+            and date_le(CAST(a.application_date as date),#{dto.endDate})
+            group by a.inspection_type
+    </select>
+    <select id="queryAllPendingResultInspectApp" resultType="com.yeejoin.amos.boot.biz.common.dto.CountDto">
+        SELECT
+            count(1) as longValue,
+            a.inspection_type as keyStr
+        FROM
+             tz_jyjc_inspection_application a,
+             tz_base_enterprise_info b
+         where
+             a.inspection_unit_code= b.use_unit_code
+             and ((b.supervise_org_code != '50' and b.supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (b.supervise_org_code = '50' and b.office_region LIKE CONCAT ('%', #{dto.cityCode}, '%')))
+             and a.status = '6616'
+             and EXISTS (select 1 from tz_jyjc_inspection_result r where r.result_status='1' and a.application_no = r.application_no)
+             and date_ge(CAST(a.accept_date as date),#{dto.beginDate}) and date_le(CAST(a.accept_date as date),#{dto.endDate})
+             group by a.inspection_type
+    </select>
+    <select id="queryAppByEquListForDP" resultType="com.yeejoin.amos.boot.biz.common.dto.CountDto">
+        -- 8大类 待检数量
+        SELECT
+                count(1) as longValue,
+                a.equip_classify as keyStr,
+                'pending' as label
+        FROM
+                 tz_jyjc_inspection_application a,
+                 tz_base_enterprise_info b
+         where
+                 a.inspection_unit_code= b.use_unit_code
+                 and ((b.supervise_org_code != '50' and b.supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (b.supervise_org_code = '50' and b.office_region LIKE CONCAT ('%', #{dto.cityCode}, '%')))
+                 and a.status = '6616'
+                 and EXISTS (select 1 from tz_jyjc_inspection_result r where r.result_status='1' and a.application_no = r.application_no)
+                 and date_ge(CAST(a.accept_date as date),#{dto.beginDate}) and date_le(CAST(a.accept_date as date),#{dto.endDate})
+                 GROUP BY a.equip_classify
+        -- 8大类 报检数量统计
+        union all
+            SELECT
+                    count(1) as longValue,
+                    a.equip_classify as keyStr,
+                    'reporting' as label
+            FROM
+                     tz_jyjc_inspection_application a,
+                     tz_base_enterprise_info b
+             where
+                     a.inspection_unit_code= b.use_unit_code
+                     and ((b.supervise_org_code != '50' and b.supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (b.supervise_org_code = '50' and b.office_region LIKE CONCAT ('%', #{dto.cityCode}, '%')))
+                     and a.status != '6610'  and a.status != '6615'
+                     and date_ge(CAST(a.application_date as date),#{dto.beginDate}) and date_le(CAST(a.application_date as date),#{dto.endDate})
+                     GROUP BY a.equip_classify
+    </select>
+    <select id="queryAppByEquListForReporting" resultType="com.yeejoin.amos.boot.biz.common.dto.CountDto">
+           SELECT
+                    count(1) as longValue
+            FROM
+                     tz_jyjc_inspection_application a,
+                     tz_base_enterprise_info b
+             where
+                     a.inspection_unit_code= b.use_unit_code
+                    and a.status != '6610'  and a.status != '6615'
+                    and ((b.supervise_org_code != '50' and b.supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (b.supervise_org_code = '50' and b.office_region LIKE CONCAT ('%', #{dto.cityCode}, '%')))
+        <if test="dto.beginDate !=null and dto.beginDate !=''">
+                        and date_ge(CAST(a.application_date as date),#{dto.beginDate})
+                    </if>
+                    <if test="dto.endDate !=null and dto.endDate !=''">
+                        and date_le(CAST(a.application_date as date),#{dto.endDate})
+                    </if>
+    </select>
 </mapper>

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

@@ -157,4 +157,28 @@
         </where>
         ORDER BY res.sequence_nbr DESC
     </select>
+    <select id="queryInspectionTimelinessTopXX" resultType="com.yeejoin.amos.boot.module.jyjc.api.dto.InspectionTimelinesDto">
+        select
+            a1.avgtime as count,
+            a1.inspection_unit_code as unitCode,
+            b1.use_unit as name,
+            b1.city
+        from
+            (SELECT
+                ROUND(avg(EXTRACT(EPOCH FROM ( r.rec_date - r.plan_create_date)) / 60),0) as avgtime,
+                r.inspection_unit_code
+            FROM
+               tz_jyjc_inspection_result r,
+               tz_base_enterprise_info b
+            where
+                r.result_status ='2'
+                and r.inspection_unit_code= b.use_unit_code
+                and ((b.supervise_org_code != '50' and b.supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (b.supervise_org_code = '50' and b.office_region LIKE CONCAT ('%', #{dto.cityCode}, '%')))
+                GROUP BY r.inspection_unit_code ORDER BY avgtime
+                limit #{top}
+            ) a1,
+            tz_base_enterprise_info b1
+        WHERE
+            a1.inspection_unit_code =  b1.use_unit_code
+    </select>
 </mapper>

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

@@ -50,4 +50,37 @@
         UPDATE tz_jyjc_opening_application set promoter = null
         where sequence_nbr = #{id}
     </update>
+    <select id="queryInspectionOrgListForPublicity" resultType="com.yeejoin.amos.boot.module.jyjc.api.dto.PublicityInspectOrgInfoDto">
+        select
+            b.use_unit as unitName,
+            l.cert_no as approvalNumber,
+            l.expiry_date as aapprovalDeadline,
+            b.use_code as unitCode,
+            a.expiry_date as businessDeadline,
+            a.licenceType
+        from
+            (SELECT
+             unit_code,
+             expiry_date,
+             unit_code_name,
+             case when
+             open_biz_type = 'jy' then '1233-1'
+                when
+             open_biz_type = 'jc' then '1233-2'
+             end as open_biz_type,
+             open_biz_type as licenceType
+             FROM
+             "tz_jyjc_opening_application"
+            where
+            status = '6616') a,
+            tz_base_enterprise_info b,
+            (select cert_no, min(expiry_date) as expiry_date, unit_code, cert_type_code from tz_base_unit_licence GROUP BY cert_no,unit_code,cert_type_code) l
+        where
+            a.unit_code= b.use_unit_code
+            and a.unit_code=l.unit_code
+            and l.cert_type_code = a.open_biz_type
+            and b.supervise_org_code like CONCAT(#{orgCode}, '%')
+            and ((b.supervise_org_code != '50' and b.supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (b.supervise_org_code = '50' and b.office_region LIKE CONCAT ('%', #{dto.cityCode}, '%')))
+            ORDER BY unitName
+    </select>
 </mapper>

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

@@ -34,6 +34,11 @@
             <groupId>net.javacrumbs.shedlock</groupId>
             <artifactId>shedlock-provider-redis-spring</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.yeejoin</groupId>
+            <artifactId>visual-feign-morphic</artifactId>
+            <version>1.9.0-SNAPSHOT</version>
+        </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/config/RestTemplateConfig.java

+package com.yeejoin.amos.boot.module.jyjc.biz.config;
+
+import org.springframework.cloud.client.loadbalancer.LoadBalanced;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * @Author: xl
+ * @Description:
+ * @Date: 2022/9/21 18:04
+ */
+@Configuration
+public class RestTemplateConfig {
+
+    @Bean
+    @LoadBalanced
+    public RestTemplate getRestTemplate() {
+        return new RestTemplate();
+    }
+}
\ 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/controller/DPStatisticsController.java

 package com.yeejoin.amos.boot.module.jyjc.biz.controller;
 
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
+import com.yeejoin.amos.boot.module.jyjc.api.dto.InspectionTimelinesDto;
+import com.yeejoin.amos.boot.module.jyjc.api.dto.PublicityInspectOrgInfoDto;
 import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.DPStatisticsServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.FieldError;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
@@ -42,8 +41,8 @@ public class DPStatisticsController {
     @PostMapping(value = "/inspectTime/count/byEquListAndInspectType")
     public ResponseModel<Map<String, Object>> inspectTimeCountByTypeAndEquList(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
         List<FieldError> fieldErrors = result.getFieldErrors();
-        if(!fieldErrors.isEmpty()){
-           throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
         }
         return ResponseHelper.buildResponse(statisticsService.inspectTimeCountByTypeAndEquList(dpFilterParamDto));
     }
@@ -53,10 +52,110 @@ public class DPStatisticsController {
     @PostMapping(value = "/inspectTimeCount")
     public ResponseModel<Map<String, Object>> inspectTimeCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
         List<FieldError> fieldErrors = result.getFieldErrors();
-        if(!fieldErrors.isEmpty()){
+        if (!fieldErrors.isEmpty()) {
             throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
         }
         return ResponseHelper.buildResponse(statisticsService.inspectTimeCount(dpFilterParamDto));
     }
 
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-检验检测-左侧检验检测人员统计", notes = "大屏-检验检测-左侧检验检测人员统计")
+    @PostMapping(value = "/jy/person/count")
+    public ResponseModel<Map<String, Object>> inspectPersonCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.inspectPersonCount(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-检验检测-各检验类型业务数量统计", notes = "大屏-检验检测-各检验类型业务数量统计")
+    @PostMapping(value = "/jy/allApp/countByType")
+    public ResponseModel<Map<String, Object>> inspectBizNumCountByType(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.queryAllFlowingAndFinishedInspectApp(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-检验检测-各检验类型待检数量统计", notes = "大屏-检验检测-各检验类型待检数量统计")
+    @PostMapping(value = "/jy/pendingApp/countByType")
+    public ResponseModel<Map<String, Object>> queryAllFlowingAndFinishedInspectApp(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.queryAllPendingResultInspectApp(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-检验检测-按机构进行检验时效统计Top10排名", notes = "大屏-检验检测-按机构进行检验时效统计Top10排名")
+    @PostMapping(value = "/jy/timeliness/top")
+    public ResponseModel<List<InspectionTimelinesDto>> inspectionTimelinessTopXX(@RequestParam(required = false, defaultValue = "10") String top, @Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.queryInspectionTimelinessTopXX(top, dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-检验检测-检验检测机构公示", notes = "大屏-检验检测-检验检测机构公示")
+    @PostMapping(value = "/jy/inspectionOrgList/publicity")
+    public ResponseModel<List<PublicityInspectOrgInfoDto>> inspectionOrgListForPublicity(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.queryInspectionOrgListForPublicity(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-检验检测-八大类设备报检/待检数量统计", notes = "大屏-检验检测-八大类设备报检/待检数量统计")
+    @PostMapping(value = "/jy/inspectionEquip/countByEquList")
+    public ResponseModel<Map<String, Object>> inspectionEquipCountByEquList(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.queryInspectionEquipByEquList(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-检验检测-中间地图左侧全局统计", notes = "大屏-检验检测-中间地图左侧全局统计")
+    @PostMapping(value = "/jy/center-map/legend")
+    public ResponseModel<Map<String, Object>> centerMapCountForGlobal(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.getCenterMapCountDataForGlobal(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-检验检测-中间地图地市统计", notes = "大屏-检验检测-中间-地图地市统计")
+    @PostMapping(value = "/jy/center-map/overview")
+    public ResponseModel<List<Map<String, Object>>> centerMapCountForOverview(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.getCenterMapCountDataForOverview(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-检验检测-八大类设备检验临期、超期统计", notes = "大屏-检验检测-八大类设备检验临期、超期统计")
+    @PostMapping(value = "/jy/equipInspectTime/countByEquList")
+    public ResponseModel<Map<String, Object>> equipInspectTimeCountByEquList(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.equipInspectTimeCountByEquList(dpFilterParamDto));
+    }
+
 }

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

+package com.yeejoin.amos.boot.module.jyjc.biz.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.jyjc.biz.service.impl.DPSubServiceImpl;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.Map;
+
+/**
+ * 大屏统计controller
+ *
+ * @author Administrator
+ */
+@RestController
+@RequestMapping("/dp/sub")
+@Api(tags = "大屏二级弹窗")
+public class DPSubController {
+
+
+    private DPSubServiceImpl subService;
+
+    public DPSubController(DPSubServiceImpl subService) {
+        this.subService = subService;
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "动态详情页", notes = "动态详情页")
+    @PostMapping(value = "/{template}")
+    public ResponseModel<JSONObject> commonQuery(@PathVariable String template, @RequestBody Map<String, Object> param) {
+        if (template.equals("company")){
+            Assert.notNull(param.get("useUnitCode"), "企业统一信用代码不能为空");
+        } else if (template.equals("equip")){
+            param.put("record", param.get("SEQUENCE_NBR"));
+            param.put("equList", param.get("EQU_LIST_CODE"));
+            Assert.notNull(param.get("record"), "设备ID不能为空");
+            Assert.notNull(param.get("equList"), "设备种类不能为空");
+            template = template + "_" + param.get("equList");
+        } else {
+            throw new RuntimeException("暂无模板");
+        }
+        return ResponseHelper.buildResponse(subService.commonQuery(template, param));
+    }
+}

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

 package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
 
 import cn.hutool.core.date.DateUtil;
+import com.yeejoin.amos.boot.biz.common.dto.CountDto;
 import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
 import com.yeejoin.amos.boot.module.jyjc.api.dto.InspectTimeCountDto;
+import com.yeejoin.amos.boot.module.jyjc.api.dto.InspectionTimelinesDto;
+import com.yeejoin.amos.boot.module.jyjc.api.dto.PublicityInspectOrgInfoDto;
 import com.yeejoin.amos.boot.module.jyjc.api.enums.BizTypeEnum;
-import com.yeejoin.amos.boot.module.jyjc.api.mapper.JyjcInspectionApplicationEquipMapper;
+import com.yeejoin.amos.boot.module.jyjc.api.enums.JYJCTypeEnum;
+import com.yeejoin.amos.boot.module.jyjc.api.mapper.*;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
+import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.TzsUserInfoMapper;
+import com.yeejoin.amos.component.feign.model.FeignClientResult;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.RegionModel;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.elasticsearch.action.search.SearchRequest;
+import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.client.RequestOptions;
+import org.elasticsearch.client.RestHighLevelClient;
+import org.elasticsearch.client.core.CountRequest;
+import org.elasticsearch.client.core.CountResponse;
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.search.aggregations.AggregationBuilders;
+import org.elasticsearch.search.aggregations.bucket.terms.Terms;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.springframework.stereotype.Service;
 
+import java.io.IOException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.TemporalAdjusters;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 /**
@@ -23,6 +47,7 @@ import java.util.stream.Collectors;
  * @author Administrator
  */
 @Service
+@Slf4j
 public class DPStatisticsServiceImpl {
 
     /**
@@ -39,9 +64,32 @@ public class DPStatisticsServiceImpl {
 
     private JyjcInspectionApplicationEquipMapper inspectionApplicationEquipMapper;
 
-    public DPStatisticsServiceImpl(EquipmentCategoryMapper equipmentCategoryMapper, JyjcInspectionApplicationEquipMapper inspectionApplicationEquipMapper) {
+    private JyjcInspectionApplicationMapper inspectionApplicationMapper;
+
+    private TzsUserInfoMapper tzsUserInfoMapper;
+
+    private JyjcBaseMapper jyjcBaseMapper;
+
+    private JyjcInspectionResultMapper inspectionResultMapper;
+
+    private JyjcOpeningApplicationMapper openingApplicationMapper;
+
+
+    private static Map<String, String> regionCodeOrgCodeMap = new ConcurrentHashMap<>();
+
+    private static Map<String, List<RegionModel>> regionChildRegionMap = new ConcurrentHashMap<>();
+
+    private RestHighLevelClient restHighLevelClient;
+
+    public DPStatisticsServiceImpl(EquipmentCategoryMapper equipmentCategoryMapper, JyjcInspectionApplicationEquipMapper inspectionApplicationEquipMapper, JyjcInspectionApplicationMapper inspectionApplicationMapper, TzsUserInfoMapper tzsUserInfoMapper, JyjcBaseMapper jyjcBaseMapper, JyjcInspectionResultMapper inspectionResultMapper, JyjcOpeningApplicationMapper openingApplicationMapper, RestHighLevelClient restHighLevelClient) {
         this.equipmentCategoryMapper = equipmentCategoryMapper;
         this.inspectionApplicationEquipMapper = inspectionApplicationEquipMapper;
+        this.inspectionApplicationMapper = inspectionApplicationMapper;
+        this.tzsUserInfoMapper = tzsUserInfoMapper;
+        this.jyjcBaseMapper = jyjcBaseMapper;
+        this.inspectionResultMapper = inspectionResultMapper;
+        this.openingApplicationMapper = openingApplicationMapper;
+        this.restHighLevelClient = restHighLevelClient;
     }
 
 
@@ -101,7 +149,7 @@ public class DPStatisticsServiceImpl {
     }
 
     private List<Map<String, Object>> getLegendData(List<BizTypeEnum> bizTypeEnums) {
-       return bizTypeEnums.stream().map(b->{
+        return bizTypeEnums.stream().map(b -> {
             Map<String, Object> item = new HashMap<>();
             item.put("dataKey", b.getCode());
             item.put("value", b.getName());
@@ -130,11 +178,378 @@ public class DPStatisticsServiceImpl {
             dpFilterParamDto.setBeginDate(LocalDateTime.of(firstDayOfPrevMonth, java.time.LocalTime.MIN).format(sdf));
             dpFilterParamDto.setEndDate(LocalDateTime.of(lastDayOfPrevMonth, java.time.LocalTime.MAX).format(sdf));
             Integer inspectTimeCount = inspectionApplicationEquipMapper.inspectTimeCount(dpFilterParamDto);
-            xDataList.add(firstDayOfPrevMonth.getMonthValue()+"月");
+            xDataList.add(firstDayOfPrevMonth.getMonthValue() + "月");
             yDataList.add(null == inspectTimeCount ? 0 : inspectTimeCount);
         }
-        returnMap.put("xdata",xDataList);
-        returnMap.put("ydata",yDataList);
+        returnMap.put("xdata", xDataList);
+        returnMap.put("ydata", yDataList);
         return returnMap;
     }
+
+    public Map<String, Object> inspectPersonCount(DPFilterParamDto dpFilterParamDto) {
+        // 1.查询条件构造未上送时间时，默认查询数据为近一个月数据
+        this.setDefaultFilter(dpFilterParamDto);
+        // 2.按照前端约定格式返回数据
+        Map<String, Object> result = new HashMap<>();
+        List<RegionModel> childRegion = this.getRegionList(dpFilterParamDto);
+        if (childRegion.isEmpty()) {
+            return new HashMap<>(0);
+        }
+        //2.1 x轴数据构造
+        result.put("xdata", this.getXDataForInspectPersonCount(childRegion));
+        //2.3 y轴数据构造
+        this.buildYDataForInspectPersonCount(result, childRegion);
+        return result;
+    }
+
+    private void buildYDataForInspectPersonCount(Map<String, Object> result, List<RegionModel> childRegion) {
+        List<Long> yData = new ArrayList<>();
+        childRegion.forEach(regionModel -> {
+            String orgCode = this.getAndSetOrgCode(regionModel.getRegionCode() + "");
+            if (StringUtils.isEmpty(orgCode)) {
+                yData.add(0L);
+            } else {
+                Long num = tzsUserInfoMapper.countUserByPostAndAreaCode(orgCode, "6615",regionModel.getRegionCode() + "");
+                yData.add(num);
+            }
+        });
+        result.put("ydata", yData);
+    }
+
+    private String getAndSetOrgCode(String regionCode) {
+        String orgCode = regionCodeOrgCodeMap.get(regionCode);
+        if (orgCode == null) {
+            orgCode = jyjcBaseMapper.getOrgCodeByCompanyCode(regionCode);
+            if (orgCode == null) {
+                return "";
+            }
+            regionCodeOrgCodeMap.put(regionCode, orgCode);
+        }
+        return orgCode;
+    }
+
+    private List<String> getXDataForInspectPersonCount(List<RegionModel> childRegion) {
+        return childRegion.stream().map(RegionModel::getRegionName).collect(Collectors.toList());
+    }
+
+    private List<RegionModel> getRegionList(DPFilterParamDto dpFilterParamDto) {
+        try {
+            if (regionChildRegionMap.get(dpFilterParamDto.getCityCode()) == null) {
+                FeignClientResult<List<RegionModel>> feignClientResult = Systemctl.regionClient.queryByParentRegionCode(Integer.parseInt(dpFilterParamDto.getCityCode()));
+                List<RegionModel> regionModels = feignClientResult.getResult();
+                regionChildRegionMap.put(dpFilterParamDto.getCityCode(), regionModels);
+                return regionModels;
+            } else {
+                return regionChildRegionMap.get(dpFilterParamDto.getCityCode());
+            }
+        } catch (Exception e) {
+            log.error("查询行政区域失败：{}", e.getMessage());
+        }
+        return new ArrayList<>();
+    }
+
+    public Map<String, Object> queryAllFlowingAndFinishedInspectApp(DPFilterParamDto dpFilterParamDto) {
+        // 1.查询条件构造未上送时间时，默认查询数据为近一个月数据
+        this.setDefaultFilter(dpFilterParamDto);
+        // 2.按照前端约定格式返回数据
+        Map<String, Object> result = new HashMap<>();
+        JYJCTypeEnum[] jyjcTypeEnums = JYJCTypeEnum.values();
+        //2.1 x轴数据构造
+        result.put("xdata", this.getXDataForInspectBizNumCount(jyjcTypeEnums));
+        //2.3 y轴数据构造
+        this.buildYDataForFlowingAndFinishedInspectApp(result, jyjcTypeEnums, dpFilterParamDto);
+        return result;
+    }
+
+    public Map<String, Object> queryAllPendingResultInspectApp(DPFilterParamDto dpFilterParamDto) {
+        // 1.查询条件构造未上送时间时，默认查询数据为近一个月数据
+        this.setDefaultFilter(dpFilterParamDto);
+        // 2.按照前端约定格式返回数据
+        Map<String, Object> result = new HashMap<>();
+        JYJCTypeEnum[] jyjcTypeEnums = JYJCTypeEnum.values();
+        //2.1 x轴数据构造
+        result.put("xdata", this.getXDataForInspectBizNumCount(jyjcTypeEnums));
+        //2.3 y轴数据构造
+        this.buildYDataForPendingResultInspectApp(result, jyjcTypeEnums, dpFilterParamDto);
+        return result;
+    }
+
+    private void buildYDataForPendingResultInspectApp(Map<String, Object> result, JYJCTypeEnum[] jyjcTypeEnums, DPFilterParamDto dpFilterParamDto) {
+        String orgCode = this.getAndSetOrgCode(dpFilterParamDto.getCityCode());
+        List<CountDto> countDtoList = inspectionApplicationMapper.queryAllPendingResultInspectApp(orgCode, dpFilterParamDto);
+        fillJYJCYData(result, jyjcTypeEnums, countDtoList);
+    }
+
+    private void fillJYJCYData(Map<String, Object> result, JYJCTypeEnum[] jyjcTypeEnums, List<CountDto> countDtoList) {
+        List<Long> yData = new ArrayList<>();
+        for (JYJCTypeEnum jyjcTypeEnum : jyjcTypeEnums) {
+            Long num = countDtoList.stream().filter(c -> c.getKeyStr().equals(jyjcTypeEnum.getCode())).mapToLong(CountDto::getLongValue).sum();
+            yData.add(num);
+        }
+        result.put("ydata", yData);
+    }
+
+    private void buildYDataForFlowingAndFinishedInspectApp(Map<String, Object> result, JYJCTypeEnum[] jyjcTypeEnums, DPFilterParamDto dpFilterParamDto) {
+        String orgCode = this.getAndSetOrgCode(dpFilterParamDto.getCityCode());
+        List<CountDto> countDtoList = inspectionApplicationMapper.queryAllFlowingAndFinishedInspectApp(orgCode, dpFilterParamDto);
+        fillJYJCYData(result, jyjcTypeEnums, countDtoList);
+    }
+
+    private List<String> getXDataForInspectBizNumCount(JYJCTypeEnum[] jyjcTypeEnums) {
+        return Arrays.stream(jyjcTypeEnums).map(JYJCTypeEnum::getName).collect(Collectors.toList());
+    }
+
+    public List<InspectionTimelinesDto> queryInspectionTimelinessTopXX(String top, DPFilterParamDto dpFilterParamDto) {
+        String orgCode = this.getAndSetOrgCode(dpFilterParamDto.getCityCode());
+        return inspectionResultMapper.queryInspectionTimelinessTopXX(top, orgCode, dpFilterParamDto);
+    }
+
+    public List<PublicityInspectOrgInfoDto> queryInspectionOrgListForPublicity(DPFilterParamDto dpFilterParamDto) {
+        String orgCode = this.getAndSetOrgCode(dpFilterParamDto.getCityCode());
+        return openingApplicationMapper.queryInspectionOrgListForPublicity(orgCode, dpFilterParamDto);
+    }
+
+    public Map<String, Object> queryInspectionEquipByEquList(DPFilterParamDto dpFilterParamDto) {
+        Map<String, Object> result = new HashMap<>();
+        // 1.查询条件构造未上送时间时，默认查询数据为近一个月数据
+        this.setDefaultFilter(dpFilterParamDto);
+        String orgCode = this.getAndSetOrgCode(dpFilterParamDto.getCityCode());
+        // 2.x轴数据构建
+        List<EquipmentCategoryDto> equipmentCategoryDtos = equipmentCategoryMapper.selectClassify();
+        this.setXDataForInspectionEquipByEquList(result, equipmentCategoryDtos);
+        // 3.y轴数据设置
+        // 目前都单设备报检故统计主表即可
+        List<CountDto> countDtos = inspectionApplicationMapper.queryAppByEquListForDP(orgCode, dpFilterParamDto);
+        Map<String, List<CountDto>> groupByMap = countDtos.stream().collect(Collectors.groupingBy(CountDto::getLabel));
+        this.setYDataForInspectionEquipByEquList(result, groupByMap, equipmentCategoryDtos);
+        // 4.图列数据设置
+        this.setLegendDataForInspectionEquipByEquList(result);
+        return result;
+    }
+
+    private void setYDataForInspectionEquipByEquList(Map<String, Object> result, Map<String, List<CountDto>> groupByMap, List<EquipmentCategoryDto> equipmentCategoryDtos) {
+        groupByMap.forEach((key, value) -> result.put(key, this.setInspectionEquipData(value, equipmentCategoryDtos)));
+    }
+
+    private List<Long> setInspectionEquipData(List<CountDto> countDtos, List<EquipmentCategoryDto> equipmentCategoryDtos) {
+        return equipmentCategoryDtos.stream().map(e -> countDtos.stream().filter(c -> c.getKeyStr().equals(e.getCode())).mapToLong(CountDto::getLongValue).sum()).collect(Collectors.toList());
+    }
+
+    private void setLegendDataForInspectionEquipByEquList(Map<String, Object> result) {
+        Map<String, Object> item1 = new LinkedHashMap<>();
+        item1.put("dataKey", "pending");
+        item1.put("value", "待检数量");
+        Map<String, Object> item2 = new LinkedHashMap<>();
+        item2.put("dataKey", "reporting");
+        item2.put("value", "报检数量");
+        result.put("legendData", Arrays.asList(item1, item2));
+    }
+
+    private void setXDataForInspectionEquipByEquList(Map<String, Object> result, List<EquipmentCategoryDto> equipmentCategoryDtos) {
+        // 8大类
+        List<String> names = equipmentCategoryDtos.stream().map(EquipmentCategoryDto::getName).collect(Collectors.toList());
+        result.put("xdata", names);
+    }
+
+
+    private List<String> getEquListXDataCommon(List<EquipmentCategoryDto> equipmentCategoryDtos) {
+        // 8大类
+        return equipmentCategoryDtos.stream().map(EquipmentCategoryDto::getName).collect(Collectors.toList());
+    }
+
+
+    public Map<String, Object> getCenterMapCountDataForGlobal(DPFilterParamDto dpFilterParamDto) {
+        Map<String, Object> result = new HashMap<>();
+        // 1.报检数量统计
+        this.staticsCenterMapCountDataReporting(result, dpFilterParamDto);
+        // 2.检验检测临期设备数数量统计
+        this.staticsCenterMapCountDataTemporary(result, dpFilterParamDto);
+        // 3.检验检测超期设备数数量统计
+        this.staticsCenterMapCountDataOverdue(result, dpFilterParamDto);
+        return result;
+    }
+
+    private void staticsCenterMapCountDataTemporary(Map<String, Object> result, DPFilterParamDto dpFilterParamDto) {
+        long num = 0;
+        CountRequest request = new CountRequest();
+        request.indices("idx_biz_view_jg_all");
+        BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
+        // 且区域信息模糊查询
+        boolMust.must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*" + dpFilterParamDto.getCityCode() + "*"));
+        // 且纳管状态为已纳管
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
+        // 且在用状态设备
+        boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
+        // 且下次检验日期大于等于当天
+        long currentDayTime = DateUtil.parse(DateUtil.today(), "yyy-MM-dd").getTime();
+        boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").gte(currentDayTime));
+        // 且查询 下次检验日期 <= 当前天+30天 极为临期
+        long currentDayAfter30DayTime = DateUtil.offsetDay(DateUtil.parse(DateUtil.today(), "yyy-MM-dd"), 30).getTime();
+        boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").lte(currentDayAfter30DayTime));
+        request.query(boolMust);
+        try {
+            CountResponse response = restHighLevelClient.count(request, RequestOptions.DEFAULT);
+            num = response.getCount();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        result.put("jyjclqsbCount", num);
+    }
+
+    private void staticsCenterMapCountDataOverdue(Map<String, Object> result, DPFilterParamDto dpFilterParamDto) {
+        long num = 0;
+        CountRequest request = new CountRequest();
+        request.indices("idx_biz_view_jg_all");
+        BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
+        // 区域信息模糊查询
+        boolMust.must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*" + dpFilterParamDto.getCityCode() + "*"));
+        // 纳管状态为已纳管
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
+        // 在用状态设备
+        boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
+        // 查询下次检验日期小于当前天的设备，即为超期检验超期设备
+        long currentDayTime = DateUtil.parse(DateUtil.now(), "yyy-MM-dd").getTime();
+        boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").lt(currentDayTime));
+        request.query(boolMust);
+        try {
+            CountResponse response = restHighLevelClient.count(request, RequestOptions.DEFAULT);
+            num = response.getCount();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        result.put("jyjccqsbCount", num);
+    }
+
+
+    private void staticsCenterMapCountDataReporting(Map<String, Object> result, DPFilterParamDto dpFilterParamDto) {
+        String orgCode = this.getAndSetOrgCode(dpFilterParamDto.getCityCode());
+        CountDto countDto = inspectionApplicationMapper.queryAppByEquListForReporting(orgCode, dpFilterParamDto);
+        result.put("bjCount", countDto.getLongValue());
+    }
+
+    public List<Map<String, Object>> getCenterMapCountDataForOverview(DPFilterParamDto dpFilterParamDto) {
+        return getRegionList(dpFilterParamDto).parallelStream().filter(e -> e.getParentRegionCode() != null && (e.getParentRegionCode().toString()).equals(dpFilterParamDto.getCityCode())).map(r -> {
+            DPFilterParamDto filterParamDto = new DPFilterParamDto();
+            filterParamDto.setCityCode(r.getRegionCode().toString());
+            Map<String, Object> itemResult = getCenterMapOverviewData(filterParamDto);
+            itemResult.put("regionCode", r.getRegionCode());
+            itemResult.put("regionName", r.getRegionName());
+            return itemResult;
+        }).collect(Collectors.toList());
+    }
+
+    private Map<String, Object> getCenterMapOverviewData(DPFilterParamDto filterParamDto) {
+        Map<String, Object> result = new HashMap<>();
+        // 1.报检数量统计
+        this.staticsCenterMapCountDataReporting(result, filterParamDto);
+        // 2.检验检测临期设备数数量统计
+        this.staticsCenterMapCountDataTemporary(result, filterParamDto);
+        // 3.检验检测超期设备数数量统计
+        this.staticsCenterMapCountDataOverdue(result, filterParamDto);
+        return result;
+    }
+
+    public Map<String, Object> equipInspectTimeCountByEquList(DPFilterParamDto dpFilterParamDto) {
+        // 1.按照前端约定格式返回数据
+        Map<String, Object> result = new HashMap<>();
+        // 1.1 图列数据构造
+        result.put("legendData", this.getLegendDataForJyTime());
+        // 8大类设备种类
+        List<EquipmentCategoryDto> equipmentCategoryDtos = equipmentCategoryMapper.selectClassify();
+        // 2.x轴数据构造
+        result.put("xdata", this.getEquListXDataCommon(equipmentCategoryDtos));
+        // 3.y轴数据构造
+        this.buildYDataForJyTime(result, dpFilterParamDto, equipmentCategoryDtos);
+        return result;
+    }
+
+    private void buildYDataForJyTime(Map<String, Object> result, DPFilterParamDto dpFilterParamDto, List<EquipmentCategoryDto> equipmentCategoryDtos) {
+        // 1.检验检测临期设备数数量统计
+        result.put("approach", staticsCenterMapCountDataForJyTimeTemporary(dpFilterParamDto, equipmentCategoryDtos));
+        // 2.检验检测超期设备数数量统计
+        result.put("overdue", staticsCenterMapCountDataForJyTimeOverdue(dpFilterParamDto, equipmentCategoryDtos));
+    }
+
+    private List<Long> staticsCenterMapCountDataForJyTimeTemporary(DPFilterParamDto dpFilterParamDto, List<EquipmentCategoryDto> equipmentCategoryDtos) {
+        List<Long> seresData = new ArrayList<>();
+        SearchRequest request = new SearchRequest();
+        request.indices("idx_biz_view_jg_all");
+        BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
+        // 且区域信息模糊查询
+        boolMust.must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*" + dpFilterParamDto.getCityCode() + "*"));
+        // 且纳管状态为已纳管
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
+        // 且在用状态设备
+        boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
+        // 且下次检验日期大于等于当天 且查询 下次检验日期 <= 当前天+30天 极为临期
+        long currentDayTime = DateUtil.parse(DateUtil.today(), "yyy-MM-dd").getTime();
+        long currentDayAfter30DayTime = DateUtil.offsetDay(DateUtil.parse(DateUtil.today(), "yyy-MM-dd"), 30).getTime();
+        boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").gte(currentDayTime).lte(currentDayAfter30DayTime));
+        SearchSourceBuilder builder = new SearchSourceBuilder();
+        builder.query(boolMust);
+        TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("count_by_equ_list_code").field("EQU_LIST_CODE");
+        builder.aggregation(aggregationBuilder);
+        request.source(builder);
+        try {
+            SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
+            Terms terms = response.getAggregations().get("count_by_equ_list_code");
+            Map<String, Long> countMap = new HashMap<>();
+            for (Terms.Bucket bucket : terms.getBuckets()) {
+                countMap.put(bucket.getKeyAsString(), bucket.getDocCount());
+            }
+            // 按照8大类枚举，进行加工。目的：固定八大类防止没统计数据导致缺少分类、将设备种类的code换成前端定义的key
+            equipmentCategoryDtos.forEach(c -> {
+                seresData.add(countMap.getOrDefault(c.getCode(), 0L));
+            });
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return seresData;
+    }
+
+    private List<Long> staticsCenterMapCountDataForJyTimeOverdue(DPFilterParamDto dpFilterParamDto, List<EquipmentCategoryDto> equipmentCategoryDtos) {
+        List<Long> seresData = new ArrayList<>();
+        SearchRequest request = new SearchRequest();
+        request.indices("idx_biz_view_jg_all");
+        BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
+        // 区域信息模糊查询
+        boolMust.must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*" + dpFilterParamDto.getCityCode() + "*"));
+        // 纳管状态为已纳管
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
+        // 在用状态设备
+        boolMust.must(QueryBuilders.termQuery("EQU_STATE", EquimentEnum.ZAIYONG.getCode()));
+        // 查询下次检验日期小于当前天的设备，即为超期检验超期设备
+        long currentDayTime = DateUtil.parse(DateUtil.now(), "yyy-MM-dd").getTime();
+        boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").lt(currentDayTime));
+        SearchSourceBuilder builder = new SearchSourceBuilder();
+        builder.query(boolMust);
+        TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms("count_by_equ_list_code").field("EQU_LIST_CODE");
+        builder.aggregation(aggregationBuilder);
+        request.source(builder);
+        try {
+            SearchResponse response = restHighLevelClient.search(request, RequestOptions.DEFAULT);
+            Terms terms = response.getAggregations().get("count_by_equ_list_code");
+            Map<String, Long> countMap = new HashMap<>();
+            for (Terms.Bucket bucket : terms.getBuckets()) {
+                countMap.put(bucket.getKeyAsString(), bucket.getDocCount());
+            }
+            // 按照8大类枚举，进行加工。目的：固定八大类防止没统计数据导致缺少分类、将设备种类的code换成前端定义的key
+            equipmentCategoryDtos.forEach(c -> {
+                seresData.add(countMap.getOrDefault(c.getCode(), 0L));
+            });
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return seresData;
+    }
+
+    private Object getLegendDataForJyTime() {
+        Map<String, Object> item1 = new LinkedHashMap<>();
+        item1.put("dataKey", "approach");
+        item1.put("value", "临期");
+        Map<String, Object> item2 = new LinkedHashMap<>();
+        item2.put("dataKey", "overdue");
+        item2.put("value", "超期");
+        return Arrays.asList(item1, item2);
+    }
 }

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

+package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.jyjc.biz.util.DpSubUtils;
+import com.yeejoin.amos.boot.module.jyjc.biz.util.JsonValueUtils;
+import com.yeejoin.amos.boot.module.jyjc.biz.util.RestTemplateUtils;
+import com.yeejoin.amos.boot.module.jyjc.biz.util.StringUtils;
+import com.yeejoin.amos.feign.morphic.Morphic;
+import com.yeejoin.amos.feign.morphic.model.FormSceneModel;
+import jdk.nashorn.api.scripting.ScriptObjectMirror;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.client.loadbalancer.LoadBalanced;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.client.RestTemplate;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
+import org.typroject.tyboot.core.foundation.utils.DateUtil;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.script.Invocable;
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import java.net.URI;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
+
+/**
+ * 大屏二级页面实现类
+ *
+ * @author Administrator
+ */
+@Slf4j
+@Service
+public class DPSubServiceImpl {
+
+    private static final String GATEWAY_SERVER_NAME = "AMOS-SERVER-GATEWAY";
+
+    @Autowired
+    @LoadBalanced
+    private RestTemplate restTemplate;
+
+    public JSONObject commonQuery(String template, @RequestBody Map<String, Object> param) {
+        JSONObject result = new JSONObject();
+        String templateJson = DpSubUtils.getFileContent(template + ".json");
+
+        //1、替换json中所有的变量
+        if (!ValidationUtil.isEmpty(param)) {
+            for (Map.Entry item : param.entrySet()) {
+                templateJson = templateJson.replaceAll("\\{" + item.getKey() + "\\}", item.getValue().toString());
+            }
+        }
+        //2、解析结构
+        result = JSON.parseObject(templateJson);
+        JSONArray tabs = result.getJSONArray("tabs");
+        JSONObject content = result.getJSONObject("content");
+        tabs.stream().forEach(x -> {
+            this.buildContent(content, (JSONObject) x);
+        });
+        return result;
+    }
+
+    public void buildContent(JSONObject content, JSONObject tab) {
+        Long formSeq = tab.getLong("formSeq");
+        Object resultConvert = JsonValueUtils.getValueByKey(tab, "dataConfig", "dataConfig.resultConvert");
+        Object api = JsonValueUtils.getValueByKey(tab, "dataConfig", "dataConfig.api");
+        Object columnWidth = JsonValueUtils.getValueByKey(tab, "dataConfig", "dataConfig.columnWidth");
+
+        JSONObject map = content.getJSONObject(tab.getString("key"));
+        JSONObject apiResult = new JSONObject();
+
+        if (!ValidationUtil.isEmpty(api)) {
+            ResponseModel responseModel = this.getApiResult((JSONObject) api, !ValidationUtil.isEmpty(resultConvert) ? resultConvert.toString() : null);
+            if (!ValidationUtil.isEmpty(responseModel.getResult())) {
+                apiResult = JSONObject.parseObject(responseModel.getResult().toString());
+            }
+        }
+
+        if (!ValidationUtil.isEmpty(formSeq)) {
+            FormSceneModel formPage = Morphic.formSceneClient.seleteOne(formSeq).getResult();
+            // 1、排除表单隐藏字段
+            JSONArray children = (JSONArray) JsonValueUtils.getValueByKey(JSONObject.parseObject(formPage.getContent()), "children", "children");
+            Object showHideRules = JsonValueUtils.getValueByKey(JSONObject.parseObject(formPage.getContent()), "formConfig", "formConfig.showHideRules");
+
+            // 处理显隐逻辑
+            this.processShowHideRules(children, showHideRules, apiResult);
+
+            List<Object> noHiddenChildren = children.stream().filter(x -> !"hidden".equals(JsonValueUtils.getValueByKey(x, "visualParams", "visualParams.behavior"))).collect(Collectors.toList());
+            // 设置一个图片附件分组
+            JSONObject matinfo = new JSONObject();
+            matinfo.put("displayName", "图片附件");
+            matinfo.put("renderType", "matui");
+            matinfo.put("datas", new JSONArray());
+
+            for (int i = 0; i < noHiddenChildren.size(); i++) {
+                JSONObject yObj = (JSONObject) noHiddenChildren.get(i);
+
+                if ("pageSection".equals(yObj.get("componentKey")) || "columnsLayout".equals(yObj.get("componentKey"))) { // 分组或者布局容器
+                    List<Object> mergedArray = mergedList(yObj.getJSONArray("children"));
+                    // 第一组去除标题
+                    if (i == 0 || ValidationUtil.isEmpty(map.get("datas"))) {
+                        this.buildContentData(map, mergedArray, apiResult, matinfo);
+                    } else {
+                        this.buildSubContentData(map, i, yObj, mergedArray, apiResult, matinfo);
+                    }
+                } else if ("subForm".equals(yObj.get("componentKey"))) { // 子表单
+                    this.buildSubFormData(map, i, yObj, apiResult);
+                } else if ("formTable".equals(yObj.get("componentKey"))) {
+                    map = new JSONObject();
+                    JSONArray columns = (JSONArray) JsonValueUtils.getValueByKey(yObj, "visualParams", "visualParams.modelTableColumns");
+                    JSONObject columnWidthMap = (JSONObject) columnWidth;
+                    columns.stream().forEach(x -> {
+                        JSONObject xObj = (JSONObject) x;
+                        if (!ValidationUtil.isEmpty(columnWidthMap.get(xObj.get("dataIndex")))) {
+                            xObj.put("width", columnWidthMap.get(xObj.get("dataIndex")));
+                        }
+                    });
+                    map.put("columns", columns);
+                    map.put("dataList", apiResult);
+                    map.put("showPage", true);
+                    map.put("api", api);
+                    map.put("rowKey", "record");
+                    content.put(tab.getString("key"), map);
+                }
+            }
+
+            if (!ValidationUtil.isEmpty(matinfo.getJSONArray("datas"))){
+                matinfo.put("columns", map.getJSONObject("basic").getString("columns"));
+                map.getJSONArray("subs").add(matinfo);
+            }
+        } else {
+            if (ValidationUtil.isEmpty(map)) {
+                content.put(tab.getString("key"), apiResult);
+            }
+        }
+    }
+
+    private JSONArray processShowHideRules(JSONArray children, Object showHideRules, JSONObject apiResult) {
+        if (!ValidationUtil.isEmpty(showHideRules)) {
+            ((JSONArray) showHideRules).stream().forEach(x -> {
+                JSONObject xObj = (JSONObject) x;
+                boolean hide = true;
+                JSONArray conditions = xObj.getJSONArray("condition");
+                String relation = null;
+                boolean lastConditionResult = false;
+                for (int i = 0; i < conditions.size(); i++) {
+                    JSONObject conditionObj = conditions.getJSONObject(i);
+                    String value = conditionObj.getString("value");
+                    String condition = conditionObj.getString("condition");
+                    JSONObject item = this.findByEid(children, JsonValueUtils.getValueByKey(conditionObj, "name", "name.key").toString());
+
+                    Object fieldvalue = apiResult.get(JsonValueUtils.getValueByKey(item, "visualParams", "visualParams.fieldKey"));
+                    if (ValidationUtil.isEmpty(relation)) {
+                        if (condition.equals("notUndefined") && !ValidationUtil.isEmpty(fieldvalue)) {
+                            lastConditionResult = !ValidationUtil.isEmpty(fieldvalue);
+                            hide = false;
+                        } else if (condition.equals("unequal") && !ValidationUtil.isEmpty(fieldvalue) && !fieldvalue.equals(value)) {
+                            lastConditionResult = !fieldvalue.equals(value);
+                            hide = false;
+                        } else if (condition.equals("equal") && !ValidationUtil.isEmpty(fieldvalue) && fieldvalue.equals(value)) {
+                            lastConditionResult = fieldvalue.equals(value);
+                            hide = false;
+                        }
+                    } else {
+                        if (lastConditionResult && condition.equals("notUndefined") && !ValidationUtil.isEmpty(fieldvalue)) {
+                            lastConditionResult = !ValidationUtil.isEmpty(fieldvalue);
+                            hide = false;
+                        } else if (lastConditionResult && condition.equals("unequal") && !ValidationUtil.isEmpty(fieldvalue) && !fieldvalue.equals(value)) {
+                            lastConditionResult = !fieldvalue.equals(value);
+                            hide = false;
+                        } else if (lastConditionResult && condition.equals("equal") && !ValidationUtil.isEmpty(fieldvalue) && fieldvalue.equals(value)) {
+                            lastConditionResult = fieldvalue.equals(value);
+                            hide = false;
+                        } else {
+                            hide = true;
+                        }
+                    }
+                    relation = conditionObj.getString("relation");
+                }
+
+                if (hide) {
+                    JSONArray showColumns = xObj.getJSONArray("showColumns");
+                    showColumns.stream().forEach(showColumn -> {
+                        boolean match = false; // 是否匹配标识
+                        List<Object> collect = children.stream().filter(y -> showColumn.equals(JsonValueUtils.getValueByKey(y, "eid", "eid"))).collect(Collectors.toList());
+
+                        if (ValidationUtil.isEmpty(collect)) {
+                            for (int i = 0; i < children.size(); i++) {
+                                if (match) {
+                                    break;
+                                }
+                                JSONArray subChildren = children.getJSONObject(i).getJSONArray("children");
+                                for (int j = 0; j < subChildren.size(); j++) {
+                                    if (match) {
+                                        break;
+                                    }
+                                    Object cchildren = JsonValueUtils.getValueByKey(subChildren.get(j), "children", "children");
+                                    if (!ValidationUtil.isEmpty(cchildren)) {
+                                        List<Object> ccollect = ((JSONArray) cchildren).stream().filter(y -> showColumn.equals(JsonValueUtils.getValueByKey(y, "eid", "eid"))).collect(Collectors.toList());
+                                        if (!ValidationUtil.isEmpty(ccollect)) {
+                                            JSONObject groupObj = (JSONObject) ccollect.get(0);
+                                            JSONObject visualParams = groupObj.getJSONObject("visualParams");
+                                            visualParams.put("behavior", "hidden");
+                                            match = true;
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+                        } else {
+                            JSONObject groupObj = (JSONObject) collect.get(0);
+                            JSONObject visualParams = groupObj.getJSONObject("visualParams");
+                            visualParams.put("behavior", "hidden");
+                        }
+                    });
+                }
+            });
+        }
+        return children;
+    }
+
+    private JSONObject findByEid(JSONArray children, String eid) {
+        List<Object> collect = children.stream().filter(x -> eid.equals(JsonValueUtils.getValueByKey(x, "eid", "eid"))).collect(Collectors.toList());
+        if (ValidationUtil.isEmpty(collect)) {
+            for (int i = 0; i < children.size(); i++) {
+                JSONArray subChildren = children.getJSONObject(i).getJSONArray("children");
+                for (int j = 0; j < subChildren.size(); j++) {
+                    if (ValidationUtil.isEmpty(subChildren.getJSONObject(j).get("children"))) {
+                        List<Object> ccollect = subChildren.stream().filter(y -> eid.equals(JsonValueUtils.getValueByKey(y, "eid", "eid"))).collect(Collectors.toList());
+                        if (!ValidationUtil.isEmpty(ccollect)) {
+                            return (JSONObject) ccollect.get(0);
+                        }
+                    } else {
+                        Object cchildren = JsonValueUtils.getValueByKey(subChildren.get(j), "children", "children");
+                        if (!ValidationUtil.isEmpty(cchildren)) {
+                            List<Object> ccollect = ((JSONArray) cchildren).stream().filter(y -> eid.equals(JsonValueUtils.getValueByKey(y, "eid", "eid"))).collect(Collectors.toList());
+                            if (!ValidationUtil.isEmpty(ccollect)) {
+                                return (JSONObject) ccollect.get(0);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return (JSONObject) collect.get(0);
+    }
+
+    /**
+     * 合并分组组件下的所有组件
+     *
+     * @param children
+     * @return
+     */
+    private List<Object> mergedList(JSONArray children) {
+        JSONArray mergedArray = new JSONArray();
+        int maxSize = 0; // 初始化为JSONArray的长度
+        for (int i = 0; i < children.size(); i++) {
+            JSONArray cchildren = children.getJSONObject(i).getJSONArray("children");
+            if (!ValidationUtil.isEmpty(cchildren)) {
+                maxSize = Math.max(maxSize, cchildren.size());
+            }
+        }
+
+        for (int i = 0; i < maxSize; i++) {
+            for (int j = 0; j < children.size(); j++) {
+                JSONArray cchildren = children.getJSONObject(j).getJSONArray("children");
+                if (!ValidationUtil.isEmpty(cchildren)) {
+                    List<Object> noHiddenMergedArray = cchildren.stream().filter(x -> {
+                        JSONObject xObj = (JSONObject) x;
+                        return !"hidden".equals(JsonValueUtils.getValueByKey(xObj, "visualParams", "visualParams.behavior"));
+                    }).collect(Collectors.toList());
+
+                    if (i < noHiddenMergedArray.size()) {
+                        mergedArray.add(cchildren.get(i));
+                    }
+                }
+            }
+        }
+        return mergedArray;
+    }
+
+    public JSONObject buildContentData(JSONObject map, List<Object> mergedArray, JSONObject apiResult, JSONObject matinfo) {
+        JSONArray datas = new JSONArray();
+        // 处理二维码
+        mergedArray.stream().filter(x -> "QRCode".equals(JsonValueUtils.getValueByKey(x, "componentKey", null))).findFirst().ifPresent(x -> {
+            JSONObject qrcode = map.getJSONObject("qrcode");
+            String problemTime = apiResult.getString("problemTime");
+            String problemStatus = apiResult.getString("problemStatus");
+            String color = null;
+            if (!ValidationUtil.isEmpty(problemTime)) {
+                try {
+                    qrcode.put("text", DateUtil.formatDate(DateUtil.smartFormat(problemTime), "yyyy-MM-dd"));
+                    qrcode.put("subtext", DateUtil.formatDate(DateUtil.smartFormat(problemTime), "HH:mm:ss"));
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+            if ("正常".equals(problemStatus)) {
+                color = "green";
+            } else if ("异常".equals(problemStatus)) {
+                color = "red";
+            }
+            qrcode.put("value", !ValidationUtil.isEmpty(apiResult.get("useCode")) ? apiResult.get("useCode") : apiResult.get("USE_ORG_CODE"));
+            qrcode.put("status", problemStatus);
+            qrcode.put("color", color);
+        });
+
+        mergedArray = mergedArray.stream().filter(x -> !"QRCode".equals(JsonValueUtils.getValueByKey(x, "componentKey", null))).collect(Collectors.toList());
+
+        mergedArray.stream().forEach(x -> {
+            Object fieldKey = JsonValueUtils.getValueByKey(x, "visualParams", "visualParams.fieldKey");
+            if (!ValidationUtil.isEmpty(fieldKey)) {
+                this.processWidgets(datas, x, fieldKey.toString(), apiResult, matinfo);
+            }
+        });
+        map.put("datas", datas);
+        return map;
+    }
+
+    public JSONObject buildSubContentData(JSONObject map, int i, JSONObject yObj, List<Object> mergedArray, JSONObject apiResult, JSONObject matinfo) {
+        JSONArray subs = map.getJSONArray("subs");
+        JSONArray children = yObj.getJSONArray("children");
+        List<Object> columnsArray = children.stream().filter(x -> {
+            JSONObject xObj = (JSONObject) x;
+            return !ValidationUtil.isEmpty(xObj.getJSONArray("children")) && xObj.getJSONArray("children").size() > 0;
+        }).collect(Collectors.toList());
+
+        JSONObject subObj = new JSONObject();
+        subObj.put("key", "key" + i);
+        subObj.put("displayName", JsonValueUtils.getValueByKey(yObj, "visualParams", "visualParams.title"));
+        subObj.put("renderType", "basic");
+        subObj.put("columns", columnsArray.size());
+
+        JSONArray datas = new JSONArray();
+        mergedArray.stream().forEach(x -> {
+            Object fieldKey = JsonValueUtils.getValueByKey(x, "visualParams", "visualParams.fieldKey");
+            if (!ValidationUtil.isEmpty(fieldKey)) {
+                this.processWidgets(datas, x, fieldKey.toString(), apiResult, matinfo);
+                subObj.put("datas", datas);
+            }
+        });
+        subs.add(subObj);
+        return map;
+    }
+
+    /**
+     * 处理不同组件的展示
+     *
+     * @param datas
+     * @param x
+     * @param fieldKey
+     * @param apiResult
+     * @return
+     */
+    public JSONArray processWidgets(JSONArray datas, Object x, String fieldKey, JSONObject apiResult, JSONObject matinfo) {
+        JSONObject jsonObject = new JSONObject();
+
+        JSONObject xObj = (JSONObject) x;
+        JSONObject visualParams = xObj.getJSONObject("visualParams");
+        jsonObject.put("label", visualParams.getString("label"));
+        Object value = apiResult.get(fieldKey);
+
+        if ("upload".equals(xObj.getString("componentKey"))) {
+            jsonObject.put("type", "img");
+            if (!ValidationUtil.isEmpty(value)) {
+                jsonObject.put("value", ((JSONArray) value).getJSONObject(0).getString("url"));
+            }
+        } else if ("attachmentUpload".equals(xObj.getString("componentKey"))) {
+            JSONArray attachmentUploadDatas = matinfo.getJSONArray("datas");
+            if (!ValidationUtil.isEmpty(value)) {
+                JSONObject attachmentUploadDatasObj = new JSONObject();
+                attachmentUploadDatasObj.put("value", value);
+                attachmentUploadDatas.add(attachmentUploadDatasObj);
+            }
+        } else if ("checkbox".equals(xObj.getString("componentKey"))) {
+            jsonObject.put("type", "text");
+            ResponseModel checkboxResult = this.getApiResult(visualParams.getJSONObject("api"), null);
+            if (!ValidationUtil.isEmpty(checkboxResult) && checkboxResult.getStatus() == 200 && !ValidationUtil.isEmpty(value)) {
+                List<Object> collect = ((JSONArray) checkboxResult.getResult()).stream().filter(y -> ((JSONArray) value).contains(JsonValueUtils.getValueByKey(y, "valueKey", "valueKey"))).collect(Collectors.toList());
+                String nameKey = collect.stream().map(item -> ((JSONObject) item).getString("nameKey")).collect(Collectors.joining("、"));
+                jsonObject.put("value", nameKey);
+            } else {
+                jsonObject.put("value", value);
+            }
+        } else if ("select".equals(xObj.getString("componentKey"))) {
+            jsonObject.put("type", "text");
+            ResponseModel selectResult = this.getApiResult(visualParams.getJSONObject("api"), null);
+            if (!ValidationUtil.isEmpty(selectResult) && selectResult.getStatus() == 200 && !ValidationUtil.isEmpty(value)) {
+                ((JSONArray) selectResult.getResult()).stream().filter(y -> value.equals(JsonValueUtils.getValueByKey(y, "valueKey", "valueKey"))).findFirst().ifPresent(z -> {
+                    jsonObject.put("value", ((JSONObject) z).getString("nameKey"));
+                });
+            } else {
+                jsonObject.put("value", value);
+            }
+        } else {
+            jsonObject.put("type", "text");
+            jsonObject.put("value", value);
+        }
+        datas.add(jsonObject);
+        return datas;
+    }
+
+    public JSONObject buildSubFormData(JSONObject map, int i, JSONObject yObj, JSONObject apiResult) {
+        JSONArray subs = map.getJSONArray("subs");
+        JSONArray children = yObj.getJSONArray("children");
+
+        JSONObject subObj = new JSONObject();
+        subObj.put("key", "key" + i);
+        subObj.put("displayName", JsonValueUtils.getValueByKey(yObj, "visualParams", "visualParams.label"));
+        subObj.put("renderType", "table");
+
+        List<Object> noHiddenChildren = children.stream().filter(x -> {
+            JSONObject xObj = (JSONObject) x;
+            return !"hidden".equals(JsonValueUtils.getValueByKey(xObj, "visualParams", "visualParams.behavior"));
+        }).collect(Collectors.toList());
+
+        List<JSONObject> columns = noHiddenChildren.stream().map(x -> {
+            JSONObject xObj = (JSONObject) x;
+            JSONObject visualParams = xObj.getJSONObject("visualParams");
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("key", xObj.get("eid"));
+            jsonObject.put("dataIndex", visualParams.get("fieldKey"));
+            jsonObject.put("title", visualParams.get("label"));
+            return jsonObject;
+        }).collect(Collectors.toList());
+
+        subObj.put("rowKey", "key");
+        subObj.put("showPage", false);
+        subObj.put("columns", columns);
+        subObj.put("dataList", apiResult.get(JsonValueUtils.getValueByKey(yObj, "visualParams", "visualParams.fieldKey")));
+
+        subs.add(subObj);
+        return map;
+    }
+
+    public ResponseModel getApiResult(JSONObject apiObj, String resultConvert) {
+        String url = apiObj.getString("apiPath");
+        String reqType = !ValidationUtil.isEmpty(apiObj.getString("httpMethod")) ? apiObj.getString("httpMethod") : "GET";
+        Object params = apiObj.get("params");
+        Object body = apiObj.get("body");
+        ResponseEntity<String> responseEntity = null;
+        //如果url以/开头，则调用本服务内接口
+        if (url != null && url.trim().startsWith("/")) {
+            url = "http://" + GATEWAY_SERVER_NAME + url;
+        }
+        if (url != null && url.trim().startsWith("http")) {
+            String reqUrl = buildUrl(url, params);
+
+            HttpHeaders httpHeaders = this.builderHeaders();
+            log.info("调用第三方接口: {}, httpheaders: {}", reqUrl, httpHeaders);
+            try {
+                URI reqUri = new URI(reqUrl);
+                if (StringUtils.contrastLowerStr("GET", reqType)) {
+                    responseEntity = reqUrl.contains(GATEWAY_SERVER_NAME)
+                            ? RestTemplateUtils.get(restTemplate, reqUri, httpHeaders, body, String.class, new HashMap<>())
+                            : RestTemplateUtils.get(reqUri, httpHeaders, body, String.class, new HashMap<>());
+                } else if (StringUtils.contrastLowerStr("POST", reqType)) {
+                    responseEntity = reqUrl.contains(GATEWAY_SERVER_NAME)
+                            ? RestTemplateUtils.post(restTemplate, reqUri, httpHeaders, body, String.class, new HashMap<>())
+                            : RestTemplateUtils.post(reqUri, httpHeaders, body, String.class, new HashMap<>());
+                } else if (StringUtils.contrastLowerStr("PUT", reqType)) {
+                    responseEntity = reqUrl.contains(GATEWAY_SERVER_NAME)
+                            ? RestTemplateUtils.put(restTemplate, reqUri, httpHeaders, body, String.class)
+                            : RestTemplateUtils.put(reqUri, httpHeaders, body, String.class);
+                } else if (StringUtils.contrastLowerStr("DELETE", reqType)) {
+                    responseEntity = reqUrl.contains(GATEWAY_SERVER_NAME)
+                            ? RestTemplateUtils.delete(restTemplate, reqUri, httpHeaders, body, String.class)
+                            : RestTemplateUtils.delete(reqUri, httpHeaders, body, String.class);
+                }
+            } catch (Exception e) {
+                log.info("调用第三方接口失败, 请求头参数：{}", httpHeaders);
+                e.printStackTrace();
+                throw new RuntimeException(String.format("调用第三方接口失败, %s请求【%s】，失败原因：%s", reqType, reqUrl, e.getMessage()));
+            }
+        } else {
+            throw new IllegalArgumentException("仅支持以/或http开头的地址");
+        }
+        String response = responseEntity.getBody();
+        //结果转换（执行javaScript函数）
+        Object bizResult = convertResult(JSONObject.parseObject(response), resultConvert);
+        ResponseModel responseModel = JSONObject.parseObject(response, ResponseModel.class);
+
+        JSONObject ruleData = apiObj.getJSONObject("ruleData");
+        if (!ValidationUtil.isEmpty(ruleData)) {
+            String responseSuccess = ruleData.getString("responseSuccess").replace("data", "");
+            Object result = JsonValueUtils.getValueByKey(bizResult, "result", responseSuccess);
+            boolean isRefactor = false; // 是否需要重构返回字段
+            if (result instanceof JSONObject) {
+                Map<String, Object> resultMap = (Map) result;
+                for (String key : ruleData.keySet()) {
+                    if (!(key.equals("responseExpression") || key.equals("responseSuccess") || key.equals("responseError"))) {
+                        isRefactor = true;
+                        resultMap.put(key, resultMap.get(ruleData.get(key)));
+                    }
+                }
+                result = isRefactor ? resultMap : result;
+            } else if (result instanceof JSONArray) {
+                JSONArray jsonArray = (JSONArray) result;
+
+                for (int i = 0; i < jsonArray.size(); i++) {
+                    JSONObject obj = jsonArray.getJSONObject(i);
+                    for (String key : ruleData.keySet()) {
+                        if (!(key.equals("responseExpression") || key.equals("responseSuccess") || key.equals("responseError"))) {
+                            isRefactor = true;
+                            obj.put(key, obj.get(ruleData.get(key)));
+                        }
+                    }
+                }
+                result = isRefactor ? jsonArray : result;
+            }
+            responseModel.setResult(result);
+        }
+        return responseModel;
+    }
+
+    private String buildUrl(String url, Object params) {
+        if (!url.contains("?") && !ValidationUtil.isEmpty(params)) {
+            url += "?";
+        }
+        if (params instanceof Map) {
+            url = url + StringUtils.transMap2UrlParam((Map) params);
+        } else if (params instanceof List) {
+            url = url + StringUtils.transList2UrlParam((List) params);
+        }
+        return url.replace("?&", "?");
+    }
+
+    private HttpHeaders builderHeaders() {
+        HttpHeaders httpheaders = new HttpHeaders();
+        httpheaders.add("appKey", RequestContext.getAppKey());
+        httpheaders.add("product", RequestContext.getProduct());
+        httpheaders.add("token", RequestContext.getToken());
+        httpheaders.setContentType(MediaType.APPLICATION_JSON);
+        return httpheaders;
+    }
+
+    /**
+     * ScriptObjectMirror 转 JavaObject
+     *
+     * @param scriptObj
+     * @return
+     */
+    private static Object convertIntoJavaObject(Object scriptObj) {
+        if (scriptObj instanceof ScriptObjectMirror) {
+            ScriptObjectMirror scriptObjectMirror = (ScriptObjectMirror) scriptObj;
+            if (scriptObjectMirror.isFunction()) {
+                return scriptObjectMirror.toString();
+            } else if (scriptObjectMirror.isArray()) {
+                return new JSONArray(scriptObjectMirror.values().stream().map(e -> convertIntoJavaObject(e)).collect(Collectors.toList()));
+            } else {
+                return new JSONObject(scriptObjectMirror.entrySet().stream().collect(Collectors.toMap(e -> e.getKey(), e -> convertIntoJavaObject(e.getValue()))));
+            }
+        } else {
+            return scriptObj;
+        }
+    }
+
+    /**
+     * 结果转换（执行javaScript函数）
+     *
+     * @param bizResult     原始请求结果
+     * @param resultConvert js转换脚本
+     * @return 转换后的结果
+     */
+    private Object convertResult(Object bizResult, String resultConvert) {
+        if (!ValidationUtil.isEmpty(resultConvert)) {
+            //获取javaScript执行引擎
+            ScriptEngine engine = new ScriptEngineManager().getEngineByName("javascript");
+            //获取js函数执行体并拼接函数名
+            String jsFun = "function resultConvert(data){" + resultConvert + "}";
+            //向js函数传入参数
+            engine.put("data", bizResult);
+
+            try {
+                engine.eval(jsFun);
+                if (engine instanceof Invocable) {
+                    Invocable invoke = (Invocable) engine;
+                    //执行js函数，获取返回值
+                    bizResult = invoke.invokeFunction("resultConvert", bizResult);
+                }
+            } catch (Exception e) {
+                log.info("js表达式runtime错误：{}", e.getMessage());
+                throw new RuntimeException(String.format("结果转换错误【%s】", e.getMessage()));
+            }
+            //ScriptObjectMirror 转 JavaObject
+            bizResult = convertIntoJavaObject(bizResult);
+        }
+        return bizResult;
+    }
+}

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

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Optional;
 
@@ -25,13 +26,16 @@ public class InspectionPlanServiceImpl {
 
     private JyjcInspectionApplicationEquipServiceImpl applicationEquipService;
 
+    private JyjcInspectionResultServiceImpl inspectionResultService;
+
     private ESEquipmentCategory esEquipmentCategory;
 
     public InspectionPlanServiceImpl(JyjcInspectionApplicationServiceImpl inspectionApplicationService,
                                      JyjcInspectionApplicationEquipServiceImpl applicationEquipService,
-                                     ESEquipmentCategory  esEquipmentCategory) {
+                                     JyjcInspectionResultServiceImpl inspectionResultService, ESEquipmentCategory esEquipmentCategory) {
         this.inspectionApplicationService = inspectionApplicationService;
         this.applicationEquipService = applicationEquipService;
+        this.inspectionResultService = inspectionResultService;
         this.esEquipmentCategory = esEquipmentCategory;
     }
 
@@ -40,15 +44,23 @@ public class InspectionPlanServiceImpl {
         LambdaUpdateWrapper<JyjcInspectionApplication> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.set(JyjcInspectionApplication::getPlanData, JSONObject.toJSONString(model));
         updateWrapper.eq(BaseEntity::getSequenceNbr, applicationSeq);
+        updateWrapper.set(JyjcInspectionApplication::getPlanCreateDate, new Date());
         inspectionApplicationService.update(updateWrapper);
+        // 异步写入计划排期日期，统计办理时效使用
+        this.updatePlanCreateDate(applicationSeq);
         return model;
     }
 
+    private void updatePlanCreateDate(String applicationSeq) {
+        JyjcInspectionApplication inspectionApplication = inspectionApplicationService.getById(applicationSeq);
+        inspectionResultService.updatePlanCreateDateByAppNo(inspectionApplication.getApplicationNo());
+    }
+
     public JSONObject getDetail(String applicationSeq) {
         JyjcInspectionApplication inspectionApplication = inspectionApplicationService.getById(applicationSeq);
         // 初始时查询设备地址关联设备表
         JSONObject jsonObject = inspectionApplication.getPlanData();
-        if(jsonObject == null){
+        if (jsonObject == null) {
             jsonObject = new JSONObject();
             String address = this.getOneEquipAddress(applicationSeq);
             jsonObject.put("address", address);
@@ -61,10 +73,10 @@ public class InspectionPlanServiceImpl {
         List<JyjcInspectionApplicationEquip> applicationEquips = applicationEquipService.list(new LambdaQueryWrapper<JyjcInspectionApplicationEquip>().eq(JyjcInspectionApplicationEquip::getApplicationSeq, applicationSeq));
         // 拼接地址
         List<String> allAddress = new ArrayList<>();
-        applicationEquips.forEach(e->{
+        applicationEquips.forEach(e -> {
             String record = e.getEquipUnicode();
             Optional<ESEquipmentCategoryDto> optional = esEquipmentCategory.findById(record);
-            if(optional.isPresent()){
+            if (optional.isPresent()) {
                 ESEquipmentCategoryDto esEquipmentCategoryDto = optional.get();
                 allAddress.add(this.concatDetailAddress(esEquipmentCategoryDto));
             }
@@ -77,6 +89,6 @@ public class InspectionPlanServiceImpl {
         String usePlace = esEquipmentCategoryDto.getUSE_PLACE();
         // 详细地址
         String address = esEquipmentCategoryDto.getADDRESS();
-        return String.format("%s%s",usePlace, address);
+        return String.format("%s%s", usePlace, address);
     }
 }

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

@@ -1289,7 +1289,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         }
         // 只有纳管的设备才能做业务 TODO
         boolMust.must(QueryBuilders.existsQuery("IS_INTO_MANAGEMENT"));
-        boolMust.must(QueryBuilders.termsQuery("IS_INTO_MANAGEMENT", true));
+        boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
     }
 
     private Set<String> getEquipInFlowing() {

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

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
@@ -39,6 +40,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.Resource;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -504,4 +506,12 @@ public class JyjcInspectionResultServiceImpl extends BaseService<JyjcInspectionR
         String group = getPersonIdentityByType(selectedOrgInfo.getCompany().getCompanyType());
         return JyjcInspectionApplicationServiceImpl.getDictionarieModels(group);
     }
+
+    @Async
+    public void updatePlanCreateDateByAppNo(String appNo) {
+        LambdaUpdateWrapper<JyjcInspectionResult> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(JyjcInspectionResult::getApplicationNo, appNo);
+        updateWrapper.set(JyjcInspectionResult::getPlanCreateDate, new Date());
+        this.update(updateWrapper);
+    }
 }
\ 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/util/DpSubUtils.java

+package com.yeejoin.amos.boot.module.jyjc.biz.util;
+
+
+import org.springframework.core.io.ClassPathResource;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+
+public class DpSubUtils {
+
+    public static String companyJson = null;
+    public static String textJson = null;
+    public static String imageJson = null;
+    public static String circleJson = null;
+    public static String rectJson = null;
+
+    static {
+//        companyJson = getFileContent("company.json");
+//        textJson = getFileContent("text.json");
+//        imageJson = getFileContent("image.json");
+//        circleJson = getFileContent("circle.json");
+//        rectJson = getFileContent("rect.json");
+    }
+
+    public static String getFileContent(String filename){
+        try {
+            BufferedReader br = new BufferedReader(new InputStreamReader(new ClassPathResource("json/"+filename).getInputStream()));
+            StringBuffer sb = new StringBuffer();
+            String line = null;
+            while((line = br.readLine())!=null){
+                if(line.trim().length()>0)
+                    sb.append(line);
+            }
+            br.close();
+            return sb.toString();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+//			return null;
+        }
+    }
+}

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

+package com.yeejoin.amos.boot.module.jyjc.biz.util;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.google.common.base.Strings;
+
+/**
+ * @Author: xl
+ * @Description: json快速取值
+ * @Date: 2022/5/12 11:11
+ */
+public class JsonValueUtils {
+
+    public static Object getValueByKey(Object originObject, String startKey,
+                                       String targetKey) {
+        if (Strings.isNullOrEmpty(startKey)) {
+            return originObject;
+        }
+        if (originObject instanceof JSONObject) {
+            return getValueFromJSONObjectByKey((JSONObject) originObject, startKey,
+                    targetKey);
+        }
+        if (originObject instanceof JSONArray) {
+            return getValueFromJSONArrayByKey((JSONArray) originObject, startKey,
+                    targetKey);
+        }
+        return null;
+    }
+
+    private static String getNextKey(String startKey, String targetKey) {
+        if (Strings.isNullOrEmpty(targetKey)) {
+            return null;
+        }
+        String[] keys = targetKey.split("\\.");
+        for (int i = 0; i < keys.length; i++) {
+            if (keys[i].equals(startKey) && (i < keys.length - 1)) {
+                return keys[i + 1];
+            }
+        }
+        return null;
+    }
+
+    private static Object getValueFromJSONArrayByKey(JSONArray originObject,
+                                                     String startKey,
+                                                     String targetKey) {
+        try {
+            Integer integer = Integer.valueOf(startKey);
+            JSONObject jsonObject = originObject.getJSONObject(integer);
+            Object targetObject = getValueFromJSONObjectByKey(jsonObject, getNextKey(startKey, targetKey),
+                    targetKey);
+            if (targetObject != null) {
+                return targetObject;
+            }
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private static Object getValueFromJSONObjectByKey(JSONObject originObject,
+                                                      String startKey,
+                                                      String targetKey) {
+        Object object = originObject.get(startKey);
+        return object != null
+                ? getValueByKey(object, getNextKey(startKey, targetKey),
+                targetKey)
+                : null;
+    }
+}

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

+package com.yeejoin.amos.boot.module.jyjc.biz.util;
+
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.RestTemplate;
+
+import java.net.URI;
+import java.util.Map;
+
+/**
+ * @Author: xl
+ * @Description: 远程调用工具类
+ * @Date: 2021/10/8 13:46
+ */
+public class RestTemplateUtils {
+
+    private static class SingletonRestTemplate {
+        static final RestTemplate INSTANCE = new RestTemplate();
+    }
+
+    private RestTemplateUtils() {
+    }
+
+    public static RestTemplate getInstance() {
+        return SingletonRestTemplate.INSTANCE;
+    }
+
+    /**
+     * 带请求头的GET请求调用方式
+     *
+     * @param uri          请求URL
+     * @param headers      请求头参数
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，与Map中的key对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> get(URI uri, HttpHeaders headers, Object requestBody, Class<T> responseType, Map<String, ?> uriVariables) {
+        HttpEntity<?> requestEntity = new HttpEntity<>(headers);
+        return RestTemplateUtils.getInstance().exchange(uri, HttpMethod.GET, requestEntity, responseType);
+    }
+
+    /**
+     * @param restTemplate 可传入负载均衡的restTemplate
+     * @param uri
+     * @param headers
+     * @param responseType
+     * @param uriVariables
+     * @param <T>
+     * @return
+     */
+    public static <T> ResponseEntity<T> get(RestTemplate restTemplate, URI uri, HttpHeaders headers, Object requestBody, Class<T> responseType, Map<String, ?> uriVariables) {
+        HttpEntity<?> requestEntity = new HttpEntity<>(headers);
+        return restTemplate.exchange(uri, HttpMethod.GET, requestEntity, responseType);
+    }
+
+    /**
+     * 带请求头的POST请求调用方式
+     *
+     * @param uri          请求URL
+     * @param headers      请求头参数
+     * @param requestBody  请求参数体
+     * @param responseType 返回对象类型
+     * @param uriVariables URL中的变量，与Map中的key对应
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> post(URI uri, HttpHeaders headers, Object requestBody, Class<T> responseType, Map<String, ?> uriVariables) {
+        HttpEntity<Object> requestEntity = new HttpEntity<Object>(requestBody, headers);
+        return RestTemplateUtils.getInstance().postForEntity(uri, requestEntity, responseType);
+    }
+
+    /**
+     * @param restTemplate 可传入负载均衡的restTemplate
+     * @param uri
+     * @param headers
+     * @param requestBody
+     * @param responseType
+     * @param uriVariables
+     * @param <T>
+     * @return
+     */
+    public static <T> ResponseEntity<T> post(RestTemplate restTemplate, URI uri, HttpHeaders headers, Object requestBody, Class<T> responseType, Map<String, ?> uriVariables) {
+        HttpEntity<Object> requestEntity = new HttpEntity<Object>(requestBody, headers);
+        return restTemplate.postForEntity(uri, requestEntity, responseType);
+    }
+
+    /**
+     * 带请求头的PUT请求调用方式
+     *
+     * @param uri          请求URL
+     * @param headers      请求头参数
+     * @param requestBody  请求参数体
+     * @param responseType 返回对象类型
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> put(URI uri, HttpHeaders headers, Object requestBody, Class<T> responseType) {
+        HttpEntity<Object> requestEntity = new HttpEntity<Object>(requestBody, headers);
+        return RestTemplateUtils.getInstance().exchange(uri, HttpMethod.PUT, requestEntity, responseType);
+    }
+
+    /**
+     * @param restTemplate 可传入负载均衡的restTemplate
+     * @param uri
+     * @param headers
+     * @param requestBody
+     * @param responseType
+     * @param <T>
+     * @return
+     */
+    public static <T> ResponseEntity<T> put(RestTemplate restTemplate, URI uri, HttpHeaders headers, Object requestBody, Class<T> responseType) {
+        HttpEntity<Object> requestEntity = new HttpEntity<Object>(requestBody, headers);
+        return restTemplate.exchange(uri, HttpMethod.PUT, requestEntity, responseType);
+    }
+
+    /**
+     * 带请求头的DELETE请求调用方式
+     *
+     * @param uri          请求URL
+     * @param headers      请求头参数
+     * @param requestBody  请求参数体
+     * @param responseType 返回对象类型
+     * @return ResponseEntity 响应对象封装类
+     */
+    public static <T> ResponseEntity<T> delete(URI uri, HttpHeaders headers, Object requestBody, Class<T> responseType) {
+        HttpEntity<Object> requestEntity = new HttpEntity<Object>(requestBody, headers);
+        return RestTemplateUtils.getInstance().exchange(uri, HttpMethod.DELETE, requestEntity, responseType);
+    }
+
+    /**
+     * @param restTemplate 可传入负载均衡的restTemplate
+     * @param uri
+     * @param headers
+     * @param requestBody
+     * @param responseType
+     * @param <T>
+     * @return
+     */
+    public static <T> ResponseEntity<T> delete(RestTemplate restTemplate, URI uri, HttpHeaders headers, Object requestBody, Class<T> responseType) {
+        HttpEntity<Object> requestEntity = new HttpEntity<Object>(requestBody, headers);
+        return restTemplate.exchange(uri, HttpMethod.DELETE, requestEntity, responseType);
+    }
+}

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

+package com.yeejoin.amos.boot.module.jyjc.biz.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author: xinglei
+ * @Description:
+ * @Date: 2020/8/24 9:58
+ */
+public class StringUtils {
+
+    public static boolean contrastLowerStr(String str1, String str2) {
+        boolean flag = false;
+        if (str1.toLowerCase().equals(str2.toLowerCase())) {
+            flag = true;
+        }
+        return flag;
+    }
+
+    /**
+     * 将map转换成url
+     *
+     * @param map
+     * @return
+     */
+    public static String transMap2UrlParam(Map<String, Object> map) {
+
+        StringBuilder stringBuilder = new StringBuilder();
+        for (Map.Entry entry : map.entrySet()) {
+            // 值为空或匹配total不拼接
+            if (ValidationUtil.isEmpty(entry.getValue()) || "total".equals(entry.getKey()))
+                continue;
+            try {
+                stringBuilder.append("&").append(entry.getKey()).append("=").append(URLEncoder.encode(entry.getValue().toString(), "UTF-8"));
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
+        }
+        return stringBuilder.toString();
+    }
+
+    /**
+     * 将list转换成url
+     *
+     * @param list
+     * @return
+     */
+    public static String transList2UrlParam(List<Map<String, Object>> list) {
+        StringBuilder stringBuilder = new StringBuilder();
+        list.forEach(x -> {
+            Map<String, Object> map = JSONObject.parseObject(JSON.toJSONString(x));
+            try {
+                stringBuilder.append("&").append(map.get("key")).append("=").append(URLEncoder.encode(map.get("value").toString(), "UTF-8"));
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
+        });
+        return stringBuilder.toString();
+    }
+}

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/company.json

+{
+  "name": "检验检测机构模板",
+  "tabs": [
+    {
+      "key": "basic",
+      "displayName": "基本信息",
+      "renderType": "basic",
+      "formSeq": "1793454184889085953",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/tcm/baseEnterprise/getInfoByUseCode/map",
+          "params": {
+            "useCode": "{useUnitCode}"
+          }
+        },
+        "resultConvert": ""
+      }
+    },
+    {
+      "key": "devtable",
+      "displayName": "设备列表",
+      "renderType": "table",
+      "formSeq": "1792821076963651585",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/page",
+          "params": {
+            "number": 1,
+            "size": 14,
+            "USE_UNIT_CREDIT_CODE": "{useUnitCode}"
+          }
+        },
+        "columnWidth": {
+          "EQU_LIST": 150,
+          "EQU_CATEGORY": 160,
+          "EQU_DEFINE": 150,
+          "PRODUCT_NAME": 180,
+          "EQU_CODE": 180,
+          "FACTORY_NUM": 180,
+          "PRODUCE_UNIT_NAME": 180,
+          "USE_UNIT_NAME": 180
+        }
+      }
+    }
+  ],
+  "content": {
+    "basic": {
+      "columns": 2,
+      "datas": [],
+      "qrcode": {},
+      "subs": []
+    }
+  }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_1000.json

+{
+  "name": "设备-锅炉",
+  "tabs": [
+    {
+      "key": "basic",
+      "displayName": "设备信息",
+      "renderType": "basic",
+      "formSeq": "1793458381554479105",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipInfo"
+          }
+        }
+      }
+    },
+    {
+      "key": "gl",
+      "displayName": "锅炉技术参数",
+      "renderType": "basic",
+      "formSeq": "1734819004637278210",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipParams"
+          }
+        }
+      }
+    },
+    {
+      "key": "reghistory",
+      "displayName": "监管履历信息",
+      "renderType": "timeline",
+      "formSeq": "",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/common/equOnJgServiceOperationRecords",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result",
+            "operater": "content"
+          }
+        }
+      }
+    },
+    {
+      "key": "devtable",
+      "displayName": "问题列表",
+      "renderType": "table",
+      "formSeq": "1793458819301404673",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/safety-problem-tracing/equipId/page",
+          "params": {
+            "number": 1,
+            "size": 10,
+            "record": "{record}"
+          }
+        },
+        "columnWidth": {
+
+        }
+      }
+    }
+  ],
+  "content": {
+    "basic": {
+      "columns": 3,
+      "datas": [],
+      "qrcode": {},
+      "subs": []
+    },
+    "gl": {
+      "columns": 4,
+      "datas": [],
+      "subs": []
+    }
+  }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_2000.json

+{
+  "name": "设备-压力容器",
+  "tabs": [
+    {
+      "key": "basic",
+      "displayName": "设备信息",
+      "renderType": "basic",
+      "formSeq": "1793458381554479105",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipInfo"
+          }
+        }
+      }
+    },
+    {
+      "key": "ylrq",
+      "displayName": "压力容器技术参数",
+      "renderType": "basic",
+      "formSeq": "1734818687287848961",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipParams"
+          }
+        }
+      }
+    },
+    {
+      "key": "reghistory",
+      "displayName": "监管履历信息",
+      "renderType": "timeline",
+      "formSeq": "",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/common/equOnJgServiceOperationRecords",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result",
+            "operater": "content"
+          }
+        }
+      }
+    },
+    {
+      "key": "devtable",
+      "displayName": "问题列表",
+      "renderType": "table",
+      "formSeq": "1793458819301404673",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/safety-problem-tracing/equipId/page",
+          "params": {
+            "number": 1,
+            "size": 10,
+            "record": "{record}"
+          }
+        },
+        "columnWidth": {
+
+        }
+      }
+    }
+  ],
+  "content": {
+    "basic": {
+      "columns": 3,
+      "datas": [],
+      "qrcode": {},
+      "subs": []
+    },
+    "ylrq": {
+      "columns": 4,
+      "datas": [],
+      "subs": []
+    }
+  }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_3000.json

+{
+  "name": "设备-电梯",
+  "tabs": [
+    {
+      "key": "basic",
+      "displayName": "设备信息",
+      "renderType": "basic",
+      "formSeq": "1793458381554479105",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipInfo"
+          }
+        }
+      }
+    },
+    {
+      "key": "dt",
+      "displayName": "电梯技术参数",
+      "renderType": "basic",
+      "formSeq": "1734504628768239617",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipParams"
+          }
+        }
+      }
+    },
+    {
+      "key": "reghistory",
+      "displayName": "监管履历信息",
+      "renderType": "timeline",
+      "formSeq": "",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/common/equOnJgServiceOperationRecords",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result",
+            "operater": "content"
+          }
+        }
+      }
+    },
+    {
+      "key": "devtable",
+      "displayName": "问题列表",
+      "renderType": "table",
+      "formSeq": "1793458819301404673",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/safety-problem-tracing/equipId/page",
+          "params": {
+            "number": 1,
+            "size": 10,
+            "record": "{record}"
+          }
+        },
+        "columnWidth": {
+
+        }
+      }
+    }
+  ],
+  "content": {
+    "basic": {
+      "columns": 3,
+      "datas": [],
+      "qrcode": {},
+      "subs": []
+    },
+    "dt": {
+      "columns": 4,
+      "datas": [],
+      "subs": []
+    }
+  }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_4000.json

+{
+  "name": "设备-起重机械",
+  "tabs": [
+    {
+      "key": "basic",
+      "displayName": "设备信息",
+      "renderType": "basic",
+      "formSeq": "1793458381554479105",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipInfo"
+          }
+        }
+      }
+    },
+    {
+      "key": "qzqx",
+      "displayName": "起重机械技术参数",
+      "renderType": "basic",
+      "formSeq": "1734818709194698753",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipParams"
+          }
+        }
+      }
+    },
+    {
+      "key": "reghistory",
+      "displayName": "监管履历信息",
+      "renderType": "timeline",
+      "formSeq": "",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/common/equOnJgServiceOperationRecords",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result",
+            "operater": "content"
+          }
+        }
+      }
+    },
+    {
+      "key": "devtable",
+      "displayName": "问题列表",
+      "renderType": "table",
+      "formSeq": "1793458819301404673",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/safety-problem-tracing/equipId/page",
+          "params": {
+            "number": 1,
+            "size": 10,
+            "record": "{record}"
+          }
+        },
+        "columnWidth": {
+
+        }
+      }
+    }
+  ],
+  "content": {
+    "basic": {
+      "columns": 3,
+      "datas": [],
+      "qrcode": {},
+      "subs": []
+    },
+    "qzqx": {
+      "columns": 4,
+      "datas": [],
+      "subs": []
+    }
+  }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_5000.json

+{
+  "name": "设备-场（厂）内机动车",
+  "tabs": [
+    {
+      "key": "basic",
+      "displayName": "设备信息",
+      "renderType": "basic",
+      "formSeq": "1793458381554479105",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipInfo"
+          }
+        }
+      }
+    },
+    {
+      "key": "cnjdc",
+      "displayName": "场（厂）内机动车技术参数",
+      "renderType": "basic",
+      "formSeq": "1734818684284727297",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipParams"
+          }
+        }
+      }
+    },
+    {
+      "key": "reghistory",
+      "displayName": "监管履历信息",
+      "renderType": "timeline",
+      "formSeq": "",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/common/equOnJgServiceOperationRecords",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result",
+            "operater": "content"
+          }
+        }
+      }
+    },
+    {
+      "key": "devtable",
+      "displayName": "问题列表",
+      "renderType": "table",
+      "formSeq": "1793458819301404673",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/safety-problem-tracing/equipId/page",
+          "params": {
+            "number": 1,
+            "size": 10,
+            "record": "{record}"
+          }
+        },
+        "columnWidth": {
+
+        }
+      }
+    }
+  ],
+  "content": {
+    "basic": {
+      "columns": 3,
+      "datas": [],
+      "qrcode": {},
+      "subs": []
+    },
+    "cnjdc": {
+      "columns": 4,
+      "datas": [],
+      "subs": []
+    }
+  }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_6000.json

+{
+  "name": "设备-大型游乐设施",
+  "tabs": [
+    {
+      "key": "basic",
+      "displayName": "设备信息",
+      "renderType": "basic",
+      "formSeq": "1793458381554479105",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipInfo"
+          }
+        }
+      }
+    },
+    {
+      "key": "dxylss",
+      "displayName": "大型游乐设施技术参数",
+      "renderType": "basic",
+      "formSeq": "1734818700369883137",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipParams"
+          }
+        }
+      }
+    },
+    {
+      "key": "reghistory",
+      "displayName": "监管履历信息",
+      "renderType": "timeline",
+      "formSeq": "",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/common/equOnJgServiceOperationRecords",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result",
+            "operater": "content"
+          }
+        }
+      }
+    },
+    {
+      "key": "devtable",
+      "displayName": "问题列表",
+      "renderType": "table",
+      "formSeq": "1793458819301404673",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/safety-problem-tracing/equipId/page",
+          "params": {
+            "number": 1,
+            "size": 10,
+            "record": "{record}"
+          }
+        },
+        "columnWidth": {
+
+        }
+      }
+    }
+  ],
+  "content": {
+    "basic": {
+      "columns": 3,
+      "datas": [],
+      "qrcode": {},
+      "subs": []
+    },
+    "dxylss": {
+      "columns": 4,
+      "datas": [],
+      "subs": []
+    }
+  }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_8000.json

+{
+  "name": "设备-压力管道",
+  "tabs": [
+    {
+      "key": "basic",
+      "displayName": "设备信息",
+      "renderType": "basic",
+      "formSeq": "1793458381554479105",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipInfo"
+          }
+        }
+      }
+    },
+    {
+      "key": "ylgd",
+      "displayName": "压力管道",
+      "renderType": "basic",
+      "formSeq": "1734818687287848961",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipParams"
+          }
+        }
+      }
+    },
+    {
+      "key": "reghistory",
+      "displayName": "监管履历信息",
+      "renderType": "timeline",
+      "formSeq": "",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/common/equOnJgServiceOperationRecords",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result",
+            "operater": "content"
+          }
+        }
+      }
+    },
+    {
+      "key": "devtable",
+      "displayName": "问题列表",
+      "renderType": "table",
+      "formSeq": "1793458819301404673",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/safety-problem-tracing/equipId/page",
+          "params": {
+            "number": 1,
+            "size": 10,
+            "record": "{record}"
+          }
+        },
+        "columnWidth": {
+
+        }
+      }
+    }
+  ],
+  "content": {
+    "basic": {
+      "columns": 3,
+      "datas": [],
+      "qrcode": {},
+      "subs": []
+    },
+    "ylgd": {
+      "columns": 4,
+      "datas": [],
+      "subs": []
+    }
+  }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/equip_9000.json

+{
+  "name": "设备-客运索道",
+  "tabs": [
+    {
+      "key": "basic",
+      "displayName": "设备信息",
+      "renderType": "basic",
+      "formSeq": "1793458381554479105",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipInfo"
+          }
+        }
+      }
+    },
+    {
+      "key": "kysd",
+      "displayName": "客运索道",
+      "renderType": "basic",
+      "formSeq": "1734818694514634753",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/equipment-register/{record}",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipParams"
+          }
+        }
+      }
+    },
+    {
+      "key": "reghistory",
+      "displayName": "监管履历信息",
+      "renderType": "timeline",
+      "formSeq": "",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/common/equOnJgServiceOperationRecords",
+          "params": {
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result",
+            "operater": "content"
+          }
+        }
+      }
+    },
+    {
+      "key": "devtable",
+      "displayName": "问题列表",
+      "renderType": "table",
+      "formSeq": "1793458819301404673",
+      "dataConfig": {
+        "api": {
+          "httpMethod":"GET",
+          "apiPath":"/jg/safety-problem-tracing/equipId/page",
+          "params": {
+            "number": 1,
+            "size": 10,
+            "record": "{record}"
+          }
+        },
+        "columnWidth": {
+
+        }
+      }
+    }
+  ],
+  "content": {
+    "basic": {
+      "columns": 3,
+      "datas": [],
+      "qrcode": {},
+      "subs": []
+    },
+    "kysd": {
+      "columns": 4,
+      "datas": [],
+      "subs": []
+    }
+  }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/resources/json/untest_company.json

+{
+  "name": "非检验检测机构模板",
+  "tabs": [
+    {
+      "key": "basic",
+      "displayName": "基本信息",
+      "renderType": "basic",
+      "formSeq": "1793454184889085953",
+      "dataConfig": {
+        "api": {
+          "reqType":"GET",
+          "url":"/tcm/baseEnterprise/getInfoByUseCode",
+          "params": {
+            "useCode": "{useUnitCode}"
+          }
+        }
+      }
+    },
+    {
+      "key": "devtable",
+      "displayName": "设备列表",
+      "renderType": "table",
+      "formSeq": "1792821076963651585",
+      "dataConfig": {
+        "api": {
+          "reqType":"GET",
+          "url":"/jg/equipment-register/page",
+          "params": {
+            "number": 1,
+            "size": 10,
+            "USE_UNIT_CREDIT_CODE": "{useUnitCode}"
+          }
+        }
+      }
+    }
+  ],
+  "content": {
+    "basic": {
+      "columns": 2,
+      "datas": [],
+      "qrcode": {
+        "src": "/public/ag/zongshu.png",
+        "text": "2023/12/26",
+        "subtext": "23:10:16"
+      },
+      "subs": []
+    }
+  }
+}
\ No newline at end of file

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/dto/TzBaseEnterpriseInfoDto.java

@@ -289,6 +289,9 @@ public class TzBaseEnterpriseInfoDto extends BaseDto {
     @ApiModelProperty(value = "行业主管部门")
     private String industrySupervisor;
 
+	@ApiModelProperty(value = "企业问题状态")
+	private String status;
+
 
 	private String region;
 

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/enums/ProblemStatusEnum.java

+package com.yeejoin.amos.boot.module.tcm.api.enums;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 问题状态
+ */
+
+public enum ProblemStatusEnum {
+    NORMAL("正常", "0"),
+    ABNORMAL("异常", "1");
+
+    private String name;
+
+    private String code;
+
+    ProblemStatusEnum(String name, String code) {
+        this.name = name;
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setStatus(String code) {
+        this.code = code;
+    }
+
+    public static Map<String, String> getName = new HashMap<>();
+    public static Map<String, String> getCode = new HashMap<>();
+
+    static {
+        for (ProblemStatusEnum e : ProblemStatusEnum.values()) {
+            getName.put(e.code, e.name);
+            getCode.put(e.name, e.code);
+        }
+    }
+}
+

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/mapper/TzBaseEnterpriseInfoMapper.java

 package com.yeejoin.amos.boot.module.tcm.api.mapper;
 
-import java.util.List;
-import java.util.Map;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,6 +8,9 @@ import com.yeejoin.amos.boot.module.tcm.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.tcm.api.entity.TzBaseEnterpriseInfo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 企业数据信息 Mapper 接口
  *
@@ -54,4 +54,6 @@ public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseI
     List<TzBaseEnterpriseInfo> listNoQrCode();
 
 	List<Map<String, Object>> getEquipType(@Param("type")String type);
+
+    Map<String, Object> getProblemInfoBySourceId(@Param("sourceId")String sourceId);
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/java/com/yeejoin/amos/boot/module/tcm/api/service/ITzBaseEnterpriseInfoService.java

@@ -48,4 +48,6 @@ public interface ITzBaseEnterpriseInfoService extends IService<TzBaseEnterpriseI
 	String setLabel(List<Long> enterpriseIds, List<String> enterpriseLabels);
 
 	BaseUnitLicence getUnitLicenceMessage(String unitCode);
+
+	Map<String, Object> getInfoByUseCodeMap(String useCode);
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml

@@ -172,5 +172,8 @@
 			</if>
 		</where>
 	</select>
+    <select id="getProblemInfoBySourceId" resultType="java.util.Map">
+		select * from tzs_safety_problem_tracing where source_id = #{sourceId} order by rec_date desc limit 1
+	</select>
 
 </mapper>

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/TzBaseEnterpriseInfoController.java

@@ -200,6 +200,13 @@ public class TzBaseEnterpriseInfoController extends BaseController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @RequestMapping(value = "/getInfoByUseCode/map", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "根据统一信用代码查询企业详情返回map", notes = "根据统一信用代码查询企业详情返回map")
+    public ResponseModel<Map<String, Object>> getInfoByUseCodeMap(String useCode) {
+        return ResponseHelper.buildResponse(iTzBaseEnterpriseInfoService.getInfoByUseCodeMap(useCode));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @RequestMapping(value = "/getInfoByUseCodeList", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据统一信用代码查询企业详情", notes = "根据统一信用代码查询企业详情")
     public ResponseModel<IPage<TzBaseEnterpriseInfoDto>> getInfoByUseCodeList(String useCode) {

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
@@ -21,6 +22,7 @@ import com.yeejoin.amos.boot.module.tcm.api.dto.TzsBaseInstitutionDto;
 import com.yeejoin.amos.boot.module.tcm.api.entity.*;
 import com.yeejoin.amos.boot.module.tcm.api.enums.EnterpriseEnums;
 import com.yeejoin.amos.boot.module.tcm.api.enums.LicenceTypeEnum;
+import com.yeejoin.amos.boot.module.tcm.api.enums.ProblemStatusEnum;
 import com.yeejoin.amos.boot.module.tcm.api.enums.UnitTypeEnum;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.TzBaseEnterpriseInfoMapper;
 import com.yeejoin.amos.boot.module.tcm.api.mapper.TzsUserInfoMapper;
@@ -237,6 +239,57 @@ public class TzBaseEnterpriseInfoServiceImpl
 
 	}
 
+
+	@Override
+	public Map<String, Object> getInfoByUseCodeMap(String useCode) {
+		TzBaseEnterpriseInfoDto infoByUseCode = getInfoByUseCode(useCode);
+		// 通过sourceId获取问题信息
+		Map<String,Object> problemInfo = baseMapper.getProblemInfoBySourceId(infoByUseCode.getSequenceNbr().toString());
+		ObjectMapper objectMapper = new ObjectMapper();
+		Map<String,Object> resultMap = new HashMap<>();
+
+		RegUnitIcDto regUnitIcDto = infoByUseCode.getRegUnitIcDto();
+		RegUnitInfoDto regUnitInfoDto = infoByUseCode.getRegUnitInfoDto();
+		TzsBaseInstitution tzsBaseInstitution = infoByUseCode.getRegUnitMessage();
+		Map<String,Object> regUnitIcDtoMap = new HashMap<>();
+		Map<String,Object> regUnitInfoDtoMap = new HashMap<>();
+		Map<String,Object> tzsBaseInstitutionMap = new HashMap<>();
+		try {
+			resultMap = objectMapper.convertValue(infoByUseCode, Map.class);
+			regUnitIcDtoMap = objectMapper.convertValue(regUnitIcDto, Map.class);
+			regUnitInfoDtoMap = objectMapper.convertValue(regUnitInfoDto, Map.class);
+			tzsBaseInstitutionMap = objectMapper.convertValue(tzsBaseInstitution, Map.class);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		if(!ObjectUtils.isEmpty(regUnitIcDtoMap)){
+			resultMap.putAll(regUnitIcDtoMap);
+		}
+		if(!ObjectUtils.isEmpty(regUnitInfoDtoMap)){
+			regUnitInfoDtoMap.remove("unitLicences");
+			resultMap.putAll(regUnitInfoDtoMap);
+		}
+		if(!ObjectUtils.isEmpty(tzsBaseInstitutionMap)){
+			resultMap.putAll(tzsBaseInstitutionMap);
+		}
+		resultMap.remove("regUnitIcDto");
+		resultMap.remove("regUnitInfoDto");
+		resultMap.remove("tzsBaseInstitution");
+
+		resultMap.put("unitAddress", resultMap.get("province") + "/" + resultMap.get("city") + "/" + resultMap.get("district"));
+
+		Map<String,Object> longitudeLatitudeMap = new HashMap<>();
+		longitudeLatitudeMap.put("address", resultMap.get("address"));
+		longitudeLatitudeMap.put("latitude", resultMap.get("latitude"));
+		longitudeLatitudeMap.put("longitude", resultMap.get("longitude"));
+		resultMap.put("longitudeLatitude", longitudeLatitudeMap);
+
+		resultMap.put("problemTime", ObjectUtils.isEmpty(problemInfo) ? null : problemInfo.get("problem_time"));
+		resultMap.put("problemStatus", (ObjectUtils.isEmpty(resultMap.get("status")) || "null".equals(resultMap.get("status"))) ? ProblemStatusEnum.NORMAL.getName() : ProblemStatusEnum.getName.get(resultMap.get("status")));
+		return resultMap;
+	}
+
+
 	@Override
 	public TzBaseEnterpriseInfoDto getInfoByUseCode(String useCode) {
 		TzBaseEnterpriseInfo tzBaseEnterpriseInfo = tzBaseEnterpriseInfoMapper.selectOne(new QueryWrapper<TzBaseEnterpriseInfo>().eq("use_code", useCode));
@@ -869,4 +922,6 @@ public class TzBaseEnterpriseInfoServiceImpl
 		return baseUnitLicenceService.getBaseMapper().selectOne(lambda);
 
 	}
+
+
 }

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/statistics/ScreenImpl.java

@@ -452,7 +452,7 @@ public class ScreenImpl implements IScreenService {
         //设置模糊搜索
         searchSourceBuilder.query(QueryBuilders.boolQuery()
                 .must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*"+screenDto.getCityCode()+"*"))
-                .must(QueryBuilders.termsQuery("IS_INTO_MANAGEMENT", true)));
+                .must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true)));
         searchSourceBuilder.aggregation(
                         AggregationBuilders.terms("USE_SITE_CODE").field("USE_SITE_CODE")
         );

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

@@ -89,5 +89,7 @@ public interface EquipmentCategoryMapper extends BaseMapper<EquipmentCategory> {
 
 
     List<String> selectXiXianNew();
+
+    Long countEquipByReginCode(String orgCode);
 }
 

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

@@ -6,11 +6,8 @@ import com.yeejoin.amos.boot.module.ymt.api.dto.TzsUserInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.TzsUserInfo;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-import java.util.Set;
-
 public interface TzsUserInfoMapper extends BaseMapper<TzsUserInfo> {
     Page<TzsUserInfoDto> selectPageMessage(@Param("page") Page<TzsUserInfoDto> page, @Param("dto") TzsUserInfoDto dto);
 
-    Long countUserByPostAndAreaCode(@Param("orgCode") String orgCode, @Param("post") String post);
+    Long countUserByPostAndAreaCode(@Param("orgCode") String orgCode, @Param("post") String post, @Param("regionCode") String regionCode);
 }

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

@@ -680,4 +680,15 @@
           AND ( ibjoi."CODE96333" NOT LIKE'31%' OR ibjoi."CODE96333" IS NULL )
           AND "CLAIM_STATUS" = '已认领';
     </select>
+    <select id="countEquipByReginCode" resultType="java.lang.Long">
+        select
+            count(1)
+        from
+            idx_biz_jg_use_info ibjui,
+            idx_biz_jg_supervision_info ibjsi
+        where
+            ibjui."RECORD" = ibjsi."RECORD"
+            and ibjsi."ORG_BRANCH_CODE" like concat (#{reginCode},'%')
+            and ibjui."IS_INTO_MANAGEMENT" = true
+    </select>
 </mapper>

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

@@ -57,7 +57,7 @@
         WHERE
             tui.unit_code =  bi.use_unit_code
             and tui.post LIKE concat ( '%', #{post}, '%' )
-            and bi.supervise_org_code LIKE CONCAT ( #{orgCode}, '%' )
+            and ((bi.supervise_org_code != '50' and bi.supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (bi.supervise_org_code = '50' and bi.office_region LIKE CONCAT ('%', #{regionCode}, '%')))
             and tui.is_delete=false
     </select>
 </mapper>
\ No newline at end of file