电能测试第一版

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

@@ -36,6 +36,8 @@ public interface DeviceService extends CrudService<Device> {
      */
     DeviceCountVO selectDeviceCountByType(Integer site);
 
+    List<Device> list(Integer userId,Integer siteId,Integer deviceStatus,Date startTime,Date endTime,String type);
+
     List<DeviceList> deviceList(String siteId);
 
     List<Device> dataManagementDeviceList(int siteId, int deviceType);

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

@@ -71,6 +71,11 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
         return deviceCountVo;
     }
 
+    @Override
+    public List<Device> list(Integer userId,Integer siteId,Integer deviceStatus,Date startTime,Date endTime,String type) {
+        return baseMapper.list(userId,siteId,deviceStatus,startTime,endTime,type);
+    }
+
     /**
      * 汇总
      *

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

@@ -9,12 +9,12 @@ import com.bizmatics.common.core.exception.BusinessException;
 import com.bizmatics.common.core.util.*;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.common.spring.util.GlobalUtils;
-import com.bizmatics.model.Device;
-import com.bizmatics.model.HtAnalogData;
-import com.bizmatics.model.RtAnalogData;
-import com.bizmatics.persistence.mapper.DeviceMapper;
+import com.bizmatics.model.*;
 import com.bizmatics.persistence.mapper.RtAnalogDataMapper;
+import com.bizmatics.service.DeviceAttributeService;
+import com.bizmatics.service.DeviceService;
 import com.bizmatics.service.RtAnalogDataService;
+import com.bizmatics.service.SiteDynamicPropertiesService;
 import com.bizmatics.service.util.SecurityUtils;
 import com.bizmatics.service.vo.RadCountVO;
 import com.bizmatics.service.vo.RealScoreVO;
@@ -43,7 +43,11 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
 
 
     @Autowired
-    private DeviceMapper deviceMapper;
+    private DeviceService deviceService;
+    @Autowired
+    private SiteDynamicPropertiesService siteDynamicPropertiesService;
+    @Autowired
+    private DeviceAttributeService deviceAttributeService;
 
 
     @Override
@@ -53,7 +57,7 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
         AtomicReference<Integer> easyLoad = new AtomicReference<>(0);
         AtomicReference<Integer> norMalLoad = new AtomicReference<>(0);
         AtomicReference<Integer> count = new AtomicReference<>(0);
-        List<Device> deviceList = deviceMapper.list(userId, null, null, null, null, null);
+        List<Device> deviceList = deviceService.list(userId, null, null, null, null, null);
         List<RtAnalogData> list = baseMapper.list(userId);
         for (Device device : deviceList) {
             list.stream()
@@ -115,13 +119,14 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
         LambdaQueryWrapper<RtAnalogData> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(RtAnalogData::getDeviceName,deviceName);
         RtAnalogData rtAnalogData = getOne(queryWrapper);
+
         return null;
     }
 
     /**
      * 填充实时数据
      */
-    public void fillRealScoreData(RtAnalogData rtAnalogData){
+    public void fillRealScoreData(RtAnalogData rtAnalogData, SiteDynamicProperties siteDynamicProperties,DeviceAttribute deviceAttribute){
         List<Double> checkList = new ArrayList<>();
         RealScoreVO realScoreVo = BeanMapperUtils.map(rtAnalogData, RealScoreVO.class);
         checkList.add(realScoreVo.getIa());
@@ -135,6 +140,16 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
         checkList.add(realScoreVo.getUc());
         //电压不平衡
         realScoreVo.setVtBalun(checkBalun(checkList));
+        //电压合格率
+        realScoreVo.setUaQualified(Arith.sub(rtAnalogData.getUa(), Double.parseDouble(siteDynamicProperties.getVoltageLevel())));
+        realScoreVo.setUbQualified(Arith.sub(rtAnalogData.getUb(), Double.parseDouble(siteDynamicProperties.getVoltageLevel())));
+        realScoreVo.setUcQualified(Arith.sub(rtAnalogData.getUc(), Double.parseDouble(siteDynamicProperties.getVoltageLevel())));
+        //电流负载率
+        realScoreVo.setIaLoad(Arith.div(realScoreVo.getIa(),deviceAttribute.getRatedCurrent()));
+        realScoreVo.setIbLoad(Arith.div(realScoreVo.getIb(),deviceAttribute.getRatedCurrent()));
+        realScoreVo.setIcLoad(Arith.div(realScoreVo.getIc(),deviceAttribute.getRatedCurrent()));
+        //金
+
     }
 
 

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

@@ -43,7 +43,7 @@ public class RealScoreVO {
     /**
      * 功率因素
       */
-    private Double power;
+    private Double COS;
     /**
      * 电流不平衡
      */
@@ -53,16 +53,36 @@ public class RealScoreVO {
      */
     private Double vtBalun;
     /**
-     * a电流负载
+     * ia电流负载
      */
-    private Double aLoad;
+    private Double iaLoad;
     /**
-     * b电流负载
+     * ib电流负载
      */
-    private Double bLoad;
+    private Double ibLoad;
     /**
-     * c电流负载
+     * ic电流负载
      */
-    private Double cLoad;
+    private Double icLoad;
+    /**
+     * ua合格率
+     */
+    private Double uaQualified;
+    /**
+     * ub合格率
+     */
+    private Double ubQualified;
+    /**
+     * uc合格率
+     */
+    private Double ucQualified;
+    /**
+     * 分数
+     */
+    private Double score;
+    /**
+     * 回路
+     */
+    private String loop;
 
 }