添加总览页面处置动态接口

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/OverviewQuestionDto.java

+package com.yeejoin.amos.boot.module.jxiop.api.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class OverviewQuestionDto {
+    @ApiModelProperty(value = "预警id")
+    private String warningId;
+
+    @ApiModelProperty(value = "问题创建时间")
+    private String createDate;
+
+    @ApiModelProperty(value = "问题内容")
+    private String content;
+
+    @ApiModelProperty(value = "问题完成情况描述")
+    private String completionStatusDesc;
+
+    @ApiModelProperty(value = "来源场站")
+    private String sourceAttributionDesc;
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/service/IMcbWarningService.java

 package com.yeejoin.amos.boot.module.jxiop.api.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.OverviewQuestionDto;
 
 import java.util.List;
 import java.util.Map;
@@ -30,6 +31,9 @@ public interface IMcbWarningService {
 	Page<Map<String, Object>> queryWarningPage(Page<Map<String, Object>> page, Integer processingStatus,
 			String eventLevel, String createDate,String startTime,String endTime, String warningSourceType,String overView);
 
+
+	Page<OverviewQuestionDto> overviewQuestionList(Integer current, Integer size, String startTime, String endTime);
+
 	/**
 	 * 预警信息总数
 	 *

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/warning/McbWarningMapper.xml

@@ -189,6 +189,37 @@
         </where>
     </select>
 
+    <select id="overviewQuestionList" resultType="com.yeejoin.amos.boot.module.jxiop.api.dto.OverviewQuestionDto">
+        SELECT
+        warning.SEQUENCE_NBR warningId,
+        question.CREATE_DATE createDate,
+        question.CONTENT content,
+        question.COMPLETION_STATUS_DESC completionStatusDesc,
+        question.SOURCE_ATTRIBUTION_DESC sourceAttributionDesc
+        FROM
+        mcb_warning_question_info question,
+        mcb_warning_warning_info warning
+        <where>
+            question.NUM IS NOT NULL
+            AND question.NUM = warning.QUESTION_NUM
+            AND question.COMPLETION_STATUS != '1'
+            AND warning.WARNING_SOURCE_TYPE in (select mcb_data_dictionary.name from mcb_data_dictionary WHERE mcb_data_dictionary.remark = 'OVERVIEW' )
+            <if test="startTime != null and startTime != ''">
+                AND question.CREATE_DATE >= #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND question.CREATE_DATE &lt;= #{endTime}
+            </if>
+            <if test="projectOrgCodes != null and projectOrgCodes.size() > 0">
+                AND question.SOURCE_ATTRIBUTION IN
+                <foreach collection="projectOrgCodes" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        ORDER BY question.CREATE_DATE DESC
+    </select>
+
     <select id="queryQuestionList" resultType="java.util.Map">
         SELECT
             question.SEQUENCE_NBR,

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/McbWarningController.java

 package com.yeejoin.amos.boot.module.jxiop.biz.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.OverviewQuestionDto;
 import com.yeejoin.amos.boot.module.jxiop.api.service.IMcbWarningService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -72,6 +73,26 @@ public class McbWarningController {
 				mcbWarningService.queryWarningPage(page, processingStatus, eventLevel, createDate, startTime,endTime,  warningSourceType,overView));
 	}
 
+	/**
+	 * 总览页面问题记录(只显示物联告警/风电(光伏只能分析)的数据)
+	 * @param current 页码
+	 * @param size  条数
+	 * @param startTime 开始时间
+	 * @param endTime   结束时间
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@GetMapping(value = "/warning-question-info/overviewQuestionList")
+	@ApiOperation(httpMethod = "GET", value = "总览页面问题记录表分页查询", notes = "总览页面问题记录表分页查询")
+	public ResponseModel<Page<OverviewQuestionDto>> overviewQuestionList(
+			@RequestParam(value = "current", defaultValue = "1") Integer current,
+			@RequestParam(value = "size", defaultValue = "20") Integer size,
+			@RequestParam(required = false) String startTime,
+			@RequestParam(required = false) String endTime
+	) {
+		return ResponseHelper.buildResponse(mcbWarningService.overviewQuestionList(current, size, startTime,endTime));
+	}
+
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "GET", value = "[监测总览]预警信息总数", notes = "[监测总览]预警信息总数")
 	@GetMapping(value = "/warning/count")

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mcbwarningmapper/McbWarningMapper.java

 package com.yeejoin.amos.boot.module.jxiop.biz.mcbwarningmapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.OverviewQuestionDto;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -46,6 +47,13 @@ public interface McbWarningMapper extends BaseMapper {
             @Param("overView") String overView
     );
 
+
+    List<OverviewQuestionDto> overviewQuestionList(
+            @Param("projectOrgCodes") List<String> projectOrgCodes,
+            @Param("startTime") String startTime,
+            @Param("endTime") String endTime
+    );
+
     /**
      * 预警总数
      *

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/McbWarningServiceImpl.java

@@ -3,6 +3,9 @@ package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.OverviewQuestionDto;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.RectificationUnitClassifyTreeDto;
 import com.yeejoin.amos.boot.module.jxiop.api.feign.McbWarningFeign;
 import com.yeejoin.amos.boot.module.jxiop.api.service.IMcbWarningService;
@@ -88,6 +91,32 @@ public class McbWarningServiceImpl implements IMcbWarningService {
 		return page;
 	}
 
+	@Override
+	public Page<OverviewQuestionDto> overviewQuestionList(Integer current, Integer size, String startTime, String endTime) {
+		List<String> projectOrgCodes = this.getProjectOrgCodes();
+
+
+		if(startTime!=null && startTime != "") {
+			startTime+= " 00:00:00";
+		}
+
+		if(endTime!=null && endTime != "") {
+			endTime+= " 23:59:59";
+		}
+
+
+		PageHelper.startPage(current, size);
+		List<OverviewQuestionDto> list = mcbWarningMapper.overviewQuestionList(projectOrgCodes, startTime, endTime);
+		PageInfo<OverviewQuestionDto> page = new PageInfo(list);
+		Page<OverviewQuestionDto> pagenew = new Page<>();
+		pagenew.setCurrent(current);
+		pagenew.setTotal(page.getTotal());
+		pagenew.setSize(size);
+		pagenew.setRecords(page.getList());
+
+		return pagenew;
+	}
+
 	/**
 	 * 预警信息总数
 	 *