实验室配置 编辑 异常bug修复

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/LabSensorController.java

@@ -127,9 +127,23 @@ public class LabSensorController extends BaseController {
     @Log(title = "传感器", businessType = BusinessType.UPDATE)
     @PutMapping
     public ResultData edit(@RequestBody @Validated(ValidGroup.Crud.Update.class) LabSensor labSensor) {
-        Integer routeNum =labSensor.getRouteNum()==null?-1:labSensor.getRouteNum();
-        labSensor.setRouteNum(routeNum);
-        return ResultData.success(labSensorService.updateLabSensor(labSensor));
+        LabSensor res = labSensorService.selectLabSensorById(labSensor.getId());
+        if (res != null) {
+            Integer routeNum =labSensor.getRouteNum()==null?-1:labSensor.getRouteNum();
+            //检查重复
+            if (!res.getGatewayId().equals(labSensor.getGatewayId()) || !res.getRouteNum().equals(routeNum)) {
+                LabSensor check = new LabSensor();
+                check.setGatewayId(labSensor.getGatewayId());
+                check.setRouteNum(routeNum);
+                Integer count = labSensorService.selectDataCount(check);
+                if (count != null && count > 0) {
+                    return ResultData.fail("此网关编号+路由信息已重复");
+                }
+            }
+            labSensor.setRouteNum(routeNum);
+            return ResultData.success(labSensorService.updateLabSensor(labSensor));
+        }
+        return ResultData.fail("未找到此配置");
     }
 
     /**