设备管理编辑保存功能完善

src/main/java/com/hb/proj/base/controller/DeviceController.java

@@ -90,7 +90,7 @@ public class DeviceController {
 	 * @return
 	 */
 	@RequestMapping("/add")
-	public RespVO<String> add(DevicePO device,AccessToken token){
+	public RespVO<String> add(@Validated DevicePO device,AccessToken token){
 		 if(service.existDevice(device.getDeviceCode(),null)) {
 			 return RespVOBuilder.error("该设备编码已存在，勿重复添加");
 		 }
@@ -109,13 +109,23 @@ public class DeviceController {
 	 * @return
 	 */
 	@RequestMapping("/update")
-	public RespVO<Object> update(DevicePO device,AccessToken token){
+	public RespVO<Object> update(@Validated DevicePO device,AccessToken token){
 		if(service.existDevice(device.getDeviceCode(), device.getDeviceId())) {
 			 return RespVOBuilder.error("该设备编码已存在，勿重复添加");
-		 }
+		}
+		
+		DeviceVO dbDev=service.get(device.getDeviceId());
+		if(dbDev==null) {
+			return RespVOBuilder.error("设备不存在");
+		}
+		device.setWellId(dbDev.getWellId()); //避免更新时丢失已关联的井
 		device.setModifyBy(token.getUsName());
 		service.update(device);
 		
+		if(device.getDeviceCode().equals(dbDev.getDeviceCode())) { //更改了设备编号，同步通知采集程序
+			 synComp.synAllDev();
+		}
+		
 		return RespVOBuilder.ok();
 	  
 		

src/main/java/com/hb/proj/model/DevicePO.java

@@ -2,6 +2,7 @@ package com.hb.proj.model;
 
 import java.util.Date;
 
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
 @Data
@@ -21,6 +22,7 @@ public class DevicePO {
 	
 	private String serialNum;
 	
+	@NotBlank(message="设备编号不能为控")
 	private String deviceCode;
 	
 	private String wellId;