修改 跑马灯列据重复报警数据多条 过滤为相同一条 警情确认弹窗数据 过滤为相同一条 iot趋势正序 值班列表

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/DynamicFormInstanceMapper.xml

@@ -330,8 +330,8 @@
         <if test="params != null and params.size() > 0">
             where
             d.instanceId in (
-            select tt.instance_id from cb_duty_person_shift tt where tt.duty_date >= #{stratTime}
-            and tt.duty_date <![CDATA[<=]]>  #{endTime}
+            select tt.instance_id from cb_duty_person_shift tt where tt.duty_date >= DATE_FORMAT(#{stratTime},'%Y-%m-%d')
+            and tt.duty_date <![CDATA[<=]]> DATE_FORMAT(#{endTime},'%Y-%m-%d')
             )
             <foreach collection="params" index="key" item="value" separator="">
                 <choose>

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/CommonPageInfoParam.java

@@ -85,6 +85,10 @@ public class CommonPageInfoParam extends CommonPageable {
 	private String orgCode;
 
 	private Long alarmLogId;
+	/**
+	 * 系统类型(机场、电力)
+	 */
+	private String systemSource;
 
 	public Long getAlarmLogId() {
 		return alarmLogId;
@@ -109,6 +113,14 @@ public class CommonPageInfoParam extends CommonPageable {
 	 */
 	private String handleStatus;
 
+	public String getSystemSource() {
+		return systemSource;
+	}
+
+	public void setSystemSource(String systemSource) {
+		this.systemSource = systemSource;
+	}
+
 	/**
 	 * 所属消防系统编码
 	 */

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/CommonPageParamUtil.java

@@ -75,6 +75,8 @@ public class CommonPageParamUtil {
 				param.setIndexTypeCode(toString(queryRequests.get(i).getValue()));
 			} else if ("alarmLogId".equals(name)) {
 				param.setAlarmLogId(toLong(queryRequests.get(i).getValue()));
+			}else if ("systemSource".equals(name)) {
+				param.setSystemSource(toString(queryRequests.get(i).getValue()));
 			}
 		}
 		if(commonPageable !=null){

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentAlarmController.java

@@ -86,6 +86,111 @@ public class EquipmentAlarmController extends AbstractBaseController {
     }
 
     /**
+     * 跑马灯列表分页查询
+     *
+     * @return
+     */
+    @RequestMapping(value = "/listRunAway", method = RequestMethod.GET)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "列表分页查询", produces = "application/json;charset=UTF-8", notes = "列表分页查询")
+    public ResponseModel listPageRunAway(@RequestParam(value = "beginDate", required = false) String beginDate,
+                                  @RequestParam(value = "endDate", required = false) String endDate,
+                                  @RequestParam(value = "warehouseStructureName", required = false) String warehouseStructureName,
+                                  @RequestParam(value = "equipCode", required = false) String equipCode,
+                                  @RequestParam(value = "handleStatus", required = false) String handleStatus,
+                                  @RequestParam(value = "system", required = false) String system,
+                                  @RequestParam(value = "alarmType", required = false) String alarmType,
+                                  @RequestParam(value = "type", required = false) String type,
+                                  @RequestParam(value = "buildIds", required = false) List<String> buildIds,
+                                  @RequestParam(value = "id", required = false) String id,
+                                  @RequestParam(value = "cleanStatus", required = false) String cleanStatus,
+                                  @RequestParam(value = "isRemoveShield", required = false) String isRemoveShield,
+                                  CommonPageable commonPageable) {
+        if (commonPageable.getPageNumber() == 0) {
+            commonPageable.setPageNumber(1);
+        }
+        ReginParams reginParams = getSelectedOrgInfo();
+        List<CommonRequest> queryRequests = new ArrayList<>();
+        CommonRequest request = new CommonRequest();
+        request.setName("beginDate");
+        request.setValue(StringUtil.isNotEmpty(beginDate) ? StringUtils.trimToNull(beginDate).substring(0, 10) + " 00:00:00" : null);
+        queryRequests.add(request);
+        CommonRequest request1 = new CommonRequest();
+        request1.setName("endDate");
+        request1.setValue(StringUtil.isNotEmpty(endDate) ? StringUtils.trimToNull(endDate).substring(0, 10) + " 23:59:59" : null);
+        queryRequests.add(request1);
+        CommonRequest request2 = new CommonRequest();
+        request2.setName("warehouseStructureName");
+        request2.setValue(StringUtil.isNotEmpty(warehouseStructureName) ? StringUtils.trimToNull(warehouseStructureName) : null);
+        queryRequests.add(request2);
+        CommonRequest request3 = new CommonRequest();
+        request3.setName("equipCode");
+        request3.setValue(StringUtil.isNotEmpty(equipCode) ? StringUtils.trimToNull(equipCode) : null);
+        queryRequests.add(request3);
+        CommonRequest request4 = new CommonRequest();
+        request4.setName("alarmType");
+        request4.setValue(StringUtil.isNotEmpty(alarmType) ? StringUtils.trimToNull(alarmType) : null);
+        queryRequests.add(request4);
+        CommonRequest request5 = new CommonRequest();
+        request5.setName("orgCode");
+        request5.setValue(null);
+        queryRequests.add(request5);
+        CommonRequest request6 = new CommonRequest();
+        request6.setName("handleStatus");
+        request6.setValue(StringUtil.isNotEmpty(handleStatus) ? StringUtils.trimToNull(handleStatus) : null);
+        queryRequests.add(request6);
+        CommonRequest request7 = new CommonRequest();
+        request7.setName("system");
+        request7.setValue(StringUtil.isNotEmpty(system) ? StringUtils.trimToNull(system) : null);
+        queryRequests.add(request7);
+        CommonRequest request8 = new CommonRequest();
+        request8.setName("type");
+        request8.setValue(StringUtil.isNotEmpty(type) ? StringUtils.trimToNull(type) : null);
+        queryRequests.add(request8);
+        CommonRequest request9 = new CommonRequest();
+        request9.setName("buildIds");
+        request9.setValue(ObjectUtils.isEmpty(buildIds) ? null : buildIds);
+        queryRequests.add(request9);
+        CommonRequest request10 = new CommonRequest();
+        request10.setName("id");
+        request10.setValue(StringUtil.isNotEmpty(id) ? StringUtils.trimToNull(id) : null);
+        queryRequests.add(request10);
+        CommonRequest request11 = new CommonRequest();
+        request11.setName("cleanStatus");
+        request11.setValue(StringUtil.isNotEmpty(cleanStatus) ? StringUtils.trimToNull(cleanStatus) : null);
+        queryRequests.add(request11);
+        CommonRequest request12 = new CommonRequest();
+        request12.setName("isRemoveShield");
+        request12.setValue(StringUtil.isNotEmpty(isRemoveShield) ? StringUtils.trimToNull(isRemoveShield) : null);
+        queryRequests.add(request12);
+        if (equioEnabled) {
+            if (!ValidationUtil.isEmpty(reginParams.getPersonIdentity())) {
+                CommonRequest request13 = new CommonRequest();
+                request13.setName("bizOrgCode");
+                request13.setValue(StringUtil.isNotEmpty(reginParams.getPersonIdentity().getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : null);
+                queryRequests.add(request13);
+            }
+            //此参数用于XML中对数据进行分组 不为空则分组  取某装备某个指标的最新状态
+            CommonRequest request14 = new CommonRequest();
+            request14.setName("systemSource");
+            request14.setValue("JC");
+            queryRequests.add(request14);
+        }else {
+            CommonRequest request13 = new CommonRequest();
+            request13.setName("bizOrgCode");
+            request13.setValue("");
+            //此参数用于XML中对数据进行分组 为NULL则保持原有逻辑不分组 逐条显示
+            CommonRequest request14 = new CommonRequest();
+            request14.setName("systemSource");
+            request14.setValue(null);
+            queryRequests.add(request14);
+        }
+        CommonPageInfoParam param = CommonPageParamUtil.fillCommonPageInfoParam(queryRequests, commonPageable);
+        Page<Map<String, Object>> list = iEquipmentSpecificAlarmService.listPage(param);
+        return CommonResponseUtil.success(list);
+    }
+
+    /**
      * 列表分页查询
      *
      * @return
@@ -332,10 +437,19 @@ public class EquipmentAlarmController extends AbstractBaseController {
                 request14.setValue(StringUtil.isNotEmpty(reginParams.getPersonIdentity().getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : null );
                 queryRequests.add(request14);
             }
+            //此参数用于XML中对数据进行分组 不为空则对数据分组 取某装备某个指标的最新状态
+            CommonRequest request19 = new CommonRequest();
+            request19.setName("systemSource");
+            request19.setValue("JC");
+            queryRequests.add(request19);
         }else {
             CommonRequest request14 = new CommonRequest();
             request14.setName("bizOrgCode");
             request14.setValue("");
+            //此参数用于XML中对数据进行分组 为NULL则保持原有逻辑不分组 逐条显示
+            CommonRequest request19 = new CommonRequest();
+            request19.setName("systemSource");
+            request19.setValue(null);
         }
 
             CommonPageInfoParam param = CommonPageParamUtil.fillCommonPageInfoParam(queryRequests, commonPageable);

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/TopographyController.java

@@ -966,10 +966,11 @@ public class TopographyController extends AbstractBaseController {
                     vo.setTimes(dates);
                     res.add(vo);
                 }
-
                 for (IotIndexResVo s : res) {
                     s.setIotData(map.get(s.getNameKey()));
+                    Collections.reverse(s.getIotData());
                     s.setTimes(dates);
+                    Collections.reverse(s.getTimes());
                 }
                 return CommonResponseUtil.success(res);
             }

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml

@@ -166,6 +166,9 @@
     </select>
     <select id="page" resultType="java.util.HashMap">
         SELECT
+               *
+               from
+        ( SELECT
 	        wlesal.id,
 	        wlesal.org_code,
 	        wlesal.equipment_specific_id AS fireEquipmentId,
@@ -254,8 +257,10 @@
                 wles.biz_org_code like concat (#{param.bizOrgCode},'%')
             </if>
         </where>
-        ORDER BY wlesal.create_date DESC
-        
+        ORDER BY wlesal.create_date DESC ) b
+        <if test="param.systemSource != null" >
+            GROUP BY fireEquipmentId,fireEquipmentIndexId
+        </if>
     </select>
     <select id="pageQuery" resultType="java.util.HashMap">
         SELECT
@@ -286,6 +291,13 @@
     </select>
     <select id="pageAlarmsInfo" resultType="Map">
         SELECT
+        a.*
+        FROM (
+        SELECT
+        b.*
+        FROM
+        (
+        SELECT
             wlesal.id AS alarmId,
             wlesal.org_code AS orgCode,
             wlesal.equipment_specific_id AS fireEquipmentId,
@@ -374,9 +386,9 @@
             <if test="param.confirmType != null and param.confirmType != '' and param.confirmType == 3">
                 AND wlesal.clean_time IS NOT NULL
             </if>
-            <if test="param.beginDate!=null">AND wlesal.create_date <![CDATA[>=]]> #{param.beginDate}</if>
-            <if test="param.endDate!=null">AND wlesal.create_date <![CDATA[<=]]> #{param.endDate}</if>
-            <if test="param.alarmType != null and param.alarmType != ''">AND wlesal.type = #{param.alarmType}</if>
+            <if test="param.systemSource == null and param.beginDate!=null">AND wlesal.create_date <![CDATA[>=]]> #{param.beginDate}</if>
+            <if test="param.systemSource == null and param.endDate!=null">AND wlesal.create_date <![CDATA[<=]]> #{param.endDate}</if>
+            <if test="param.systemSource == null and param.alarmType != null and param.alarmType != ''">AND wlesal.type = #{param.alarmType}</if>
             <if test="param.systemCode != null and param.systemCode != ''">
                 AND find_in_set(#{param.systemCode}, wlesal.system_codes)
             </if>
@@ -387,10 +399,10 @@
             </if>
             <if test="param.id!=null and param.id!=''">AND wlesal.equipment_specific_id = #{param.id}</if>
             <if test="param.status!=null and param.status!=3">AND wlesal.status = #{param.status}</if>
-            <if test="param.cleanStatus != null and param.cleanStatus != '' and param.cleanStatus == 1">AND
+            <if test="param.systemSource == null and param.cleanStatus != null and param.cleanStatus != '' and param.cleanStatus == 1">AND
                 wlesal.clean_time IS NOT NULL
             </if>
-            <if test="param.cleanStatus != null and param.cleanStatus != '' and param.cleanStatus == 2">AND
+            <if test="param.systemSource == null and param.cleanStatus != null and param.cleanStatus != '' and param.cleanStatus == 2">AND
                 wlesal.clean_time IS NULL
             </if>
             <if test="param.isRemoveShield != null and param.isRemoveShield != ''">AND
@@ -412,7 +424,17 @@
                 AND wlesal.equipment_specific_index_key like concat(concat("%",#{param.fireEquipmentSpecificIndexKey}),"%")
             </if>
         </where>
-            ORDER BY wlesal.create_date DESC
+            ORDER BY wlesal.create_date DESC )  b
+        <if test="param.systemSource != null" >
+            GROUP BY fireEquipmentId,fireEquipmentIndexId
+        </if>) a
+        <where>
+            <if test="param.systemSource != null and param.beginDate!=null">AND a.createDate <![CDATA[>=]]> #{param.beginDate}</if>
+            <if test="param.systemSource != null and param.endDate!=null">AND a.createDate <![CDATA[<=]]> #{param.endDate}</if>
+            <if test="param.systemSource != null and param.alarmType != null and param.alarmType != ''">AND a.type = #{param.alarmType}</if>
+            <if test="param.systemSource != null and param.cleanStatus != null and param.cleanStatus != ''">AND a.cleanStatusVal = #{param.cleanStatus}</if>
+        </where>
+
     </select>
     <select id="getAlarmList" resultType="java.util.HashMap">
         SELECT