10000

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/MarqueeData.java

@@ -29,5 +29,9 @@ public class MarqueeData extends BaseEntity {
      * 是否已读【0：未读；1：已读】
      */
     private String isRead;
+    /**
+     * 设备id
+     */
+    private String equipmentSpecificId;
 
 }

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

 package com.yeejoin.equipmanage.controller;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletResponse;
-
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.equipmanage.common.utils.*;
+import com.yeejoin.equipmanage.common.vo.AlarmDataVO;
+import com.yeejoin.equipmanage.common.vo.AlarmEquipMockDataVO;
+import com.yeejoin.equipmanage.common.vo.AlarmListDataVO;
 import com.yeejoin.equipmanage.mapper.EquipmentSpecificMapper;
+import com.yeejoin.equipmanage.service.IEquipmentSpecificAlarmService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -23,20 +24,11 @@ import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yeejoin.equipmanage.common.utils.CommonPageInfoParam;
-import com.yeejoin.equipmanage.common.utils.CommonPageParamUtil;
-import com.yeejoin.equipmanage.common.utils.CommonPageable;
-import com.yeejoin.equipmanage.common.utils.CommonRequest;
-import com.yeejoin.equipmanage.common.utils.CommonResponseUtil;
-import com.yeejoin.equipmanage.common.utils.StringUtil;
-import com.yeejoin.equipmanage.common.vo.AlarmDataVO;
-import com.yeejoin.equipmanage.common.vo.AlarmEquipMockDataVO;
-import com.yeejoin.equipmanage.common.vo.AlarmListDataVO;
-import com.yeejoin.equipmanage.service.IEquipmentSpecificAlarmService;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author keyong
@@ -181,6 +173,108 @@ public class EquipmentAlarmController extends AbstractBaseController {
     }
 
     /**
+     * 稳压泵跑马灯消息已读列表分页查询
+     *
+     * @return
+     */
+    @RequestMapping(value = "/listPage", method = RequestMethod.GET)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "列表分页查询", produces = "application/json;charset=UTF-8", notes = "列表分页查询")
+    public ResponseModel list(@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);
+            }
+        }else {
+            CommonRequest request13 = new CommonRequest();
+            request13.setName("bizOrgCode");
+            request13.setValue("");
+        }
+        CommonPageInfoParam param = CommonPageParamUtil.fillCommonPageInfoParam(queryRequests, commonPageable);
+        Page<Map<String, Object>> list = iEquipmentSpecificAlarmService.pageList(param);
+        return CommonResponseUtil.success(list);
+    }
+
+    @RequestMapping(value = "/updateReadStatus", method = RequestMethod.GET)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "修改消息已读状态", produces = "application/json;charset=UTF-8", notes = "修改消息已读状态")
+    public ResponseModel updateReadStatus(@RequestParam(value = "messageId") String messageId) {
+        return CommonResponseUtil.success(iEquipmentSpecificAlarmService.updateReadStatus(messageId));
+    }
+
+    /**
      * 通过id获取告警详情
      *
      * @return

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/MarqueeDataMapper.java

+package com.yeejoin.equipmanage.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.equipmanage.common.entity.MarqueeData;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+
+@Mapper
+public interface MarqueeDataMapper extends BaseMapper<MarqueeData> {
+
+
+    List<Map<String, Object>> selectAll();
+
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEquipmentSpecificAlarmService.java

@@ -95,4 +95,8 @@ public interface IEquipmentSpecificAlarmService extends IService<EquipmentSpecif
     Page<Map<String, Object>> fireAlarmLogPage(CommonPageInfoParam param);
 
     List<Map<String, Object>> alarmTrend(String bizOrgCode);
+
+    Page<Map<String, Object>> pageList(CommonPageInfoParam param);
+
+    int updateReadStatus(String messageId);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentSpecificAlarmServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.yeejoin.amos.boot.biz.common.excel.ExcelUtil;
+import com.yeejoin.amos.feign.systemctl.model.MessageModel;
 import com.yeejoin.equipmanage.common.datasync.entity.FireEquipmentFireAlarm;
 import com.yeejoin.equipmanage.common.dto.OrgUsrDto;
 import com.yeejoin.equipmanage.common.entity.*;
@@ -21,7 +22,9 @@ import com.yeejoin.equipmanage.common.utils.DateUtils;
 import com.yeejoin.equipmanage.common.utils.StringUtil;
 import com.yeejoin.equipmanage.common.vo.*;
 import com.yeejoin.equipmanage.fegin.JcsFeign;
+import com.yeejoin.equipmanage.fegin.SystemctlFeign;
 import com.yeejoin.equipmanage.mapper.*;
+import com.yeejoin.equipmanage.remote.RemoteSecurityService;
 import com.yeejoin.equipmanage.service.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -81,6 +84,13 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
     @Autowired
     private ISignalClassifyService signalClassifyService;
 
+    @Autowired
+    MarqueeDataMapper marqueeDataMapper;
+    @Autowired
+    private RemoteSecurityService remoteSecurityService;
+    @Autowired
+    private SystemctlFeign systemctlFeign;
+
     @Value("${window.vedioFormat}")
     String vedioFormat;
 
@@ -739,4 +749,54 @@ public class EquipmentSpecificAlarmServiceImpl extends ServiceImpl<EquipmentSpec
     public List<Map<String, Object>> alarmTrend(String bizOrgCode) {
         return this.baseMapper.alarmTrend(bizOrgCode);
     }
+
+    @Override
+    public Page<Map<String, Object>> pageList(CommonPageInfoParam param) {
+        Page result = new Page<>(param.getPageNumber(), param.getPageSize());
+        if (AlarmTypeEnum.GZGJ.getCode().equals(param.getAlarmType())) {
+            param.setAlarmType("");
+            param.setIsFireAlarm("false");
+        }
+        Page<Map<String, Object>> resultPage = this.baseMapper.page(result, param);
+        if (resultPage.getTotal() > 0) {
+            for (Map<String, Object> x : resultPage.getRecords()) {
+                LocalDateTime createDate = (LocalDateTime) x.get("createDate");
+                x.put("createDate", Date.from(createDate.atZone(ZoneId.systemDefault()).toInstant()));
+                if (ObjectUtils.isEmpty(x.get("handleType"))) {
+                    x.put("handleType", null);
+                } else {
+                    String handleType = ConfirmAlamEnum.getTypeByCode(String.valueOf(x.get("handleType")));
+                    x.put("handleType", StringUtil.isNotEmpty(handleType) ? handleType : signalClassifyService.getTypeNameByCode(String.valueOf(x.get("handleType"))).getTypeName());
+                }
+                // 冗余统一跑马灯显示字段取值
+                x.put("equipmentSpecificIndexName", x.get("fireEquipmentSpecificIndexName"));
+            }
+        }
+        List<Map<String, Object>> list = marqueeDataMapper.selectAll();
+        List<Map<String, Object>> records = resultPage.getRecords();
+        for (Map<String, Object> stringObjectMap : list) {
+            records.add(stringObjectMap);
+        }
+        resultPage.setRecords(records);
+        return resultPage;
+    }
+
+    @Override
+    public int updateReadStatus(String messageId) {
+        MarqueeData marqueeData = marqueeDataMapper.selectById(messageId);
+        marqueeData.setIsRead("1");
+        int i = marqueeDataMapper.updateById(marqueeData);
+        MessageModel model = new MessageModel();
+        model.setMsgType("pressurePump");
+        model.setSendTime(new Date());
+        model.setIsSendWeb(true);
+        model.setCategory(1);
+        model.setIsSendApp(false);
+        model.setTerminal("WEB");
+        Map<String, String> ext = new HashMap<>();
+        ext.put("isRead", "1");
+        Token token = remoteSecurityService.getServerToken();
+        systemctlFeign.create(token.getAppKey(), token.getProduct(), token.getToke(), model);
+        return i;
+    }
 }

amos-boot-system-equip/src/main/resources/mapper/MarqueeDataMapper.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.equipmanage.mapper.MarqueeDataMapper">
+
+<select id="selectAll" resultType="java.util.Map">
+    select
+        id message_id,
+        type fireEquipmentSpecificIndexName,
+        position,
+        name equipmentSpecificName,
+        create_date createDate,
+        message_type,
+        is_read,
+        equipment_specific_id id
+    from
+        wl_marquee_data
+    where
+        is_read = '0'
+    </select>
+</mapper>