完善预警代码;

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/warn/WarnSettingConstant.java

@@ -13,23 +13,20 @@ public class WarnSettingConstant {
 	public static final String min = "min";
 	/** 预警阀值上限  */
 	public static final String max = "max";
-	/**   */
+	/** 业务类型  */
 	public static final String billType = "billType";
-	/**   */
+	/**  业务ID */
 	public static final String billId = "billId";
-	/**   */
+	/**  预警指标*/
 	public static final String target = "target";
-	/**   */
+	/**  指标数据类型 */
 	public static final String targetType = "targetType";
-	/**   */
+	/**  通知人员 */
 	public static final String personnel = "personnel";
-	/**   */
+	/**  备注 */
 	public static final String memo = "memo";
 	
 	
-	
-	/************************************/
-	
 	/** 实体名:预警执行记录  */
 	public static final String ENTITY_WARNINGEXE = "com.xyst.dinas.biz.datamodel.WarningExe";
 	
@@ -47,7 +44,4 @@ public class WarnSettingConstant {
 	public static final String ACTUAL_VALUE = "actualValue";
 
 
-
-
-
 }

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/warn/WarningServiceImpl.java

@@ -33,16 +33,20 @@ public class WarningServiceImpl implements WarningService{
 	@Override
     public UUID insertWarnSetting(WarnSetting warnSetting) {
 		
+		String billType = warnSetting.getBillType();
+		String warnCalculator = warnSetting.warnCalculator();
+		Assert.notNull(billType, "The billType must not be null!");
+		Assert.notNull(warnCalculator, "The warnCalculator must not be null!");
 		KClass type = Amino.getApplicationMetadataContext().getBean(WarnSettingConstant.ENTITY_WARNSETTING, KClass.class);
 		KObject setting = type.newInstance();
-		setting.set(WarnSettingConstant.billType, warnSetting.getBillType());
+		setting.set(WarnSettingConstant.billType, billType);
 		setting.set(WarnSettingConstant.billId, warnSetting.getBillId());
 		setting.set(WarnSettingConstant.target, warnSetting.getTarget());
 		setting.set(WarnSettingConstant.targetType, warnSetting.getTargetType());
 		setting.set(WarnSettingConstant.min, warnSetting.getMin());
 		setting.set(WarnSettingConstant.max, warnSetting.getMax());
 		setting.set(WarnSettingConstant.memo, warnSetting.getMemo());
-		setting.set(WarnSettingConstant.warnCalculator, warnSetting.warnCalculator());
+		setting.set(WarnSettingConstant.warnCalculator, warnCalculator);
 		setting.set(WarnSettingConstant.isOpen, warnSetting.isOpen()==null? true:warnSetting.isOpen());
 		String[] personnel = warnSetting.getPersonnel();
 		if (personnel!=null) {

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/web/WarnSettingController.java

@@ -36,7 +36,6 @@ public class WarnSettingController {
 	@PostMapping("/warnsetting/insert")
 	public Object insertWarnSetting(@RequestBody WarnSettingEntity warnSettingEntity) {
 		
-//		BeanUtils.copyProperties(warnSettingEntity, WarnSettingReq.class);
 		warningService.insertWarnSetting(warnSettingEntity);
 		return ResponseObj.success("预警设置新增成功");
 	}