增加修改预警设置的接口;

backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/request/UpdateWarnSetting.java

+package com.xyst.dinas.biz.request;
+
+import java.util.List;
+import java.util.UUID;
+
+public class UpdateWarnSetting {
+
+	private UUID id;
+	private UUID version;
+	
+	private UUID billId;
+	private String target;
+	
+	private String max;
+	private String min;
+	private List<UUID> personnel;
+	private String memo;
+	
+	
+	public UUID getId() {
+		return id;
+	}
+	public void setId(UUID id) {
+		this.id = id;
+	}
+	public UUID getVersion() {
+		return version;
+	}
+	public void setVersion(UUID version) {
+		this.version = version;
+	}
+	public UUID getBillId() {
+		return billId;
+	}
+	public void setBillId(UUID billId) {
+		this.billId = billId;
+	}
+	public String getTarget() {
+		return target;
+	}
+	public void setTarget(String target) {
+		this.target = target;
+	}
+	public String getMax() {
+		return max;
+	}
+	public void setMax(String max) {
+		this.max = max;
+	}
+	public String getMin() {
+		return min;
+	}
+	public void setMin(String min) {
+		this.min = min;
+	}
+	public List<UUID> getPersonnel() {
+		return personnel;
+	}
+	public void setPersonnel(List<UUID> personnel) {
+		this.personnel = personnel;
+	}
+	public String getMemo() {
+		return memo;
+	}
+	public void setMemo(String memo) {
+		this.memo = memo;
+	}
+	
+	
+}

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

@@ -6,6 +6,8 @@ import java.util.UUID;
 import org.springframework.lang.NonNull;
 import org.springframework.lang.Nullable;
 
+import com.beecode.bcp.type.KObject;
+import com.xyst.dinas.biz.request.UpdateWarnSetting;
 import com.xyst.dinas.biz.warn.WarnExeRecord;
 import com.xyst.dinas.biz.warn.WarnSetting;
 
@@ -19,7 +21,21 @@ public interface IWarningSettingService {
 	public UUID insertWarnSetting(WarnSetting warnSetting) ;
 	
 	WarnSetting getWarnSetting(@NonNull String billType, @Nullable UUID billId, @Nullable String target);
+	/**
+	 * 根据ID查询一条预警设置
+	 * @param id
+	 * @return
+	 */
+	KObject queryWarnSettingById(UUID id);
+	
+	/**
+	 * 更新预警设置
+	 * @param warnSetting
+	 */
+	void updateWarnSetting(UpdateWarnSetting warnSetting);
+	
 	
+	/***************************************/
 	
 	public UUID insertWarnExe(WarnExeRecord warnExeRecord);
 	

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

@@ -5,17 +5,21 @@ import java.util.UUID;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.Assert;
 
 import com.beecode.amino.core.Amino;
 import com.beecode.bcp.type.KClass;
 import com.beecode.bcp.type.KObject;
 import com.beecode.bcp.type.json.JSONObjectUtils;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.xyst.dinas.biz.request.UpdateWarnSetting;
 import com.xyst.dinas.biz.warn.WarnExeRecord;
 import com.xyst.dinas.biz.warn.WarnSetting;
 import com.xyst.dinas.biz.warn.WarnSettingConstant;
 import com.xyst.dinas.biz.warn.dao.WarnSettingDao;
 
+import net.bytebuddy.dynamic.scaffold.MethodRegistry.Handler.ForImplementation;
+
 @Transactional
 public class WarningSettingServiceImpl implements IWarningSettingService{
 
@@ -69,4 +73,37 @@ public class WarningSettingServiceImpl implements IWarningSettingService{
 		warnSettingDao.update(object);		
 	}
 
+	@Override
+	public KObject queryWarnSettingById(UUID id) {
+		KObject KObj = warnSettingDao.queryWarnSettingById(id);
+		return KObj;
+	}
+
+	@Override
+	public void updateWarnSetting(UpdateWarnSetting warnSetting) {
+		
+		UUID warSettingId = warnSetting.getId();
+		Assert.notNull(warSettingId, "The warSettingId must not be null");
+		KObject warSettingIdObj = warnSettingDao.queryWarnSettingById(warSettingId);
+		
+		List<UUID> personnel = warnSetting.getPersonnel();
+		if (personnel!=null) {
+			String personnelStr = UuidListToString(personnel);
+			warSettingIdObj.set("personnel", personnelStr);
+		}
+		String min = warnSetting.getMin();
+		if(min!=null) warSettingIdObj.set("min", min);
+		
+		warnSettingDao.update(warSettingIdObj);
+	}
+	
+	
+	private String UuidListToString(List<UUID> uuids) {
+		StringBuilder str = new StringBuilder();
+		for (UUID uuid : uuids) {
+			str.append(uuid.toString()).append(",");
+		}
+		return str.toString();
+	}
+
 }

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

 package com.xyst.dinas.biz.web;
 
+import java.util.UUID;
+
+import org.json.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.beecode.bcp.type.KObject;
+import com.xyst.dinas.biz.request.UpdateWarnSetting;
+import com.xyst.dinas.biz.warn.service.IWarningSettingService;
 
 /**
  * 预警
@@ -9,13 +21,27 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @author Jackpot
  * @date 2021年4月2日
  */
+@RestController
 public class WarnSettingController {
 
+	@Autowired
+	private IWarningSettingService warningSettingService;
 	
-	@PostMapping("/warn/update")
-	public String updateWarnSettingPerson(@RequestBody String boday) {
+	//更新预警设置
+	@PostMapping("/warnsetting/update")
+	public String updateWarnSettingPerson(@RequestBody UpdateWarnSetting warnSetting) {
 		
+		warningSettingService.updateWarnSetting(warnSetting);
+		return "success";
+	}
+	
+	//查询一条预警设置
+	@GetMapping("/warnsetting/{id}")
+	public KObject queryWarnSetting(@PathVariable UUID id) {
 		
-		return null;
+		Assert.notNull(id,"The id must not be null");
+		return warningSettingService.queryWarnSettingById(id);
 	}
+	
+	
 }