Skip to content

A
amos-boot-zx-biz
Commit eef4856f authored by chenzhao's avatar chenzhao
Browse files
Options

任务总览 优化文档代码处理

parent b60eb87e
Hide whitespace changes
Inline Side-by-side
Showing with 302 additions and 77 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/HealthStatusIndicatorServiceImpl.java
View file @ eef4856f
...@@ -94,11 +94,11 @@ public class HealthStatusIndicatorServiceImpl { ...@@ -94,11 +94,11 @@ public class HealthStatusIndicatorServiceImpl {
/** /**
* 夏造风电分析index_key * 夏造风电分析index_key
*/ */
public static final String INDEX_KEY_FAN = "XZFX#FX%s#ZNFX"; public static final String INDEX_KEY_FAN = "XZFX#ZNFX";
/** /**
* 泰和光伏分析 index_key * 泰和光伏分析 index_key
*/ */
public static final String INDEX_KEY_PV = "THFX#FXGF#ZNFX"; public static final String INDEX_KEY_PV = "THFX#ZNFX";
/** /**
* 智能分析触发预警系统标识 - 光伏 * 智能分析触发预警系统标识 - 光伏
*/ */
...@@ -2703,6 +2703,7 @@ public class HealthStatusIndicatorServiceImpl { ...@@ -2703,6 +2703,7 @@ public class HealthStatusIndicatorServiceImpl {
riskBizInfoVo.setSourceAttributionDesc(idxBizPvWarningRecord.getStation()); riskBizInfoVo.setSourceAttributionDesc(idxBizPvWarningRecord.getStation());
riskBizInfoVo.setWarningObjectType("equip"); riskBizInfoVo.setWarningObjectType("equip");
riskBizInfoVo.setWarningTime(DateUtil.now()); riskBizInfoVo.setWarningTime(DateUtil.now());
riskBizInfoVo.setBussId(String.valueOf(idxBizPvWarningRecord.getTs()));
riskBizInfoVo.setWarningObjectLinkUrl(getJumpUrlByInfo(idxBizPvWarningRecord.getKks(), jumpConfigs)); riskBizInfoVo.setWarningObjectLinkUrl(getJumpUrlByInfo(idxBizPvWarningRecord.getKks(), jumpConfigs));
List<RiskDynamicDetailsVo> detailsVos = new ArrayList<>(); List<RiskDynamicDetailsVo> detailsVos = new ArrayList<>();
RiskDynamicDetailsVo dynamicDetailsVo = new RiskDynamicDetailsVo(); RiskDynamicDetailsVo dynamicDetailsVo = new RiskDynamicDetailsVo();
...@@ -2757,7 +2758,7 @@ public class HealthStatusIndicatorServiceImpl { ...@@ -2757,7 +2758,7 @@ public class HealthStatusIndicatorServiceImpl {
log.info("===开始触发风险预警模型===数量为：{}", idxBizFanWarningRecords.size()); log.info("===开始触发风险预警模型===数量为：{}", idxBizFanWarningRecords.size());
idxBizFanWarningRecords.stream().forEach(idxBizFanWarningRecord -> { idxBizFanWarningRecords.stream().forEach(idxBizFanWarningRecord -> {
BizMessage bizMessage = new BizMessage(); BizMessage bizMessage = new BizMessage();
bizMessage.setIndexKey(String.format(INDEX_KEY_FAN, idxBizFanWarningRecord.getNumber())); bizMessage.setIndexKey(INDEX_KEY_FAN);
bizMessage.setIndexValue(idxBizFanWarningRecord.getPointName()); bizMessage.setIndexValue(idxBizFanWarningRecord.getPointName());
// bizMessage.setTraceId(idxBizFanWarningRecord.getSequenceNbr()); // bizMessage.setTraceId(idxBizFanWarningRecord.getSequenceNbr());
RiskBizInfoVo riskBizInfoVo = new RiskBizInfoVo(); RiskBizInfoVo riskBizInfoVo = new RiskBizInfoVo();
......
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/service/IMcbWarningService.java
View file @ eef4856f
...@@ -28,28 +28,28 @@ public interface IMcbWarningService { ...@@ -28,28 +28,28 @@ public interface IMcbWarningService {
* @return 预警信息列表 * @return 预警信息列表
*/ */
Page<Map<String, Object>> queryWarningPage(Page<Map<String, Object>> page, Integer processingStatus, Page<Map<String, Object>> queryWarningPage(Page<Map<String, Object>> page, Integer processingStatus,
String eventLevel, String createDate, String warningSourceType); String eventLevel, String createDate,String startTime,String endTime, String warningSourceType,String overView);
/** /**
* 预警信息总数 * 预警信息总数
* *
* @return 预警信息总数 * @return 预警信息总数
*/ */
Long queryWarningCount(Integer processingStatus, String eventLevel, String createDate, String warningSourceType); Long queryWarningCount(Integer processingStatus, String eventLevel, String createDate,String startTime,String endTime, String warningSourceType,String overView);
/** /**
* 问题信息列表 * 问题信息列表
* *
* @return 问题信息列表 * @return 问题信息列表
*/ */
Page<Map<String, Object>> queryQuestionPage(Page<Map<String, Object>> page, Integer completionStatus); Page<Map<String, Object>> queryQuestionPage(Page<Map<String, Object>> page, Integer completionStatus, String startTime, String endTime);
/** /**
* 问题信息列表 * 问题信息列表
* *
* @return 问题信息列表 * @return 问题信息列表
*/ */
Long queryQuestionCount(Integer completionStatus); Long queryQuestionCount(Integer completionStatus, String startTime, String endTime);
/** /**
* 获取地图点位/路线 * 获取地图点位/路线
...@@ -94,4 +94,7 @@ public interface IMcbWarningService { ...@@ -94,4 +94,7 @@ public interface IMcbWarningService {
Object getLampListByCodes(String questionRectificationStatus, String warningSourceType, String objectName); Object getLampListByCodes(String questionRectificationStatus, String warningSourceType, String objectName);
List<Map<String, Object>> stationOverNum();
Object stationOverTotal(String province);
} }
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/warning/McbWarningMapper.xml
View file @ eef4856f
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
LEFT JOIN amos_mcb.mcb_warning_base_source_attribution source ON source.CODE = log.SOURCE_ATTRIBUTION LEFT JOIN amos_mcb.mcb_warning_base_source_attribution source ON source.CODE = log.SOURCE_ATTRIBUTION
<where> <where>
date(log.CREATE_DATE) = CURRENT_DATE date(log.CREATE_DATE) = CURRENT_DATE
and WARNING_SOURCE_TYPE_CODE in (SELECT code FROM amos_mcb.mcb_data_dictionary WHERE remark = 'OVERVIEW' )
<if test="projectOrgCodes != null and projectOrgCodes.size() > 0"> <if test="projectOrgCodes != null and projectOrgCodes.size() > 0">
AND SOURCE_ATTRIBUTION IN AND SOURCE_ATTRIBUTION IN
<foreach collection="projectOrgCodes" item="item" open="(" separator="," close=")"> <foreach collection="projectOrgCodes" item="item" open="(" separator="," close=")">
...@@ -23,49 +24,79 @@ ...@@ -23,49 +24,79 @@
</select> </select>
<select id="queryWeekCount" resultType="java.util.Map"> <select id="queryWeekCount" resultType="java.util.Map">
<!-- SELECT-->
<!-- DATE_FORMAT(b.alarmDate, '%m/%d') AS axisData,-->
<!-- b.code AS code,-->
<!-- b.province AS province,-->
<!-- IFNULL(count(log.SEQUENCE_NBR), 0) AS seriesData-->
<!-- FROM-->
<!-- (-->
<!-- SELECT-->
<!-- source.CODE AS code,-->
<!-- a.DATE AS alarmDate,-->
<!-- source.PROVINCE AS province-->
<!-- FROM-->
<!-- amos_mcb.mcb_warning_base_source_attribution source,-->
<!-- (-->
<!-- SELECT CURDATE() AS date-->
<!-- UNION ALL-->
<!-- SELECT DATE_SUB( CURDATE(), INTERVAL 1 DAY ) AS date-->
<!-- UNION ALL-->
<!-- SELECT DATE_SUB( CURDATE(), INTERVAL 2 DAY ) AS date-->
<!-- UNION ALL-->
<!-- SELECT DATE_SUB( CURDATE(), INTERVAL 3 DAY ) AS date-->
<!-- UNION ALL-->
<!-- SELECT DATE_SUB( CURDATE(), INTERVAL 4 DAY ) AS date-->
<!-- UNION ALL-->
<!-- SELECT DATE_SUB( CURDATE(), INTERVAL 5 DAY ) AS date-->
<!-- UNION ALL-->
<!-- SELECT DATE_SUB( CURDATE(), INTERVAL 6 DAY ) AS date-->
<!-- ) a-->
<!-- ) b-->
<!-- LEFT JOIN amos_mcb.mcb_warning_warning_info log ON date(log.CREATE_DATE) = b.alarmDate AND log.SOURCE_ATTRIBUTION = b.CODE-->
<!-- <where>-->
<!-- <if test="projectOrgCodes != null and projectOrgCodes.size() > 0">-->
<!-- AND b.CODE IN-->
<!-- <foreach collection="projectOrgCodes" item="item" open="(" separator="," close=")">-->
<!-- #{item}-->
<!-- </foreach>-->
<!-- </if>-->
<!-- </where>-->
<!-- GROUP BY-->
<!--&#45;&#45; b.code,-->
<!-- b.alarmDate-->
<!-- ORDER BY-->
<!-- b.alarmDate ASC-->
SELECT SELECT
DATE_FORMAT(b.alarmDate, '%m/%d') AS axisData, a.date as axisData ,
b.code AS code, IFNULL(b.seriesData,0) as seriesData
b.province AS province,
IFNULL(count(log.SEQUENCE_NBR), 0) AS seriesData
FROM FROM
( (
SELECT SELECT
source.CODE AS code, CURDATE( ) AS date UNION ALL
a.DATE AS alarmDate, SELECT
source.PROVINCE AS province DATE_SUB( CURDATE( ), INTERVAL 1 DAY ) AS date UNION ALL
FROM SELECT
amos_mcb.mcb_warning_base_source_attribution source, DATE_SUB( CURDATE( ), INTERVAL 2 DAY ) AS date UNION ALL
( SELECT
SELECT CURDATE() AS date DATE_SUB( CURDATE( ), INTERVAL 3 DAY ) AS date UNION ALL
UNION ALL SELECT
SELECT DATE_SUB( CURDATE(), INTERVAL 1 DAY ) AS date DATE_SUB( CURDATE( ), INTERVAL 4 DAY ) AS date UNION ALL
UNION ALL SELECT
SELECT DATE_SUB( CURDATE(), INTERVAL 2 DAY ) AS date DATE_SUB( CURDATE( ), INTERVAL 5 DAY ) AS date UNION ALL
UNION ALL SELECT
SELECT DATE_SUB( CURDATE(), INTERVAL 3 DAY ) AS date DATE_SUB( CURDATE( ), INTERVAL 6 DAY ) AS date
UNION ALL ) a
SELECT DATE_SUB( CURDATE(), INTERVAL 4 DAY ) AS date LEFT JOIN (SELECT
UNION ALL IFNULL( count( log.SEQUENCE_NBR ), 0 ) AS seriesData,
SELECT DATE_SUB( CURDATE(), INTERVAL 5 DAY ) AS date date( log.CREATE_DATE ) AS axisData
UNION ALL FROM
SELECT DATE_SUB( CURDATE(), INTERVAL 6 DAY ) AS date amos_mcb.mcb_warning_warning_info log
) a WHERE
) b log.WARNING_SOURCE_TYPE_CODE IN ( SELECT CODE FROM amos_mcb.mcb_data_dictionary WHERE remark = 'OVERVIEW' )
LEFT JOIN amos_mcb.mcb_warning_warning_info log ON date(log.CREATE_DATE) = b.alarmDate AND log.SOURCE_ATTRIBUTION = b.CODE AND date( log.CREATE_DATE ) >= CURDATE( ) - INTERVAL 7 DAY
<where> GROUP BY
<if test="projectOrgCodes != null and projectOrgCodes.size() > 0"> date( log.CREATE_DATE )) b ON a.date = b.axisData
AND b.CODE IN
<foreach collection="projectOrgCodes" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</where>
GROUP BY
-- b.code,
b.alarmDate
ORDER BY
b.alarmDate ASC
</select> </select>
<select id="queryWarningList" resultType="java.util.Map"> <select id="queryWarningList" resultType="java.util.Map">
...@@ -101,9 +132,18 @@ ...@@ -101,9 +132,18 @@
AND log.CREATE_DATE &gt;= concat(#{createDate}, ' 00:00:00') AND log.CREATE_DATE &gt;= concat(#{createDate}, ' 00:00:00')
AND log.CREATE_DATE &lt;= concat(#{createDate}, ' 23:59:59') AND log.CREATE_DATE &lt;= concat(#{createDate}, ' 23:59:59')
</if> </if>
<if test="startTime != null and startTime != ''">
AND log.CREATE_DATE &gt;= concat(#{startTime}, ' 00:00:00')
</if>
<if test="endTime != null and endTime != ''">
AND log.CREATE_DATE &lt;= concat(#{endTime}, ' 23:59:59')
</if>
<if test="warningSourceType != null and warningSourceType != ''"> <if test="warningSourceType != null and warningSourceType != ''">
AND log.WARNING_SOURCE_TYPE = #{warningSourceType} AND log.WARNING_SOURCE_TYPE = #{warningSourceType}
</if> </if>
<if test="overView != null and overView != ''">
AND log.WARNING_SOURCE_TYPE_CODE IN (select code from mcb_data_dictionary where remark = 'OVERVIEW')
</if>
</where> </where>
ORDER BY ORDER BY
log.CREATE_DATE DESC log.CREATE_DATE DESC
...@@ -134,9 +174,18 @@ ...@@ -134,9 +174,18 @@
AND log.CREATE_DATE &gt;= concat(#{createDate}, ' 00:00:00') AND log.CREATE_DATE &gt;= concat(#{createDate}, ' 00:00:00')
AND log.CREATE_DATE &lt;= concat(#{createDate}, ' 23:59:59') AND log.CREATE_DATE &lt;= concat(#{createDate}, ' 23:59:59')
</if> </if>
<if test="startTime != null and startTime != ''">
AND log.CREATE_DATE &gt;= concat(#{startTime}, ' 00:00:00')
</if>
<if test="endTime != null and endTime != ''">
AND log.CREATE_DATE &lt;= concat(#{endTime}, ' 23:59:59')
</if>
<if test="warningSourceType != null and warningSourceType != ''"> <if test="warningSourceType != null and warningSourceType != ''">
AND log.WARNING_SOURCE_TYPE = #{warningSourceType} AND log.WARNING_SOURCE_TYPE = #{warningSourceType}
</if> </if>
<if test="overView != null and overView != ''">
AND log.WARNING_SOURCE_TYPE_CODE IN (select code from mcb_data_dictionary where remark = 'OVERVIEW')
</if>
</where> </where>
</select> </select>
...@@ -149,10 +198,19 @@ ...@@ -149,10 +198,19 @@
question.SOURCE_ATTRIBUTION_DESC, question.SOURCE_ATTRIBUTION_DESC,
question.SOURCE_ATTRIBUTION, question.SOURCE_ATTRIBUTION,
question.CONTENT, question.CONTENT,
question.LEVEL_DESC,
source.PROVINCE source.PROVINCE
FROM FROM
amos_mcb.mcb_warning_question_info question (SELECT
LEFT JOIN amos_mcb.mcb_warning_base_source_attribution source ON source.CODE = question.SOURCE_ATTRIBUTION QUESTION_NUM
FROM
amos_mcb.mcb_warning_warning_info
WHERE
mcb_warning_warning_info.PROCESSING_STATUS = 2
AND QUESTION_NUM IS NOT NULL
AND mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE IN ( SELECT CODE FROM amos_mcb.mcb_data_dictionary WHERE remark = 'OVERVIEW' )
) warnNum LEFT join amos_mcb.mcb_warning_question_info question on question.NUM = warnNum.QUESTION_NUM
LEFT JOIN amos_mcb.mcb_warning_base_source_attribution source ON source.CODE = question.SOURCE_ATTRIBUTION
<where> <where>
<if test="projectOrgCodes != null and projectOrgCodes.size() > 0"> <if test="projectOrgCodes != null and projectOrgCodes.size() > 0">
AND question.SOURCE_ATTRIBUTION IN AND question.SOURCE_ATTRIBUTION IN
...@@ -163,6 +221,12 @@ ...@@ -163,6 +221,12 @@
<if test="completionStatus != null"> <if test="completionStatus != null">
AND question.COMPLETION_STATUS = #{completionStatus} AND question.COMPLETION_STATUS = #{completionStatus}
</if> </if>
<if test="startTime != null and startTime != ''">
AND question.CREATE_DATE &gt;= concat(#{startTime}, ' 00:00:00')
</if>
<if test="endTime != null and endTime != ''">
AND question.CREATE_DATE &lt;= concat(#{endTime}, ' 23:59:59')
</if>
</where> </where>
ORDER BY ORDER BY
question.REC_DATE DESC question.REC_DATE DESC
...@@ -170,11 +234,19 @@ ...@@ -170,11 +234,19 @@
</select> </select>
<select id="queryQuestionCount" resultType="java.lang.Long"> <select id="queryQuestionCount" resultType="java.lang.Long">
SELECT select
count(*) count(*)
FROM FROM
amos_mcb.mcb_warning_question_info question (SELECT
LEFT JOIN amos_mcb.mcb_warning_base_source_attribution source ON source.CODE = question.SOURCE_ATTRIBUTION QUESTION_NUM
FROM
amos_mcb.mcb_warning_warning_info
WHERE
mcb_warning_warning_info.PROCESSING_STATUS = 2
AND QUESTION_NUM IS NOT NULL
AND mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE IN ( SELECT CODE FROM amos_mcb.mcb_data_dictionary WHERE remark = 'OVERVIEW' )
) warnNum LEFT join amos_mcb.mcb_warning_question_info question on question.NUM = warnNum.QUESTION_NUM
LEFT JOIN amos_mcb.mcb_warning_base_source_attribution source ON source.CODE = question.SOURCE_ATTRIBUTION
<where> <where>
<if test="projectOrgCodes != null and projectOrgCodes.size() > 0"> <if test="projectOrgCodes != null and projectOrgCodes.size() > 0">
AND question.SOURCE_ATTRIBUTION IN AND question.SOURCE_ATTRIBUTION IN
...@@ -185,6 +257,93 @@ ...@@ -185,6 +257,93 @@
<if test="completionStatus != null"> <if test="completionStatus != null">
AND question.COMPLETION_STATUS = #{completionStatus} AND question.COMPLETION_STATUS = #{completionStatus}
</if> </if>
<if test="startTime != null and startTime != ''">
AND question.CREATE_DATE &gt;= concat(#{startTime}, ' 00:00:00')
</if>
<if test="endTime != null and endTime != ''">
AND question.CREATE_DATE &lt;= concat(#{endTime}, ' 23:59:59')
</if>
</where> </where>
</select> </select>
<select id="stationOverNum" resultType="map">
WITH
SubQuery AS (
SELECT
SOURCE_ATTRIBUTION,
SUM(IFNULL(RPN, 0)) AS totalRPN,
COUNT(SEQUENCE_NBR) AS todayAlarm
FROM
amos_mcb.mcb_warning_warning_info
WHERE
date(CREATE_DATE) = CURRENT_DATE and mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE in (select code FROM amos_mcb.mcb_data_dictionary WHERE remark = 'OVERVIEW')
GROUP BY
SOURCE_ATTRIBUTION
)
SELECT
a.SEQUENCE_NBR AS sequenceNbr,
COALESCE(a.NAME, '') AS `name`,
COALESCE(a.CODE, '') AS `code`,
COALESCE(a.PARENT_ID, '') AS parentId,
COALESCE(a.LONGITUDE, '') AS longitude,
COALESCE(a.LATITUDE, '') AS latitude,
COALESCE(a.PROVINCE, '') AS province,
COALESCE(a.LINK_SOURCE_ATTRIBUTION_ID, '') AS linkSourceAttributionId,
COALESCE(a.MAP_URL, '') AS mapUrl,
COALESCE(sq.totalRPN / NULLIF(COUNT(b.SOURCE_ATTRIBUTION), 0), 0) AS rpn,
IFNULL(sq.todayAlarm,0) as todayAlarm
FROM
amos_mcb.mcb_warning_base_source_attribution a
LEFT JOIN
SubQuery sq ON a.CODE = sq.SOURCE_ATTRIBUTION
LEFT JOIN
amos_mcb.mcb_warning_warning_info b ON a.CODE = b.SOURCE_ATTRIBUTION AND date(b.CREATE_DATE) = CURRENT_DATE
GROUP BY
a.CODE, a.SEQUENCE_NBR, sq.totalRPN, sq.todayAlarm
</select>
<select id="getYearTotal" resultType="integer">
SELECT
count( 1 ) AS yearNum
FROM
amos_mcb.mcb_warning_warning_info
Left join mcb_warning_base_source_attribution mwbsa on mwbsa.`CODE` = mcb_warning_warning_info.SOURCE_ATTRIBUTION
WHERE
YEAR(CREATE_DATE) = YEAR(CURDATE())
<if test="province != null and province != '' ">
and mwbsa.PROVINCE LIKE CONCAT (#{province},'%')
</if>
and mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE in (select code FROM amos_mcb.mcb_data_dictionary WHERE remark = 'OVERVIEW')
</select>
<select id="getMonthTotal" resultType="integer">
SELECT
count( 1 ) AS monNum
FROM
amos_mcb.mcb_warning_warning_info
Left join mcb_warning_base_source_attribution mwbsa on mwbsa.`CODE` = mcb_warning_warning_info.SOURCE_ATTRIBUTION
WHERE
MONTH(CREATE_DATE) = MONTH(CURDATE())
<if test="province != null and province != '' ">
and mwbsa.PROVINCE LIKE CONCAT (#{province},'%')
</if>
and mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE in (select code FROM amos_mcb.mcb_data_dictionary WHERE remark = 'OVERVIEW')
</select>
<select id="getDayTotal" resultType="integer">
SELECT
count( 1 ) AS dayNUM ,
mwbsa.PROVINCE
FROM
amos_mcb.mcb_warning_warning_info
Left join mcb_warning_base_source_attribution mwbsa on mwbsa.`CODE` = mcb_warning_warning_info.SOURCE_ATTRIBUTION
WHERE
DATE_FORMAT(CREATE_DATE,'%Y-%m-%d') = CURDATE()
<if test="province != null and province != '' ">
and mwbsa.PROVINCE LIKE CONCAT (#{province},'%')
</if>
and mcb_warning_warning_info.WARNING_SOURCE_TYPE_CODE in (select code FROM amos_mcb.mcb_data_dictionary WHERE remark = 'OVERVIEW')
</select>
</mapper> </mapper>
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/McbWarningController.java
View file @ eef4856f
...@@ -63,10 +63,13 @@ public class McbWarningController { ...@@ -63,10 +63,13 @@ public class McbWarningController {
@RequestParam(value = "processingStatus", required = false) Integer processingStatus, @RequestParam(value = "processingStatus", required = false) Integer processingStatus,
@RequestParam(value = "eventLevel", required = false) String eventLevel, @RequestParam(value = "eventLevel", required = false) String eventLevel,
@RequestParam(value = "createDate", required = false) String createDate, @RequestParam(value = "createDate", required = false) String createDate,
@RequestParam(value = "startTime", required = false) String startTime,
@RequestParam(value = "endTime", required = false) String endTime,
@RequestParam(value = "overView", required = false) String overView,
@RequestParam(value = "warningSourceType", required = false) String warningSourceType) { @RequestParam(value = "warningSourceType", required = false) String warningSourceType) {
Page<Map<String, Object>> page = new Page<>(pageNumber, pageSize); Page<Map<String, Object>> page = new Page<>(pageNumber, pageSize);
return ResponseHelper.buildResponse( return ResponseHelper.buildResponse(
mcbWarningService.queryWarningPage(page, processingStatus, eventLevel, createDate, warningSourceType)); mcbWarningService.queryWarningPage(page, processingStatus, eventLevel, createDate, startTime,endTime, warningSourceType,overView));
} }
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
...@@ -76,8 +79,11 @@ public class McbWarningController { ...@@ -76,8 +79,11 @@ public class McbWarningController {
@RequestParam(value = "processingStatus", required = false) Integer processingStatus, @RequestParam(value = "processingStatus", required = false) Integer processingStatus,
@RequestParam(value = "eventLevel", required = false) String eventLevel, @RequestParam(value = "eventLevel", required = false) String eventLevel,
@RequestParam(value = "createDate", required = false) String createDate, @RequestParam(value = "createDate", required = false) String createDate,
@RequestParam(value = "startTime", required = false) String startTime,
@RequestParam(value = "endTime", required = false) String endTime,
@RequestParam(value = "overView", required = false) String overView,
@RequestParam(value = "warningSourceType", required = false) String warningSourceType) { @RequestParam(value = "warningSourceType", required = false) String warningSourceType) {
Long count = mcbWarningService.queryWarningCount(processingStatus, eventLevel, createDate, warningSourceType); Long count = mcbWarningService.queryWarningCount(processingStatus, eventLevel,createDate, startTime,endTime, warningSourceType,overView);
Map<String, Object> result = new HashMap<String, Object>() { Map<String, Object> result = new HashMap<String, Object>() {
{ {
this.put("count", count); this.put("count", count);
...@@ -92,9 +98,12 @@ public class McbWarningController { ...@@ -92,9 +98,12 @@ public class McbWarningController {
public ResponseModel<Page<Map<String, Object>>> queryQuestionList( public ResponseModel<Page<Map<String, Object>>> queryQuestionList(
@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber, @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
@RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize, @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize,
@RequestParam(value = "completionStatus", required = false) Integer completionStatus) { @RequestParam(value = "completionStatus", required = false) Integer completionStatus,
@RequestParam(value = "startTime", required = false) String startTime,
@RequestParam(value = "endTime", required = false) String endTime
) {
Page<Map<String, Object>> page = new Page<>(pageNumber, pageSize); Page<Map<String, Object>> page = new Page<>(pageNumber, pageSize);
return ResponseHelper.buildResponse(mcbWarningService.queryQuestionPage(page, completionStatus)); return ResponseHelper.buildResponse(mcbWarningService.queryQuestionPage(page, completionStatus,startTime,endTime));
} }
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
...@@ -136,8 +145,12 @@ public class McbWarningController { ...@@ -136,8 +145,12 @@ public class McbWarningController {
@ApiOperation(httpMethod = "GET", value = "[监测总览]问题总数", notes = "[监测总览]问题总数") @ApiOperation(httpMethod = "GET", value = "[监测总览]问题总数", notes = "[监测总览]问题总数")
@GetMapping(value = "/question/count") @GetMapping(value = "/question/count")
public ResponseModel<Map<String, Object>> queryQuestionCount( public ResponseModel<Map<String, Object>> queryQuestionCount(
@RequestParam(value = "completionStatus", required = false) Integer completionStatus) { @RequestParam(value = "completionStatus", required = false) Integer completionStatus,
Long count = mcbWarningService.queryQuestionCount(completionStatus); @RequestParam(value = "startTime", required = false) String startTime,
@RequestParam(value = "endTime", required = false) String endTime
) {
Long count = mcbWarningService.queryQuestionCount(completionStatus,startTime,endTime);
Map<String, Object> result = new HashMap<String, Object>() { Map<String, Object> result = new HashMap<String, Object>() {
{ {
this.put("count", count); this.put("count", count);
...@@ -180,4 +193,19 @@ public class McbWarningController { ...@@ -180,4 +193,19 @@ public class McbWarningController {
@RequestParam(value = "objectName", required = false) String objectName) { @RequestParam(value = "objectName", required = false) String objectName) {
return ResponseHelper.buildResponse(mcbWarningService.getLampListByCodes(questionRectificationStatus,warningSourceType,objectName)); return ResponseHelper.buildResponse(mcbWarningService.getLampListByCodes(questionRectificationStatus,warningSourceType,objectName));
} }
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "GET", value = "任务总览-地图接口", notes = "任务总览-地图接口")
@GetMapping(value = "/warning-warning-info/stationOverNum")
public ResponseModel<Object> stationOverNum() {
return ResponseHelper.buildResponse(mcbWarningService.stationOverNum());
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "GET", value = "任务总览-地图接口", notes = "任务总览-地图接口")
@GetMapping(value = "/warning-warning-info/stationOverTotal")
public ResponseModel<Object> stationOverTotal(String province) {
return ResponseHelper.buildResponse(mcbWarningService.stationOverTotal(province));
}
} }
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mcbwarningmapper/McbWarningMapper.java
View file @ eef4856f
...@@ -40,7 +40,10 @@ public interface McbWarningMapper extends BaseMapper { ...@@ -40,7 +40,10 @@ public interface McbWarningMapper extends BaseMapper {
@Param("processingStatus") Integer processingStatus, @Param("processingStatus") Integer processingStatus,
@Param("eventLevel") String eventLevel, @Param("eventLevel") String eventLevel,
@Param("createDate") String createDate, @Param("createDate") String createDate,
@Param("warningSourceType") String warningSourceType @Param("startTime") String startTime,
@Param("endTime") String endTime,
@Param("warningSourceType") String warningSourceType,
@Param("overView") String overView
); );
/** /**
...@@ -53,7 +56,10 @@ public interface McbWarningMapper extends BaseMapper { ...@@ -53,7 +56,10 @@ public interface McbWarningMapper extends BaseMapper {
@Param("processingStatus") Integer processingStatus, @Param("processingStatus") Integer processingStatus,
@Param("eventLevel") String eventLevel, @Param("eventLevel") String eventLevel,
@Param("createDate") String createDate, @Param("createDate") String createDate,
@Param("warningSourceType") String warningSourceType @Param("startTime") String startTime,
@Param("endTime") String endTime,
@Param("warningSourceType") String warningSourceType,
@Param("overView") String overView
); );
/** /**
...@@ -65,9 +71,14 @@ public interface McbWarningMapper extends BaseMapper { ...@@ -65,9 +71,14 @@ public interface McbWarningMapper extends BaseMapper {
@Param("start") Long start, @Param("start") Long start,
@Param("offset") Long offset, @Param("offset") Long offset,
@Param("projectOrgCodes") List<String> projectOrgCodes, @Param("projectOrgCodes") List<String> projectOrgCodes,
@Param("completionStatus") Integer completionStatus @Param("completionStatus") Integer completionStatus,
@Param("startTime") String startTime,
@Param("endTime") String endTime
); );
List<Map<String, Object>> stationOverNum();
/** /**
* 问题总数 * 问题总数
* *
...@@ -75,6 +86,12 @@ public interface McbWarningMapper extends BaseMapper { ...@@ -75,6 +86,12 @@ public interface McbWarningMapper extends BaseMapper {
*/ */
Long queryQuestionCount( Long queryQuestionCount(
@Param("projectOrgCodes") List<String> projectOrgCodes, @Param("projectOrgCodes") List<String> projectOrgCodes,
@Param("completionStatus") Integer completionStatus @Param("completionStatus") Integer completionStatus,
@Param("startTime") String startTime,
@Param("endTime") String endTime
); );
Integer getYearTotal(String province);
Integer getMonthTotal(String province);
Integer getDayTotal(String province);
} }
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/McbWarningServiceImpl.java
View file @ eef4856f
...@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.module.jxiop.api.service.IPermissionService; ...@@ -10,6 +10,7 @@ import com.yeejoin.amos.boot.module.jxiop.api.service.IPermissionService;
import com.yeejoin.amos.boot.module.jxiop.biz.mcbwarningmapper.McbWarningMapper; import com.yeejoin.amos.boot.module.jxiop.biz.mcbwarningmapper.McbWarningMapper;
import com.yeejoin.amos.component.feign.model.FeignClientResult; import com.yeejoin.amos.component.feign.model.FeignClientResult;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -71,7 +72,7 @@ public class McbWarningServiceImpl implements IMcbWarningService { ...@@ -71,7 +72,7 @@ public class McbWarningServiceImpl implements IMcbWarningService {
*/ */
@Override @Override
public Page<Map<String, Object>> queryWarningPage(Page<Map<String, Object>> page, Integer processingStatus, public Page<Map<String, Object>> queryWarningPage(Page<Map<String, Object>> page, Integer processingStatus,
String eventLevel, String createDate, String warningSourceType) { String eventLevel, String createDate,String startTime,String endTime, String warningSourceType,String overView) {
List<String> projectOrgCodes = this.getProjectOrgCodes(); List<String> projectOrgCodes = this.getProjectOrgCodes();
long start = page.getCurrent() - 1; long start = page.getCurrent() - 1;
long offset = page.getSize() * page.getCurrent(); long offset = page.getSize() * page.getCurrent();
...@@ -79,9 +80,9 @@ public class McbWarningServiceImpl implements IMcbWarningService { ...@@ -79,9 +80,9 @@ public class McbWarningServiceImpl implements IMcbWarningService {
projectOrgCodes.add("NULL"); projectOrgCodes.add("NULL");
} }
List<Map<String, Object>> records = mcbWarningMapper.queryWarningList(start, offset, projectOrgCodes, List<Map<String, Object>> records = mcbWarningMapper.queryWarningList(start, offset, projectOrgCodes,
processingStatus, eventLevel, createDate, warningSourceType); processingStatus, eventLevel, createDate,startTime,endTime, warningSourceType,overView);
Long total = mcbWarningMapper.queryWarningCount(projectOrgCodes, processingStatus, eventLevel, createDate, Long total = mcbWarningMapper.queryWarningCount(projectOrgCodes, processingStatus, eventLevel, createDate,startTime,endTime,
warningSourceType); warningSourceType,overView);
page.setRecords(records); page.setRecords(records);
page.setTotal(total); page.setTotal(total);
return page; return page;
...@@ -94,14 +95,14 @@ public class McbWarningServiceImpl implements IMcbWarningService { ...@@ -94,14 +95,14 @@ public class McbWarningServiceImpl implements IMcbWarningService {
* @return 预警信息总数 * @return 预警信息总数
*/ */
@Override @Override
public Long queryWarningCount(Integer processingStatus, String eventLevel, String createDate, public Long queryWarningCount(Integer processingStatus, String eventLevel, String createDate,String startTime,String endTime,
String warningSourceType) { String warningSourceType,String overView) {
List<String> projectOrgCodes = this.getProjectOrgCodes(); List<String> projectOrgCodes = this.getProjectOrgCodes();
if (projectOrgCodes.isEmpty()) { if (projectOrgCodes.isEmpty()) {
projectOrgCodes.add("NULL"); projectOrgCodes.add("NULL");
} }
return mcbWarningMapper.queryWarningCount(projectOrgCodes, processingStatus, eventLevel, createDate, return mcbWarningMapper.queryWarningCount(projectOrgCodes, processingStatus, eventLevel, createDate,startTime,endTime,
warningSourceType); warningSourceType,overView);
} }
/** /**
...@@ -112,7 +113,7 @@ public class McbWarningServiceImpl implements IMcbWarningService { ...@@ -112,7 +113,7 @@ public class McbWarningServiceImpl implements IMcbWarningService {
* @return 问题信息列表 * @return 问题信息列表
*/ */
@Override @Override
public Page<Map<String, Object>> queryQuestionPage(Page<Map<String, Object>> page, Integer completionStatus) { public Page<Map<String, Object>> queryQuestionPage(Page<Map<String, Object>> page, Integer completionStatus, String startTime, String endTime) {
List<String> projectOrgCodes = this.getProjectOrgCodes(); List<String> projectOrgCodes = this.getProjectOrgCodes();
long start = page.getCurrent() - 1; long start = page.getCurrent() - 1;
long offset = page.getSize() * page.getCurrent(); long offset = page.getSize() * page.getCurrent();
...@@ -120,8 +121,8 @@ public class McbWarningServiceImpl implements IMcbWarningService { ...@@ -120,8 +121,8 @@ public class McbWarningServiceImpl implements IMcbWarningService {
projectOrgCodes.add("NULL"); projectOrgCodes.add("NULL");
} }
List<Map<String, Object>> records = mcbWarningMapper.queryQuestionList(start, offset, projectOrgCodes, List<Map<String, Object>> records = mcbWarningMapper.queryQuestionList(start, offset, projectOrgCodes,
completionStatus); completionStatus,startTime,endTime);
Long total = mcbWarningMapper.queryQuestionCount(projectOrgCodes, completionStatus); Long total = mcbWarningMapper.queryQuestionCount(projectOrgCodes, completionStatus,startTime,endTime);
page.setRecords(records); page.setRecords(records);
page.setTotal(total); page.setTotal(total);
return page; return page;
...@@ -134,12 +135,12 @@ public class McbWarningServiceImpl implements IMcbWarningService { ...@@ -134,12 +135,12 @@ public class McbWarningServiceImpl implements IMcbWarningService {
* @return 问题信息列表 * @return 问题信息列表
*/ */
@Override @Override
public Long queryQuestionCount(Integer completionStatus) { public Long queryQuestionCount(Integer completionStatus, String startTime, String endTime) {
List<String> projectOrgCodes = this.getProjectOrgCodes(); List<String> projectOrgCodes = this.getProjectOrgCodes();
if (projectOrgCodes.isEmpty()) { if (projectOrgCodes.isEmpty()) {
projectOrgCodes.add("NULL"); projectOrgCodes.add("NULL");
} }
return mcbWarningMapper.queryQuestionCount(projectOrgCodes, completionStatus); return mcbWarningMapper.queryQuestionCount(projectOrgCodes, completionStatus,startTime,endTime);
} }
/** /**
...@@ -310,4 +311,20 @@ public class McbWarningServiceImpl implements IMcbWarningService { ...@@ -310,4 +311,20 @@ public class McbWarningServiceImpl implements IMcbWarningService {
return projectOrgCodes; return projectOrgCodes;
} }
public List<Map<String, Object>> stationOverNum(){
return mcbWarningMapper.stationOverNum();
}
public Map<String,Object> stationOverTotal(String province){
Map<String, Object> map = new HashMap<>();
map.put("dayNum",mcbWarningMapper.getDayTotal(province));
map.put("monNum",mcbWarningMapper.getMonthTotal(province));
map.put("yearNum",mcbWarningMapper.getYearTotal(province));
return map;
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment