Преглед на файлове

fix仪表状态按判断原始模拟量位号突变超过某阈值得出值

LLL преди 8 месеца
родител
ревизия
790b5a5fa9

+ 3 - 3
jeecg-module-interlock/src/main/java/org/jeecg/modules/detail/controller/InterlockDetailController.java

@@ -72,7 +72,7 @@ public class InterlockDetailController extends JeecgController<InterlockDetail,
 		 long duration = endTime - startTime;
 		 String log = "联锁逻辑状态-分页列表查询程序运行时间(毫秒):" + duration;
 		 System.out.println(log);
-		 interlockDetailMapper.insertIntoTimeTestLog("联锁逻辑状态",duration);
+//		 interlockDetailMapper.insertIntoTimeTestLog("联锁逻辑状态",duration);
 	 	 return Result.OK(pageList);
 
 	 }
@@ -91,7 +91,7 @@ public class InterlockDetailController extends JeecgController<InterlockDetail,
 		 long duration = endTime - startTime;
 		 String log = "原联锁逻辑状态-分页列表查询程序运行时间(毫秒):" + duration;
 		 System.out.println(log);
-		 interlockDetailMapper.insertIntoTimeTestLog("原联锁逻辑状态",duration);
+//		 interlockDetailMapper.insertIntoTimeTestLog("原联锁逻辑状态",duration);
 		 return Result.OK(pageList);
 
 	 }
@@ -114,7 +114,7 @@ public class InterlockDetailController extends JeecgController<InterlockDetail,
 		 long duration = endTime - startTime;
 		 String log = "联锁详细信息程序运行时间(毫秒):" + duration;
 		 System.out.println(log);
-		 interlockDetailMapper.insertIntoTimeTestLog("联锁详细信息",duration);
+//		 interlockDetailMapper.insertIntoTimeTestLog("联锁详细信息",duration);
 		 return Result.OK(pageList);
 	 }
 

+ 3 - 1
jeecg-module-interlock/src/main/java/org/jeecg/modules/summary/service/impl/InterlockSummaryServiceImpl.java

@@ -34,6 +34,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -381,7 +382,8 @@ public class InterlockSummaryServiceImpl extends ServiceImpl<InterlockSummaryMap
 
                         BigDecimal number = upperLimit.subtract(lowerLimit);
                         BigDecimal newYz = number.multiply(new BigDecimal(yz));
-                        if ((num.divide(beginValue).compareTo(newYz)) > 0){
+                        BigDecimal nowNum = num.divide(beginValue,2, RoundingMode.HALF_UP);
+                        if ((nowNum.compareTo(newYz)) > 0){
                             dto.setInstrumentStatus(instrumentStatusAbnormal); // 故障
                         }else dto.setInstrumentStatus(instrumentStatusNormal); // 正常
                     }