Merge branch 'developer' of http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz into developer

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpStationMapper.xml

@@ -470,7 +470,7 @@
             <if test="dto.amosCompanyCode!=null">
                 and hygf_jp_station.amos_company_code =#{dto.amosCompanyCode}
             </if>
-            and hygf_jp_station.`on_grid_type`=null and hygf_jp_station.type='家庭户用'
+            and hygf_jp_station.`on_grid_type` is null and hygf_jp_station.type='家庭户用'
         </where>
 
     </select>

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

@@ -29,7 +29,7 @@ public interface IMcbWarningService {
 	 * @return 预警信息列表
 	 */
 	Page<Map<String, Object>> queryWarningPage(Page<Map<String, Object>> page, Integer processingStatus,
-			String eventLevel, String createDate,String startTime,String endTime, String warningSourceType,String overView);
+			String eventLevel, String createDate,String startTime,String endTime, String warningSourceType,String objectName,String overView);
 
 
 	Page<OverviewQuestionDto> overviewQuestionList(Integer current, Integer size, String startTime, String endTime);
@@ -39,7 +39,7 @@ public interface IMcbWarningService {
 	 *
 	 * @return 预警信息总数
 	 */
-	Long queryWarningCount(Integer processingStatus, String eventLevel, String createDate,String startTime,String endTime, String warningSourceType,String overView);
+	Long queryWarningCount(Integer processingStatus, String eventLevel, String createDate,String startTime,String endTime, String warningSourceType,String objectName, String overView);
 
 	/**
 	 * 问题信息列表

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

@@ -116,7 +116,10 @@
             log.CONTENT,
             LEVEL.COLOR,
             source.PROVINCE,
-            log.WARNING_SOURCE_TYPE
+            log.WARNING_SOURCE_TYPE,
+            log.OBJECT_NAME,
+            log.PROCESSING_STATUS,
+            log.PROCESSING_STATUS_DESC
         FROM
             amos_mcb.mcb_warning_warning_info log
                 LEFT JOIN amos_mcb.mcb_warning_base_warning_level LEVEL ON log.EVENT_LEVEL = LEVEL.CODE and LEVEL.SEQUENCE_NBR in (1, 2, 3)
@@ -145,7 +148,10 @@
                 AND log.CREATE_DATE <= concat(#{endTime}, ' 23:59:59')
             </if>
             <if test="warningSourceType != null and warningSourceType != ''">
-                AND log.WARNING_SOURCE_TYPE = #{warningSourceType}
+                AND log.WARNING_SOURCE_TYPE like concat('%', #{warningSourceType}, '%')
+            </if>
+            <if test="objectName != null and objectName != ''">
+                AND log.OBJECT_NAME like concat('%', #{objectName}, '%')
             </if>
 	        <if test="overView != null and overView != ''">
                 AND log.WARNING_SOURCE_TYPE_CODE IN (select code from mcb_data_dictionary where remark = 'OVERVIEW')
@@ -153,7 +159,7 @@
         </where>
         ORDER BY
             log.CREATE_DATE DESC
-        LIMIT #{start}, #{offset}
+        LIMIT #{start}, #{size}
     </select>
 
     <select id="queryWarningCount" resultType="java.lang.Long">
@@ -187,7 +193,10 @@
                 AND log.CREATE_DATE &lt;= concat(#{endTime}, ' 23:59:59')
             </if>
             <if test="warningSourceType != null and warningSourceType != ''">
-                AND log.WARNING_SOURCE_TYPE = #{warningSourceType}
+                AND log.WARNING_SOURCE_TYPE like concat('%', #{warningSourceType}, '%')
+            </if>
+            <if test="objectName != null and objectName != ''">
+                AND log.OBJECT_NAME like concat('%', #{objectName}, '%')
             </if>
             <if test="overView != null and overView != ''">
                 AND log.WARNING_SOURCE_TYPE_CODE IN (select code from mcb_data_dictionary where remark = 'OVERVIEW')
@@ -199,7 +208,7 @@
         SELECT
         warning.SEQUENCE_NBR warningId,
         question.CREATE_DATE createDate,
-        question.CONTENT content,
+        warning.CONTENT content,
         question.COMPLETION_STATUS_DESC completionStatusDesc,
         question.SOURCE_ATTRIBUTION_DESC sourceAttributionDesc
         FROM

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/mapper/cluster/SjglZsjZsbtzMapper.xml

@@ -155,6 +155,7 @@
         ifnull(a.qrcode_color, '') AS qrCodeColor,
         ifnull(b.COMPANY_NAME, '') AS stationName,
         ifnull(a.CREATE_TIME, '') as recDate,
+        ifnull(a.UPDATE_STAMP, '') as updateTime,
         a.DBID AS objectId,
         c.SBBM as jobId,
         case when a.QRCODE_COLOR = 'red' then 1

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

@@ -67,10 +67,12 @@ public class McbWarningController {
 			@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,
+			@RequestParam(value = "objectName", required = false) String objectName
+	) {
 		Page<Map<String, Object>> page = new Page<>(pageNumber, pageSize);
 		return ResponseHelper.buildResponse(
-				mcbWarningService.queryWarningPage(page, processingStatus, eventLevel, createDate, startTime,endTime,  warningSourceType,overView));
+				mcbWarningService.queryWarningPage(page, processingStatus, eventLevel, createDate, startTime,endTime,  warningSourceType,objectName, overView));
 	}
 
 	/**
@@ -103,8 +105,10 @@ public class McbWarningController {
 			@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) {
-		Long count = mcbWarningService.queryWarningCount(processingStatus, eventLevel,createDate, startTime,endTime, warningSourceType,overView);
+			@RequestParam(value = "warningSourceType", required = false) String warningSourceType,
+			@RequestParam(value = "objectName", required = false) String objectName
+	) {
+		Long count = mcbWarningService.queryWarningCount(processingStatus, eventLevel,createDate, startTime,endTime, warningSourceType, objectName, overView);
 		Map<String, Object> result = new HashMap<String, Object>() {
 			{
 				this.put("count", count);

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

@@ -36,7 +36,7 @@ public interface McbWarningMapper extends BaseMapper {
      */
     List<Map<String, Object>> queryWarningList(
             @Param("start") Long start,
-            @Param("offset") Long offset,
+            @Param("size") Long size,
             @Param("projectOrgCodes") List<String> projectOrgCodes,
             @Param("processingStatus") Integer processingStatus,
             @Param("eventLevel") String eventLevel,
@@ -44,24 +44,10 @@ public interface McbWarningMapper extends BaseMapper {
             @Param("startTime") String startTime,
             @Param("endTime") String endTime,
             @Param("warningSourceType") String warningSourceType,
+            @Param("objectName") String objectName,
             @Param("overView") String overView
     );
 
-
-    List<OverviewQuestionDto> overviewQuestionList(
-            Integer offset,
-            Integer size,
-            List<String> projectOrgCodes,
-            String startTime,
-            String endTime
-    );
-
-    Integer overviewQuestionListTotal(
-            List<String> projectOrgCodes,
-            String startTime,
-            String endTime
-    );
-
     /**
      * 预警总数
      *
@@ -75,9 +61,27 @@ public interface McbWarningMapper extends BaseMapper {
             @Param("startTime") String startTime,
             @Param("endTime") String endTime,
             @Param("warningSourceType") String warningSourceType,
+            @Param("objectName") String objectName,
             @Param("overView") String overView
     );
 
+
+    List<OverviewQuestionDto> overviewQuestionList(
+            Integer offset,
+            Integer size,
+            List<String> projectOrgCodes,
+            String startTime,
+            String endTime
+    );
+
+    Integer overviewQuestionListTotal(
+            List<String> projectOrgCodes,
+            String startTime,
+            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

@@ -75,17 +75,17 @@ public class McbWarningServiceImpl implements IMcbWarningService {
 	 */
 	@Override
 	public Page<Map<String, Object>> queryWarningPage(Page<Map<String, Object>> page, Integer processingStatus,
-			String eventLevel, String createDate,String startTime,String endTime, String warningSourceType,String overView) {
+			String eventLevel, String createDate,String startTime,String endTime, String warningSourceType,String objectName, String overView) {
 		List<String> projectOrgCodes = this.getProjectOrgCodes();
-		long start = page.getCurrent() - 1;
-		long offset = page.getSize() * page.getCurrent();
+		long start = (page.getCurrent() - 1) * page.getSize();
+		long size = page.getSize();
 		if (projectOrgCodes.isEmpty()) {
 			projectOrgCodes.add("NULL");
 		}
-		List<Map<String, Object>> records = mcbWarningMapper.queryWarningList(start, offset, projectOrgCodes,
-				processingStatus, eventLevel, createDate,startTime,endTime, warningSourceType,overView);
+		List<Map<String, Object>> records = mcbWarningMapper.queryWarningList(start, size, projectOrgCodes,
+				processingStatus, eventLevel, createDate,startTime,endTime, warningSourceType,objectName, overView);
 		Long total = mcbWarningMapper.queryWarningCount(projectOrgCodes, processingStatus, eventLevel, createDate,startTime,endTime,
-				warningSourceType,overView);
+				warningSourceType,objectName, overView);
 		page.setRecords(records);
 		page.setTotal(total);
 		return page;
@@ -123,13 +123,13 @@ public class McbWarningServiceImpl implements IMcbWarningService {
 	 */
 	@Override
 	public Long queryWarningCount(Integer processingStatus, String eventLevel, String createDate,String startTime,String endTime,
-			String warningSourceType,String overView) {
+			String warningSourceType,String objectName, String overView) {
 		List<String> projectOrgCodes = this.getProjectOrgCodes();
 		if (projectOrgCodes.isEmpty()) {
 			projectOrgCodes.add("NULL");
 		}
 		return mcbWarningMapper.queryWarningCount(projectOrgCodes, processingStatus, eventLevel, createDate,startTime,endTime,
-				warningSourceType,overView);
+				warningSourceType,objectName,overView);
 	}
 
 	/**