告警设备接口的完善

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

@@ -2,6 +2,8 @@ package com.bizmatics.controller.web;
 
 
 import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.model.AlarmPower;
 import com.bizmatics.service.AlarmPowerService;
 import com.bizmatics.service.vo.ApCountVO;
 import com.bizmatics.service.vo.CommonIcoVO;
@@ -33,8 +35,8 @@ public class AlarmPowerController {
      * @return
      */
     @RequestMapping("/count")
-    public ApiResult<ApCountVO> count(){
-        return ApiResult.success(alarmPowerService.selectCount());
+    public ApiResult<ApCountVO> count(@RequestParam(required = false) Integer siteId) {
+        return ApiResult.success(alarmPowerService.selectCount(siteId));
     }
 
 
@@ -43,8 +45,20 @@ public class AlarmPowerController {
      * @return
      */
     @RequestMapping("/trendIco")
-    public ApiResult<List<CommonIcoVO>> selectByDate(@RequestParam Date date,@RequestParam Integer siteId){
-        return ApiResult.success(alarmPowerService.selectByDate(date, siteId));
+    public ApiResult<List<CommonIcoVO>> selectByDate(@RequestParam Date startTime,
+                                                     @RequestParam(required = false) Date endTime,
+                                                     @RequestParam Integer siteId){
+        return ApiResult.success(alarmPowerService.selectByDate(startTime,endTime,siteId));
+    }
+
+    @RequestMapping("/page")
+    public ApiResult<CommonPage<AlarmPower>> page(@RequestParam(required = false) Date startTime,
+                                                  @RequestParam(required = false) Date endTime,
+                                                  @RequestParam(required = false) Integer status,
+                                                  @RequestParam(required = false) Integer siteId,
+                                                  @RequestParam Integer current,
+                                                  @RequestParam Integer size){
+        return ApiResult.success(alarmPowerService.page(startTime, endTime, status, siteId, current, size));
     }
 }
 

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

@@ -1,10 +1,13 @@
 package com.bizmatics.persistence.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.bizmatics.model.AlarmPower;
 import com.bizmatics.common.mvc.base.CrudMapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -29,4 +32,13 @@ public interface AlarmPowerMapper extends CrudMapper<AlarmPower> {
                         @Param("handlingStatus") Integer handlingStatus,
                         @Param("startTime") Date startTime,
                         @Param("endTime") Date endTime);
+
+
+
+    List<AlarmPower> list(IPage<AlarmPower> page,
+                          @Param("userId") Integer userId,
+                          @Param("siteId") Integer siteId,
+                          @Param("handlingStatus") Integer handlingStatus,
+                          @Param("startTime") Date startTime,
+                          @Param("endTime") Date endTime);
 }

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

@@ -44,5 +44,30 @@
             </if>
         </where>
     </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>
+        </where>
+    </select>
 
 </mapper>

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

@@ -1,5 +1,6 @@
 package com.bizmatics.service;
 
+import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.model.AlarmPower;
 import com.bizmatics.common.mvc.base.CrudService;
 import com.bizmatics.service.vo.ApCountVO;
@@ -28,7 +29,7 @@ public interface AlarmPowerService extends CrudService<AlarmPower> {
      * 告警趋势图
      * @return
      */
-    List<CommonIcoVO> selectByDate(Date date,Integer siteId);
+    List<CommonIcoVO> selectByDate(Date startTime,Date endTime,Integer siteId);
 
     /**
      * list
@@ -36,9 +37,8 @@ public interface AlarmPowerService extends CrudService<AlarmPower> {
      * @param endTime 结束时间
      * @param status 状态
      * @param siteId 站点id
-     * @param routeId 线路id
      * @return
      */
-    List<AlarmPower> list(Date startTime,Date endTime,Integer status,Integer siteId,Integer routeId);
+    CommonPage<AlarmPower> page(Date startTime, Date endTime, Integer status, Integer siteId, Integer current, Integer size);
 
 }

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

@@ -3,6 +3,8 @@ package com.bizmatics.service;
 import com.bizmatics.model.Route;
 import com.bizmatics.common.mvc.base.CrudService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +15,5 @@ import com.bizmatics.common.mvc.base.CrudService;
  */
 public interface RouteService extends CrudService<Route> {
 
+
 }

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

@@ -1,5 +1,7 @@
 package com.bizmatics.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.common.core.util.DateUtils;
 import com.bizmatics.model.AlarmPower;
 import com.bizmatics.persistence.mapper.AlarmPowerMapper;
@@ -14,6 +16,7 @@ import org.springframework.stereotype.Service;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -37,25 +40,36 @@ public class AlarmPowerServiceImpl extends AbstractCrudService<AlarmPowerMapper,
     }
 
     @Override
-    public List<CommonIcoVO> selectByDate(Date date,Integer siteId) {
+    public List<CommonIcoVO> selectByDate(Date startTime,Date endTime,Integer siteId) {
         List<Object> faultList = new ArrayList<>();
         List<Object> rushList = new ArrayList<>();
+        List<Object> noDisposeList = new ArrayList<>();
         Integer userId = SessionLocal.getUserId();
-        for (int i = 0; i < Integer.parseInt(DateUtils.getDay(date)); i++) {
-            Date setDays = DateUtils.setDays(date, i);
+        int forCount = 0;
+        if (null == startTime){
+            forCount = 7;
+        }else {
+            forCount = DateUtils.getDistanceOfTwoDateNew(endTime,startTime);
+        }
+        for (int i = 0; i < forCount; i++) {
+            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));
         }
         List<CommonIcoVO> list = new ArrayList<>();
         list.add(CommonIcoVO.builder().name("故障数量").list(faultList).build());
         list.add(CommonIcoVO.builder().name("抢修数量").list(rushList).build());
+        list.add(CommonIcoVO.builder().name("未处理数量").list(noDisposeList).build());
         return list;
     }
 
     @Override
-    public List<AlarmPower> list(Date startTime, Date endTime, Integer status, Integer siteId, Integer routeId) {
-        return null;
+    public CommonPage<AlarmPower> page(Date startTime, Date endTime, Integer status, Integer siteId,Integer current,Integer size) {
+        Page<AlarmPower> page = new Page<>(current, size);
+        baseMapper.list(page,SessionLocal.getUserId(),siteId,status,startTime,endTime);
+        return this.ToCommonPage(page);
     }
 }

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

@@ -6,6 +6,8 @@ import com.bizmatics.service.RouteService;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +19,5 @@ import org.springframework.stereotype.Service;
 @Service
 public class RouteServiceImpl extends AbstractCrudService<RouteMapper, Route> implements RouteService {
 
+
 }