采用vo来使用

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

@@ -3,8 +3,8 @@ package com.bizmatics.controller.web;
 
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.service.AlarmPowerService;
+import com.bizmatics.service.vo.ApCountVO;
 import com.bizmatics.service.vo.CommonIcoVO;
-import com.bizmatics.service.vo.CommonTotalVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -33,7 +33,7 @@ public class AlarmPowerController {
      * @return
      */
     @RequestMapping("/count")
-    public ApiResult<List<CommonTotalVO>> count(){
+    public ApiResult<ApCountVO> count(){
         return ApiResult.success(alarmPowerService.selectCount());
     }
 

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

@@ -3,7 +3,7 @@ package com.bizmatics.controller.web;
 
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.service.DeviceService;
-import com.bizmatics.service.vo.CommonTotalVO;
+import com.bizmatics.service.vo.DeviceCountVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -33,7 +33,7 @@ public class DeviceController {
      * @return
      */
     @RequestMapping("/count")
-    public ApiResult<List<CommonTotalVO>> count(@RequestParam Date startTime, @RequestParam Date endTime){
+    public ApiResult<DeviceCountVO> count(@RequestParam Date startTime, @RequestParam Date endTime){
         return ApiResult.success(deviceService.selectDeviceCount(startTime,endTime));
     }
 
@@ -44,7 +44,7 @@ public class DeviceController {
      * @return
      */
     @RequestMapping("/deviceTypeCount")
-    public ApiResult<List<CommonTotalVO>> selectDeviceCountByType(@RequestParam Integer site){
+    public ApiResult<DeviceCountVO> selectDeviceCountByType(@RequestParam Integer site){
         return ApiResult.success(deviceService.selectDeviceCountByType(site));
     }
 }

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

@@ -4,8 +4,8 @@ package com.bizmatics.controller.web;
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.service.HtAnalogDataService;
 import com.bizmatics.service.vo.CommonIcoVO;
-import com.bizmatics.service.vo.CommonTotalVO;
-import io.swagger.annotations.Api;
+import com.bizmatics.service.vo.HadCountVO;
+import com.bizmatics.service.vo.TimeShareVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -35,7 +35,7 @@ public class HtAnalogDataController {
      * @return
      */
     @RequestMapping("count")
-    public ApiResult<List<CommonTotalVO>> count(){
+    public ApiResult<HadCountVO> count(){
         return ApiResult.success(htAnalogDataService.selectCount());
     }
 
@@ -56,7 +56,7 @@ public class HtAnalogDataController {
      * @return
      */
     @RequestMapping("dayMonthYearEp")
-    public ApiResult<List<CommonTotalVO>> getCountBySite(@RequestParam Integer siteId){
+    public ApiResult<HadCountVO> getCountBySite(@RequestParam Integer siteId){
         return ApiResult.success(htAnalogDataService.getCountBySite(siteId));
     }
 
@@ -68,7 +68,7 @@ public class HtAnalogDataController {
      * @return
      */
     @RequestMapping("timeShare")
-    public ApiResult<List<CommonTotalVO>> getTimeShare(Integer siteId,Date date){
+    public ApiResult<TimeShareVO> getTimeShare(Integer siteId, Date date){
         return ApiResult.success(htAnalogDataService.getTimeShare(siteId,date));
     }
 

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

@@ -3,7 +3,6 @@ package com.bizmatics.controller.web;
 
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.service.PersonnelService;
-import com.bizmatics.service.vo.CommonTotalVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 

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

@@ -3,7 +3,6 @@ package com.bizmatics.controller.web;
 
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.service.RtAnalogDataService;
-import com.bizmatics.service.vo.CommonTotalVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 

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

@@ -3,7 +3,6 @@ package com.bizmatics.controller.web;
 
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.service.SiteService;
-import com.bizmatics.service.vo.CommonTotalVO;
 import com.bizmatics.service.vo.SiteVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -2,8 +2,8 @@ package com.bizmatics.service;
 
 import com.bizmatics.model.AlarmPower;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.service.vo.ApCountVO;
 import com.bizmatics.service.vo.CommonIcoVO;
-import com.bizmatics.service.vo.CommonTotalVO;
 
 import java.util.Date;
 import java.util.List;
@@ -22,7 +22,7 @@ public interface AlarmPowerService extends CrudService<AlarmPower> {
      * 告警总数和未处理告警总数
      * @return
      */
-    List<CommonTotalVO> selectCount();
+    ApCountVO selectCount();
 
     /**
      * 告警趋势图

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

@@ -2,10 +2,9 @@ package com.bizmatics.service;
 
 import com.bizmatics.model.Device;
 import com.bizmatics.common.mvc.base.CrudService;
-import com.bizmatics.service.vo.CommonTotalVO;
+import com.bizmatics.service.vo.DeviceCountVO;
 
 import java.util.Date;
-import java.util.List;
 
 /**
  * <p>
@@ -21,7 +20,7 @@ public interface DeviceService extends CrudService<Device> {
      * 查询不同状态设备数量
      * @return
      */
-    List<CommonTotalVO> selectDeviceCount(Date startTime, Date endTime);
+    DeviceCountVO selectDeviceCount(Date startTime, Date endTime);
 
 
     /**
@@ -29,5 +28,5 @@ public interface DeviceService extends CrudService<Device> {
      * @param site
      * @return
      */
-    List<CommonTotalVO> selectDeviceCountByType(Integer site);
+    DeviceCountVO selectDeviceCountByType(Integer site);
 }

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

@@ -3,7 +3,8 @@ package com.bizmatics.service;
 import com.bizmatics.model.HtAnalogData;
 import com.bizmatics.common.mvc.base.CrudService;
 import com.bizmatics.service.vo.CommonIcoVO;
-import com.bizmatics.service.vo.CommonTotalVO;
+import com.bizmatics.service.vo.HadCountVO;
+import com.bizmatics.service.vo.TimeShareVO;
 
 import java.util.Date;
 import java.util.List;
@@ -23,7 +24,7 @@ public interface HtAnalogDataService extends CrudService<HtAnalogData> {
      * 日/月/年用电量
      * @return
      */
-    List<CommonTotalVO> selectCount();
+    HadCountVO selectCount();
 
     /**
      * 用电趋势图
@@ -39,7 +40,7 @@ public interface HtAnalogDataService extends CrudService<HtAnalogData> {
      * 站点日/月/年用电量
      * @return
      */
-    List<CommonTotalVO> getCountBySite(Integer siteId);
+    HadCountVO getCountBySite(Integer siteId);
 
 
     /**
@@ -48,7 +49,7 @@ public interface HtAnalogDataService extends CrudService<HtAnalogData> {
      * @param date
      * @return
      */
-    List<CommonTotalVO> getTimeShare(Integer siteId,Date date);
+    TimeShareVO getTimeShare(Integer siteId, Date date);
 
     /**
      * 需量趋势图

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

@@ -2,7 +2,7 @@ package com.bizmatics.service;
 
 import com.bizmatics.model.Personnel;
 import com.bizmatics.common.mvc.base.CrudService;
-import com.bizmatics.service.vo.CommonTotalVO;
+import com.bizmatics.service.vo.PerCountVO;
 
 import java.util.List;
 
@@ -21,6 +21,6 @@ public interface PersonnelService extends CrudService<Personnel> {
      * 查询运维人员
      * @return
      */
-    List<CommonTotalVO> selectCount();
+    PerCountVO selectCount();
 
 }

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

@@ -2,7 +2,7 @@ package com.bizmatics.service;
 
 import com.bizmatics.model.RtAnalogData;
 import com.bizmatics.common.mvc.base.CrudService;
-import com.bizmatics.service.vo.CommonTotalVO;
+import com.bizmatics.service.vo.RadCountVO;
 
 import java.util.List;
 
@@ -17,6 +17,6 @@ import java.util.List;
 public interface RtAnalogDataService extends CrudService<RtAnalogData> {
 
 
-    List<CommonTotalVO> selectCount();
+    RadCountVO selectCount();
 
 }

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

@@ -2,7 +2,6 @@ package com.bizmatics.service;
 
 import com.bizmatics.model.Site;
 import com.bizmatics.common.mvc.base.CrudService;
-import com.bizmatics.service.vo.CommonTotalVO;
 import com.bizmatics.service.vo.SiteVO;
 
 import java.util.List;

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

@@ -6,8 +6,9 @@ import com.bizmatics.persistence.mapper.AlarmPowerMapper;
 import com.bizmatics.service.AlarmPowerService;
 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 com.bizmatics.service.vo.CommonTotalVO;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -27,16 +28,12 @@ public class AlarmPowerServiceImpl extends AbstractCrudService<AlarmPowerMapper,
 
 
     @Override
-    public List<CommonTotalVO> selectCount() {
-        List<CommonTotalVO> list = new ArrayList<>();
+    public ApCountVO selectCount() {
         Integer userId = SessionLocal.getUserId();
-        list.add(CommonTotalVO.builder()
-                .name("告警总数")
-                .objectData(baseMapper.selectCount(userId, null, null, null, null))
-                .build());
-        list.add(CommonTotalVO.builder().name("未处理告警总数")
-                .objectData(baseMapper.selectCount(userId, null, 0, null, null)).build());
-        return list;
+        ApCountVO apCountVo = new ApCountVO();
+        apCountVo.setCount(baseMapper.selectCount(userId, null, null, null, null));
+        apCountVo.setUnCount(baseMapper.selectCount(userId, null, 0, null, null));
+        return apCountVo;
     }
 
     @Override

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

@@ -7,7 +7,7 @@ import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.service.enums.DeviceStatusCode;
 import com.bizmatics.service.enums.DeviceType;
 import com.bizmatics.service.util.SessionLocal;
-import com.bizmatics.service.vo.CommonTotalVO;
+import com.bizmatics.service.vo.DeviceCountVO;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -27,36 +27,31 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
 
 
     @Override
-    public List<CommonTotalVO> selectDeviceCount(Date startTime, Date endTime) {
+    public DeviceCountVO selectDeviceCount(Date startTime, Date endTime) {
         Integer userId = SessionLocal.getUserId();
-        List<CommonTotalVO> list = new ArrayList<>();
-        list.add(CommonTotalVO.builder().name(DeviceStatusCode.NORMAL.getDescribe()).objectData(baseMapper
-                .selectCount(userId,null,DeviceStatusCode.NORMAL.getValue(),startTime,endTime,null)).build());
-        list.add(CommonTotalVO.builder().name(DeviceStatusCode.OFFLINE.getDescribe()).objectData(baseMapper
-                .selectCount(userId,null,DeviceStatusCode.OFFLINE.getValue(),startTime,endTime,null)).build());
-        list.add(CommonTotalVO.builder().name(DeviceStatusCode.DEVICE.getDescribe()).objectData(baseMapper
-                .selectCount(userId,null,DeviceStatusCode.DEVICE.getValue(),startTime,endTime,null)).build());
-        list.add(CommonTotalVO.builder().name(DeviceStatusCode.FAULT.getDescribe()).objectData(baseMapper
-                .selectCount(userId,null,DeviceStatusCode.FAULT.getValue(),startTime,endTime,null)).build());
-        return list;
+        DeviceCountVO deviceCountVo = new DeviceCountVO();
+        deviceCountVo.setNormalCount(baseMapper
+                .selectCount(userId,null,DeviceStatusCode.NORMAL.getValue(),startTime,endTime,null));
+        deviceCountVo.setOffLineCount(baseMapper
+                .selectCount(userId,null,DeviceStatusCode.OFFLINE.getValue(),startTime,endTime,null));
+        deviceCountVo.setDeviceCount(baseMapper
+                .selectCount(userId,null,DeviceStatusCode.DEVICE.getValue(),startTime,endTime,null));
+        deviceCountVo.setFaultCount(baseMapper
+                .selectCount(userId,null,DeviceStatusCode.FAULT.getValue(),startTime,endTime,null));
+
+        return deviceCountVo;
     }
 
     @Override
-    public List<CommonTotalVO> selectDeviceCountByType(Integer site) {
+    public DeviceCountVO selectDeviceCountByType(Integer site) {
+        DeviceCountVO deviceCountVo = new DeviceCountVO();
         Integer userId = SessionLocal.getUserId();
-        List<CommonTotalVO> list = new ArrayList<>();
         int oneEightThreeEp = baseMapper.selectCount(userId, site, null, null, null, DeviceType.ONE_EIGHT_THREE_EP.getValue());
         int oneSevenOneEp = baseMapper.selectCount(userId, site,null , null, null, DeviceType.ONE_SEVEN_ONE_EP.getValue());
         int oneSevenThreeEp = baseMapper.selectCount(userId, site, null, null, null, DeviceType.ONE_SEVEN_THREE_EP.getValue());
         int video = baseMapper.selectCount(userId, site, null, null, null, DeviceType.VODEO_MONITROING.getValue());
-        list.add(CommonTotalVO.builder()
-                .name("用电")
-                .objectData(oneEightThreeEp+oneSevenOneEp+oneSevenThreeEp)
-                .build());
-        list.add(CommonTotalVO.builder()
-                .name("视频")
-                .objectData(video)
-                .build());
-        return list;
+        deviceCountVo.setEpCount(oneEightThreeEp+oneSevenOneEp+oneSevenThreeEp);
+        deviceCountVo.setVideoCount(video);
+        return deviceCountVo;
     }
 }

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

@@ -8,7 +8,8 @@ import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.service.util.Arith;
 import com.bizmatics.service.util.SessionLocal;
 import com.bizmatics.service.vo.CommonIcoVO;
-import com.bizmatics.service.vo.CommonTotalVO;
+import com.bizmatics.service.vo.HadCountVO;
+import com.bizmatics.service.vo.TimeShareVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -29,17 +30,14 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
     private HtAnalogDataMapper htAnalogDataMapper;
 
     @Override
-    public List<CommonTotalVO> selectCount() {
+    public HadCountVO selectCount() {
         Integer userId = SessionLocal.getUserId();
         Date date = new Date();
-        List<CommonTotalVO> list = new ArrayList<>();
-        list.add(CommonTotalVO.builder().name("day")
-                .objectData(getElectricity(userId,null,DateUtils.getDayStartTime(date),date)).build());
-        list.add(CommonTotalVO.builder().name("month")
-                .objectData(getElectricity(userId,null,DateUtils.getFirstDayOfMonth(date),date)).build());
-        list.add(CommonTotalVO.builder().name("year")
-                .objectData(getElectricity(userId,null,DateUtils.getBeginDayOfYear(date),date)).build());
-        return list;
+        HadCountVO hadCountVO = new HadCountVO();
+        hadCountVO.setDayCount(getElectricity(userId,null,DateUtils.getDayStartTime(date),date));
+        hadCountVO.setMonthCount(getElectricity(userId,null,DateUtils.getFirstDayOfMonth(date),date));
+        hadCountVO.setYearCount(getElectricity(userId,null,DateUtils.getBeginDayOfYear(date),date));
+        return hadCountVO;
     }
 
     @Override
@@ -52,7 +50,7 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
     }
 
     @Override
-    public List<CommonTotalVO> getCountBySite(Integer siteId) {
+    public HadCountVO getCountBySite(Integer siteId) {
         Date date = new Date();
         Integer userId = SessionLocal.getUserId();
         //当日开始时间
@@ -61,70 +59,35 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
         Date firstDayOfMonth = DateUtils.getFirstDayOfMonth(date);
         //当年开始时间
         Date firstDayOfYear = DateUtils.getBeginDayOfYear(date);
-        Double dayCount = getElectricity(userId,siteId,firstDayOfDate,date);
-        Double monthCount = getElectricity(userId,siteId,firstDayOfMonth,date);
-        Double yearCount = getElectricity(userId,siteId,firstDayOfYear,date);
-        Double lastDayCount = getElectricity(userId,siteId,DateUtils.addDays(firstDayOfDate, -1),DateUtils.addDays(date, -1));
-        Double lastMonthCount = getElectricity(userId,siteId,DateUtils.addMonths(firstDayOfMonth, -1),DateUtils.addMonths(date, -1));
-        Double lastYearCount = getElectricity(userId,siteId,DateUtils.addYears(firstDayOfYear, -1),DateUtils.addYears(date, -1));
-
-        List<CommonTotalVO> list = new ArrayList<>();
-
-        list.add(CommonTotalVO.builder().name("day")
-                .objectData(dayCount)
-                .build());
-        list.add(CommonTotalVO.builder().name("month")
-                .objectData(monthCount)
-                .build());
-        list.add(CommonTotalVO.builder().name("year")
-                .objectData(yearCount)
-                .build());
-        list.add(CommonTotalVO.builder().name("lastDay")
-                .objectData(lastDayCount)
-                .build());
-        list.add(CommonTotalVO.builder().name("lastMonth")
-                .objectData(lastMonthCount)
-                .build());
-        list.add(CommonTotalVO.builder().name("lastYear")
-                .objectData(lastYearCount)
-                .build());
-        list.add(CommonTotalVO.builder().name("dayRadio")
-                .objectData(Arith.div(lastDayCount,dayCount))
-                .build());
-        list.add(CommonTotalVO.builder().name("monthRadio")
-                .objectData(Arith.div(lastMonthCount,monthCount))
-                .build());
-        list.add(CommonTotalVO.builder().name("yearRadio")
-                .objectData(Arith.div(lastYearCount,yearCount))
-                .build());
-        return list;
+        HadCountVO hadCountVO = new HadCountVO();
+        hadCountVO.setDayCount(getElectricity(userId,siteId,firstDayOfDate,date));
+        hadCountVO.setMonthCount(getElectricity(userId,siteId,firstDayOfMonth,date));
+        hadCountVO.setYearCount(getElectricity(userId,siteId,firstDayOfYear,date));
+        hadCountVO.setLastDayCount(getElectricity(userId,siteId,DateUtils.addDays(firstDayOfDate, -1),DateUtils.addDays(date, -1)));
+        hadCountVO.setLastMonthCount(getElectricity(userId,siteId,DateUtils.addMonths(firstDayOfMonth, -1),DateUtils.addMonths(date, -1)));
+        hadCountVO.setLastYearCount(getElectricity(userId,siteId,DateUtils.addYears(firstDayOfYear, -1),DateUtils.addYears(date, -1)));
+        hadCountVO.setDayRadio(Arith.div(hadCountVO.getLastDayCount(),hadCountVO.getDayCount()));
+        hadCountVO.setMonthRadio(Arith.div(hadCountVO.getLastMonthCount(),hadCountVO.getMonthCount()));
+        hadCountVO.setYearRadio(Arith.div(hadCountVO.getLastYearCount(),hadCountVO.getYearCount()));
+        return hadCountVO;
     }
 
     @Override
-    public List<CommonTotalVO> getTimeShare(Integer siteId,Date date) {
+    public TimeShareVO getTimeShare(Integer siteId, Date date) {
         Integer userId = SessionLocal.getUserId();
+        TimeShareVO timeShareVO = new TimeShareVO();
+        timeShareVO.setNeed(getElectricity(userId, siteId, DateUtils.setHours(date, 9), DateUtils.setHours(date, 12)));
         //高峰
         Double peakStart = getElectricity(userId, siteId, DateUtils.setHours(date, 8), DateUtils.setHours(date, 12));
         Double peakEnd = getElectricity(userId, siteId, DateUtils.setHours(date, 16), DateUtils.setHours(date, 20));
+        timeShareVO.setPeak(peakStart+peakEnd);
         //平
         Double flatStart = getElectricity(userId, siteId, DateUtils.setHours(date, 6), DateUtils.setHours(date, 8));
         Double flatCentre = getElectricity(userId, siteId, DateUtils.setHours(date, 12), DateUtils.setHours(date, 16));
         Double flatEnd = getElectricity(userId, siteId, DateUtils.setHours(date, 20), DateUtils.setHours(date, 22));
-        List<CommonTotalVO> list = new ArrayList<>();
-
-        list.add(CommonTotalVO.builder().name("need")
-                .objectData(getElectricity(userId,siteId,DateUtils.setHours(date,9),DateUtils.setHours(date,12)))
-                .build());
-        list.add(CommonTotalVO.builder().name("peak")
-                .objectData(peakStart+peakEnd)
-                .build());
-        list.add(CommonTotalVO.builder().name("grain")
-                .objectData(getElectricity(userId, siteId, DateUtils.setHours(date, 22), DateUtils.setHours(DateUtils.addDays(date,1), 6)))
-                .build());
-        list.add(CommonTotalVO.builder().name("flat")
-                .objectData(flatStart+flatCentre+flatEnd)
-                .build());
-        return list;
+        timeShareVO.setFlat(flatStart+flatCentre+flatEnd);
+        timeShareVO.setGrain(getElectricity(userId, siteId, DateUtils.setHours(date, 22), DateUtils.setHours(DateUtils.addDays(date, 1), 6)));
+        return timeShareVO;
     }
 
     @Override

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

@@ -6,7 +6,6 @@ import com.bizmatics.persistence.mapper.PersonnelMapper;
 import com.bizmatics.service.PersonnelService;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.service.enums.PersonnelType;
-import com.bizmatics.service.vo.CommonTotalVO;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;

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

@@ -11,7 +11,7 @@ import com.bizmatics.service.SiteService;
 import com.bizmatics.service.UserSiteService;
 import com.bizmatics.service.util.Arith;
 import com.bizmatics.service.util.SessionLocal;
-import com.bizmatics.service.vo.CommonTotalVO;
+import com.bizmatics.service.vo.RadCountVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -39,7 +39,7 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
 
 
     @Override
-    public List<CommonTotalVO> selectCount() {
+    public RadCountVO selectCount() {
         Integer userId = SessionLocal.getUserId();
         List<UserSite> userSites = userSiteService.list(Wrappers.lambdaQuery(UserSite.class).eq(UserSite::getUserId, userId));
         AtomicReference<Integer> heavyLoad = new AtomicReference<>(0);
@@ -58,13 +58,10 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
             }
         });
         int count = userSites.size();
-        List<CommonTotalVO> list = new ArrayList<>();
-        list.add(CommonTotalVO.builder().name("重载运行")
-                .objectData(Arith.div(heavyLoad.get(),count)).build());
-        list.add(CommonTotalVO.builder().name("轻载运行")
-                .objectData(Arith.div(easyLoad.get(),count)).build());
-        list.add(CommonTotalVO.builder().name("正常运行")
-                .objectData(Arith.div(norMalLoad.get(),count)).build());
-        return list;
+        RadCountVO radCountVO = new RadCountVO();
+        radCountVO.setHeavyLoad(Arith.div(heavyLoad.get(),count));
+        radCountVO.setEasyLoad(Arith.div(easyLoad.get(),count));
+        radCountVO.setNorMalLoad(Arith.div(norMalLoad.get(),count));
+        return radCountVO;
     }
 }

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

@@ -11,7 +11,6 @@ import com.bizmatics.service.SiteService;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.service.enums.DeviceStatusCode;
 import com.bizmatics.service.util.SessionLocal;
-import com.bizmatics.service.vo.CommonTotalVO;
 import com.bizmatics.service.vo.SiteVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -1,24 +0,0 @@
-package com.bizmatics.service.vo;
-
-import lombok.Builder;
-import lombok.Data;
-
-/**
- * @author yq
- * @date 2021/7/9 15:12
- */
-@Builder
-@Data
-public class CommonTotalVO {
-
-
-    /**
-     * 名称
-     */
-    private String name;
-
-    /**
-     * 数据
-     */
-    private Object objectData;
-}

fiveep-service/src/main/java/com/bizmatics/service/vo/SiteCountVO.java → fiveep-service/src/main/java/com/bizmatics/service/vo/DeviceCountVO.java

@@ -8,7 +8,7 @@ import org.bouncycastle.asn1.cmc.LraPopWitness;
  * @date 2021/7/7 15:10
  */
 @Data
-public class SiteCountVO {
+public class DeviceCountVO {
 
     /**
      * 正常
@@ -30,4 +30,13 @@ public class SiteCountVO {
      * 站点数量/设备数量
      */
     private Integer count;
+    /**
+     * 用户量
+     */
+    private Integer epCount;
+
+    /**
+     * 视频量
+     */
+    private Integer videoCount;
 }

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

@@ -23,4 +23,32 @@ public class HadCountVO {
      * 年用电量
      */
     private Double yearCount;
+
+    /**
+     * 昨天用电量
+     */
+    private Double lastDayCount;
+    /**
+     * 上月用电量
+     */
+    private Double lastMonthCount;
+
+    /**
+     * 年用电量
+     */
+    private Double lastYearCount;
+
+    /**
+     * 日期比例
+     */
+    private Double dayRadio;
+    /**
+     * 月比例
+     */
+    private Double monthRadio;
+
+    /**
+     * 年比例
+     */
+    private Double yearRadio;
 }

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

@@ -0,0 +1,28 @@
+package com.bizmatics.service.vo;
+
+import lombok.Data;
+
+/**
+ * @author yq
+ * @date 2021/7/9 16:48
+ */
+@Data
+public class TimeShareVO {
+
+    /**
+     * 尖
+     */
+    private Double need;
+    /**
+     * 峰
+     */
+    private Double peak;
+    /**
+     * 谷
+     */
+    private Double grain;
+    /**
+     * 平
+     */
+    private Double flat;
+}