站点运行状态统计

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

@@ -100,5 +100,20 @@ public class AlarmPowerController {
                                                   @RequestParam(required = false) Integer siteId){
         return ApiResult.success(alarmPowerService.export(startTime, endTime, status, siteId));
     }
+
+
+    /**
+     * 运行状态
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param siteId 站点
+     * @return
+     */
+    @GetMapping("/runStatus")
+    public ApiResult<List<CommonIcoVO>> runStatus(@RequestParam Date startTime,
+                                                  @RequestParam Date endTime,
+                                                  @RequestParam Integer siteId){
+        return ApiResult.success(alarmPowerService.runStatus(startTime,endTime,siteId));
+    }
 }
 

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

@@ -31,7 +31,26 @@ public interface AlarmPowerMapper extends CrudMapper<AlarmPower> {
                         @Param("siteId") Integer siteId,
                         @Param("handlingStatus") Integer handlingStatus,
                         @Param("startTime") Date startTime,
-                        @Param("endTime") Date endTime);
+                        @Param("endTime") Date endTime,
+                        @Param("measName") String measName,
+                        @Param("digitalStatus") Integer digitalStatus);
+
+
+
+    /**
+     * 查询告警数量
+     * @param userId
+     * @param siteId
+     * @param handlingStatus
+     * @return
+     */
+    List<AlarmPower> list(@Param("userId") Integer userId,
+                        @Param("siteId") Integer siteId,
+                        @Param("handlingStatus") Integer handlingStatus,
+                        @Param("startTime") Date startTime,
+                        @Param("endTime") Date endTime,
+                        @Param("measName") String measName,
+                        @Param("digitalStatus") Integer digitalStatus);
 
 
 

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

@@ -22,7 +22,8 @@ public interface SiteMapper extends CrudMapper<Site> {
                     @Param("siteId") Integer siteId,
                     @Param("siteStatus") Integer siteStatus);
 
-    List<Site> list(@Param("userId") Integer userId);
+    List<Site> list(@Param("userId") Integer userId,
+                    @Param("name") String name);
 
 
 }

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

@@ -42,6 +42,12 @@
             <if test="endTime != null">
                 and ap.soe_time = #{endTime}
             </if>
+            <if test="measName != null and measName != ''">
+                and ap.meas_name = #{measName}
+            </if>
+            <if test="digitalStatus != null and digitalStatus != ''">
+                and ap.digital_value = #{digitalStatus}
+            </if>
         </where>
     </select>
     <select id="page" resultType="com.bizmatics.model.AlarmPower">
@@ -87,6 +93,37 @@
         </where>
         order by rsd.sending_time desc
     </select>
+    <select id="list" 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 ap
+        on d.device_code = ap.device_code
+        <where>
+            <if test="userId != null and userId != 0">
+                and us.user_id = #{userId}
+            </if>
+            <if test="siteId != null and siteId != 0">
+                and us.site_id = #{siteId}
+            </if>
+            <if test="handlingStatus != null">
+                and ap.handling_status = #{handlingStatus}
+            </if>
+            <if test="startTime != null">
+                and ap.soe_time = #{startTime}
+            </if>
+            <if test="endTime != null">
+                and ap.soe_time = #{endTime}
+            </if>
+            <if test="measName != null and measName != ''">
+                and ap.meas_name = #{measName}
+            </if>
+            <if test="digitalStatus != null and digitalStatus != ''">
+                and ap.digital_value = #{digitalStatus}
+            </if>
+        </where>
+    </select>
 
 
 </mapper>

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

@@ -46,6 +46,9 @@
             <if test="userId != null and userId != 0">
                 and us.user_id = #{userId}
             </if>
+            <if test="name != null and name != ''">
+                and s.site_name = #{name}
+            </if>
         </where>
     </select>
 

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

@@ -55,4 +55,13 @@ public interface AlarmPowerService extends CrudService<AlarmPower> {
      */
     String export(Date startTime, Date endTime, Integer status, Integer siteId);
 
+
+    /**
+     * 运行状态
+      * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param siteId 站点
+     * @return
+     */
+    List<CommonIcoVO> runStatus(Date startTime, Date endTime,Integer siteId);
 }

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

@@ -48,8 +48,8 @@ public class AlarmPowerServiceImpl extends AbstractCrudService<AlarmPowerMapper,
     public ApCountVO selectCount(Integer siteId) {
         Integer userId = SessionLocal.getUserId();
         ApCountVO apCountVo = new ApCountVO();
-        apCountVo.setCount(baseMapper.selectCount(userId, siteId, null, null, null));
-        apCountVo.setUnCount(baseMapper.selectCount(userId, siteId, 0, null, null));
+        apCountVo.setCount(baseMapper.selectCount(userId, siteId, null, null, null, null, null));
+        apCountVo.setUnCount(baseMapper.selectCount(userId, siteId, 0, null, null, null, null));
         return apCountVo;
     }
 
@@ -64,9 +64,9 @@ public class AlarmPowerServiceImpl extends AbstractCrudService<AlarmPowerMapper,
             Date setDays = DateUtils.addDays(endTime, -i);
             Date dayStartTime = DateUtils.getDayStartTime(setDays);
             Date dayEndTime = DateUtils.getDayEndTime(setDays);
-            faultList.add(baseMapper.selectCount(userId, siteId, null, dayStartTime, dayEndTime));
-            rushList.add(baseMapper.selectCount(userId, siteId, 1, dayStartTime, dayEndTime));
-            noDisposeList.add(baseMapper.selectCount(userId, siteId, 0, dayStartTime, dayEndTime));
+            faultList.add(baseMapper.selectCount(userId, siteId, null, dayStartTime, dayEndTime, null, null));
+            rushList.add(baseMapper.selectCount(userId, siteId, 1, dayStartTime, dayEndTime, null, null));
+            noDisposeList.add(baseMapper.selectCount(userId, siteId, 0, dayStartTime, dayEndTime, null, null));
             dateList.add(DateUtils.getMonth(setDays)+"-"+DateUtils.getDay(setDays));
         }
         List<CommonIcoVO> list = new ArrayList<>();
@@ -161,4 +161,32 @@ public class AlarmPowerServiceImpl extends AbstractCrudService<AlarmPowerMapper,
         }
         return file.getName();
     }
+
+    @Override
+    public List<CommonIcoVO> runStatus(Date startTime, Date endTime, Integer siteId) {
+        Integer userId = SessionLocal.getUserId();
+        List<CommonIcoVO> list = new ArrayList<>();
+        List<Object> offCounts = new ArrayList<>();
+        List<Object> offDateS = new ArrayList<>();
+        List<Object> runStatus = new ArrayList<>();
+        List<Object> runDates = new ArrayList<>();
+        Date forEndTime;
+        do {
+            Date dayStartTime = DateUtils.getDayStartTime(startTime);
+            Date dayEndTime = DateUtils.getDayEndTime(startTime);
+            Integer count = baseMapper.selectCount(userId, siteId, null, dayStartTime, dayEndTime, "LoadLive", 1);
+            offCounts.add(count);
+            forEndTime = dayEndTime;
+            offDateS.add(DateUtils.format(endTime,DateUtils.PARSE_PATTERNS[8]));
+        } while (forEndTime.before(endTime));
+
+        List<AlarmPower> loadLive = baseMapper.list(userId, siteId, null, startTime, endTime, "LoadLive", null);
+        loadLive.forEach(alarmPower -> {
+            runStatus.add(alarmPower.getDigitalValue());
+            runDates.add(DateUtils.format(alarmPower.getSendingTime(),DateUtils.PARSE_PATTERNS[5]));
+        });
+        list.add(CommonIcoVO.builder().name("offCount").list(offCounts).listDate(offDateS).build());
+        list.add(CommonIcoVO.builder().name("runStates").list(runStatus).listDate(runDates).build());
+        return list;
+    }
 }

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

@@ -47,7 +47,7 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
     @Override
     public List<SiteVO> list(String name) {
         List<SiteVO> list = new ArrayList<>();
-        List<Site> sites = baseMapper.list(SessionLocal.getUserId());
+        List<Site> sites = baseMapper.list(SessionLocal.getUserId(),name);
         Integer userId = SessionLocal.getUserId();
         for (Site site:sites) {
             SiteVO siteVo = BeanMapperUtils.map(site, SiteVO.class);