bug修复

src/main/java/com/zhgd/xmgl/modules/antipressurefold/controller/AntiPressureFoldDevController.java

@@ -86,8 +86,7 @@ public class AntiPressureFoldDevController {
 	@ApiOperation(value = "添加抗压抗折一体机-设备信息", notes = "添加抗压抗折一体机-设备信息", httpMethod = "POST")
 	@PostMapping(value = "/add")
 	public Result<AntiPressureFoldDev> add(@RequestBody AntiPressureFoldDev antiPressureFoldDev) {
-		antiPressureFoldDev.setId(null);
+		antiPressureFoldDevService.add(antiPressureFoldDev);
-		antiPressureFoldDevService.save(antiPressureFoldDev);
 		return Result.ok();
 	}
 
@@ -100,7 +99,7 @@ public class AntiPressureFoldDevController {
 	@ApiOperation(value = "编辑抗压抗折一体机-设备信息", notes = "编辑抗压抗折一体机-设备信息", httpMethod = "POST")
 	@PostMapping(value = "/edit")
 	public Result<AntiPressureFoldDev> edit(@RequestBody AntiPressureFoldDev antiPressureFoldDev) {
-		antiPressureFoldDevService.updateById(antiPressureFoldDev);
+		antiPressureFoldDevService.edit(antiPressureFoldDev);
 		return Result.ok();
 	}
 

src/main/java/com/zhgd/xmgl/modules/antipressurefold/service/IAntiPressureFoldDevService.java

@@ -18,4 +18,8 @@ public interface IAntiPressureFoldDevService extends IService<AntiPressureFoldDe
     IPage<AntiPressureFoldDev> queryPageList(HashMap<String, Object> paramMap);
 
     List<AntiPressureFoldDev> queryList(HashMap<String, Object> paramMap);
+
+    void add(AntiPressureFoldDev antiPressureFoldDev);
+
+    void edit(AntiPressureFoldDev antiPressureFoldDev);
 }

src/main/java/com/zhgd/xmgl/modules/antipressurefold/service/impl/AntiPressureFoldDevServiceImpl.java

@@ -1,8 +1,11 @@
 package com.zhgd.xmgl.modules.antipressurefold.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zhgd.jeecg.common.execption.OpenAlertException;
 import com.zhgd.xmgl.modules.antipressurefold.entity.AntiPressureFoldDev;
 import com.zhgd.xmgl.modules.antipressurefold.mapper.AntiPressureFoldDevMapper;
 import com.zhgd.xmgl.modules.antipressurefold.service.IAntiPressureFoldDevService;
+import com.zhgd.xmgl.modules.pitchmixstation.entity.AntiPressureFoldDev;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -39,6 +42,30 @@ public class AntiPressureFoldDevServiceImpl extends ServiceImpl<AntiPressureFold
         return dealList(this.list(queryWrapper));
     }
 
+    @Override
+    public void add(AntiPressureFoldDev antiPressureFoldDev) {
+        AntiPressureFoldDev dev = baseMapper.selectOne(new LambdaQueryWrapper<AntiPressureFoldDev>()
+                .eq(AntiPressureFoldDev::getDevSn, antiPressureFoldDev.getDevSn()));
+        if (dev != null) {
+            throw new OpenAlertException("设备编码已存在");
+        }
+
+        antiPressureFoldDev.setId(null);
+        baseMapper.insert(antiPressureFoldDev);
+    }
+
+    @Override
+    public void edit(AntiPressureFoldDev antiPressureFoldDev) {
+        AntiPressureFoldDev dev = baseMapper.selectOne(new LambdaQueryWrapper<AntiPressureFoldDev>()
+                .eq(AntiPressureFoldDev::getDevSn, antiPressureFoldDev.getDevSn())
+                .ne(AntiPressureFoldDev::getId, antiPressureFoldDev.getId())
+        );
+        if (dev != null) {
+            throw new OpenAlertException("设备编码已存在");
+        }
+        baseMapper.updateById(antiPressureFoldDev);
+    }
+
     private QueryWrapper<AntiPressureFoldDev> getQueryWrapper(HashMap<String, Object> paramMap) {
         QueryWrapper<AntiPressureFoldDev> queryWrapper = QueryGenerator.initPageQueryWrapper(AntiPressureFoldDev.class, paramMap);
         queryWrapper.orderByDesc(RefUtil.fieldNameUlc(AntiPressureFoldDev::getId));

src/main/java/com/zhgd/xmgl/modules/hangbasket/controller/HangBasketDevController.java

@@ -86,7 +86,7 @@ public class HangBasketDevController {
 	@ApiOperation(value = "添加挂篮设备信息", notes = "添加挂篮设备信息", httpMethod = "POST")
 	@PostMapping(value = "/add")
 	public Result<HangBasketDev> add(@RequestBody HangBasketDev hangBasketDev) {
-		hangBasketDevService.save(hangBasketDev);
+		hangBasketDevService.add(hangBasketDev);
 		return Result.ok();
 	}
 
@@ -99,7 +99,7 @@ public class HangBasketDevController {
 	@ApiOperation(value = "编辑挂篮设备信息", notes = "编辑挂篮设备信息", httpMethod = "POST")
 	@PostMapping(value = "/edit")
 	public Result<HangBasketDev> edit(@RequestBody HangBasketDev hangBasketDev) {
-		hangBasketDevService.updateById(hangBasketDev);
+		hangBasketDevService.edit(hangBasketDev);
 		return Result.ok();
 	}
 

src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketDevService.java

@@ -18,4 +18,8 @@ public interface IHangBasketDevService extends IService<HangBasketDev> {
     IPage<HangBasketDev> queryPageList(HashMap<String, Object> paramMap);
 
     List<HangBasketDev> queryList(HashMap<String, Object> paramMap);
+
+    void add(HangBasketDev hangBasketDev);
+
+    void edit(HangBasketDev hangBasketDev);
 }

src/main/java/com/zhgd/xmgl/modules/hangbasket/service/impl/HangBasketDevServiceImpl.java

@@ -1,21 +1,22 @@
 package com.zhgd.xmgl.modules.hangbasket.service.impl;
 
-import com.zhgd.xmgl.modules.hangbasket.entity.HangBasketDev;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zhgd.xmgl.modules.hangbasket.mapper.HangBasketDevMapper;
-import com.zhgd.xmgl.modules.hangbasket.service.IHangBasketDevService;
-import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.zhgd.jeecg.common.system.query.QueryGenerator;
-import com.zhgd.xmgl.util.PageUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhgd.jeecg.common.execption.OpenAlertException;
+import com.zhgd.jeecg.common.system.query.QueryGenerator;
+import com.zhgd.xmgl.modules.hangbasket.entity.HangBasketDev;
+import com.zhgd.xmgl.modules.hangbasket.mapper.HangBasketDevMapper;
+import com.zhgd.xmgl.modules.hangbasket.service.IHangBasketDevService;
+import com.zhgd.xmgl.util.PageUtil;
+import com.zhgd.xmgl.util.RefUtil;
+import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
 import java.util.List;
 
-import com.zhgd.xmgl.util.RefUtil;
-
 /**
  * @Description: 挂篮设备
  * @author： pds
@@ -39,6 +40,30 @@ public class HangBasketDevServiceImpl extends ServiceImpl<HangBasketDevMapper, H
         return dealList(this.list(queryWrapper));
     }
 
+    @Override
+    public void add(HangBasketDev hangBasketDev) {
+        HangBasketDev dev = baseMapper.selectOne(new LambdaQueryWrapper<HangBasketDev>()
+                .eq(HangBasketDev::getDevSn, hangBasketDev.getDevSn()));
+        if (dev != null) {
+            throw new OpenAlertException("设备编码已存在");
+        }
+
+        hangBasketDev.setId(null);
+        baseMapper.insert(hangBasketDev);
+    }
+
+    @Override
+    public void edit(HangBasketDev hangBasketDev) {
+        HangBasketDev dev = baseMapper.selectOne(new LambdaQueryWrapper<HangBasketDev>()
+                .eq(HangBasketDev::getDevSn, hangBasketDev.getDevSn())
+                .ne(HangBasketDev::getId, hangBasketDev.getId())
+        );
+        if (dev != null) {
+            throw new OpenAlertException("设备编码已存在");
+        }
+        baseMapper.updateById(hangBasketDev);
+    }
+
     private QueryWrapper<HangBasketDev> getQueryWrapper(HashMap<String, Object> paramMap) {
         QueryWrapper<HangBasketDev> queryWrapper = QueryGenerator.initPageQueryWrapper(HangBasketDev.class, paramMap);
         queryWrapper.orderByDesc(RefUtil.fieldNameUlc(HangBasketDev::getId));

src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveCompactionDevServiceImpl.java

@@ -1,9 +1,12 @@
 package com.zhgd.xmgl.modules.pave.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zhgd.jeecg.common.execption.OpenAlertException;
 import com.zhgd.xmgl.modules.pave.entity.PaveCompactionDev;
 import com.zhgd.xmgl.modules.pave.entity.vo.CountPaveCompactionDevVo;
 import com.zhgd.xmgl.modules.pave.mapper.PaveCompactionDevMapper;
 import com.zhgd.xmgl.modules.pave.service.IPaveCompactionDevService;
+import com.zhgd.xmgl.modules.pitchmixstation.entity.PaveCompactionDev;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -59,12 +62,27 @@ public class PaveCompactionDevServiceImpl extends ServiceImpl<PaveCompactionDevM
 
     @Override
     public void add(PaveCompactionDev paveCompactionDev) {
+        PaveCompactionDev dev = baseMapper.selectOne(new LambdaQueryWrapper<PaveCompactionDev>()
+                .eq(PaveCompactionDev::getDevSn, paveCompactionDev.getDevSn()));
+        if (dev != null) {
+            throw new OpenAlertException("设备编码已存在");
+        }
+
+
         paveCompactionDev.setId(null);
         baseMapper.insert(paveCompactionDev);
     }
 
     @Override
     public void edit(PaveCompactionDev paveCompactionDev) {
+        PaveCompactionDev dev = baseMapper.selectOne(new LambdaQueryWrapper<PaveCompactionDev>()
+                .eq(PaveCompactionDev::getDevSn, paveCompactionDev.getDevSn())
+                .ne(PaveCompactionDev::getId, paveCompactionDev.getId())
+        );
+        if (dev != null) {
+            throw new OpenAlertException("设备编码已存在");
+        }
+
         baseMapper.updateById(paveCompactionDev);
     }
 

src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveDevServiceImpl.java

@@ -1,9 +1,12 @@
 package com.zhgd.xmgl.modules.pave.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zhgd.jeecg.common.execption.OpenAlertException;
 import com.zhgd.xmgl.modules.pave.entity.PaveDev;
 import com.zhgd.xmgl.modules.pave.entity.vo.CountPaveDevVo;
 import com.zhgd.xmgl.modules.pave.mapper.PaveDevMapper;
 import com.zhgd.xmgl.modules.pave.service.IPaveDevService;
+import com.zhgd.xmgl.modules.pitchmixstation.entity.PaveDev;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -59,12 +62,24 @@ public class PaveDevServiceImpl extends ServiceImpl<PaveDevMapper, PaveDev> impl
 
     @Override
     public void add(PaveDev paveDev) {
+        PaveDev dev = baseMapper.selectOne(new LambdaQueryWrapper<PaveDev>()
+                .eq(PaveDev::getDevSn, paveDev.getDevSn()));
+        if (dev != null) {
+            throw new OpenAlertException("设备编码已存在");
+        }
         paveDev.setId(null);
         baseMapper.insert(paveDev);
     }
 
     @Override
     public void edit(PaveDev paveDev) {
+        PaveDev dev = baseMapper.selectOne(new LambdaQueryWrapper<PaveDev>()
+                .eq(PaveDev::getDevSn, paveDev.getDevSn())
+                .ne(PaveDev::getId, paveDev.getId())
+        );
+        if (dev != null) {
+            throw new OpenAlertException("设备编码已存在");
+        }
         baseMapper.updateById(paveDev);
     }
 

src/main/java/com/zhgd/xmgl/modules/pitchmixstation/controller/PitchMixStationDevController.java

@@ -86,7 +86,7 @@ public class PitchMixStationDevController {
     @ApiOperation(value = "添加沥青拌合站设备信息", notes = "添加沥青拌合站设备信息", httpMethod = "POST")
     @PostMapping(value = "/add")
     public Result<PitchMixStationDev> add(@RequestBody PitchMixStationDev pitchMixStationDev) {
-        pitchMixStationDevService.save(pitchMixStationDev);
+        pitchMixStationDevService.add(pitchMixStationDev);
         return Result.ok();
     }
 
@@ -99,7 +99,7 @@ public class PitchMixStationDevController {
     @ApiOperation(value = "编辑沥青拌合站设备信息", notes = "编辑沥青拌合站设备信息", httpMethod = "POST")
     @PostMapping(value = "/edit")
     public Result<PitchMixStationDev> edit(@RequestBody PitchMixStationDev pitchMixStationDev) {
-        pitchMixStationDevService.updateById(pitchMixStationDev);
+        pitchMixStationDevService.edit(pitchMixStationDev);
         return Result.ok();
     }
 

src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/IPitchMixStationDevService.java

@@ -18,4 +18,8 @@ public interface IPitchMixStationDevService extends IService<PitchMixStationDev>
     IPage<PitchMixStationDev> queryPageList(HashMap<String, Object> paramMap);
 
     List<PitchMixStationDev> queryList(HashMap<String, Object> paramMap);
+
+    void add(PitchMixStationDev pitchMixStationDev);
+
+    void edit(PitchMixStationDev pitchMixStationDev);
 }

src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/impl/PitchMixStationDevServiceImpl.java

@@ -1,8 +1,12 @@
 package com.zhgd.xmgl.modules.pitchmixstation.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zhgd.jeecg.common.execption.OpenAlertException;
+import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.PitchMixStationDev;
 import com.zhgd.xmgl.modules.pitchmixstation.entity.PitchMixStationDev;
 import com.zhgd.xmgl.modules.pitchmixstation.mapper.PitchMixStationDevMapper;
 import com.zhgd.xmgl.modules.pitchmixstation.service.IPitchMixStationDevService;
+import com.zhgd.xmgl.modules.stablewater.entity.PitchMixStationDev;
 import com.zhgd.xmgl.util.RefUtil;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -38,6 +42,30 @@ public class PitchMixStationDevServiceImpl extends ServiceImpl<PitchMixStationDe
         return dealList(this.list(queryWrapper));
     }
 
+    @Override
+    public void add(PitchMixStationDev pitchMixStationDev) {
+        PitchMixStationDev dev = baseMapper.selectOne(new LambdaQueryWrapper<PitchMixStationDev>()
+                .eq(PitchMixStationDev::getDevSn, pitchMixStationDev.getDevSn()));
+        if (dev != null) {
+            throw new OpenAlertException("设备编码已存在");
+        }
+
+        pitchMixStationDev.setId(null);
+        baseMapper.insert(pitchMixStationDev);
+    }
+
+    @Override
+    public void edit(PitchMixStationDev pitchMixStationDev) {
+        PitchMixStationDev dev = baseMapper.selectOne(new LambdaQueryWrapper<PitchMixStationDev>()
+                .eq(PitchMixStationDev::getDevSn, pitchMixStationDev.getDevSn())
+                .ne(PitchMixStationDev::getId, pitchMixStationDev.getId())
+        );
+        if (dev != null) {
+            throw new OpenAlertException("设备编码已存在");
+        }
+        baseMapper.updateById(pitchMixStationDev);
+    }
+
     private QueryWrapper<PitchMixStationDev> getQueryWrapper(HashMap<String, Object> paramMap) {
         QueryWrapper<PitchMixStationDev> queryWrapper = QueryGenerator.initPageQueryWrapper(PitchMixStationDev.class, paramMap);
         queryWrapper.orderByDesc(RefUtil.fieldNameUlc(PitchMixStationDev::getId));

src/main/java/com/zhgd/xmgl/modules/pressuretest/controller/PressureTestMachineDevController.java

@@ -86,7 +86,7 @@ public class PressureTestMachineDevController {
 	@ApiOperation(value = "添加压力试验机设备信息", notes = "添加压力试验机设备信息", httpMethod = "POST")
 	@PostMapping(value = "/add")
 	public Result<PressureTestMachineDev> add(@RequestBody PressureTestMachineDev pressureTestMachineDev) {
-		pressureTestMachineDevService.save(pressureTestMachineDev);
+		pressureTestMachineDevService.add(pressureTestMachineDev);
 		return Result.ok();
 	}
 
@@ -99,7 +99,7 @@ public class PressureTestMachineDevController {
 	@ApiOperation(value = "编辑压力试验机设备信息", notes = "编辑压力试验机设备信息", httpMethod = "POST")
 	@PostMapping(value = "/edit")
 	public Result<PressureTestMachineDev> edit(@RequestBody PressureTestMachineDev pressureTestMachineDev) {
-		pressureTestMachineDevService.updateById(pressureTestMachineDev);
+        pressureTestMachineDevService.edit(pressureTestMachineDev);
 		return Result.ok();
 	}
 

src/main/java/com/zhgd/xmgl/modules/pressuretest/service/IPressureTestMachineDevService.java

@@ -18,4 +18,8 @@ public interface IPressureTestMachineDevService extends IService<PressureTestMac
     IPage<PressureTestMachineDev> queryPageList(HashMap<String, Object> paramMap);
 
     List<PressureTestMachineDev> queryList(HashMap<String, Object> paramMap);
+
+    void add(PressureTestMachineDev pressureTestMachineDev);
+
+    void edit(PressureTestMachineDev pressureTestMachineDev);
 }

src/main/java/com/zhgd/xmgl/modules/pressuretest/service/impl/PressureTestMachineDevServiceImpl.java

@@ -1,5 +1,8 @@
 package com.zhgd.xmgl.modules.pressuretest.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zhgd.jeecg.common.execption.OpenAlertException;
+import com.zhgd.xmgl.modules.pitchmixstation.entity.PressureTestMachineDev;
 import com.zhgd.xmgl.modules.pressuretest.entity.PressureTestMachineDev;
 import com.zhgd.xmgl.modules.pressuretest.mapper.PressureTestMachineDevMapper;
 import com.zhgd.xmgl.modules.pressuretest.service.IPressureTestMachineDevService;
@@ -39,6 +42,29 @@ public class PressureTestMachineDevServiceImpl extends ServiceImpl<PressureTestM
         return dealList(this.list(queryWrapper));
     }
 
+    @Override
+    public void add(PressureTestMachineDev pressureTestMachineDev) {
+        PressureTestMachineDev dev = baseMapper.selectOne(new LambdaQueryWrapper<PressureTestMachineDev>()
+                .eq(PressureTestMachineDev::getDevSn, pressureTestMachineDev.getDevSn()));
+        if (dev != null) {
+            throw new OpenAlertException("设备编码已存在");
+        }
+        pressureTestMachineDev.setId(null);
+        baseMapper.insert(pressureTestMachineDev);
+    }
+
+    @Override
+    public void edit(PressureTestMachineDev pressureTestMachineDev) {
+        PressureTestMachineDev dev = baseMapper.selectOne(new LambdaQueryWrapper<PressureTestMachineDev>()
+                .eq(PressureTestMachineDev::getDevSn, pressureTestMachineDev.getDevSn())
+                .ne(PressureTestMachineDev::getId, pressureTestMachineDev.getId())
+        );
+        if (dev != null) {
+            throw new OpenAlertException("设备编码已存在");
+        }
+        baseMapper.updateById(pressureTestMachineDev);
+    }
+
     private QueryWrapper<PressureTestMachineDev> getQueryWrapper(HashMap<String, Object> paramMap) {
         QueryWrapper<PressureTestMachineDev> queryWrapper = QueryGenerator.initPageQueryWrapper(PressureTestMachineDev.class, paramMap);
         queryWrapper.orderByDesc(RefUtil.fieldNameUlc(PressureTestMachineDev::getId));

src/main/java/com/zhgd/xmgl/modules/stablewater/controller/StableWaterMixStationDevController.java

@@ -86,7 +86,7 @@ public class StableWaterMixStationDevController {
     @ApiOperation(value = "添加水稳拌合站设备信息", notes = "添加水稳拌合站设备信息", httpMethod = "POST")
     @PostMapping(value = "/add")
     public Result<StableWaterMixStationDev> add(@RequestBody StableWaterMixStationDev stableWaterMixStationDev) {
-        stableWaterMixStationDevService.save(stableWaterMixStationDev);
+        stableWaterMixStationDevService.add(stableWaterMixStationDev);
         return Result.ok();
     }
 
@@ -99,7 +99,7 @@ public class StableWaterMixStationDevController {
     @ApiOperation(value = "编辑水稳拌合站设备信息", notes = "编辑水稳拌合站设备信息", httpMethod = "POST")
     @PostMapping(value = "/edit")
     public Result<StableWaterMixStationDev> edit(@RequestBody StableWaterMixStationDev stableWaterMixStationDev) {
-        stableWaterMixStationDevService.updateById(stableWaterMixStationDev);
+        stableWaterMixStationDevService.edit(stableWaterMixStationDev);
         return Result.ok();
     }
 

src/main/java/com/zhgd/xmgl/modules/stablewater/service/IStableWaterMixStationDevService.java

@@ -18,4 +18,8 @@ public interface IStableWaterMixStationDevService extends IService<StableWaterMi
     IPage<StableWaterMixStationDev> queryPageList(HashMap<String, Object> paramMap);
 
     List<StableWaterMixStationDev> queryList(HashMap<String, Object> paramMap);
+
+    void add(StableWaterMixStationDev stableWaterMixStationDev);
+
+    void edit(StableWaterMixStationDev stableWaterMixStationDev);
 }

src/main/java/com/zhgd/xmgl/modules/stablewater/service/impl/StableWaterMixStationDevServiceImpl.java

@@ -1,5 +1,9 @@
 package com.zhgd.xmgl.modules.stablewater.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zhgd.jeecg.common.execption.OpenAlertException;
+import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.StableWaterMixStationDev;
+import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.StableWaterMixStationDev;
 import com.zhgd.xmgl.modules.stablewater.entity.StableWaterMixStationDev;
 import com.zhgd.xmgl.modules.stablewater.mapper.StableWaterMixStationDevMapper;
 import com.zhgd.xmgl.modules.stablewater.service.IStableWaterMixStationDevService;
@@ -38,6 +42,29 @@ public class StableWaterMixStationDevServiceImpl extends ServiceImpl<StableWater
         return dealList(this.list(queryWrapper));
     }
 
+    @Override
+    public void add(StableWaterMixStationDev stableWaterMixStationDev) {
+        StableWaterMixStationDev dev = baseMapper.selectOne(new LambdaQueryWrapper<StableWaterMixStationDev>()
+                .eq(StableWaterMixStationDev::getDevSn, stableWaterMixStationDev.getDevSn()));
+        if (dev != null) {
+            throw new OpenAlertException("设备SN已存在");
+        }
+        stableWaterMixStationDev.setId(null);
+        baseMapper.insert(stableWaterMixStationDev);
+    }
+
+    @Override
+    public void edit(StableWaterMixStationDev stableWaterMixStationDev) {
+        StableWaterMixStationDev dev = baseMapper.selectOne(new LambdaQueryWrapper<StableWaterMixStationDev>()
+                .eq(StableWaterMixStationDev::getDevSn, stableWaterMixStationDev.getDevSn())
+                .ne(StableWaterMixStationDev::getId, stableWaterMixStationDev.getId())
+        );
+        if (dev != null) {
+            throw new OpenAlertException("设备SN已存在");
+        }
+        baseMapper.updateById(stableWaterMixStationDev);
+    }
+
     private QueryWrapper<StableWaterMixStationDev> getQueryWrapper(HashMap<String, Object> paramMap) {
         QueryWrapper<StableWaterMixStationDev> queryWrapper = QueryGenerator.initPageQueryWrapper(StableWaterMixStationDev.class, paramMap);
         queryWrapper.orderByDesc(RefUtil.fieldNameUlc(StableWaterMixStationDev::getId));

src/main/java/com/zhgd/xmgl/modules/universaltest/controller/UniversalTestDevController.java

@@ -86,8 +86,7 @@ public class UniversalTestDevController {
 	@ApiOperation(value = "添加万能试验机-设备信息", notes = "添加万能试验机-设备信息", httpMethod = "POST")
 	@PostMapping(value = "/add")
 	public Result<UniversalTestDev> add(@RequestBody UniversalTestDev universalTestDev) {
-		universalTestDev.setId(null);
+		universalTestDevService.add(universalTestDev);
-		universalTestDevService.save(universalTestDev);
 		return Result.ok();
 	}
 
@@ -100,7 +99,7 @@ public class UniversalTestDevController {
 	@ApiOperation(value = "编辑万能试验机-设备信息", notes = "编辑万能试验机-设备信息", httpMethod = "POST")
 	@PostMapping(value = "/edit")
 	public Result<UniversalTestDev> edit(@RequestBody UniversalTestDev universalTestDev) {
-		universalTestDevService.updateById(universalTestDev);
+		universalTestDevService.edit(universalTestDev);
 		return Result.ok();
 	}
 

src/main/java/com/zhgd/xmgl/modules/universaltest/service/IUniversalTestDevService.java

@@ -20,4 +20,9 @@ public interface IUniversalTestDevService extends IService<UniversalTestDev> {
     List<UniversalTestDev> queryList(HashMap<String, Object> paramMap);
 
     List<UniversalTestDev> countUniversalTestDev(HashMap<String, Object> paramMap);
+
+    void add(UniversalTestDev universalTestDev);
+
+    void edit(UniversalTestDev universalTestDev);
+
 }

src/main/java/com/zhgd/xmgl/modules/universaltest/service/impl/UniversalTestDevServiceImpl.java

@@ -1,5 +1,8 @@
 package com.zhgd.xmgl.modules.universaltest.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zhgd.jeecg.common.execption.OpenAlertException;
+import com.zhgd.xmgl.modules.pitchmixstation.entity.UniversalTestDev;
 import com.zhgd.xmgl.modules.universaltest.entity.UniversalTestDev;
 import com.zhgd.xmgl.modules.universaltest.mapper.UniversalTestDevMapper;
 import com.zhgd.xmgl.modules.universaltest.service.IUniversalTestDevService;
@@ -44,6 +47,31 @@ public class UniversalTestDevServiceImpl extends ServiceImpl<UniversalTestDevMap
         return baseMapper.countUniversalTestDev(paramMap);
     }
 
+    @Override
+    public void add(UniversalTestDev universalTestDev) {
+        UniversalTestDev dev = baseMapper.selectOne(new LambdaQueryWrapper<UniversalTestDev>()
+                .eq(UniversalTestDev::getDevSn, universalTestDev.getDevSn()));
+        if (dev != null) {
+            throw new OpenAlertException("设备编码已存在");
+        }
+
+        universalTestDev.setId(null);
+        baseMapper.insert(universalTestDev);
+    }
+
+    @Override
+    public void edit(UniversalTestDev universalTestDev) {
+        UniversalTestDev dev = baseMapper.selectOne(new LambdaQueryWrapper<UniversalTestDev>()
+                .eq(UniversalTestDev::getDevSn, universalTestDev.getDevSn())
+                .ne(UniversalTestDev::getId, universalTestDev.getId())
+        );
+        if (dev != null) {
+            throw new OpenAlertException("设备编码已存在");
+        }
+
+        baseMapper.updateById(universalTestDev);
+    }
+
     private QueryWrapper<UniversalTestDev> getQueryWrapper(HashMap<String, Object> paramMap) {
         QueryWrapper<UniversalTestDev> queryWrapper = QueryGenerator.initPageQueryWrapper(UniversalTestDev.class, paramMap);
         queryWrapper.orderByDesc(RefUtil.fieldNameUlc(UniversalTestDev::getId));