web完善

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

@@ -3,6 +3,7 @@ package com.bizmatics.controller.web;
 
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.service.PersonnelService;
+import com.bizmatics.service.vo.PerCountVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -30,7 +31,7 @@ public class PersonnelController {
      * @return
      */
     @RequestMapping("count")
-    public ApiResult<List<CommonTotalVO>> getCount(){
+    public ApiResult<PerCountVO> getCount(){
         return ApiResult.success(personnelService.selectCount());
     }
 }

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

@@ -3,6 +3,7 @@ package com.bizmatics.controller.web;
 
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.service.RtAnalogDataService;
+import com.bizmatics.service.vo.RadCountVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -29,7 +30,7 @@ public class RtAnalogDataController {
      * @return
      */
     @RequestMapping("count")
-    public ApiResult<List<CommonTotalVO>> getCount(){
+    public ApiResult<RadCountVO> getCount(){
         return ApiResult.success(rtAnalogDataService.selectCount());
     }
 }

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

@@ -3,6 +3,7 @@ package com.bizmatics.controller.web;
 
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.service.SiteService;
+import com.bizmatics.service.vo.DeviceCountVO;
 import com.bizmatics.service.vo.SiteVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -31,7 +32,7 @@ public class SiteController {
      * @return
      */
     @RequestMapping("count")
-    public ApiResult<List<CommonTotalVO>> getCount(){
+    public ApiResult<DeviceCountVO> getCount(){
         return ApiResult.success(siteService.selectCount());
     }
 
@@ -46,5 +47,15 @@ public class SiteController {
         return ApiResult.success(siteService.list(name));
     }
 
+    /**
+     * 查看站点详情
+     * @param siteId
+     * @return
+     */
+    @RequestMapping("one")
+    public ApiResult<SiteVO> getOne(@RequestParam(required = false) Long siteId){
+        return ApiResult.success(siteService.getOne(siteId));
+    }
+
 }
 

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

@@ -2,6 +2,7 @@ package com.bizmatics.service;
 
 import com.bizmatics.model.Site;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.service.vo.DeviceCountVO;
 import com.bizmatics.service.vo.SiteVO;
 
 import java.util.List;
@@ -21,7 +22,7 @@ public interface SiteService extends CrudService<Site> {
      * 查看不同状态的站点数量
      * @return
      */
-    List<CommonTotalVO> selectCount();
+    DeviceCountVO selectCount();
 
 
     /**

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

@@ -6,6 +6,7 @@ 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.PerCountVO;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -23,16 +24,10 @@ import java.util.List;
 public class PersonnelServiceImpl extends AbstractCrudService<PersonnelMapper, Personnel> implements PersonnelService {
 
     @Override
-    public List<CommonTotalVO> selectCount() {
-        List<CommonTotalVO> list = new ArrayList<>();
-        list.add(CommonTotalVO.builder()
-                .name(PersonnelType.MAINTENANCE.getName())
-                .objectData(baseMapper.selectCount(Wrappers.lambdaQuery(Personnel.class).eq(Personnel::getPersonnelFunction, PersonnelType.MAINTENANCE.getValue())))
-                .build());
-        list.add(CommonTotalVO.builder()
-                .name(PersonnelType.POWER.getName())
-                .objectData(baseMapper.selectCount(Wrappers.lambdaQuery(Personnel.class).eq(Personnel::getPersonnelFunction, PersonnelType.POWER.getValue())))
-                .build());
-        return list;
+    public PerCountVO selectCount() {
+        PerCountVO perCountVO = new PerCountVO();
+        perCountVO.setPower(baseMapper.selectCount(Wrappers.lambdaQuery(Personnel.class).eq(Personnel::getPersonnelFunction, PersonnelType.POWER.getValue())));
+        perCountVO.setMaintain(baseMapper.selectCount(Wrappers.lambdaQuery(Personnel.class).eq(Personnel::getPersonnelFunction, PersonnelType.MAINTENANCE.getValue())));
+        return perCountVO;
     }
 }

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

@@ -11,6 +11,7 @@ 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.DeviceCountVO;
 import com.bizmatics.service.vo.SiteVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -30,24 +31,17 @@ import java.util.Optional;
 @Service
 public class SiteServiceImpl extends AbstractCrudService<SiteMapper, Site> implements SiteService {
 
-    @Autowired
-    private DeviceService deviceService;
     @Autowired
     private DeviceMapper deviceMapper;
     @Override
-    public List<CommonTotalVO> selectCount() {
-        List<CommonTotalVO> list = new ArrayList<>();
+    public DeviceCountVO selectCount() {
         Integer userId = SessionLocal.getUserId();
-        list.add(CommonTotalVO.builder().name(DeviceStatusCode.NORMAL.getDescribe())
-                .objectData(baseMapper.selectCount(userId,null,DeviceStatusCode.NORMAL.getValue())).build());
-        list.add(CommonTotalVO.builder().name(DeviceStatusCode.OFFLINE.getDescribe())
-                .objectData(baseMapper.selectCount(userId,null,DeviceStatusCode.OFFLINE.getValue())).build());
-        list.add(CommonTotalVO.builder().name(DeviceStatusCode.DEVICE.getDescribe())
-                .objectData(baseMapper.selectCount(userId,null,DeviceStatusCode.DEVICE.getValue())).build());
-        list.add(CommonTotalVO.builder().name(DeviceStatusCode.FAULT.getDescribe())
-                .objectData(baseMapper.selectCount(userId,null,DeviceStatusCode.FAULT.getValue())).build());
-
-        return list;
+        DeviceCountVO deviceCountVO = new DeviceCountVO();
+        deviceCountVO.setNormalCount(baseMapper.selectCount(userId,null,DeviceStatusCode.NORMAL.getValue()));
+        deviceCountVO.setOffLineCount(baseMapper.selectCount(userId,null,DeviceStatusCode.OFFLINE.getValue()));
+        deviceCountVO.setDeviceCount(baseMapper.selectCount(userId,null,DeviceStatusCode.DEVICE.getValue()));
+        deviceCountVO.setFaultCount(baseMapper.selectCount(userId,null,DeviceStatusCode.FAULT.getValue()));
+        return deviceCountVO;
     }
 
     @Override