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

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/mapper/AlertCalledMapper.java

@@ -43,6 +43,23 @@ public interface AlertCalledMapper extends BaseMapper<AlertCalled> {
      * @param endDate
      * @return
      */
+    List<Map<String, Object>> queryNearlyList(@Param("beginDate") String beginDate,
+                                               @Param("endDate") String endDate,
+                                               @Param("regionCode") String regionCode
+    );
+    /**
+     * 接警情况统计（按场所）
+     *
+     * @return
+     */
+    List<Map<String, Object>> queryListByLocation(@Param("regionCode") String regionCode);
+    /**
+     * 接警情况统计
+     *
+     * @param beginDate
+     * @param endDate
+     * @return
+     */
     Map<String, Long> queryAlertStatusCount(@Param("beginDate") String beginDate,
                                             @Param("endDate") String endDate,
                                             @Param("groupCode") String groupCode,

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/mapper/AlertStatisticsMapper.java

@@ -20,4 +20,6 @@ public interface AlertStatisticsMapper extends BaseMapper<AlertStatistics> {
     Long countProblemByTypeDateAndOrgCode(@Param("problemType") String problemType,@Param("dto") DPFilterParamDto params, @Param("orgCode") String orgCode);
 
     String getOrgCodeByCompanyCode(String cityCode);
+
+    Long countEmergencyEventsByOrgCodeAndDate(@Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto filterParamDto);
 }

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/java/com/yeejoin/amos/boot/module/elevator/api/mapper/YjBaseMapper.java

+package com.yeejoin.amos.boot.module.elevator.api.mapper;
+
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-12-13
+ */
+@Mapper
+public interface YjBaseMapper {
+
+    CompanyModel selectOneCompanyByCode(String companyCode);
+
+    String getOrgCodeByCompanyCode(String companyCode);
+}

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/AlertCalledMapper.xml

@@ -122,6 +122,41 @@
 		</if>
 	</select>
 
+	<select id="queryNearlyList" resultType="java.util.Map">
+		SELECT
+			date_format (call_time, '%Y-%m-%d') AS day,
+			alarm_type as alarmType,
+			ifnull ( SUM ( CASE WHEN father_alert IS NULL THEN 1 ELSE 0 END ), 0) AS majorAlertCount
+		FROM
+			tz_alert_called
+		WHERE
+		    biz_org_code like concat(#{regionCode}, '%')
+		    AND day BETWEEN #{beginDate} AND #{endDate}
+		GROUP BY
+			day, alarm_type
+		ORDER BY
+			day ASC
+	</select>
+
+	<select id="queryListByLocation" resultType="java.util.Map">
+		SELECT
+			ifnull ( SUM ( CASE WHEN father_alert IS NULL THEN 1 ELSE 0 END ), 0 ) AS majorAlertCount,
+			cdd.NAME as name
+		FROM
+			tz_alert_called tac
+				LEFT JOIN idx_biz_jg_use_info ibjuj ON tac.equipment_id = ibjuj.RECORD
+				LEFT JOIN cb_data_dictionary cdd ON ibjuj.USE_PLACE = cdd.sequence_nbr
+		WHERE
+			biz_org_code LIKE concat(#{regionCode}, '%')
+		  AND (tac.alarm_type_code = '960' or tac.alarm_type_code = '961')
+		  AND
+			ibjuj.USE_PLACE is NOT NULL
+		  AND	cdd.NAME is NOT NULL
+		GROUP BY
+			cdd.NAME
+		ORDER BY ibjuj.USE_PLACE ASC
+	</select>
+
 	<select id="queryAlertListByQueryDto" resultType="java.util.Map">
 		SELECT
 		a.sequence_nbr AS sequenceNbr,

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

@@ -112,4 +112,19 @@
     <select id="getOrgCodeByCompanyCode" resultType="java.lang.String">
         select org_code from privilege_company where company_code = #{companyCode} limit 1
     </select>
+    <select id="countEmergencyEventsByOrgCodeAndDate" resultType="java.lang.Long">
+        SELECT
+			ifnull (SUM ( CASE WHEN father_alert IS NULL THEN 1 ELSE 0 END ), 0) AS total
+		FROM
+			tz_alert_called
+		WHERE
+		    biz_org_code like concat(#{orgCode}, '%')
+		    and (alarm_type_code = '960' or alarm_type_code = '961')
+            <if test="dto.beginDate !=null and dto.beginDate !=''">
+                and date_ge(CAST(call_time as date),#{dto.beginDate})
+            </if>
+            <if test="dto.endDate !=null and dto.endDate !=''">
+                and date_le(CAST(call_time as date),#{dto.endDate})
+            </if>
+    </select>
 </mapper>

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-api/src/main/resources/mapper/YjBaseMapper.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.elevator.api.mapper.YjBaseMapper">
+
+    <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-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/controller/DPStatisticsController.java

+package com.yeejoin.amos.boot.module.elevator.biz.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
+import com.yeejoin.amos.boot.module.elevator.api.dto.AlertMaintenanceUnitStatisticsDto;
+import com.yeejoin.amos.boot.module.elevator.api.dto.AlertMsgDto;
+import com.yeejoin.amos.boot.module.elevator.api.dto.AlertPaperInfoDto;
+import com.yeejoin.amos.boot.module.elevator.api.dto.AlertUseUnitStatisticsDto;
+import com.yeejoin.amos.boot.module.elevator.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.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 大屏统计controller
+ *
+ * @author Administrator
+ */
+@RestController
+@RequestMapping("/db/statistics")
+@Api(tags = "大屏统计")
+public class DPStatisticsController {
+
+
+    private DPStatisticsServiceImpl statisticsService;
+
+    public DPStatisticsController(DPStatisticsServiceImpl statisticsService) {
+        this.statisticsService = statisticsService;
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-应急-办理量 (近7日)", notes = "大屏-应急-办理量 (近7日)")
+    @PostMapping(value = "/yj/eventStatByDay")
+    public ResponseModel<JSONObject> eventStatByDay(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) throws Exception {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.eventStatByDay(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-应急-电梯数量统计 (按区域)", notes = "大屏-应急-电梯数量统计 (按区域)")
+    @PostMapping(value = "/yj/elevatorCountStat")
+    public ResponseModel<JSONObject> elevatorCountStat(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) throws Exception {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.elevatorCountStat(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-应急-事件分布 (按场所)", notes = "大屏-应急-事件分布 (按场所)")
+    @PostMapping(value = "/yj/eventStatByLocation")
+    public ResponseModel<JSONObject> eventStatByLocation(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) throws Exception {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.eventStatByLocation(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-应急-困人救援月度情况", notes = "大屏-应急-困人救援月度情况")
+    @PostMapping(value = "/yj/trappedUserCount")
+    public ResponseModel<JSONObject> trappedUserCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) throws Exception {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.trappedUserCount(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-应急-即时警情列表", notes = "大屏-应急-即时警情列表")
+    @PostMapping(value = "/yj/instantAlert")
+    public ResponseModel<List<AlertPaperInfoDto>> instantAlert(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) throws Exception {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.instantAlert(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-应急-月度困人故障高发使用单位", notes = "大屏-应急-月度困人故障高发使用单位")
+    @PostMapping(value = "/yj/trappedUserHighCompanyCount")
+    public ResponseModel<List<AlertUseUnitStatisticsDto>> trappedUserHighCompanyCount(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) throws Exception {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.trappedUserHighCompanyCount(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-应急-维保单位平均救援时间排名", notes = "大屏-应急-维保单位平均救援时间排名")
+    @PostMapping(value = "/yj/rankUnitByRescueTime")
+    public ResponseModel<List<AlertMaintenanceUnitStatisticsDto>> rankUnitByRescueTime(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) throws Exception {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.rankUnitByRescueTime(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-应急-各地市应急事件总数排名", notes = "大屏-应急-各地市应急事件总数排名")
+    @PostMapping(value = "/yj/regionEventRank")
+    public ResponseModel<JSONObject> regionEventRank(@Validated @RequestBody DPFilterParamDto dpFilterParamDto, BindingResult result) throws Exception {
+        List<FieldError> fieldErrors = result.getFieldErrors();
+        if (!fieldErrors.isEmpty()) {
+            throw new BadRequest(fieldErrors.get(0).getDefaultMessage());
+        }
+        return ResponseHelper.buildResponse(statisticsService.regionEventRank(dpFilterParamDto));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "POST", value = "大屏-应急-中间地图图列统计", notes = "大屏-应急-中间地图图列统计")
+    @PostMapping(value = "/yj/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 = "/yj/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));
+    }
+}

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

@@ -411,7 +411,6 @@ public class JgEnableDisableServiceImpl extends BaseService<JgEnableDisableDto,
             jgEnableDisable.setAuditStatus(String.valueOf(FlowStatusEnum.TO_BE_SUBMITTED.getName()));
         }
         jgEnableDisable.setEquList(String.valueOf(map.get("equListDesc")));
-        jgEnableDisable.setSupervisoryCode(String.valueOf(map.get("supervisoryCode")));
         jgEnableDisable.setCreateUserName(reginParams.getUserModel().getRealName());
         jgEnableDisable.setCreateUserId(reginParams.getUserModel().getUserId());
 

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

@@ -2135,8 +2135,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
      */
     private void fillHistoryDataWithNewEquip(JSONObject jsonObject, JgUseRegistration jgUseRegistration, String record) {
         // 非已完成、非作废时显示设备最新信息。前置需求：一个设备只能同时发起一个流程
-        if (!(jgUseRegistration.getStatus().equals(FlowStatusEnum.TO_BE_FINISHED.getName())
-                || jgUseRegistration.getStatus().equals(FlowStatusEnum.TO_BE_DISCARD.getName()))
+        if (!(FlowStatusEnum.TO_BE_FINISHED.getName().equals(jgUseRegistration.getStatus())
+                || FlowStatusEnum.TO_BE_DISCARD.getName().equals(jgUseRegistration.getStatus()))
                 || "1".equals(jgUseRegistration.getRegType())) {
             // 基本信息 + 制造信息
             Map<String, Object> detail = this.baseMapper.getDetail(record);

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

@@ -20,10 +20,11 @@ public interface JyjcInspectionApplicationEquipMapper extends BaseMapper<JyjcIns
     /**
      * 检验检测次数统计维度按照设备种类、检验类型进行统计
      *
-     * @param dpFilterParamDto g过滤条件
+     * @param dpFilterParamDto 过滤条件时间
+     * @param orgCode          过滤条件区域对应的公司的orgCode
      * @return 统计列表
      */
-    List<InspectTimeCountDto> countInspectTimeCountByTypeAndEquList(DPFilterParamDto dpFilterParamDto);
+    List<InspectTimeCountDto> countInspectTimeCountByTypeAndEquList(@Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto dpFilterParamDto);
 
     Integer inspectTimeCount(@Param("dpFilterParamDto") DPFilterParamDto dpFilterParamDto);
 }

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

@@ -21,31 +21,29 @@
             c.equ_define,
             count(1) as num
         from
-        (SELECT
-        ae.equ_list,
-        ae.equ_category,
-        ae.equ_define,
-        a.biz_type,
-        concat(u.PROVINCE,'#', u.CITY,'#', u.COUNTY) as areaCode
-        FROM
-        "tz_jyjc_inspection_application_equip" ae,
-        tz_jyjc_inspection_application a,
-        "idx_biz_jg_use_info" u
-        where
-        ae.equip_unicode = u."RECORD"
-        and a.sequence_nbr = ae.application_seq
-        and (a.application_date between #{beginDate} and #{endDate})
-        and a.status='6616'
-        and u."PROVINCE" <![CDATA[<>]]> ''
-        and u."CITY"  <![CDATA[<>]]> ''
-        and u."COUNTY"  <![CDATA[<>]]> ''
-        ) c
+            (
+            SELECT
+                ae.equ_list,
+                ae.equ_category,
+                ae.equ_define,
+                a.biz_type,
+                s.ORG_BRANCH_CODE as orgBranchCode
+            FROM
+                "tz_jyjc_inspection_application_equip" ae,
+                 tz_jyjc_inspection_application a,
+                "idx_biz_jg_supervision_info" s
+            where
+                s."RECORD" = ae.equip_unicode
+                and a.sequence_nbr = ae.application_seq
+                and a.application_date between #{dto.beginDate} and #{dto.endDate}
+                and a.status='6616'
+            ) c
         where
-        c.areaCode like concat('%',#{cityCode}, '%')
-        group by c.biz_type,
-        c.equ_list,
-        c.equ_category,
-        c.equ_define
+            c.orgBranchCode like concat(#{orgCode}, '%')
+            group by c.biz_type,
+            c.equ_list,
+            c.equ_category,
+            c.equ_define
     </select>
     <select id="inspectTimeCount" resultType="java.lang.Integer">
         SELECT COUNT

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

@@ -114,8 +114,9 @@ public class DPStatisticsServiceImpl {
     }
 
     private void buildYData(Map<String, Object> result, List<BizTypeEnum> bizTypeEnums, DPFilterParamDto dpFilterParamDto, List<EquipmentCategoryDto> equipmentCategoryDtos) {
+        String orgCode = this.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         // 待统计的数据本来sql可以单独统计，但是要求气瓶单独从压力容器里拎出来，与八大类同级，故java处理
-        List<InspectTimeCountDto> inspectTimeCountDtos = inspectionApplicationEquipMapper.countInspectTimeCountByTypeAndEquList(dpFilterParamDto);
+        List<InspectTimeCountDto> inspectTimeCountDtos = inspectionApplicationEquipMapper.countInspectTimeCountByTypeAndEquList(orgCode,dpFilterParamDto);
         bizTypeEnums.forEach(bizTypeEnum -> {
             result.put(bizTypeEnum.getCode(), this.countNumByBizTypeAndEquList(equipmentCategoryDtos, bizTypeEnum.getCode(), inspectTimeCountDtos));
         });