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

@@ -70,4 +70,6 @@ public interface ElevatorMapper extends BaseMapper<Elevator> {
     Map<String, Object> selectMainUnitMessage(String sequenceNbr);
 
     Map<String, Object> selectUseUnitByAlertId(String sequenceNbr);
+
+    List<Map<String, Object>> elevatorCountStat(@Param("regionCodes") List<String> regionCodes);
 }

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,40 @@
 		</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
+			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/ElevatorMapper.xml

@@ -581,4 +581,20 @@
             ibjmri.SEQUENCE_NBR = #{sequenceNbr}
 
     </select>
+
+    <select id="elevatorCountStat" resultType="java.util.Map">
+        SELECT
+            district,
+            region_code as regionCode,
+            count(region_code) as total
+        FROM
+            tcb_elevator
+        WHERE
+            <if test="regionCodes != null">
+                <foreach collection="regionCodes" index="index" item="item" open="(" separator=" OR " close=")">
+                    tcb_elevator.region_code LIKE CONCAT('%', #{item}, '%')
+                </foreach>
+            </if>
+        GROUP BY region_code
+    </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.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/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));
+    }
+}

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

+package com.yeejoin.amos.boot.module.common.api.enums;
+
+import lombok.Getter;
+
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.List;
+
+@Getter
+public enum IssueMainBodyEnum {
+    //个人
+    PERSON("个人","1"),
+    //企业
+    COMPANY("企业","2"),
+    //设备
+    EQUIPMENT("设备","3"),
+    //气瓶
+    CYLINDER("气瓶","4"),
+
+    ;
+
+    String name;
+    String code;
+
+    private IssueMainBodyEnum(String name, String code) {
+        this.name = name;
+        this.code = code;
+    }
+
+    public static List<HashMap<String,String>> getEnumList() {
+        List<HashMap<String, String>> list = new ArrayList<>();
+        for (IssueMainBodyEnum testEnum : EnumSet.allOf(IssueMainBodyEnum.class)) {
+            HashMap<String, String> map = new HashMap<>();
+            map.put(testEnum.name,testEnum.code.toString());
+            list.add(map);
+        }
+        return list;
+    }
+
+    public static List<String> getEnumNameList() {
+        List<String> list = new ArrayList<>();
+        for (IssueMainBodyEnum testEnum : EnumSet.allOf(IssueMainBodyEnum.class)) {
+            list.add(testEnum.getName());
+        }
+        return list;
+    }
+
+}

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

+package com.yeejoin.amos.boot.module.common.api.enums;
+
+import lombok.Getter;
+
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.List;
+
+@Getter
+public enum IssueTypeEnum {
+    //检验超期（设备）
+    CHECK_OVERDUE_EQUMENT("检验超期","2","3"),
+    //维保超期（设备）
+    MAINTENANCE_OVERDUE_EQUMENT("维保超期","1","3"),
+    //资质超期（设备）
+    QUALIFICATION_OVERDUE_EQUMENT("资质超期","3","3"),
+    //检验不合格（设备）
+    CHECK_UNQUALIFIED_EQUMENT("检验不合格","4","3"),
+    //超设计使用年限（设备）
+    DESIGN_OVERDUE_EQUMENT("超设计使用年限","5","3"),
+    //电梯困人（设备）
+    ELEVATOR_TRAPPED_EQUMENT("电梯困人","6","3"),
+    //电梯故障（设备）
+    ELEVATOR_FAULT_EQUMENT("电梯故障","7","3"),
+    //许可临期(公司)
+    LICENSE_EXPIRY_COMPANY("许可临期","8","2"),
+    //许可超期（公司）
+    LICENSE_OVERDUE_COMPANY("许可超期","9","2"),
+    //维保备案超期（公司）
+    MAINTENANCE_RECORD_OVERDUE_COMPANY("维保备案超期","10","2"),
+    //许可临期（个人）
+    LICENSE_EXPIRY_PERSON("许可临期","11","1"),
+    //许可超期（个人）
+    LICENSE_OVERDUE_PERSON("许可超期","12","1"),
+    //许可超期（气瓶）
+    LICENSE_OVERDUE_CYLINDER("许可超期","13","4"),
+    //检验超期（气瓶）
+    CHECK_OVERDUE_CYLINDER("检验超期","14","4"),
+    //检验不合格（气瓶）
+    CHECK_UNQUALIFIED_CYLINDER("检验不合格","15","4"),
+    //操作人员资质超期（气瓶）
+    OPERATOR_QUALIFICATION_OVERDUE_CYLINDER("操作人员资质超期","16","1"),
+    //充装异常（气瓶）
+    CHARGE_EXCEPTION_CYLINDER("充装异常","17","4"),
+
+
+
+    ;
+
+    String name;
+    String code;
+    String mainBody;
+
+    private IssueTypeEnum(String name, String code, String mainBody) {
+        this.name = name;
+        this.code = code;
+        this.mainBody = mainBody;
+    }
+
+    public static List<HashMap<String,String>> getEnumList() {
+        List<HashMap<String, String>> list = new ArrayList<>();
+        for (IssueTypeEnum testEnum : EnumSet.allOf(IssueTypeEnum.class)) {
+            HashMap<String, String> map = new HashMap<>();
+            map.put(testEnum.name,testEnum.code.toString());
+            list.add(map);
+        }
+        return list;
+    }
+
+    public static List<String> getEnumNameListByMainBody(String mainBody) {
+        List<String> list = new ArrayList<>();
+        for (IssueTypeEnum testEnum : EnumSet.allOf(IssueTypeEnum.class)) {
+            if(mainBody.equals(testEnum.getMainBody())){
+                list.add(testEnum.getName());
+            }
+        }
+        return list;
+    }
+
+}

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

+package com.yeejoin.amos.boot.module.cylinder.api.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface DPStatisticsMapper {
+
+    String getOrgCodeByCompanyCode(@Param("cityCode") String cityCode);
+
+    List<Map<String, Object>> selectByOrgAndMainBody(@Param("orgCode") String orgCode, @Param("mainBodyNameList") List<String> mainBodyNameList,
+                                                     @Param("startDate") String startDate, @Param("status") String status);
+
+    List<Map<String, Object>> selectByOrgAndProblemType(@Param("orgCode") String orgCode, @Param("enumNameList") List<String> enumNameList,
+                                                        @Param("startDate") String startDate, @Param("sourceType") String sourceType);
+
+    List<Map<String, Object>> getIssueCountByMonth(@Param("orgCode") String orgCode, @Param("year") String year, @Param("status") String status);
+    List<Map<String, Object>> getIssueCountByDate(@Param("orgCode") String orgCode, @Param("year") String year, @Param("status") String status);
+}

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-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.cylinder.api.mapper.DPStatisticsMapper">
+
+
+	<select id="getOrgCodeByCompanyCode" resultType="java.lang.String">
+		select org_code from privilege_company where company_code = #{cityCode} limit 1
+	</select>
+	<select id="selectByOrgAndMainBody" resultType="java.util.Map">
+		SELECT COUNT
+				   ( 1 ),
+			   source_type AS sourceType
+		FROM
+			tzs_safety_problem_tracing
+		WHERE
+			governing_body_org_code LIKE concat ( #{orgCode}, '%' )
+		  	AND create_date &gt;= #{startDate}
+		    AND source_type IN
+			<foreach collection="mainBodyNameList" item="item" separator="," open="(" close=")">
+				#{item}
+			</foreach>
+			<if test="null != status">
+				AND problem_status_code = #{status}
+			</if>
+		GROUP BY
+			source_type
+	</select>
+	<select id="selectByOrgAndProblemType" resultType="java.util.Map">
+		SELECT COUNT
+			( 1 ),
+			problem_type AS problemType
+			FROM
+			tzs_safety_problem_tracing
+		WHERE
+			governing_body_org_code LIKE concat ( #{orgCode}, '%' )
+			AND create_date &gt;= #{startDate}
+		  	AND source_type = #{sourceType}
+			AND problem_type IN
+				<foreach collection="enumNameList" item="item" separator="," open="(" close=")">
+					#{item}
+				</foreach>
+		GROUP BY
+			problem_type
+
+	</select>
+	<select id="getIssueCountByMonth" resultType="java.util.Map">
+		SELECT COUNT
+				   ( 1 ),
+			   DATE_FORMAT(create_date,'%Y-%m') AS time
+		FROM
+			tzs_safety_problem_tracing
+		WHERE
+			governing_body_org_code LIKE concat ( #{orgCode}, '%' )
+		  	AND DATE_FORMAT(create_date,'%Y') = #{year}
+			<if test="null != status">
+				AND problem_status_code = #{status}
+			</if>
+		GROUP BY
+			DATE_FORMAT(create_date,'%Y-%m')
+	</select>
+
+	<select id="getIssueCountByDate" resultType="java.util.Map">
+		SELECT COUNT
+			( 1 ),
+			DATE_FORMAT(create_date,'%Y-%m-%d') AS time
+		FROM
+			tzs_safety_problem_tracing
+		WHERE
+			governing_body_org_code LIKE concat ( #{orgCode}, '%' )
+			AND DATE_FORMAT(create_date,'%Y-%m-%d') &gt;= #{year}
+			<if test="null != status">
+				AND problem_status_code = #{status}
+			</if>
+		GROUP BY
+			DATE_FORMAT(create_date,'%Y-%m-%d')
+	</select>
+
+</mapper>
+
+

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/controller/CylinderStatisticsController.java

@@ -74,4 +74,88 @@ public class CylinderStatisticsController {
         Map<String, Object> result = service.getsecurityIndex(regionCode.toString());
         return ResponseHelper.buildResponse(result);
     };
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "问题类型主体统计")
+    @PostMapping(value = "/mainBodyCount")
+    public ResponseModel<Map<String, Object>> mainBodyCount(@RequestBody Map<String, Object> map ) throws Exception {
+        Object regionCode = map.get("cityCode");
+        if (ObjectUtils.isEmpty(regionCode)) {
+            regionCode = "610000";
+        }
+        Map<String, Object> result = service.mainBodyCount(regionCode.toString());
+        return ResponseHelper.buildResponse(result);
+    };
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "设备问题近30天统计")
+    @PostMapping(value = "/equipmentCount")
+    public ResponseModel<Map<String, Object>> equipmentCount(@RequestBody Map<String, Object> map ) throws Exception {
+        Object regionCode = map.get("cityCode");
+        if (ObjectUtils.isEmpty(regionCode)) {
+            regionCode = "610000";
+        }
+        Map<String, Object> result = service.equipmentCount(regionCode.toString());
+        return ResponseHelper.buildResponse(result);
+    };
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "企业问题近30天统计")
+    @PostMapping(value = "/companyCount")
+    public ResponseModel<List<Map<String, Object>>> companyCount(@RequestBody Map<String, Object> map ) throws Exception {
+        Object regionCode = map.get("cityCode");
+        if (ObjectUtils.isEmpty(regionCode)) {
+            regionCode = "610000";
+        }
+        List<Map<String, Object>> result = service.companyCount(regionCode.toString());
+        return ResponseHelper.buildResponse(result);
+    };
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "人员问题近30天统计")
+    @PostMapping(value = "/personCount")
+    public ResponseModel<Map<String, Object>> personCount(@RequestBody Map<String, Object> map ) throws Exception {
+        Object regionCode = map.get("cityCode");
+        if (ObjectUtils.isEmpty(regionCode)) {
+            regionCode = "610000";
+        }
+        Map<String, Object> result = service.personCount(regionCode.toString());
+        return ResponseHelper.buildResponse(result);
+    };
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "气瓶问题近30天统计")
+    @PostMapping(value = "/cylinderCount")
+    public ResponseModel<Map<String, Object>> cylinderCount(@RequestBody Map<String, Object> map ) throws Exception {
+        Object regionCode = map.get("cityCode");
+        if (ObjectUtils.isEmpty(regionCode)) {
+            regionCode = "610000";
+        }
+        Map<String, Object> result = service.cylinderCount(regionCode.toString());
+        return ResponseHelper.buildResponse(result);
+    };
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "按月统计近12个月的问题数量趋势")
+    @PostMapping(value = "/issueCountByMonth")
+    public ResponseModel<Map<String, Object>> issueCountByMonth(@RequestBody Map<String, Object> map ) throws Exception {
+        Object regionCode = map.get("cityCode");
+        if (ObjectUtils.isEmpty(regionCode)) {
+            regionCode = "610000";
+        }
+        Map<String, Object> result = service.issueCountByMonth(regionCode.toString());
+        return ResponseHelper.buildResponse(result);
+    };
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "按月统计近30天的问题数量趋势")
+    @PostMapping(value = "/issueCountByDay")
+    public ResponseModel<Map<String, Object>> issueCountByDay(@RequestBody Map<String, Object> map ) throws Exception {
+        Object regionCode = map.get("cityCode");
+        if (ObjectUtils.isEmpty(regionCode)) {
+            regionCode = "610000";
+        }
+        Map<String, Object> result = service.issueCountByDay(regionCode.toString());
+        return ResponseHelper.buildResponse(result);
+    };
 }