修改预警计算器(轻量?) 预警值单位吨不乘1000

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/internal/service/DischargingServiceImpl.java

@@ -113,6 +113,12 @@ public class DischargingServiceImpl implements DischargingService {
         businessWarn.warn();
     }
 
+    @Override
+    public Double getAllDischargingWeightByNowAndSandAreaId(UUID billId){
+        return dischargingDao.getAllDischargingWeightByYearAndSandAreaId(new Date(), billId);
+
+    }
+
 
     @Override
     public KObject getById(UUID id) {

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/processor/SandAreaDinasCountWarningCalculate.java

@@ -38,8 +38,7 @@ public class SandAreaDinasCountWarningCalculate implements IWarningCalculator{
             return false;
         }
 		//业务数据与设置的阀值做比较,计算是否预警
-        //开采量乘10000
-		if (dischargingWeight >= Double.parseDouble(max)*10000) {
+		if (dischargingWeight >= Double.parseDouble(max)) {
 			warnMessage = "["+target+"]"+sandAreaName+"开采量已经达到"+dischargingWeight+",超出预警值"+max;
 			return true;
 		}

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/processor/SandAreaDinasCountWarningCalculator.java

@@ -2,6 +2,8 @@ package com.xyst.dinas.production.processor;
 
 import com.xyst.dinas.biz.warn.IWarningCalculator;
 import com.xyst.dinas.biz.warn.WarnSetting;
+import com.xyst.dinas.production.service.DischargingService;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * 上岸量比较
@@ -19,6 +21,8 @@ public class SandAreaDinasCountWarningCalculator implements IWarningCalculator{
 
 	private String warnMessage;
 
+	@Autowired
+    private DischargingService dischargingService;
 
 
 	@Override
@@ -30,8 +34,14 @@ public class SandAreaDinasCountWarningCalculator implements IWarningCalculator{
             return false;
         }
 		//TODO
-		
-		return false;
+
+        this.dischargingWeight= dischargingService.getAllDischargingWeightByNowAndSandAreaId(warnSetting.getBillId());
+        //业务数据与设置的阀值做比较,计算是否预警
+        if (dischargingWeight >= Double.parseDouble(max)) {
+            warnMessage = "["+target+"]"+sandAreaName+"开采量已经达到"+dischargingWeight+",超出预警值"+max;
+            return true;
+        }
+	    return  false;
 	}
 
 	public double getDinasCount() {

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/service/DischargingService.java

@@ -13,6 +13,8 @@ public interface DischargingService {
     UUID addDischarging(KObject kObject);
 
 
+    Double getAllDischargingWeightByNowAndSandAreaId(UUID billId);
+
     KObject getById(UUID id);
 
     KObject getByCodeNum(String name, UUID id);