修改代码;

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

@@ -39,7 +39,7 @@ public interface WarnSetting {
 	String getMemo();
 	
 	/** 预警开关:是否预警*/
-	boolean isOpen();
+	Boolean isOpen();
 	
 	/** 预警计算器: Bean标识*/
 	String warnCalculator();

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

@@ -5,6 +5,29 @@ public class WarnSettingConstant {
 	/** 实体名:预警设置  */
 	public static final String ENTITY_WARNSETTING = "com.xyst.dinas.biz.datamodel.WarnSetting";
 
+	/** 预警计算器  */
+	public static final String warnCalculator = "warnCalculator";
+	/** 预警开关  */
+	public static final String isOpen = "isOpen";
+	/** 预警阀值下限  */
+	public static final String min = "min";
+	/** 预警阀值上限  */
+	public static final String max = "max";
+	/**   */
+	public static final String billType = "billType";
+	/**   */
+	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";
+	
+	
+	
 	/************************************/
 	
 	/** 实体名:预警执行记录  */
@@ -22,14 +45,6 @@ public class WarnSettingConstant {
 	public static final String WARN_STATE = "warnState";
 	/** 实际值  */
 	public static final String ACTUAL_VALUE = "actualValue";
-	/** 预警计算器  */
-	public static final String warnCalculator = "warnCalculator";
-	/** 预警开关  */
-	public static final String isOpen = "isOpen";
-	/** 预警阀值下限  */
-	public static final String min = "min";
-	/** 预警阀值上限  */
-	public static final String max = "max";
 
 
     /**

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

@@ -5,17 +5,18 @@ import java.util.UUID;
 public class WarnSettingEntity implements WarnSetting {
 
 	private UUID settingId;
+	
 	private String billType;
 	private UUID billId;
 	private String target;
 	private String targetType;
 
-	private String max;
 	private String min;
+	private String max;
 	private String warnCalculator;
 	private String[] personnel;
-	private boolean isOpen;
 	private String memo;
+	private Boolean isOpen;
 
 	public String getTargetType() {
 		return targetType;
@@ -89,11 +90,11 @@ public class WarnSettingEntity implements WarnSetting {
 		this.personnel = personnel;
 	}
 
-	public boolean isOpen() {
+	public Boolean isOpen() {
 		return isOpen;
 	}
 
-	public void setOpen(boolean isOpen) {
+	public void setOpen(Boolean isOpen) {
 		this.isOpen = isOpen;
 	}
 

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

@@ -5,7 +5,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.UUID;
 
-import com.xyst.dinas.biz.enumeration.WarnStateEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
@@ -16,9 +15,10 @@ import com.beecode.bcp.type.KObject;
 import com.beecode.bcp.type.json.JSONObjectUtils;
 import com.beecode.inz.common.BaseConstants;
 import com.fasterxml.jackson.databind.JsonNode;
-import com.xyst.dinas.biz.request.WarnSettingReq;
+import com.xyst.dinas.biz.enumeration.WarnStateEnum;
 import com.xyst.dinas.biz.warn.dao.WarnSettingDao;
 import com.xyst.dinas.biz.warn.service.WarningService;
+import com.xyst.dinas.biz.web.request.WarnSettingReq;
 
 @Transactional
 public class WarningServiceImpl implements WarningService{
@@ -34,14 +34,25 @@ public class WarningServiceImpl implements WarningService{
     public UUID insertWarnSetting(WarnSetting warnSetting) {
 		
 		KClass type = Amino.getApplicationMetadataContext().getBean(WarnSettingConstant.ENTITY_WARNSETTING, KClass.class);
-		JsonNode json = JSONObjectUtils.toJson(warnSetting);
-   		KObject object = JSONObjectUtils.toObject(json, type);
-		object.set(BaseConstants.CREATE_TIME, LocalDateTime.now());
-        object.set(BaseConstants.DEL,false);
-        object.set(BaseConstants.DISCARD,false);
-        object.set(WarnSettingConstant.isOpen, warnSetting.isOpen());
-        object.set(WarnSettingConstant.warnCalculator, warnSetting.warnCalculator());
-        UUID warSettingId = warnSettingDao.create(object);
+		KObject setting = type.newInstance();
+		setting.set(WarnSettingConstant.billType, warnSetting.getBillType());
+		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.isOpen, warnSetting.isOpen()==null? true:false);
+		String[] personnel = warnSetting.getPersonnel();
+		if (personnel!=null) {
+			String personnelStr = UuidArrayToString(personnel);
+			setting.set(WarnSettingConstant.personnel, personnelStr);
+		}
+		setting.set(BaseConstants.CREATE_TIME, LocalDateTime.now());
+		setting.set(BaseConstants.DEL,false);
+		setting.set(BaseConstants.DISCARD,false);
+        UUID warSettingId = warnSettingDao.create(setting);
         //新增后触发预警
 		BaseBusinessWarn baseBusinessWarn = new BaseBusinessWarn(warSettingId);
 		baseBusinessWarn.warn();
@@ -203,6 +214,17 @@ public class WarningServiceImpl implements WarningService{
 		}
 		return str.toString();
 	}
+    private String UuidArrayToString(String[] uuids) {
+    	StringBuilder str = new StringBuilder();
+    	for (int i = 0; i < uuids.length; i++) {
+    		if (i == uuids.length - 1) {
+    			str.append(uuids[i].toString());
+    		} else {
+    			str.append(uuids[i].toString()).append(",");
+    		}
+    	}
+    	return str.toString();
+    }
 
 	@Override
 	public BaseBusinessWarn createWarn(String billType, UUID billId, String target) {

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/warn/service/WarningService.java

@@ -8,10 +8,10 @@ import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
 
 import com.beecode.bcp.type.KObject;
-import com.xyst.dinas.biz.request.WarnSettingReq;
 import com.xyst.dinas.biz.warn.BaseBusinessWarn;
 import com.xyst.dinas.biz.warn.WarnExeRecord;
 import com.xyst.dinas.biz.warn.WarnSetting;
+import com.xyst.dinas.biz.web.request.WarnSettingReq;
 
 public interface WarningService {
 

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

@@ -7,9 +7,10 @@ import com.beecode.bcp.type.KObject;
 import com.beecode.bcp.type.json.JSONObjectUtils;
 import com.beecode.inz.basis.team.pojo.ResponseObj;
 import com.xyst.dinas.biz.constant.SandMiningAreaConstant;
-import com.xyst.dinas.biz.request.WarnSettingReq;
 import com.xyst.dinas.biz.service.SandMiningAreaService;
 import com.xyst.dinas.biz.warn.service.WarningService;
+import com.xyst.dinas.biz.web.request.WarnSettingReq;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

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

@@ -15,9 +15,9 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.beecode.bcp.type.KObject;
 import com.beecode.inz.basis.team.pojo.ResponseObj;
-import com.xyst.dinas.biz.request.WarnSettingReq;
 import com.xyst.dinas.biz.warn.WarnSettingEntity;
 import com.xyst.dinas.biz.warn.service.WarningService;
+import com.xyst.dinas.biz.web.request.WarnSettingReq;
 
 /**
  * 预警
@@ -36,6 +36,7 @@ public class WarnSettingController {
 	@PostMapping("/warnsetting/insert")
 	public Object insertWarnSetting(@RequestBody WarnSettingEntity warnSettingEntity) {
 		
+//		BeanUtils.copyProperties(warnSettingEntity, WarnSettingReq.class);
 		warningService.insertWarnSetting(warnSettingEntity);
 		return ResponseObj.success("预警设置新增成功");
 	}

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/request/WarnSettingReq.java → backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/web/request/WarnSettingReq.java

-package com.xyst.dinas.biz.request;
+package com.xyst.dinas.biz.web.request;
 
 import java.util.List;
 import java.util.UUID;