预警计算器-添加采区名称

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

 package com.xyst.dinas.production.processor;
 
+import com.xyst.dinas.biz.service.SandMiningAreaService;
 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;
 
+import java.util.UUID;
+
 /**
  * 上岸量比较
  *
@@ -24,6 +27,9 @@ public class SandAreaDinasCountWarningCalculator implements IWarningCalculator{
 	@Autowired
     private DischargingService dischargingService;
 
+	@Autowired
+    private SandMiningAreaService sandMiningAreaService;
+
 
 	@Override
 	public boolean isWarning(WarnSetting warnSetting) {
@@ -33,18 +39,28 @@ public class SandAreaDinasCountWarningCalculator implements IWarningCalculator{
 		if(max==null || max.trim().length()==0) {
             return false;
         }
-		//TODO
+        UUID billId = warnSetting.getBillId();
+        this.sandAreaName=sandMiningAreaService.getById(billId).getString("sandAreaName");
 
-        this.dischargingWeight= dischargingService.getAllDischargingWeightByNowAndSandAreaId(warnSetting.getBillId());
+        this.dischargingWeight= dischargingService.getAllDischargingWeightByNowAndSandAreaId(billId);
         //业务数据与设置的阀值做比较,计算是否预警
         if (dischargingWeight >= Double.parseDouble(max)) {
+
             warnMessage = "["+target+"]"+sandAreaName+"开采量已经达到"+dischargingWeight+",超出预警值"+max;
             return true;
         }
 	    return  false;
 	}
 
-	public double getDinasCount() {
+    public String getSandAreaName() {
+        return sandAreaName;
+    }
+
+    public void setSandAreaName(String sandAreaName) {
+        this.sandAreaName = sandAreaName;
+    }
+
+    public double getDinasCount() {
 		return dischargingWeight;
 	}
 	
@@ -66,4 +82,5 @@ public class SandAreaDinasCountWarningCalculator implements IWarningCalculator{
 	}
 
 
+
 }