散客预警是否通知人员,修改为True&&超采预警记录字段拿错了

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/internal/service/RetailInfoServiceImpl.java

@@ -78,7 +78,7 @@ public class RetailInfoServiceImpl implements RetailInfoService {
         if (warnSetting != null) {
             BaseBusinessWarn warn = warningService.createWarn(warnSetting.getSettingId());
             warn.setWarningCalculate(new RetailInfoBuyCountWarningCalculate(retailInfoName, idCard, station, selectBuyCountByIdCard(idCard, station)));
-            warn.warn(false);
+            warn.warn(true);
         } else {
             setWarningSettingEntity(newKobject, uuid, RetailInfoConstant.RETAIL_INFO_WARN_BUY_COUNT, RetailInfoConstant.RETAIL_INFO_BUY_COUNT_WARNING_CALCULATOR,templateCount.getMax(),false,true);
         }
@@ -120,7 +120,7 @@ public class RetailInfoServiceImpl implements RetailInfoService {
         List<KObject> allByStationId = warehouseUserService.getAllByStationId(UUID.fromString(stationId));
         warnSettingEntity.setPersonnel(allByStationId.stream().map(a -> a.getString("id")).toArray(String[]::new));
         warnSettingEntity.setWarnCalculator(warnCalculator);
-        warningService.insertWarnSettingToIsNotice(warnSettingEntity,false);
+        warningService.insertWarnSettingToIsNotice(warnSettingEntity,true);
         return warnSettingEntity;
     }
 

backend/xyst.dinas.production/src/main/java/com/xyst/dinas/production/internal/SandWarningExeProcessor.java

@@ -49,7 +49,7 @@ public class SandWarningExeProcessor implements DataProcessor {
                 sandAreaName = byId.getString("sandMiningAreaName");
                 shipName="-";
                 regionalCompanyName=byId.get("regionalCompany").getString("name");
-                row.put("detail", warnSetting.getMax());
+                row.put("detail", row.get("actualValue"));
 
             }else if(SandMiningAreaConstant.SAND_SHIP_WARN_BILL_TYPE.equals(billType)){
                 KObject sandMining = sandMiningService.getById(billId);
@@ -57,7 +57,7 @@ public class SandWarningExeProcessor implements DataProcessor {
                 shipName=sandMining.get("ship").getString("shipName");
                 regionalCompanyName=sandMining.get("regionalCompany").getString("name");
 
-                row.put("detail", row.get("target").toString());
+                row.put("detail", row.get("-").toString());
             }
             row.put("sandAreaName", sandAreaName);
             row.put("shipName", shipName);

backend/xyst.dinas.production/src/main/resources/com/xyst/dinas/production/query/SandWarningExe.jmx

@@ -111,7 +111,7 @@
 				</m:field>
 				<m:field>
 					<m:name>min</m:name>
-					<m:title>实际值</m:title>
+					<m:title>最少值</m:title>
 					<m:type>string</m:type>
 					<m:ref>
 						<m:name></m:name>
@@ -119,6 +119,17 @@
 					</m:ref>
 					<m:desc></m:desc>
 				</m:field>
+
+                <m:field>
+                    <m:name>actualValue</m:name>
+                    <m:title>实际值</m:title>
+                    <m:type>string</m:type>
+                    <m:ref>
+                        <m:name></m:name>
+                        <m:type></m:type>
+                    </m:ref>
+                    <m:desc></m:desc>
+                </m:field>
 				<m:field>
 					<m:name>warnState</m:name>
 					<m:title>状态</m:title>