Merge branch 'develop_tzs_register_to_0715' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/AlertCalledServiceImpl.java

@@ -1101,20 +1101,36 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
                 f.setValue(o.toString());
             }
             // 派遣状态
-            if ("dispatchStatus".equals(f.getKey()) && Boolean.TRUE.equals(dto.getDispatchStatus())) {
-                f.setValue("已通知已派遣");
+            if ("dispatchStatus".equals(f.getKey())) {
+                if (Boolean.TRUE.equals(dto.getDispatchStatus())){
+                    f.setValue("已通知已派遣");
+                }else {
+                    f.setValue("未通知未派遣");
+                }
             }
             // 到达状态
-            if ("arriveStatus".equals(f.getKey()) && Boolean.TRUE.equals(dto.getArriveStatus())) {
-                f.setValue("已到达");
+            if ("arriveStatus".equals(f.getKey())) {
+                if (Boolean.TRUE.equals(dto.getArriveStatus())){
+                    f.setValue("已到达");
+                }else {
+                    f.setValue("未到达");
+                }
             }
             // 伤亡状态
-            if ("casualtiesStatus".equals(f.getKey()) && Boolean.TRUE.equals(dto.getCasualtiesStatus())) {
-                f.setValue("出现伤亡");
+            if ("casualtiesStatus".equals(f.getKey())) {
+                if ( Boolean.TRUE.equals(dto.getCasualtiesStatus())){
+                    f.setValue("出现伤亡");
+                }else {
+                    f.setValue("未出现伤亡");
+                }
             }
             // 救援状态
-            if ("rescueStatus".equals(f.getKey()) && Boolean.TRUE.equals(dto.getRescueStatus())) {
-                f.setValue("救援成功");
+            if ("rescueStatus".equals(f.getKey())) {
+                if (Boolean.TRUE.equals(dto.getRescueStatus())){
+                    f.setValue("救援成功");
+                }else{
+                    f.setValue("未救援成功");
+                }
             }
             // 是否超时
             if ("isTimeout".equals(f.getKey())) {

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

@@ -88,4 +88,9 @@ public class DPFilterParamForDetailDto {
      */
     private String anomalyType;
 
+    /**
+     * 地址
+     */
+    private String address;
+
 }

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/BusinessTypeEnum.java

@@ -13,7 +13,7 @@ public enum BusinessTypeEnum {
 
     DQJY("dqjy","定期检验"),
     BGDJ("bgdj","变更登记"),
-    ZXBX("zxbx","注销报销");
+    ZXBX("zxbx","注销报废");
 
 
     private BusinessTypeEnum(String code, String name){

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/NoticBusinessTypeEnum.java

+package com.yeejoin.amos.boot.module.common.api.enums;
+
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.List;
+
+public enum NoticBusinessTypeEnum {
+    AZ("az","安装"),
+    WX("wx","维修"),
+    GZ("gz","改造"),
+    YZ("yz","移装");
+
+
+    private NoticBusinessTypeEnum(String code, String name){
+        this.code=code;
+        this.name=name;
+    }
+
+    private String code;
+
+    private String name;
+
+    public String getCode() {
+        return code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public static List<HashMap<String,Object>> getEnumList() {
+        List<HashMap<String, Object>> list = new ArrayList<>();
+        for (NoticBusinessTypeEnum testEnum : EnumSet.allOf(NoticBusinessTypeEnum.class)) {
+            HashMap<String, Object> map = new HashMap<>();
+            map.put("title",testEnum.name);
+            map.put("value",testEnum.code);
+            list.add(map);
+        }
+        return list;
+    }
+
+}

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

@@ -301,4 +301,7 @@ public class TzBaseEnterpriseInfoDto extends BaseDto {
 
 	@ApiModelProperty(value = "企业标签信息")
 	private String regulatoryLabels;
+
+	@ApiModelProperty(value = "单位所在城市Code")
+	private String cityCode;
 }

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

@@ -40,6 +40,7 @@ public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseI
 	 */
 	TzBaseEnterpriseInfo selectByUseUnit(String useUnit);
 
+	String getOrgCodeByCompanyCode(String companyCode);
 
 	IPage<TzBaseEnterpriseInfoDto> page(Page<TzBaseEnterpriseInfoDto> page, TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto);
 

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

@@ -134,17 +134,12 @@
 				AND regulatory_labels  LIKE CONCAT('%',#{tzBaseEnterpriseInfoDto.regulatoryLabels},'%')
 			</if>
 
-			<if test="orgCodeList != null and ! orgCodeList.isEmpty() and orgCodeList.size() > 0">
-
-				<foreach collection="orgCodeList" item="item" index="index" >
-		          <if test="index==0">
-					  AND
-				  </if>
-					<if test="index!= 0">
-						OR
-					</if>
-					 supervise_org_code LIKE CONCAT('%',#{item},'%')
+			<if test="orgCodeList != null and !orgCodeList.isEmpty()">
+				AND (
+				<foreach collection="orgCodeList" item="item" separator=" OR ">
+					supervise_org_code LIKE CONCAT('%', #{item}, '%')
 				</foreach>
+				)
 			</if>
 			AND is_delete = 0
 		</where>
@@ -155,4 +150,8 @@
 		select * from tz_base_enterprise_info where use_unit = #{useUnit}
 	</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-jczs/amos-boot-module-jczs-biz/src/main/java/com/yeejoin/amos/boot/module/jczs/biz/service/impl/TzBaseEnterpriseInfoServiceImpl.java

@@ -38,12 +38,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
-import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
-
 import java.text.ParseException;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 /**
@@ -90,6 +89,8 @@ public class TzBaseEnterpriseInfoServiceImpl
     @Autowired
     StartPlatformTokenService platformTokenService;
 
+    private static final Map<String, String> regionCodeOrgCodeMap = new ConcurrentHashMap<>();
+
     /**
      * 企业管理员变更缓存key前缀
      */
@@ -122,10 +123,23 @@ public class TzBaseEnterpriseInfoServiceImpl
                 }
             }
         }
-
+        if (tzBaseEnterpriseInfoDto.getCityCode() != null){
+            orgCodeList.add(this.getAndSetOrgCode(tzBaseEnterpriseInfoDto.getCityCode()));
+        }
         return this.baseMapper.pageList(page, tzBaseEnterpriseInfoDto, orgCodeList);
     }
 
+    public String getAndSetOrgCode(String cityCode) {
+        String orgCode = regionCodeOrgCodeMap.get(cityCode);
+        if (orgCode == null) {
+            orgCode = this.baseMapper.getOrgCodeByCompanyCode(cityCode);
+            if (orgCode != null) {
+                regionCodeOrgCodeMap.put(cityCode, orgCode);
+            }
+        }
+        return orgCode;
+    }
+
     @Override
     public TzBaseEnterpriseInfoDto detail(Long id) {
         TzBaseEnterpriseInfoDto tzBaseEnterpriseInfoDto = new TzBaseEnterpriseInfoDto();

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

@@ -76,6 +76,9 @@ public class SafetyProblemTracingDto extends BaseDto {
     @ApiModelProperty(value = "所属区域代码（6100000/6100010/6100011）")
     private String regionCode;
 
+    @ApiModelProperty(value = "所属区域代码（6100000/6100010/6100011）")
+    private String cityCode;
+
     @ApiModelProperty(value = "问题状态（0未处理、1已处理）")
     private String problemStatus;
 

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

@@ -158,9 +158,16 @@
          INNER JOIN  privilege_company pc on tjurm.receive_company_code = pc.company_code
         <where>
             tjurm.is_delete = 0 and pc.org_code  like concat (#{orgCode}, '%')
-            <if test="dto.equList != null and dto.equList != ''">
-                and tjurm.equ_list = #{dto.equList}
-            </if>
+            <choose>
+                <when test="dto.equList != null and dto.equList != '' and dto.equList == '气瓶'">
+                    and tjurm.equ_category = #{dto.equList}
+                </when>
+                <otherwise>
+                    <if test="dto.equList != null and dto.equList != ''">
+                        and tjurm.equ_list = #{dto.equList}
+                    </if>
+                </otherwise>
+            </choose>
             <if test="dto.equListCode != null and dto.equListCode != ''">
                 and tjurm.equ_list_code = #{dto.equListCode}
             </if>

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

@@ -2169,7 +2169,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         boolean isCopy = !ValidationUtil.isEmpty(equipmentInfoForm.get(IS_COPY));
         operateType = isCopy ? OPERATESAVE : operateType;
         // 新增设备保存时 : 历史设备=》dataSource为"his" jg新录入设备dataSource为"jg"
-        String dataSource = OPERATESAVE.equals(operateType) ? ("new".equals(equipSource) ? "jg" : "jg_his") : equipmentInfoForm.get("DATA_SOURCE").toString();
+        String dataSource = OPERATESAVE.equals(operateType) ? ("new".equals(equipSource) ? "jg" : "jg_his") : ValidationUtil.isEmpty(equipmentInfoForm.get("DATA_SOURCE")) ? "jg_his" : equipmentInfoForm.get("DATA_SOURCE").toString();
         if (isCopy) {
             String sourceRecord = equipmentClassForm.get(RECORD).toString();
 //            dataSource = "new".equals(equipSource) ? ("jg_" + sourceRecord) : ("jg_his_" + sourceRecord);

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

@@ -65,13 +65,12 @@ public class SafetyProblemTracingServiceImpl extends BaseService<SafetyProblemTr
     }
 
     public Page<SafetyProblemTracingDto> getProblemRecords(Page<SafetyProblemTracingDto> page, SafetyProblemTracingDto problemModel) {
-        String orgCode = getAndSetOrgCode(problemModel.getRegionCode());
+        String orgCode = getAndSetOrgCode(problemModel.getCityCode());
         if (ObjectUtils.isEmpty(orgCode)){
             return new Page<>();
         }
         problemModel.setGoverningBodyOrgCode(orgCode);
         // 使用orgCode过滤
-        problemModel.setRegionCode(null);
         // 将单位类型从code转化为value
         if (!ValidationUtil.isEmpty(problemModel.getPrincipalUnitType())){
             Collection<DataDictionary> unitTypeList = iDataDictionaryService.list(new QueryWrapper<DataDictionary>()

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 com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 
 /**
@@ -8,7 +9,7 @@ import lombok.Data;
  * @author Administrator
  */
 @Data
-public class PublicityInspectOrgInfoDto {
+public class PublicityInspectOrgInfoDto extends BaseDto {
 
     /**
      * 单位名称

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

@@ -58,7 +58,8 @@
             b.use_code as unitCode,
             b.use_code as useUnitCode,
             a.expiry_date as businessDeadline,
-            a.licenceType
+            a.licenceType,
+            b.sequence_nbr as sequenceNbr
         from
             (SELECT
              unit_code,

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/enums/MatinfoEnum.java

+package com.yeejoin.amos.boot.module.statistics.api.enums;
+
+import java.util.function.Function;
+
+public enum MatinfoEnum {
+
+    EXCEL("/public/webico/resources/上传-excl.png", (str) -> str.equals("xls") || str.equals("xlsx")),
+    PDF("/public/webico/resources/上传-pdf.png", (str) -> str.equals("pdf")),
+    PPT("/public/webico/resources/上传-ppt.png", (str) -> str.equals("ppt")),
+    WOED("/public/webico/resources/上传-word.png", (str) -> str.equals("doc") || str.equals("docx") || str.equals("txt")),
+//    IMAGE("/public/webico/resources/上传-图片.png", (str) -> false),
+    VIDEO("/public/webico/resources/上传-视频.png", (str) -> str.equals("mp4") || str.equals("avi") || str.equals("flv"));
+
+    private String icon;
+
+    private Function<String, Boolean> buildFunction;
+
+    MatinfoEnum() {
+    }
+
+    MatinfoEnum(String icon, Function<String, Boolean> buildFunction) {
+        this.icon = icon;
+        this.buildFunction = buildFunction;
+    }
+
+    public String getIcon() {
+        return icon;
+    }
+
+    public Function<String, Boolean> getBuildFunction() {
+        return buildFunction;
+    }
+
+    public static MatinfoEnum getIconUrl(String suffix){
+        for (MatinfoEnum value : values()) {
+            if (value.getBuildFunction().apply(suffix)) {
+                return value;
+            }
+        }
+        return null;
+    }
+}

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/JGStatisticsMapper.java

 package com.yeejoin.amos.boot.module.statistics.api.mapper;
 
+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.common.api.dto.DPFilterParamForDetailDto;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -55,6 +57,11 @@ public interface JGStatisticsMapper {
     Long changeCountByOrgCode(@Param("orgCode") String orgCode);
 
     List<Map<String, Object>> selectNoticeList(@Param("orgCode") String orgCode, @Param("time") String time);
+    Page<Map<String, Object>> selectNoticeDetailList(@Param("page") Page<Map<String, Object>> page, @Param("orgCode") String orgCode, @Param("time") String time, @Param("dto") DPFilterParamForDetailDto dpFilterParamDto);
+    Page<Map<String, Object>> selectAZNoticeDetailList(@Param("page") Page<Map<String, Object>> page, @Param("orgCode") String orgCode, @Param("time") String time, @Param("dto") DPFilterParamForDetailDto dpFilterParamDto);
+    Page<Map<String, Object>> selectWXNoticeDetailList(@Param("page") Page<Map<String, Object>> page, @Param("orgCode") String orgCode, @Param("time") String time, @Param("dto") DPFilterParamForDetailDto dpFilterParamDto);
+    Page<Map<String, Object>> selectGZNoticeDetailList(@Param("page") Page<Map<String, Object>> page, @Param("orgCode") String orgCode, @Param("time") String time, @Param("dto") DPFilterParamForDetailDto dpFilterParamDto);
+    Page<Map<String, Object>> selectYZNoticeDetailList(@Param("page") Page<Map<String, Object>> page, @Param("orgCode") String orgCode, @Param("time") String time, @Param("dto") DPFilterParamForDetailDto dpFilterParamDto);
 
     List<Map<String, Object>> selectNoticeCountTopTen(@Param("orgCode") String orgCode, @Param("time") String time);
 

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/AQZSDPStatisticsMapper.xml

@@ -142,7 +142,8 @@
 			sequence_nbr AS sequenceNbr,
 			source_type AS sourceType,
 			problem_type AS problemType,
-			problem_time AS problemTime
+			problem_time AS problemTime,
+		    principal_unit AS principalUnit
 		FROM
 			tzs_safety_problem_tracing
 		WHERE

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/AlertStatisticsMapper.xml

@@ -118,8 +118,9 @@
 		FROM
 			tz_alert_called
 		WHERE
-		    biz_org_code like concat(#{orgCode}, '%')
-		    and (alarm_type_code = '960' or alarm_type_code = '961')
+            is_delete = 0
+            and biz_org_code like concat(#{orgCode}, '%')
+		    and (alarm_type_code = '960' or alarm_type_code = '961' or alarm_type_code = '962')
             <if test="dto.beginDate !=null and dto.beginDate !=''">
                 and date_ge(CAST(call_time as date),#{dto.beginDate})
             </if>

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/JGDPStatisticsController.java

@@ -11,10 +11,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;
@@ -132,12 +129,14 @@ public class JGDPStatisticsController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "大屏总览-右侧-使用监管下钻列表", notes = "大屏总览-右侧-使用监管下钻列表")
     @PostMapping(value = "/zl/right/queryBizCycleDataDetailList")
-    public ResponseModel<Page<Map<String, Object>>> queryBizCycleDataDetailList(@Validated @RequestBody DPFilterParamForDetailDto dpFilterParamForDetailDto, BindingResult result) {
+    public ResponseModel<Page<Map<String, Object>>> queryBizCycleDataDetailList(@Validated @RequestBody DPFilterParamForDetailDto dpFilterParamForDetailDto, BindingResult result,
+                                                                                @RequestParam(value = "current", defaultValue = "1") Integer current,
+                                                                                @RequestParam(value = "size", defaultValue = "20") Integer size) {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {
             throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
         }
-        Page<Map<String, Object>> page = new Page<>(dpFilterParamForDetailDto.getCurrent(),dpFilterParamForDetailDto.getSize());
+        Page<Map<String, Object>> page = new Page<>(current,size);
         return ResponseHelper.buildResponse(statisticsService.queryBizCycleDataDetailList(dpFilterParamForDetailDto,page));
     }
 
@@ -307,6 +306,31 @@ public class JGDPStatisticsController {
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "监管大屏-右屏-施工情况列表（近30天）下钻列表", notes = "监管大屏-右屏-施工情况列表（近30天）下钻列表")
+    @PostMapping(value = "/noticeDetailList")
+    public ResponseModel<Page<Map<String, Object>>> noticeDetailList(@Validated @RequestBody DPFilterParamForDetailDto dpFilterParamDto, BindingResult result,
+                                                                     @RequestParam(value = "current", defaultValue = "1") Integer current,
+                                                                     @RequestParam(value = "size", defaultValue = "20") Integer size) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        Page<Map<String, Object>> page = new Page<>(current, size);
+        return ResponseHelper.buildResponse(statisticsService.noticeDetailList(page,dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "监管大屏-右屏-施工情况列表（近30天）下钻类型接口", notes = "监管大屏-右屏-施工情况列表（近30天）下钻类型接口")
+    @PostMapping(value = "/noticeListBusinessType")
+    public ResponseModel<List<Map<String, Object>>> noticeListBusinessType(@Validated @RequestBody DPFilterParamForDetailDto dpFilterParamDto, BindingResult result) {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.noticeListBusinessType(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "监管大屏-右屏-施工单位施工总量排名TOP10", notes = "大屏总览-右屏-施工单位施工总量排名TOP10")
     @PostMapping(value = "/noticeCountTop")
     public ResponseModel<List<Map<String, Object>>> noticeCountTop(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) {

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/JYJCDPStatisticsController.java

@@ -201,11 +201,15 @@ public class JYJCDPStatisticsController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "大屏-检验检测-八大类设备检验临期、超期统计下钻下部列表", notes = "大屏-检验检测-八大类设备检验临期、超期统计下钻下部列表")
     @PostMapping(value = "/equipInspectTime/equipInspectTimeCountListDetailList")
-    public ResponseModel<Page<JSONObject>> equipInspectTimeCountListDetailList(@Validated @RequestBody DPFilterParamForDetailDto dpFilterParamDto, BindingResult result) {
+    public ResponseModel<Page<JSONObject>> equipInspectTimeCountListDetailList(@Validated @RequestBody DPFilterParamForDetailDto dpFilterParamDto, BindingResult result,
+                                                                               @RequestParam(value = "current", defaultValue = "1") Integer current,
+                                                                               @RequestParam(value = "size", defaultValue = "20") Integer size) {
         List<FieldError> fieldErrors = result.getFieldErrors();
         if (!fieldErrors.isEmpty()) {
             throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
         }
+        dpFilterParamDto.setCurrent(current);
+        dpFilterParamDto.setSize(size);
         return ResponseHelper.buildResponse(statisticsService.equipInspectTimeCountListDetailList(dpFilterParamDto));
     }
 
@@ -266,8 +270,10 @@ public class JYJCDPStatisticsController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/inspectApplication/getInspectDetailList")
     @ApiOperation(httpMethod = "POST", value = "大屏检验检测下钻获取下部列表", notes = "大屏检验检测下钻获取下部列表")
-    public ResponseModel<Page<Map<String, Object>>> getInspectDetailList(@RequestBody DPFilterParamForDetailDto dpFilterParamForDetailDto) {
-        Page<Map<String, Object>> page = new Page<>(dpFilterParamForDetailDto.getCurrent(),dpFilterParamForDetailDto.getSize());
+    public ResponseModel<Page<Map<String, Object>>> getInspectDetailList(@RequestBody DPFilterParamForDetailDto dpFilterParamForDetailDto,
+                                                                         @RequestParam(value = "current", defaultValue = "1") Integer current,
+                                                                         @RequestParam(value = "size", defaultValue = "20") Integer size) {
+        Page<Map<String, Object>> page = new Page<>(current, size);
         return ResponseHelper.buildResponse(statisticsService.getInspectDetailList(dpFilterParamForDetailDto, page));
     }
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/YJDPStatisticsController.java

@@ -210,7 +210,11 @@ public class YJDPStatisticsController {
     @ApiOperation(value = "应急大屏使用-办理量 (近7天)-右上角更多-各地市业务办理情况-底部表格",
             notes = "应急大屏使用-办理量 (近7天)-右上角更多-各地市业务办理情况-底部表格")
     @PostMapping("/alertRecordTable/dp")
-    public ResponseModel<IPage<Map<String, Object>>> alertRecordTableForDP(@Validated @RequestBody DPFilterParamForDetailDto recordFilterVo) {
+    public ResponseModel<IPage<Map<String, Object>>> alertRecordTableForDP(@Validated @RequestBody DPFilterParamForDetailDto recordFilterVo,
+                                                                           @RequestParam(value = "current") Integer current,
+                                                                           @RequestParam(value = "size") Integer size) {
+        recordFilterVo.setCurrent(current);
+        recordFilterVo.setSize(size);
         return statisticsService.alertRecordTableForDP(recordFilterVo);
     }
 
@@ -243,7 +247,11 @@ public class YJDPStatisticsController {
     @ApiOperation(value = "月度困人故障高发使用单位-右上角更多-地市月度应急事件高发使用单位-表格",
             notes = "月度困人故障高发使用单位-右上角更多-地市月度应急事件高发使用单位-表格")
     @PostMapping("/alertUseUnitTable/dp")
-    public ResponseModel<IPage<AlertUseUnitStatistics>> alertUseUnitTableForDP(@Validated @RequestBody DPFilterParamForDetailDto detailDto) {
+    public ResponseModel<IPage<AlertUseUnitStatistics>> alertUseUnitTableForDP(@Validated @RequestBody DPFilterParamForDetailDto detailDto,
+                                                                               @RequestParam(value = "current") Integer current,
+                                                                               @RequestParam(value = "size") Integer size) {
+        detailDto.setCurrent(current);
+        detailDto.setSize(size);
         return statisticsService.alertUseUnitTableForDP(detailDto);
     }
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/ZLDPStatisticsController.java

@@ -116,7 +116,11 @@ public class ZLDPStatisticsController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/viewEquipPage")
     @ApiOperation(httpMethod = "POST", value = "查询设备管理列表", notes = "查询设备管理列表")
-    public ResponseModel<Page<JSONObject>> viewEquipPage(@RequestBody DPFilterParamForDetailDto paramDto) {
+    public ResponseModel<Page<JSONObject>> viewEquipPage(@RequestBody DPFilterParamForDetailDto paramDto,
+                                                         @RequestParam("size") Integer size,
+                                                         @RequestParam("current") Integer current) {
+        paramDto.setCurrent(current);
+        paramDto.setSize(size);
         return ResponseHelper.buildResponse(statisticsService.viewEquipPage(paramDto));
     }
 
@@ -132,4 +136,16 @@ public class ZLDPStatisticsController {
     public ResponseModel<List<EquCategoryVo>> getEquCategoryTree(@RequestBody DPFilterParamForDetailDto paramDto){
         return ResponseHelper.buildResponse(statisticsService.getEquCategoryList(paramDto.getTreeValue()));
     }
+
+    /**
+     * 设备八大类列表树
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "设备八大类列表树", notes = "设备八大类列表树")
+    @GetMapping(value = "/equipTree")
+    public ResponseModel<Object> equipTree(@RequestParam(value = "type", required = false) String type) {
+        return ResponseHelper.buildResponse(statisticsService.equipTree(type));
+    }
 }

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

@@ -288,13 +288,15 @@ public class CylinderDPStatisticsServiceImpl {
 
     private Map<String, Object> getCylinderMapCount(String orgCode, Map<String, Object> result) {
         if (StringUtils.isNotEmpty(orgCode)) {
-            result.put("cylindersCount", this.countForCylinderNum(orgCode));
+            Long cylindersCount = this.countForCylinderNum(orgCode);
+            Long automotiveGasCount = this.countForCylinderNumForVehicleUsed(orgCode);
+            result.put("cylindersCount", cylindersCount);
             result.put("stationCount", cylinderStatisticsMapper.countEnterpriseNumForCylinder(orgCode));
             result.put("operatorCount", cylinderAreaDataMapper.getOpertorStatisticsDataByCity(Collections.singletonList(orgCode)));
             // 液化气瓶 (个)
-            result.put("liquefiedGasCount", 0L);
+            result.put("liquefiedGasCount", cylindersCount - automotiveGasCount);
             // 车用气瓶 (个)
-            result.put("automotiveGasCount", this.countForCylinderNumForVehicleUsed(orgCode));
+            result.put("automotiveGasCount", automotiveGasCount);
             // 工业气瓶 (个)
             result.put("industrialGasCount", 0L);
             // 使用登记数量

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

@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RestTemplateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.StringUtils;
 import com.yeejoin.amos.boot.module.statistcs.biz.utils.DpSubUtils;
 import com.yeejoin.amos.boot.module.statistics.api.enums.DPStatusEnum;
+import com.yeejoin.amos.boot.module.statistics.api.enums.MatinfoEnum;
 import com.yeejoin.amos.feign.morphic.Morphic;
 import com.yeejoin.amos.feign.morphic.model.FormSceneModel;
 import jdk.nashorn.api.scripting.ScriptObjectMirror;
@@ -33,6 +34,7 @@ import javax.script.ScriptEngineManager;
 import java.net.URI;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 /**
  * 大屏二级页面实现类
@@ -526,9 +528,9 @@ public class DPSubServiceImpl {
                 e.printStackTrace();
             }
         }
-        if ("正常".equals(problemStatus)) {
+        if ("正常".equals(problemStatus) || "已处理".equals(problemStatus)) {
             color = "green";
-        } else if ("异常".equals(problemStatus)) {
+        } else if ("异常".equals(problemStatus) || "未处理".equals(problemStatus)) {
             color = "red";
         }
         qrcode.put("value", !ValidationUtil.isEmpty(result.get("SUPERVISORY_CODE")) ? "https://sxtzsb.sxsei.com:9435/tzs/?code=" + result.get("SUPERVISORY_CODE") : result.get("USE_ORG_CODE"));
@@ -592,6 +594,17 @@ public class DPSubServiceImpl {
                 JSONArray attachmentUploadDatas = matinfo.getJSONArray("datas");
                 if (!ValidationUtil.isEmpty(value)) {
                     JSONObject attachmentUploadDatasObj = new JSONObject();
+                    log.info("附件数据：{}", value);
+                    ((JSONArray)value).stream().forEach(y -> {
+                        JSONObject yObj = (JSONObject) y;
+                        String[] str = yObj.getString("url").split("\\.");
+                        if (ValidationUtil.isEmpty(str)){
+                            yObj.put("thumb", yObj.getString("url"));
+                        } else {
+                            MatinfoEnum iconUrl = MatinfoEnum.getIconUrl(str[1]);
+                            yObj.put("thumb", ValidationUtil.isEmpty(iconUrl) ? yObj.getString("url") : iconUrl.getIcon());
+                        }
+                    });
                     attachmentUploadDatasObj.put("value", value);
                     String accept = visualParams.getString("accept");
                     String label = visualParams.getString("label");
@@ -599,6 +612,7 @@ public class DPSubServiceImpl {
                         label = label + "(" + displayName + ")";
                     }
                     attachmentUploadDatasObj.put("label", label);
+                    attachmentUploadDatasObj.put("useThumb", true);
                     if (accept.equals(".*") || accept.contains("doc") || accept.contains("docx") || accept.contains("pdf") || accept.contains("xls") || accept.contains("xlsx")){
                         attachmentUploadDatasObj.put("type", "file");
                     } else if(accept.contains("png") || accept.contains("img")){
@@ -628,6 +642,24 @@ public class DPSubServiceImpl {
                         jsonObject.put("value", ((JSONObject) z).getString("nameKey"));
                     });
                 }
+            } else if ("radio".equals(xObj.getString("componentKey"))) {
+                if (!ValidationUtil.isEmpty(visualParams.getJSONObject("api"))){
+                    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 if(!ValidationUtil.isEmpty(value) && !ValidationUtil.isEmpty(visualParams.get("data"))){
+                    JSONArray data = visualParams.getJSONArray("data");
+                    Map<String, String> fieldMap = IntStream.range(0, data.size())
+                            .mapToObj(index -> data.getJSONObject(index))
+                            .collect(Collectors.toMap(
+                                    json -> json.getString("value"),
+                                    json -> json.getString("name")
+                            ));
+                    jsonObject.put("value", fieldMap.get(value));
+                }
             }
         }
         if (!("upload".equals(xObj.getString("componentKey")) || "attachmentUpload".equals(xObj.getString("componentKey")))){

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

@@ -623,7 +623,7 @@ public class JYJCDPStatisticsServiceImpl {
         long currentDayAfter30DayTime = DateUtil.offsetDay(DateUtil.parse(DateUtil.today(), "yyy-MM-dd"), 30).getTime();
         boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").gte(currentDayTime).lte(currentDayAfter30DayTime));
 
-        if(StrUtil.isNotEmpty(dpFilterParamForDetailDto.getTreeValue())) {
+        if(StrUtil.isNotEmpty(dpFilterParamForDetailDto.getTreeValue()) && !"0".equals(dpFilterParamForDetailDto.getTreeValue())) {
             boolMust.must(QueryBuilders.termQuery("EQU_LIST_CODE", dpFilterParamForDetailDto.getTreeValue()));
         }else{
             // 且8大类，目的去掉脏数据
@@ -661,7 +661,7 @@ public class JYJCDPStatisticsServiceImpl {
         long currentDayTime = DateUtil.parse(DateUtil.now(), "yyy-MM-dd").getTime();
         boolMust.must(QueryBuilders.rangeQuery("NEXT_INSPECT_DATE").lt(currentDayTime));
 
-        if(StrUtil.isNotEmpty(dpFilterParamForDetailDto.getTreeValue())) {
+        if(StrUtil.isNotEmpty(dpFilterParamForDetailDto.getTreeValue()) && !"0".equals(dpFilterParamForDetailDto.getTreeValue())) {
             boolMust.must(QueryBuilders.termQuery("EQU_LIST_CODE", dpFilterParamForDetailDto.getTreeValue()));
         }else{
             // 且8大类，目的去掉脏数据

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

@@ -245,7 +245,8 @@ public class StCommonServiceImpl {
                     // 压力容器里包括气瓶所以需要特殊处理，在统计压力容器时去掉气瓶的数量
                     if(bucket.getKeyAsString().equals(EquipmentClassifityEnum.YLRQ.getCode())){
                         countMap.put(bucket.getKeyAsString(), bucket.getDocCount() - cylinderNum);
-                    } else {
+                    } else if(!bucket.getKeyAsString().equals(EquipmentClassifityEnum.YLGD.getCode())) {
+                        //  压力管道单独统计，求总数时，不包括压力管道
                         countMap.put(bucket.getKeyAsString(), bucket.getDocCount());
                     }
                 }
@@ -254,7 +255,8 @@ public class StCommonServiceImpl {
             equipmentCategoryDtos.forEach(c -> {
                 result.put(this.castCategoryCode2WebCode(c.getCode()), countMap.getOrDefault(c.getCode(), 0L));
             });
-            result.put(DPMapStatisticsItemEnum.TOTAL.getCode(), countMap.values().stream().mapToLong(e -> e).sum() + cylinderNum);
+            // 注意，求总数时：countMap不包括气瓶数量、压力管道数量（20240819修改）
+            result.put(DPMapStatisticsItemEnum.TOTAL.getCode(), countMap.values().stream().mapToLong(e -> e).sum());
         } catch (IOException e) {
             throw new RuntimeException(e);
         }

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

@@ -400,7 +400,7 @@ public class YJDPStatisticsServiceImpl {
 
 
     public Map<String, Object> getCenterMapCountDataForGlobal(DPFilterParamDto dpFilterParamDto) {
-        this.setDefaultFilter(dpFilterParamDto);
+        // this.setDefaultFilter(dpFilterParamDto);
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto);
         if (StringUtils.isNotEmpty(orgCode)) {
             return this.getCenterMapOverviewData(orgCode, dpFilterParamDto);

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

@@ -12,12 +12,14 @@ import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto;
 import com.yeejoin.amos.boot.module.common.api.entity.AlertStatistics;
 import com.yeejoin.amos.boot.module.common.api.enums.UnitTypeEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.UserPostEnum;
+import com.yeejoin.amos.boot.module.statistcs.biz.utils.JsonUtils;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.AlertStatisticsMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.ZLStatisticsMapper;
 import com.yeejoin.amos.boot.module.statistics.api.vo.EquCategoryVo;
 import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipmentCategory;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
+import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import org.apache.commons.compress.utils.Lists;
@@ -37,6 +39,8 @@ import org.elasticsearch.search.aggregations.Aggregations;
 import org.elasticsearch.search.aggregations.bucket.terms.Terms;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.search.sort.SortOrder;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
@@ -71,6 +75,9 @@ public class ZLDPStatisticsServiceImpl {
     // 设备纳管  纳管：true 未纳管：false
     public static final String IS_INTO_MANAGEMENT = "IS_INTO_MANAGEMENT";
 
+    @Value("classpath:/json/equipCategory.json")
+    private Resource equipCategory;
+
     public ZLDPStatisticsServiceImpl(ZLStatisticsMapper screenMapper, DataDictionaryServiceImpl iDataDictionaryService, AlertStatisticsMapper alertStatisticsMapper, RestHighLevelClient restHighLevelClient, StCommonServiceImpl stCommonService, EquipmentCategoryMapper equipmentCategoryMapper) {
         this.screenMapper = screenMapper;
         this.iDataDictionaryService = iDataDictionaryService;
@@ -685,8 +692,8 @@ public class ZLDPStatisticsServiceImpl {
     public Map<String, Object> getEquipManagementRateStatistics(DPFilterParamForDetailDto paramDto) {
         Map<String, Object> result = new HashMap<>();
         List<Map<String, Object>> legendData = new ArrayList<>();
-        legendData.add(createLegend("设备总数", "equipTotal", "bar"));
-        legendData.add(createLegend("纳管率", "claimRate", "line"));
+        legendData.add(createLegend("设备总数", "equipTotal", "bar", "个"));
+        legendData.add(createLegend("纳管率", "claimRate", "line", "%"));
 
         List<RegionModel> regionList = stCommonService.setRegionIfRootParentAndNoAccessIf3Level("610000");
         // 获取区域名称并过滤
@@ -746,11 +753,12 @@ public class ZLDPStatisticsServiceImpl {
         }
     }
 
-    private Map<String, Object> createLegend(String value, String dataKey, String chartType) {
+    private Map<String, Object> createLegend(String value, String dataKey, String chartType, String unit) {
         return new HashMap<String, Object>() {{
             put("value", value);
             put("dataKey", dataKey);
             put("chartType", chartType);
+            put("unit", unit);
         }};
     }
 
@@ -841,8 +849,11 @@ public class ZLDPStatisticsServiceImpl {
         }
         if (!ObjectUtils.isEmpty(map.getString("EQU_LIST_CODE"))) {
             BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
-            String test = QueryParser.escape(map.getString("EQU_LIST_CODE"));
-            meBuilder.must(QueryBuilders.matchPhraseQuery("EQU_LIST_CODE", test));
+            if ("2300".equals(map.getString("EQU_LIST_CODE"))) {
+                meBuilder.must(QueryBuilders.matchPhraseQuery("EQU_CATEGORY_CODE", QueryParser.escape(map.getString("EQU_LIST_CODE"))));
+            } else {
+                meBuilder.must(QueryBuilders.matchPhraseQuery("EQU_LIST_CODE", QueryParser.escape(map.getString("EQU_LIST_CODE"))));
+            }
             boolMust.must(meBuilder);
         }
         if (!ObjectUtils.isEmpty(map.getString("EQU_LIST"))) {
@@ -953,25 +964,42 @@ public class ZLDPStatisticsServiceImpl {
             query.must(QueryBuilders.matchPhraseQuery("USE_UNIT_NAME", "*" + test + "*"));
             boolMust.must(query);
         }
-
         if (!ObjectUtils.isEmpty(paramDto.getTreeValue())) {
-            BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
-            String test = QueryParser.escape(paramDto.getTreeValue());
-            meBuilder.must(QueryBuilders.matchPhraseQuery("EQU_LIST_CODE", test));
-            boolMust.must(meBuilder);
-        }
-
-        if (!ObjectUtils.isEmpty(paramDto.getEquCategoryCode())) {
-            BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
-            String test = QueryParser.escape(paramDto.getEquCategoryCode());
-            meBuilder.must(QueryBuilders.matchPhraseQuery("EQU_CATEGORY_CODE", test));
-            boolMust.must(meBuilder);
+            if ("2300".equals(paramDto.getTreeValue())) {
+                if (paramDto.getEquCategoryCode() != null) {
+                    // treeValue 为 "2300" 且 equCategoryCode 非空时
+                    BoolQueryBuilder query = QueryBuilders.boolQuery();
+                    String escapedValue = QueryParser.escape(paramDto.getEquCategoryCode());
+                    query.must(QueryBuilders.matchPhraseQuery("EQU_DEFINE_CODE", escapedValue));
+                    boolMust.must(query);
+                } else {
+                    // treeValue 为 "2300" 且 equCategoryCode 为空时
+                    BoolQueryBuilder query = QueryBuilders.boolQuery();
+                    String escapedValue = QueryParser.escape(paramDto.getTreeValue());
+                    query.must(QueryBuilders.matchPhraseQuery("EQU_CATEGORY_CODE", escapedValue));
+                    boolMust.must(query);
+                }
+            } else {
+                // treeValue 不为 "2300" 时
+                BoolQueryBuilder query = QueryBuilders.boolQuery();
+                String escapedValue = QueryParser.escape(paramDto.getTreeValue());
+                query.must(QueryBuilders.matchPhraseQuery("EQU_LIST_CODE", escapedValue));
+
+                // 处理 equCategoryCode 为空的情况
+                if (paramDto.getEquCategoryCode() != null) {
+                    escapedValue = QueryParser.escape(paramDto.getEquCategoryCode());
+                    query.must(QueryBuilders.matchPhraseQuery("EQU_CATEGORY_CODE", escapedValue));
+                }
+                boolMust.must(query);
+            }
         }
 
         BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
         String param = QueryParser.escape("true");
         pBuilder.must(QueryBuilders.matchQuery(IS_INTO_MANAGEMENT, param));
         boolMust.must(pBuilder);
+        boolMust.must(QueryBuilders.termsQuery("EQU_LIST_CODE",
+                StCommonServiceImpl.getEquipmentCategory().stream().map(EquipmentCategoryDto::getCode).collect(Collectors.toList())));
 
         builder.query(boolMust);
         builder.sort("REC_DATE", SortOrder.DESC);
@@ -1015,4 +1043,26 @@ public class ZLDPStatisticsServiceImpl {
                 .map(dto -> new EquCategoryVo(dto.getName(), dto.getCode(), null))
                 .collect(Collectors.toList());
     }
+
+    public List<Map<String, Object>> equipTree(String type) {
+        List<Map<String, Object>> menus = new ArrayList<>();
+        Map<String, List<Map<String, Object>>> resourceJson = JsonUtils.getResourceJson(equipCategory);
+        List<Map<String, Object>> mapList;
+        if (ValidationUtil.isEmpty(type)) {
+            mapList = resourceJson.get(EquipmentClassifityEnum.BDLS.getCode());
+        } else {
+            if ("QTBF".equals(type)) {
+                type = "superviseBusiness";
+            }
+            mapList = resourceJson.get(type) == null ? resourceJson.get(EquipmentClassifityEnum.BDLS.getCode()) : resourceJson.get(type);
+        }
+        for (Map map : mapList) {
+            Map<String, Object> resultMap = new HashMap<>();
+            resultMap.put("instanceName", map.get("name"));
+            resultMap.put("instanceId", map.get("code"));
+            resultMap.put("image", map.get("imageUrl"));
+            menus.add(resultMap);
+        }
+        return menus;
+    }
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/utils/JsonUtils.java

+package com.yeejoin.amos.boot.module.statistcs.biz.utils;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.io.IOUtils;
+import org.springframework.core.io.Resource;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+
+
+public class JsonUtils {
+    //将json文件转化为Map<list<Map<>>>
+    public static Map getResourceJson(Resource resource) {
+        String json = null;
+        try {
+            json = IOUtils.toString(resource.getInputStream(), String.valueOf(StandardCharsets.UTF_8));
+        } catch (IOException e) {
+            throw new RuntimeException(resource + "json文件转化失败");
+        }
+        return JSONObject.parseObject(json, Map.class);
+    }
+}

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

@@ -8,10 +8,12 @@
       "dataConfig": {
         "api": {
           "httpMethod":"GET",
-          "apiPath":"/ymt/equipment-category/getFormRecordById/map",
+          "apiPath":"/jg/equipment-register/{record}",
           "params": {
-            "alias": "{EQU_LIST_CODE}",
-            "id": "{SEQUENCE_NBR}"
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipInfo"
           }
         }
       }
@@ -141,11 +143,11 @@
         "problem": []
       },
       "keyParams": [
-        { "key": "EQU_TYPE", "label": "设备种类", "source": "param"  },
-        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
-        { "key": "EQU_CATEGORY", "label": "设备品种", "source": "param"  },
+        { "key": "EQU_LIST", "label": "设备种类", "source": "param"  },
+        { "key": "EQU_CATEGORY", "label": "设备类别", "source": "param"  },
+        { "key": "EQU_DEFINE", "label": "设备品种", "source": "param"  },
         { "key": "PRODUCT_NAME", "label": "设备名称", "source": "param"  },
-        { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
+        { "key": "EQU_CODE", "label": "设备代码" },
         { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
         { "key": "ADDRESS", "label": "设备使用地点" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },

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

@@ -8,10 +8,12 @@
       "dataConfig": {
         "api": {
           "httpMethod":"GET",
-          "apiPath":"/ymt/equipment-category/getFormRecordById/map",
+          "apiPath":"/jg/equipment-register/{record}",
           "params": {
-            "alias": "{EQU_LIST_CODE}",
-            "id": "{SEQUENCE_NBR}"
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipInfo"
           }
         }
       }
@@ -145,11 +147,11 @@
         "problem": []
       },
       "keyParams_default": [
-        { "key": "EQU_TYPE", "label": "设备种类", "source": "param"  },
-        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
-        { "key": "EQU_CATEGORY", "label": "设备品种", "source": "param"  },
+        { "key": "EQU_LIST", "label": "设备种类", "source": "param"  },
+        { "key": "EQU_CATEGORY", "label": "设备类别", "source": "param"  },
+        { "key": "EQU_DEFINE", "label": "设备品种", "source": "param"  },
         { "key": "PRODUCT_NAME", "label": "设备名称", "source": "param"  },
-        { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
+        { "key": "EQU_CODE", "label": "设备代码" },
         { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
         { "key": "ADDRESS", "label": "设备使用地点" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
@@ -159,7 +161,7 @@
         { "key": "USE_INNER_CODE", "label": "单位内编号" }
       ],
       "keyParams_2300_true": [
-        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
+        { "key": "EQU_CATEGORY", "label": "设备类别", "source": "param"  },
         { "key": "PRODUCT_NAME", "label": "设备名称", "source": "param"  },
         { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
         { "key": "ADDRESS", "label": "设备使用地点" },
@@ -169,7 +171,7 @@
         { "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
       ],
       "keyParams_2300_false": [
-        { "key": "EQU_TYPE", "label": "气瓶品种" },
+        { "key": "EQU_LIST", "label": "气瓶品种" },
         { "key": "PRODUCT_NAME", "label": "产品名称" },
         { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
         { "key": "ADDRESS", "label": "设备使用地点" },

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

@@ -8,10 +8,12 @@
       "dataConfig": {
         "api": {
           "httpMethod":"GET",
-          "apiPath":"/ymt/equipment-category/getFormRecordById/map",
+          "apiPath":"/jg/equipment-register/{record}",
           "params": {
-            "alias": "{EQU_LIST_CODE}",
-            "id": "{SEQUENCE_NBR}"
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipInfo"
           }
         }
       }
@@ -141,11 +143,11 @@
         "problem": []
       },
       "keyParams": [
-        { "key": "EQU_TYPE", "label": "设备种类", "source": "param" },
-        { "key": "EQU_LIST", "label": "设备类别", "source": "param" },
-        { "key": "EQU_CATEGORY", "label": "设备品种", "source": "param" },
+        { "key": "EQU_LIST", "label": "设备种类", "source": "param" },
+        { "key": "EQU_CATEGORY", "label": "设备类别", "source": "param" },
+        { "key": "EQU_DEFINE", "label": "设备品种", "source": "param" },
         { "key": "PRODUCT_NAME", "label": "设备名称", "source": "param"  },
-        { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
+        { "key": "EQU_CODE", "label": "设备代码" },
         { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
         { "key": "ADDRESS", "label": "设备使用地点" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },

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

@@ -8,10 +8,12 @@
       "dataConfig": {
         "api": {
           "httpMethod":"GET",
-          "apiPath":"/ymt/equipment-category/getFormRecordById/map",
+          "apiPath":"/jg/equipment-register/{record}",
           "params": {
-            "alias": "{EQU_LIST_CODE}",
-            "id": "{SEQUENCE_NBR}"
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipInfo"
           }
         }
       }
@@ -137,11 +139,11 @@
         "problem": []
       },
       "keyParams": [
-        { "key": "EQU_TYPE", "label": "设备种类", "source": "param"  },
-        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
-        { "key": "EQU_CATEGORY", "label": "设备品种", "source": "param"  },
+        { "key": "EQU_LIST", "label": "设备种类", "source": "param" },
+        { "key": "EQU_CATEGORY", "label": "设备类别", "source": "param" },
+        { "key": "EQU_DEFINE", "label": "设备品种", "source": "param" },
         { "key": "PRODUCT_NAME", "label": "设备名称", "source": "param"  },
-        { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
+        { "key": "EQU_CODE", "label": "设备代码" },
         { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
         { "key": "ADDRESS", "label": "设备使用地点" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },

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

@@ -8,10 +8,12 @@
       "dataConfig": {
         "api": {
           "httpMethod":"GET",
-          "apiPath":"/ymt/equipment-category/getFormRecordById/map",
+          "apiPath":"/jg/equipment-register/{record}",
           "params": {
-            "alias": "{EQU_LIST_CODE}",
-            "id": "{SEQUENCE_NBR}"
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipInfo"
           }
         }
       }
@@ -133,11 +135,11 @@
         "problem": []
       },
       "keyParams": [
-        { "key": "EQU_TYPE", "label": "设备种类", "source": "param"  },
-        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
-        { "key": "EQU_CATEGORY", "label": "设备品种", "source": "param"  },
+        { "key": "EQU_LIST", "label": "设备种类", "source": "param" },
+        { "key": "EQU_CATEGORY", "label": "设备类别", "source": "param" },
+        { "key": "EQU_DEFINE", "label": "设备品种", "source": "param" },
         { "key": "PRODUCT_NAME", "label": "设备名称", "source": "param"  },
-        { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
+        { "key": "EQU_CODE", "label": "设备代码" },
         { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
         { "key": "ADDRESS", "label": "设备使用地点" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },

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

@@ -8,10 +8,12 @@
       "dataConfig": {
         "api": {
           "httpMethod":"GET",
-          "apiPath":"/ymt/equipment-category/getFormRecordById/map",
+          "apiPath":"/jg/equipment-register/{record}",
           "params": {
-            "alias": "{EQU_LIST_CODE}",
-            "id": "{SEQUENCE_NBR}"
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipInfo"
           }
         }
       }
@@ -127,11 +129,11 @@
         "problem": []
       },
       "keyParams": [
-        { "key": "EQU_TYPE", "label": "设备种类", "source": "param"  },
-        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
-        { "key": "EQU_CATEGORY", "label": "设备品种", "source": "param"  },
+        { "key": "EQU_LIST", "label": "设备种类", "source": "param" },
+        { "key": "EQU_CATEGORY", "label": "设备类别", "source": "param" },
+        { "key": "EQU_DEFINE", "label": "设备品种", "source": "param" },
         { "key": "PRODUCT_NAME", "label": "设备名称", "source": "param"  },
-        { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
+        { "key": "EQU_CODE", "label": "设备代码" },
         { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
         { "key": "ADDRESS", "label": "设备使用地点" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },

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

@@ -8,10 +8,12 @@
       "dataConfig": {
         "api": {
           "httpMethod":"GET",
-          "apiPath":"/ymt/equipment-category/getFormRecordById/map",
+          "apiPath":"/jg/equipment-register/{record}",
           "params": {
-            "alias": "{EQU_LIST_CODE}",
-            "id": "{SEQUENCE_NBR}"
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipInfo"
           }
         }
       }
@@ -133,11 +135,11 @@
         "problem": []
       },
       "keyParams_default": [
-        { "key": "EQU_TYPE", "label": "设备种类", "source": "param"  },
-        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
-        { "key": "EQU_CATEGORY", "label": "设备品种", "source": "param"  },
+        { "key": "EQU_LIST", "label": "设备种类", "source": "param" },
+        { "key": "EQU_CATEGORY", "label": "设备类别", "source": "param" },
+        { "key": "EQU_DEFINE", "label": "设备品种", "source": "param" },
         { "key": "PRODUCT_NAME", "label": "设备名称", "source": "param"  },
-        { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
+        { "key": "EQU_CODE", "label": "设备代码" },
         { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
         { "key": "ADDRESS", "label": "设备使用地点" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },
@@ -147,7 +149,7 @@
         { "key": "USE_INNER_CODE", "label": "单位内编号" }
       ],
       "keyParams_8300": [
-        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
+        { "key": "EQU_CATEGORY", "label": "设备类别", "source": "param"  },
         { "key": "PRODUCT_NAME", "label": "设备名称", "source": "param"  },
         { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
         { "key": "ADDRESS", "label": "设备使用地点" },

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

@@ -8,10 +8,12 @@
       "dataConfig": {
         "api": {
           "httpMethod":"GET",
-          "apiPath":"/ymt/equipment-category/getFormRecordById/map",
+          "apiPath":"/jg/equipment-register/{record}",
           "params": {
-            "alias": "{EQU_LIST_CODE}",
-            "id": "{SEQUENCE_NBR}"
+            "record": "{record}"
+          },
+          "ruleData": {
+            "responseSuccess": "data.result.equipInfo"
           }
         }
       }
@@ -133,11 +135,11 @@
         "problem": []
       },
       "keyParams": [
-        { "key": "EQU_TYPE", "label": "设备种类", "source": "param"  },
-        { "key": "EQU_LIST", "label": "设备类别", "source": "param"  },
-        { "key": "EQU_CATEGORY", "label": "设备品种", "source": "param"  },
+        { "key": "EQU_LIST", "label": "设备种类", "source": "param" },
+        { "key": "EQU_CATEGORY", "label": "设备类别", "source": "param" },
+        { "key": "EQU_DEFINE", "label": "设备品种", "source": "param" },
         { "key": "PRODUCT_NAME", "label": "设备名称", "source": "param"  },
-        { "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
+        { "key": "EQU_CODE", "label": "设备代码" },
         { "key": "USE_UNIT_NAME", "label": "使用单位名称" },
         { "key": "ADDRESS", "label": "设备使用地点" },
         { "key": "USE_ORG_CODE", "label": "使用登记证编号" },

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/resources/json/problem.json

@@ -77,6 +77,10 @@
   "content": {
     "keyinfo": {
       "title": "{principalUnit}",
+      "qrcode": {
+        "title": "监管码",
+        "problem": []
+      },
       "keyParams": [
         { "key": "sourceType", "label": "隐患主体类型" },
         { "key": "problemType", "label": "隐患类型" },

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

@@ -80,7 +80,7 @@ public interface TzBaseEnterpriseInfoMapper extends BaseMapper<TzBaseEnterpriseI
      * @param cityCode        区域code
      * @return Long   统计数量
      */
-    Long countByOperatingStatusAndOrgCode(@Param("orgCode") String orgCode, @Param("operatingStatus") String operatingStatus, @Param("cityCode") String cityCode);
+    Long countByOperatingStatusAndOrgCode(@Param("orgCode") String orgCode, @Param("operatingStatus") List<String> operatingStatus, @Param("cityCode") String cityCode);
 
 
     List<TzBaseEnterpriseInfoDto> queryByUseCode(@Param("useCodes") List<String> useCode);

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

@@ -223,7 +223,10 @@
 		 where
 		 	 1=1
 		 	and ((supervise_org_code != '50' and supervise_org_code LIKE CONCAT (#{orgCode}, '%')) or (supervise_org_code = '50' and office_region LIKE CONCAT ('%', #{cityCode}, '%')))
-		 	and operating_status = #{operatingStatus}
+		 	and
+		 	<foreach collection="operatingStatus" item="status" separator="or" open="(" close=")">
+				operating_status = #{status}
+			</foreach>
 		 	and register_type !='个人主体'
 	</select>
 	<select id="queryByUseCode" resultType="com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto">