设备告警信息

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

@@ -1,13 +1,35 @@
 package com.bizmatics.controller.web;
 
+import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.service.FacilityService;
+import com.bizmatics.service.vo.FacilityCountVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @author yq
  * @date 2021/7/12 9:09
  */
 @RestController
-@RequestMapping("/object")
+@RequestMapping("/facility")
 public class FacilityController {
+
+
+    @Autowired
+    private FacilityService facilityService;
+
+    /**
+     * 查询不同设备的数量
+     * @param siteId
+     * @return
+     */
+    @RequestMapping("count")
+    public ApiResult<List<FacilityCountVO>> getCount(@RequestParam Integer siteId){
+        return ApiResult.success(facilityService.getCount(siteId));
+    }
 }

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

@@ -2,6 +2,7 @@ package com.bizmatics.controller.web;
 
 
 import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.model.Site;
 import com.bizmatics.service.SiteService;
 import com.bizmatics.service.vo.DeviceCountVO;
 import com.bizmatics.service.vo.SiteVO;
@@ -57,5 +58,11 @@ public class SiteController {
         return ApiResult.success(siteService.getOne(siteId));
     }
 
+
+    @RequestMapping("siteList")
+    public ApiResult<List<Site>> getSiteList(Integer userId){
+        return ApiResult.success(siteService.getSiteList(userId));
+    }
+
 }
 

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

@@ -2,6 +2,7 @@ package com.bizmatics.persistence.mapper;
 
 import com.bizmatics.common.mvc.base.CrudMapper;
 import com.bizmatics.model.Facility;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -10,4 +11,9 @@ import org.springframework.stereotype.Repository;
  */
 @Repository
 public interface FacilityMapper extends CrudMapper<Facility> {
+
+
+
+    Integer selectCount(@Param("siteId") Integer siteId,
+                        @Param("name") String name);
 }

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

@@ -2,4 +2,18 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bizmatics.persistence.mapper.FacilityMapper">
 
+    <select id="selectCount" resultType="java.lang.Integer">
+        select count(1)
+        from site_object as so
+        inner join object as o
+        on so.object_id = o.id
+        <where>
+            <if test="siteId != null and siteId != 0">
+                and so.site_id = #{siteId}
+            </if>
+            <if test="name != null and name != ''">
+                and o.object_name = #{name}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -22,7 +22,7 @@ public interface AlarmPowerService extends CrudService<AlarmPower> {
      * 告警总数和未处理告警总数
      * @return
      */
-    ApCountVO selectCount();
+    ApCountVO selectCount(Integer siteId);
 
     /**
      * 告警趋势图
@@ -30,4 +30,15 @@ public interface AlarmPowerService extends CrudService<AlarmPower> {
      */
     List<CommonIcoVO> selectByDate(Date date,Integer siteId);
 
+    /**
+     * list
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param status 状态
+     * @param siteId 站点id
+     * @param routeId 线路id
+     * @return
+     */
+    List<AlarmPower> list(Date startTime,Date endTime,Integer status,Integer siteId,Integer routeId);
+
 }

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

@@ -0,0 +1,23 @@
+package com.bizmatics.service;
+
+import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.Facility;
+import com.bizmatics.service.vo.FacilityCountVO;
+
+import java.util.List;
+
+/**
+ * @author yq
+ * @date 2021/7/12 9:01
+ */
+public interface FacilityService extends CrudService<Facility> {
+
+
+    /**
+     * 查询不同设备的数量
+     * @param siteId
+     * @return
+     */
+    List<FacilityCountVO> getCount(Integer siteId);
+
+}

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

@@ -1,11 +0,0 @@
-package com.bizmatics.service;
-
-import com.bizmatics.common.mvc.base.CrudService;
-import com.bizmatics.model.Facility;
-
-/**
- * @author yq
- * @date 2021/7/12 9:01
- */
-public interface ObjectService extends CrudService<Facility> {
-}

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

@@ -39,5 +39,12 @@ public interface SiteService extends CrudService<Site> {
      */
     SiteVO getOne(Long siteId);
 
+    /**
+     * 站点字典
+     * @param userId
+     * @return
+     */
+    List<Site> getSiteList(Integer userId);
+
 
 }

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

@@ -28,11 +28,11 @@ public class AlarmPowerServiceImpl extends AbstractCrudService<AlarmPowerMapper,
 
 
     @Override
-    public ApCountVO selectCount() {
+    public ApCountVO selectCount(Integer siteId) {
         Integer userId = SessionLocal.getUserId();
         ApCountVO apCountVo = new ApCountVO();
-        apCountVo.setCount(baseMapper.selectCount(userId, null, null, null, null));
-        apCountVo.setUnCount(baseMapper.selectCount(userId, null, 0, null, null));
+        apCountVo.setCount(baseMapper.selectCount(userId, siteId, null, null, null));
+        apCountVo.setUnCount(baseMapper.selectCount(userId, siteId, 0, null, null));
         return apCountVo;
     }
 
@@ -53,4 +53,9 @@ public class AlarmPowerServiceImpl extends AbstractCrudService<AlarmPowerMapper,
         list.add(CommonIcoVO.builder().name("抢修数量").list(rushList).build());
         return list;
     }
+
+    @Override
+    public List<AlarmPower> list(Date startTime, Date endTime, Integer status, Integer siteId, Integer routeId) {
+        return null;
+    }
 }

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

@@ -0,0 +1,28 @@
+package com.bizmatics.service.impl;
+
+import com.bizmatics.common.mvc.base.AbstractCrudService;
+import com.bizmatics.model.Facility;
+import com.bizmatics.persistence.mapper.FacilityMapper;
+import com.bizmatics.service.FacilityService;
+import com.bizmatics.service.enums.ObjectCode;
+import com.bizmatics.service.vo.FacilityCountVO;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author yq
+ * @date 2021/7/12 9:02
+ */
+@Service
+public class FacilityServiceImpl extends AbstractCrudService<FacilityMapper, Facility> implements FacilityService {
+    @Override
+    public List<FacilityCountVO> getCount(Integer siteId) {
+        List<FacilityCountVO> list = new ArrayList<>();
+        list.add(new FacilityCountVO(ObjectCode.BOX_TYPE.getName(), baseMapper.selectCount(siteId, ObjectCode.BOX_TYPE.getName())));
+        list.add(new FacilityCountVO(ObjectCode.POLE_TYPE.getName(), baseMapper.selectCount(siteId, ObjectCode.POLE_TYPE.getName())));
+        list.add(new FacilityCountVO(ObjectCode.EP_TYPE.getName(), baseMapper.selectCount(siteId, ObjectCode.EP_TYPE.getName())));
+        return list;
+    }
+}

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

@@ -1,15 +0,0 @@
-package com.bizmatics.service.impl;
-
-import com.bizmatics.common.mvc.base.AbstractCrudService;
-import com.bizmatics.model.Facility;
-import com.bizmatics.persistence.mapper.FacilityMapper;
-import com.bizmatics.service.ObjectService;
-import org.springframework.stereotype.Service;
-
-/**
- * @author yq
- * @date 2021/7/12 9:02
- */
-@Service
-public class ObjectServiceImpl extends AbstractCrudService<FacilityMapper, Facility> implements ObjectService {
-}

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

@@ -75,4 +75,9 @@ public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> imple
         Site site = baseMapper.selectOne(Wrappers.lambdaQuery(Site.class).eq(Site::getId, siteId));
         return Optional.ofNullable(site).map(st -> BeanMapperUtils.map(site,SiteVO.class)).orElseThrow(() -> new BusinessException("站点信息不存在"));
     }
+
+    @Override
+    public List<Site> getSiteList(Integer userId) {
+        return baseMapper.list(SessionLocal.getUserId());
+    }
 }

fiveep-service/src/main/java/com/bizmatics/service/vo/FacilityCountVO.java

@@ -0,0 +1,29 @@
+package com.bizmatics.service.vo;
+
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/7/12 9:27
+ */
+@Data
+public class FacilityCountVO {
+
+    public FacilityCountVO(){
+    }
+
+    public FacilityCountVO(String name,Integer count){
+        this.name = name;
+        this.count = count;
+    }
+
+    /**
+     * 名称(箱变,杆变,配电)
+     */
+    private String name;
+
+    /**
+     * 数量
+     */
+    private Integer count;
+}