更改电压上下限和功率因数上限更新2

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

@@ -39,7 +39,8 @@ public interface RtAnalogDataMapper extends CrudMapper<RtAnalogData> {
     List<RtAnalogData> list(@Param("userId") Integer userId);
 
 
-    Map<String, Object> getOneMap(@Param("siteId") Integer siteId);
+    Map<String, Object> getOneMap(@Param("userId") Integer userId,
+                                  @Param("siteId") Integer siteId);
 
     List<HtAnalogData> getDataReportMap(@Param("siteId") Integer siteId, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
 

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

@@ -89,7 +89,10 @@
         on d.device_code = rad.deviceName
         <where>
             <if test="siteId != null and siteId != 0">
-                and us.site_id = #{siteId}
+              us.site_id = #{siteId}
+            </if>
+            <if test="userId != null and userId != 0">
+              and  us.user_id = #{userId}
             </if>
         </where>
     </select>

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

@@ -944,7 +944,7 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
         }else {
             singleLoopReportOneVo.setFStatus(false);
         }
-        if (SingleLoopReportList.get(0).getCos()<0.9){
+        if (SingleLoopReportList.get(0).getCos()>0.85){
             singleLoopReportOneVo.setCosStatus(true);
         }else {
             singleLoopReportOneVo.setCosStatus(false);
@@ -1021,12 +1021,12 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
         singleLoopReportOneVo.setProportionF(OverrunF+"/"+singleLoopReportOneVo.getMeasuringPoints());
         singleLoopReportOneVo.setProportionElBalun(OverrunElBalun+"/"+singleLoopReportOneVo.getMeasuringPoints());
         singleLoopReportOneVo.setProportionVtBalun(OverrunVtBalun+"/"+singleLoopReportOneVo.getMeasuringPoints());
-        singleLoopReportOneVo.setQrUa(OverrunUa==0?100.00:Double.valueOf(OverrunUa)/Double.valueOf(singleLoopReportOneVo.getMeasuringPoints())*100);
-        singleLoopReportOneVo.setQrUb(OverrunUb==0?100.00:Double.valueOf(OverrunUb)/Double.valueOf(singleLoopReportOneVo.getMeasuringPoints())*100);
-        singleLoopReportOneVo.setQrUc(OverrunUc==0?100.00:Double.valueOf(OverrunUc)/Double.valueOf(singleLoopReportOneVo.getMeasuringPoints())*100);
-        singleLoopReportOneVo.setQrF(OverrunF==0?100.00:Double.valueOf(OverrunF)/Double.valueOf(singleLoopReportOneVo.getMeasuringPoints())*100);
-        singleLoopReportOneVo.setQrElBalun(OverrunElBalun==0?100.00:Double.valueOf(OverrunElBalun)/Double.valueOf(singleLoopReportOneVo.getMeasuringPoints()));
-        singleLoopReportOneVo.setQrVtBalun(OverrunVtBalun==0?100.00:Double.valueOf(OverrunVtBalun)/Double.valueOf(singleLoopReportOneVo.getMeasuringPoints()));
+        singleLoopReportOneVo.setQrUa(OverrunUa==0?00.00:Double.valueOf(OverrunUa)/Double.valueOf(singleLoopReportOneVo.getMeasuringPoints())*100);
+        singleLoopReportOneVo.setQrUb(OverrunUb==0?00.00:Double.valueOf(OverrunUb)/Double.valueOf(singleLoopReportOneVo.getMeasuringPoints())*100);
+        singleLoopReportOneVo.setQrUc(OverrunUc==0?00.00:Double.valueOf(OverrunUc)/Double.valueOf(singleLoopReportOneVo.getMeasuringPoints())*100);
+        singleLoopReportOneVo.setQrF(OverrunF==0?00.00:Double.valueOf(OverrunF)/Double.valueOf(singleLoopReportOneVo.getMeasuringPoints())*100);
+        singleLoopReportOneVo.setQrElBalun(OverrunElBalun==0?00.00:Double.valueOf(OverrunElBalun)/Double.valueOf(singleLoopReportOneVo.getMeasuringPoints()));
+        singleLoopReportOneVo.setQrVtBalun(OverrunVtBalun==0?00.00:Double.valueOf(OverrunVtBalun)/Double.valueOf(singleLoopReportOneVo.getMeasuringPoints()));
         singleLoopReportOneVo.setVoltageLevelToplimit(voltageLevel+voltageLevelWanting);
         singleLoopReportOneVo.setVoltageLevelLowerLimit(voltageLevel-voltageLevelWanting);
         singleLoopReportOneVo.setMhz(50.00);

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

@@ -126,8 +126,9 @@ public class RtAnalogDataServiceImpl extends AbstractCrudService<RtAnalogDataMap
 
     @Override
     public List<Map<String, Object>> getOne(Integer siteId) {
+        Integer userId = SecurityUtils.getLoginUser().getUser().getUserId().intValue();
         List<Map<String, Object>> list = new ArrayList<>();
-        Map<String, Object> radMap = baseMapper.getOneMap(siteId);
+        Map<String, Object> radMap = baseMapper.getOneMap(userId,siteId);
         Optional.ofNullable(radMap).ifPresent(rad -> {
             for (String name : rad.keySet()) {
                 Map<String, Object> map = new HashMap<>();