更新需求

febs-server/gbd-demp-data-exchange/src/main/java/com/gbd/demp/data/exchange/task/LiveDataTask.java

@@ -142,7 +142,7 @@ public class LiveDataTask {
                             event.setSensorId(seq);
                             event.setAlarmTime(nowDate);
                             event.setAlarmLevel(1 + "");
-                            event.setEventStatus(1);
+                            event.setEventStatus(0);
                             event.setIsreport(1);
                             alarmEventService.generateAlarmEvent(event);
                         } else {
@@ -162,7 +162,7 @@ public class LiveDataTask {
                             event.setSensorId(seq);
                             event.setAlarmTime(nowDate);
                             event.setAlarmLevel(1 + "");
-                            event.setEventStatus(1);
+                            event.setEventStatus(0);
                             event.setIsreport(1);
                             event.setThirdPartyId(thirdPartyId);
                             alarmEventService.generateAlarmEvent(event);
@@ -178,7 +178,7 @@ public class LiveDataTask {
                             event.setSensorId(seq);
                             event.setAlarmTime(nowDate);
                             event.setAlarmLevel(2 + "");
-                            event.setEventStatus(1);
+                            event.setEventStatus(0);
                             event.setIsreport(1);
                             alarmEventService.generateAlarmEvent(event);
                         } else {
@@ -198,7 +198,7 @@ public class LiveDataTask {
                             event.setSensorId(seq);
                             event.setAlarmTime(nowDate);
                             event.setAlarmLevel(2 + "");
-                            event.setEventStatus(1);
+                            event.setEventStatus(0);
                             event.setIsreport(1);
                             event.setThirdPartyId(thirdPartyId);
                             alarmEventService.generateAlarmEvent(event);
@@ -213,7 +213,7 @@ public class LiveDataTask {
                             event.setSensorId(seq);
                             event.setAlarmTime(nowDate);
                             event.setAlarmLevel(3 + "");
-                            event.setEventStatus(1);
+                            event.setEventStatus(0);
                             event.setIsreport(1);
                             alarmEventService.generateAlarmEvent(event);
                         } else {
@@ -233,7 +233,7 @@ public class LiveDataTask {
                             event.setSensorId(seq);
                             event.setAlarmTime(nowDate);
                             event.setAlarmLevel(3 + "");
-                            event.setEventStatus(1);
+                            event.setEventStatus(0);
                             event.setIsreport(1);
                             event.setThirdPartyId(thirdPartyId);
                             alarmEventService.generateAlarmEvent(event);
@@ -248,7 +248,7 @@ public class LiveDataTask {
                             event.setSensorId(seq);
                             event.setAlarmTime(nowDate);
                             event.setAlarmLevel(4 + "");
-                            event.setEventStatus(1);
+                            event.setEventStatus(0);
                             event.setIsreport(1);
                             alarmEventService.generateAlarmEvent(event);
                         } else {
@@ -268,7 +268,7 @@ public class LiveDataTask {
                             event.setSensorId(seq);
                             event.setAlarmTime(nowDate);
                             event.setAlarmLevel(4 + "");
-                            event.setEventStatus(1);
+                            event.setEventStatus(0);
                             event.setIsreport(1);
                             event.setThirdPartyId(thirdPartyId);
                             alarmEventService.generateAlarmEvent(event);

febs-server/gbd-demp-info/src/main/java/com/gbd/demp/info/controller/AlarmEventController.java

@@ -50,16 +50,23 @@ public class AlarmEventController {
      */
     @GetMapping("list")
     @PreAuthorize("hasAuthority('alarmEvent:view')")
-    public FebsResponse alarmEventList(@RequestHeader(value = "thirdPartyToken") String thirdPartyToken, QueryRequest request, String companyName, String deviceName) {
+    public FebsResponse alarmEventList(@RequestHeader(value = "thirdPartyToken") String thirdPartyToken, QueryRequest request, String id, String deviceName) {
+        String[] ids = new String[0];
+        if (!"".equals(id) && id != null) {
+            if (id.contains(",")) {
+                ids = id.split(",");
+            } else
+                ids = new String[]{id};
+        }
         ThirdPartyUser u = ThirdPartyUtils.getThirdPartyUserInfo(thirdPartyToken);
         Map<String, Object> dataTable = null;
         if (u.getUserId() != null) {
             if (u.getEnterpriseId() != null) {//企业
-                dataTable = FebsUtil.getDataTable(this.alarmEventService.findAlarmEvents(request, u.getEnterpriseName(), deviceName, u.getPossession()));
+                dataTable = FebsUtil.getDataTable(this.alarmEventService.findAlarmEvents(request, ids, deviceName, u.getPossession()));
             } else if (u.getPossession() != null) {//功能区
-                dataTable = FebsUtil.getDataTable(this.alarmEventService.findAlarmEvents(request, companyName, deviceName, u.getPossession()));
+                dataTable = FebsUtil.getDataTable(this.alarmEventService.findAlarmEvents(request, ids, deviceName, u.getPossession()));
             } else //监管人员
-                dataTable = FebsUtil.getDataTable(this.alarmEventService.findAlarmEvents(request, companyName, deviceName, u.getPossession()));
+                dataTable = FebsUtil.getDataTable(this.alarmEventService.findAlarmEvents(request, ids, deviceName, u.getPossession()));
             return new FebsResponse().data(dataTable);
         } else
             return new FebsResponse().code(HttpStatus.FORBIDDEN);

febs-server/gbd-demp-info/src/main/java/com/gbd/demp/info/controller/DeviceInfoController.java

@@ -261,8 +261,11 @@ public class DeviceInfoController {
     @RequestMapping("/getCompanys")
     public FebsResponse getCompanys(@RequestHeader(value = "thirdPartyToken") String thirdPartyToken) {
         ThirdPartyUser u = ThirdPartyUtils.getThirdPartyUserInfo(thirdPartyToken);
-        return new FebsResponse().data(this.deviceInfoService.getCompanys(u.getPossession()));
+        if (u.getUserId() != null) {
+            if (u.getEnterpriseId() == null) //所有监管人员
+                return new FebsResponse().data(this.deviceInfoService.getCompanys(u.getPossession()));
+            return new FebsResponse().data("");
+        }
+        return new FebsResponse().data("");
     }
-
-
-}
+}

febs-server/gbd-demp-info/src/main/java/com/gbd/demp/info/entity/SensorInfo.java

@@ -70,6 +70,6 @@ public class SensorInfo {
      * 是否可编辑
      */
     @TableField(exist = false)
-    private int editable;
+    private String editable;
 
 }

febs-server/gbd-demp-info/src/main/java/com/gbd/demp/info/mapper/AlarmEventMapper.java

@@ -18,7 +18,7 @@ import java.util.List;
  */
 public interface AlarmEventMapper extends BaseMapper<AlarmEvent> {
 
-    <T> IPage<AlarmEventVO> getAlarmEvent(Page<T> page, @Param("companyName") String companyName, @Param("deviceName") String deviceName, @Param("possession") String possession);
+    <T> IPage<AlarmEventVO> getAlarmEvent(Page<T> page,  @Param("ids") String[] ids, @Param("deviceName") String deviceName, @Param("possession") String possession);
 
     /**
      * 用于监测数据管理页面

febs-server/gbd-demp-info/src/main/java/com/gbd/demp/info/service/IAlarmEventService.java

@@ -24,7 +24,7 @@ public interface IAlarmEventService extends IService<AlarmEvent> {
      * @param alarmEvent alarmEvent
      * @return IPage<AlarmEvent>
      */
-    IPage<AlarmEventVO> findAlarmEvents(QueryRequest request, String companyName, String deviceName,String possession);
+    IPage<AlarmEventVO> findAlarmEvents(QueryRequest request, String[] ids, String deviceName,String possession);
 
     IPage<AlarmEventVO> getDeviceInfoAndAlarmEvent(QueryRequest request, String[] ids, String deviceName, String possession);
 

febs-server/gbd-demp-info/src/main/java/com/gbd/demp/info/service/impl/AlarmEventServiceImpl.java

@@ -32,11 +32,11 @@ public class AlarmEventServiceImpl extends ServiceImpl<AlarmEventMapper, AlarmEv
     private final AlarmEventMapper alarmEventMapper;
 
     @Override
-    public IPage<AlarmEventVO> findAlarmEvents(QueryRequest request, String companyName, String deviceName, String possession) {
+    public IPage<AlarmEventVO> findAlarmEvents(QueryRequest request, String[] ids, String deviceName, String possession) {
         // TODO 设置查询条件
         Page<AlarmEventVO> page = new Page<>(request.getPageNum(), request.getPageSize());
         SortUtil.handlePageSort(request, page, "alarm_time", FebsConstant.ORDER_DESC, false);
-        return this.baseMapper.getAlarmEvent(page, companyName, deviceName, possession);
+        return this.baseMapper.getAlarmEvent(page, ids, deviceName, possession);
     }
 
     @Override
@@ -69,9 +69,9 @@ public class AlarmEventServiceImpl extends ServiceImpl<AlarmEventMapper, AlarmEv
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void finishEvent(Long id, String reason, String deviceId, String sensorId, String start, String end) {
-        if ("设备检修".equals(reason)) {
-            this.baseMapper.setOutliers(deviceId, sensorId, 6, start, end);
-        }
+//        if ("设备检修".equals(reason)) {
+        this.baseMapper.setOutliers(deviceId, sensorId, 6, start, end);
+//        }
         this.baseMapper.finishEvent(id, reason);
     }
 

febs-server/gbd-demp-info/src/main/java/com/gbd/demp/info/vo/AlarmEventVO.java

@@ -47,14 +47,19 @@ public class AlarmEventVO {
      */
     private String dataValue;
 
+    /**
+     * 数据状态
+     */
+    private String status;
+
     /**
      * 上报时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date reportTime;
 
-    private double lowValue;
-    private double highValue;
+    private String lowValue;
+    private String highValue;
 
 
     /**

febs-server/gbd-demp-info/src/main/resources/mapper/AlarmEventMapper.xml

@@ -23,8 +23,9 @@
         <result column="sensor_unit" jdbcType="VARCHAR" property="sensorUnit"/>
         <result column="data_value" jdbcType="DOUBLE" property="dataValue"/>
         <result column="report_time" jdbcType="TIMESTAMP" property="reportTime"/>
-        <result column="low_value" jdbcType="DOUBLE" property="lowValue"/>
-        <result column="high_value" jdbcType="DOUBLE" property="highValue"/>
+        <result column="status" jdbcType="VARCHAR" property="status"/>
+        <result column="low_value" jdbcType="VARCHAR" property="lowValue"/>
+        <result column="high_value" jdbcType="VARCHAR" property="highValue"/>
         <result column="alarm_level" jdbcType="VARCHAR" property="alarmLevel"/>
         <result column="alarm_time" jdbcType="TIMESTAMP" property="alarmTime"/>
         <result column="event_status" jdbcType="INTEGER" property="eventStatus"/>
@@ -55,8 +56,11 @@
         LEFT JOIN
         t_sensor_info t2 ON t.sensor_id = t2.sensor_id
         where 1=1
-        <if test="companyName != null and companyName != ''">
-            AND t1.company_name like CONCAT('%', #{companyName}, '%')
+        <if test="ids !=null and ids.length > 0">
+            AND t1.company_id in
+            <foreach collection="ids" item="item" open="(" separator="," close=")" index="index">
+                #{item}
+            </foreach>
         </if>
         <if test="deviceName != null and deviceName != ''">
             AND t1.device_name like CONCAT('%', #{deviceName}, '%')
@@ -64,6 +68,20 @@
         <if test="possession != null and possession != ''">
             AND t1.possession = #{possession}
         </if>
+        group by
+        t.id,
+        t1.company_name,
+        t.device_id,
+        t.sensor_id,
+        t1.device_name,
+        t2.sensor_name,
+        alarm_level,
+        alarm_time,
+        event_status,
+        finish_time,
+        isReport,
+        reason
+        order by alarm_time desc
     </select>
 
 
@@ -87,7 +105,7 @@
 
     <select id="getDeviceInfoAndAlarmEvent" resultMap="alarmEventVO">
         SELECT t5.id,t1.device_id, t1.device_name,
-        t1.company_name,t2.sensor_id,t2.sensor_name,t3.data_value,t2.sensor_unit,t3.report_time,t4.low_value,t4.high_value,t5.alarm_time,t5.alarm_level,t5.reason
+        t1.company_name,t2.sensor_id,t2.sensor_name,t3.data_value,t2.sensor_unit,t3.report_time,t3.status,t4.low_value,t4.high_value,t5.alarm_time,t5.alarm_level,t5.reason
         FROM t_device_info t1
         left join t_sensor_info t2 on t1.device_id=t2.device_id
         left join t_live_data t3 on t2.device_id=t3.device_id and t2.sensor_id=t3.sensor_id

febs-server/gbd-demp-info/src/main/resources/mapper/SensorInfoMapper.xml

@@ -11,7 +11,7 @@
         <result column="company_id" jdbcType="VARCHAR" property="companyId"/>
         <result column="sensor_name" jdbcType="VARCHAR" property="sensorName"/>
         <result column="sensor_unit" jdbcType="VARCHAR" property="sensorUnit"/>
-        <result column="editable" jdbcType="INTEGER" property="editable"/>
+        <result column="editable" jdbcType="VARCHAR" property="editable"/>
     </resultMap>