电力告警2

fiveep-controller/src/main/java/com/bizmatics/controller/web/AlarmPowerController.java

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 电力告警
@@ -76,5 +77,10 @@ public class AlarmPowerController {
                                                   @RequestParam Integer size){
         return ApiResult.success(alarmPowerService.page(startTime, endTime, status, siteId, current, size));
     }
+
+    @RequestMapping("LoopStatusList")
+    public ApiResult<List<Map<String,Object>>> getLoopStatus(@RequestParam Integer siteId){
+        return ApiResult.success(alarmPowerService.getLoopStatusList(siteId));
+    }
 }
 

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/AlarmPowerMapper.java

@@ -19,7 +19,6 @@ import java.util.Map;
  */
 public interface AlarmPowerMapper extends CrudMapper<AlarmPower> {
 
-
     /**
      * 查询告警数量
      * @param userId
@@ -41,4 +40,6 @@ public interface AlarmPowerMapper extends CrudMapper<AlarmPower> {
                           @Param("handlingStatus") Integer handlingStatus,
                           @Param("startTime") Date startTime,
                           @Param("endTime") Date endTime);
+
+    List<AlarmPower> getLoopStatusListMap(@Param("siteId") Integer siteId);
 }

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/RtAnalogDataMapper.java

@@ -31,4 +31,6 @@ public interface RtAnalogDataMapper extends CrudMapper<RtAnalogData> {
 
     Map<String,Object> getOneMap(@Param("siteId")Integer siteId);
 
+    Map<String,Object> getDataReportMap(@Param("siteId")Integer siteId,@Param("startTime")Integer startTime,@Param("endTime")Integer endTime);
+
 }

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/RtSwitchDataMapper.java

@@ -26,6 +26,4 @@ public interface RtSwitchDataMapper extends CrudMapper<RtSwitchData> {
 
     Integer getOffCountMMap(@Param("siteId") Integer siteId);
 
-    Map<String,Object> getLoopStatusListMap(@Param("siteId") Integer siteId);
-
 }

fiveep-persistence/src/main/resources/mapper/mysql/AlarmPowerMapper.xml

@@ -69,5 +69,24 @@
             </if>
         </where>
     </select>
+    <select id="getLoopStatusListMap" resultType="com.bizmatics.model.AlarmPower">
+        select
+        *
+        from user_site as us
+        inner join device as d
+        on us.site_id = d.site_id
+        inner join alarm_power as rsd
+        on d.device_code = rsd.device_code
+        <where>
+            and d.enable = 1
+            and rsd.meas_name='LoadLive'
+            and rsd.sending_time LIKE '%2020-12-23%'
+            <if test="siteId != null and siteId != 0">
+                and us.site_id = #{siteId}
+            </if>
+        </where>
+        order by rsd.sending_time desc
+    </select>
+
 
 </mapper>

fiveep-persistence/src/main/resources/mapper/mysql/RtAnalogDataMapper.xml

@@ -96,4 +96,24 @@
         </where>
     </select>
 
+
+    <select id="getDataReportMap" resultType="java.util.Map">
+        select
+        *
+        from user_site as us
+        inner join device as d
+        on us.site_id = d.site_id
+        inner join rt_analog_data as rad
+        on d.device_code = rad.deviceName
+        <where>
+            <if test="siteId != null and siteId != 0">
+                and us.site_id = #{siteId}
+            </if>
+            <if test="dataTime != null and dataTime != 0">
+                and us.dataTime > #{startTime}
+            </if>
+        </where>
+    </select>
+
+
 </mapper>

fiveep-persistence/src/main/resources/mapper/mysql/RtSwitchDataMapper.xml

@@ -103,22 +103,4 @@
             </if>
         </where>
     </select>
-
-    <select id="getLoopStatusListMap" resultType="java.util.Map">
-        select
-        *
-        from user_site as us
-        inner join device as d
-        on us.site_id = d.site_id
-        inner join rt_switch_data as rsd
-        on d.device_code = rsd.deviceName
-        <where>
-            and d.enable = 1
-            <if test="siteId != null and siteId != 0">
-                and us.site_id = #{siteId}
-            </if>
-        </where>
-        limit 1
-    </select>
-
 </mapper>

fiveep-service/src/main/java/com/bizmatics/service/AlarmPowerService.java

@@ -8,6 +8,7 @@ import com.bizmatics.service.vo.CommonIcoVO;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -41,4 +42,6 @@ public interface AlarmPowerService extends CrudService<AlarmPower> {
      */
     CommonPage<AlarmPower> page(Date startTime, Date endTime, Integer status, Integer siteId, Integer current, Integer size);
 
+    List<Map<String,Object>> getLoopStatusList(Integer siteId);
+
 }

fiveep-service/src/main/java/com/bizmatics/service/impl/AlarmPowerServiceImpl.java

@@ -10,13 +10,13 @@ import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.service.util.SessionLocal;
 import com.bizmatics.service.vo.ApCountVO;
 import com.bizmatics.service.vo.CommonIcoVO;
+import net.sf.jsqlparser.expression.DateTimeLiteralExpression;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.text.SimpleDateFormat;
+import java.time.Duration;
+import java.util.*;
 
 /**
  * <p>
@@ -68,4 +68,47 @@ public class AlarmPowerServiceImpl extends AbstractCrudService<AlarmPowerMapper,
         baseMapper.list(page,SessionLocal.getUserId(),siteId,status,startTime,endTime);
         return this.ToCommonPage(page);
     }
+
+    @Override
+    public List<Map<String, Object>> getLoopStatusList(Integer siteId) {
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        List<Map<String, Object>> list = new ArrayList<>();
+        List<AlarmPower> loopStatusListMap = baseMapper.getLoopStatusListMap(siteId);
+        int int1 = 0;
+        int int12= 0;
+        Map<String,Object> map = new HashMap<>();
+        loopStatusListMap.forEach(alarmPower -> {
+//            if (alarmPower.getDigitalValue() == 0){
+//                String time1 = formatter.format(alarmPower.getSoeTime());
+//            }else if(alarmPower.getDigitalValue() == 1){
+//                String time2 = formatter.format(alarmPower.getSoeTime());
+//            }
+            if (alarmPower.getDigitalValue() == 0){
+//                Duration differenceValue = Duration.between(time1 ,time2 );
+                // 获取的是两个时间相差的分钟数,如果想要相差小时数就调用toHours()
+//                Long minutesTime = differenceValue .toMinutes();
+            }
+        });
+//        Object value = LoopStatusList.get("LoadLive");
+
+//        int day_count = baseMapper.getOffCountDMap(siteId);
+//        int month_count = baseMapper.getOffCountMMap(siteId);
+//        Map<String,Object> map = new HashMap<>();
+//        map.put("LoadLive",value);
+//        map.put("day_count","day_count");
+//        map.put("month_count","month_count");
+//        list.add(map);
+
+
+//        Iterator<String> it = radMap.keySet().iterator();
+
+//        int duration=0;
+//        for (String name:LoopStatusList.keySet()) {
+////            String   a =formatter.;
+////            LoopStatusList.get("sending_time");
+//
+//        }
+
+        return list;
+    }
 }

fiveep-service/src/main/java/com/bizmatics/service/impl/RtSwitchDataServiceImpl.java

@@ -1,11 +1,14 @@
 package com.bizmatics.service.impl;
 
 import com.bizmatics.model.RtSwitchData;
+import com.bizmatics.persistence.mapper.AlarmPowerMapper;
 import com.bizmatics.persistence.mapper.RtSwitchDataMapper;
 import com.bizmatics.service.RtSwitchDataService;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -19,7 +22,6 @@ import java.util.*;
 @Service
 public class RtSwitchDataServiceImpl extends AbstractCrudService<RtSwitchDataMapper, RtSwitchData> implements RtSwitchDataService {
 
-
     @Override
     public List<Map<String, Object>> getOne(Integer siteId) {
         List<Map<String, Object>> list = new ArrayList<>();
@@ -35,22 +37,29 @@ public class RtSwitchDataServiceImpl extends AbstractCrudService<RtSwitchDataMap
 
     @Override
     public List<Map<String, Object>> getLoopStatus(Integer siteId) {
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         List<Map<String, Object>> list = new ArrayList<>();
         Map<String, Object> radMap = baseMapper.getLoopStatusMap(siteId);
-        Iterator<String> it = radMap.keySet().iterator();
         Object value = radMap.get("LoadLive");
         int day_count = baseMapper.getOffCountDMap(siteId);
         int month_count = baseMapper.getOffCountMMap(siteId);
+        Map<String,Object> map = new HashMap<>();
+        map.put("LoadLive",value);
+        map.put("day_count",day_count);
+        map.put("month_count",month_count);
+        list.add(map);
 
 
+//        Map<String, Object> LoopStatusList = baseMapper.getLoopStatusListMap(siteId);
+////        Iterator<String> it = radMap.keySet().iterator();
 
+//        int duration=0;
+//        for (String name:LoopStatusList.keySet()) {
+////            String   a =formatter.;
+//            radMap.get("sending_time");
+//
+//        }
 
-        for (String name:radMap.keySet()) {
-            Map<String,Object> map = new HashMap<>();
-            map.put("name",name);
-            map.put("value",radMap.get(name));
-            list.add(map);
-        }
         return list;
     }
 }