diff --git a/src/main/java/com/zhgd/xmgl/modules/antipressurefold/controller/AntiPressureFoldDevController.java b/src/main/java/com/zhgd/xmgl/modules/antipressurefold/controller/AntiPressureFoldDevController.java index 950a63342..b9f9fa2b8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/antipressurefold/controller/AntiPressureFoldDevController.java +++ b/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 add(@RequestBody AntiPressureFoldDev antiPressureFoldDev) { - antiPressureFoldDev.setId(null); - antiPressureFoldDevService.save(antiPressureFoldDev); + antiPressureFoldDevService.add(antiPressureFoldDev); return Result.ok(); } @@ -100,7 +99,7 @@ public class AntiPressureFoldDevController { @ApiOperation(value = "编辑抗压抗折一体机-设备信息", notes = "编辑抗压抗折一体机-设备信息", httpMethod = "POST") @PostMapping(value = "/edit") public Result edit(@RequestBody AntiPressureFoldDev antiPressureFoldDev) { - antiPressureFoldDevService.updateById(antiPressureFoldDev); + antiPressureFoldDevService.edit(antiPressureFoldDev); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/antipressurefold/service/IAntiPressureFoldDevService.java b/src/main/java/com/zhgd/xmgl/modules/antipressurefold/service/IAntiPressureFoldDevService.java index df0043075..08a8ac1f9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/antipressurefold/service/IAntiPressureFoldDevService.java +++ b/src/main/java/com/zhgd/xmgl/modules/antipressurefold/service/IAntiPressureFoldDevService.java @@ -18,4 +18,8 @@ public interface IAntiPressureFoldDevService extends IService queryPageList(HashMap paramMap); List queryList(HashMap paramMap); + + void add(AntiPressureFoldDev antiPressureFoldDev); + + void edit(AntiPressureFoldDev antiPressureFoldDev); } diff --git a/src/main/java/com/zhgd/xmgl/modules/antipressurefold/service/impl/AntiPressureFoldDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/antipressurefold/service/impl/AntiPressureFoldDevServiceImpl.java index c5e1f0f5e..209b94a2f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/antipressurefold/service/impl/AntiPressureFoldDevServiceImpl.java +++ b/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() + .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() + .eq(AntiPressureFoldDev::getDevSn, antiPressureFoldDev.getDevSn()) + .ne(AntiPressureFoldDev::getId, antiPressureFoldDev.getId()) + ); + if (dev != null) { + throw new OpenAlertException("设备编码已存在"); + } + baseMapper.updateById(antiPressureFoldDev); + } + private QueryWrapper getQueryWrapper(HashMap paramMap) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(AntiPressureFoldDev.class, paramMap); queryWrapper.orderByDesc(RefUtil.fieldNameUlc(AntiPressureFoldDev::getId)); diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/controller/HangBasketDevController.java b/src/main/java/com/zhgd/xmgl/modules/hangbasket/controller/HangBasketDevController.java index fcc9525d1..91668e179 100644 --- a/src/main/java/com/zhgd/xmgl/modules/hangbasket/controller/HangBasketDevController.java +++ b/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 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 edit(@RequestBody HangBasketDev hangBasketDev) { - hangBasketDevService.updateById(hangBasketDev); + hangBasketDevService.edit(hangBasketDev); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketDevService.java b/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketDevService.java index abf9d9972..01900d494 100644 --- a/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketDevService.java +++ b/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/IHangBasketDevService.java @@ -18,4 +18,8 @@ public interface IHangBasketDevService extends IService { IPage queryPageList(HashMap paramMap); List queryList(HashMap paramMap); + + void add(HangBasketDev hangBasketDev); + + void edit(HangBasketDev hangBasketDev); } diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/impl/HangBasketDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/impl/HangBasketDevServiceImpl.java index b7e19a5ae..2e7d829d5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/hangbasket/service/impl/HangBasketDevServiceImpl.java +++ b/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.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.LambdaQueryWrapper; 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() + .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() + .eq(HangBasketDev::getDevSn, hangBasketDev.getDevSn()) + .ne(HangBasketDev::getId, hangBasketDev.getId()) + ); + if (dev != null) { + throw new OpenAlertException("设备编码已存在"); + } + baseMapper.updateById(hangBasketDev); + } + private QueryWrapper getQueryWrapper(HashMap paramMap) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(HangBasketDev.class, paramMap); queryWrapper.orderByDesc(RefUtil.fieldNameUlc(HangBasketDev::getId)); diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveCompactionDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveCompactionDevServiceImpl.java index 39a1e6dad..e733d3be6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveCompactionDevServiceImpl.java +++ b/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() + .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() + .eq(PaveCompactionDev::getDevSn, paveCompactionDev.getDevSn()) + .ne(PaveCompactionDev::getId, paveCompactionDev.getId()) + ); + if (dev != null) { + throw new OpenAlertException("设备编码已存在"); + } + baseMapper.updateById(paveCompactionDev); } diff --git a/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveDevServiceImpl.java index 48e0d6ea8..c9abf44d5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pave/service/impl/PaveDevServiceImpl.java +++ b/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 impl @Override public void add(PaveDev paveDev) { + PaveDev dev = baseMapper.selectOne(new LambdaQueryWrapper() + .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() + .eq(PaveDev::getDevSn, paveDev.getDevSn()) + .ne(PaveDev::getId, paveDev.getId()) + ); + if (dev != null) { + throw new OpenAlertException("设备编码已存在"); + } baseMapper.updateById(paveDev); } diff --git a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/controller/PitchMixStationDevController.java b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/controller/PitchMixStationDevController.java index e9c553bbf..2f498fed8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/controller/PitchMixStationDevController.java +++ b/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 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 edit(@RequestBody PitchMixStationDev pitchMixStationDev) { - pitchMixStationDevService.updateById(pitchMixStationDev); + pitchMixStationDevService.edit(pitchMixStationDev); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/IPitchMixStationDevService.java b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/IPitchMixStationDevService.java index 32ab280d3..3ed670337 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/IPitchMixStationDevService.java +++ b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/IPitchMixStationDevService.java @@ -18,4 +18,8 @@ public interface IPitchMixStationDevService extends IService IPage queryPageList(HashMap paramMap); List queryList(HashMap paramMap); + + void add(PitchMixStationDev pitchMixStationDev); + + void edit(PitchMixStationDev pitchMixStationDev); } diff --git a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/impl/PitchMixStationDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/impl/PitchMixStationDevServiceImpl.java index ef8424fdf..84573b488 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pitchmixstation/service/impl/PitchMixStationDevServiceImpl.java +++ b/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() + .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() + .eq(PitchMixStationDev::getDevSn, pitchMixStationDev.getDevSn()) + .ne(PitchMixStationDev::getId, pitchMixStationDev.getId()) + ); + if (dev != null) { + throw new OpenAlertException("设备编码已存在"); + } + baseMapper.updateById(pitchMixStationDev); + } + private QueryWrapper getQueryWrapper(HashMap paramMap) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(PitchMixStationDev.class, paramMap); queryWrapper.orderByDesc(RefUtil.fieldNameUlc(PitchMixStationDev::getId)); diff --git a/src/main/java/com/zhgd/xmgl/modules/pressuretest/controller/PressureTestMachineDevController.java b/src/main/java/com/zhgd/xmgl/modules/pressuretest/controller/PressureTestMachineDevController.java index 46c0844d5..dab2695de 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pressuretest/controller/PressureTestMachineDevController.java +++ b/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 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 edit(@RequestBody PressureTestMachineDev pressureTestMachineDev) { - pressureTestMachineDevService.updateById(pressureTestMachineDev); + pressureTestMachineDevService.edit(pressureTestMachineDev); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/pressuretest/service/IPressureTestMachineDevService.java b/src/main/java/com/zhgd/xmgl/modules/pressuretest/service/IPressureTestMachineDevService.java index 978b5d105..1cb1298cd 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pressuretest/service/IPressureTestMachineDevService.java +++ b/src/main/java/com/zhgd/xmgl/modules/pressuretest/service/IPressureTestMachineDevService.java @@ -18,4 +18,8 @@ public interface IPressureTestMachineDevService extends IService queryPageList(HashMap paramMap); List queryList(HashMap paramMap); + + void add(PressureTestMachineDev pressureTestMachineDev); + + void edit(PressureTestMachineDev pressureTestMachineDev); } diff --git a/src/main/java/com/zhgd/xmgl/modules/pressuretest/service/impl/PressureTestMachineDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/pressuretest/service/impl/PressureTestMachineDevServiceImpl.java index 7b2273870..063c73b8d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pressuretest/service/impl/PressureTestMachineDevServiceImpl.java +++ b/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() + .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() + .eq(PressureTestMachineDev::getDevSn, pressureTestMachineDev.getDevSn()) + .ne(PressureTestMachineDev::getId, pressureTestMachineDev.getId()) + ); + if (dev != null) { + throw new OpenAlertException("设备编码已存在"); + } + baseMapper.updateById(pressureTestMachineDev); + } + private QueryWrapper getQueryWrapper(HashMap paramMap) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(PressureTestMachineDev.class, paramMap); queryWrapper.orderByDesc(RefUtil.fieldNameUlc(PressureTestMachineDev::getId)); diff --git a/src/main/java/com/zhgd/xmgl/modules/stablewater/controller/StableWaterMixStationDevController.java b/src/main/java/com/zhgd/xmgl/modules/stablewater/controller/StableWaterMixStationDevController.java index 33d21c235..b2b791e2c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/stablewater/controller/StableWaterMixStationDevController.java +++ b/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 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 edit(@RequestBody StableWaterMixStationDev stableWaterMixStationDev) { - stableWaterMixStationDevService.updateById(stableWaterMixStationDev); + stableWaterMixStationDevService.edit(stableWaterMixStationDev); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/stablewater/service/IStableWaterMixStationDevService.java b/src/main/java/com/zhgd/xmgl/modules/stablewater/service/IStableWaterMixStationDevService.java index c4fd0a09c..1a5e184e9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/stablewater/service/IStableWaterMixStationDevService.java +++ b/src/main/java/com/zhgd/xmgl/modules/stablewater/service/IStableWaterMixStationDevService.java @@ -18,4 +18,8 @@ public interface IStableWaterMixStationDevService extends IService queryPageList(HashMap paramMap); List queryList(HashMap paramMap); + + void add(StableWaterMixStationDev stableWaterMixStationDev); + + void edit(StableWaterMixStationDev stableWaterMixStationDev); } diff --git a/src/main/java/com/zhgd/xmgl/modules/stablewater/service/impl/StableWaterMixStationDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/stablewater/service/impl/StableWaterMixStationDevServiceImpl.java index 073f82e71..7f6fa1fb2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/stablewater/service/impl/StableWaterMixStationDevServiceImpl.java +++ b/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() + .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() + .eq(StableWaterMixStationDev::getDevSn, stableWaterMixStationDev.getDevSn()) + .ne(StableWaterMixStationDev::getId, stableWaterMixStationDev.getId()) + ); + if (dev != null) { + throw new OpenAlertException("设备SN已存在"); + } + baseMapper.updateById(stableWaterMixStationDev); + } + private QueryWrapper getQueryWrapper(HashMap paramMap) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(StableWaterMixStationDev.class, paramMap); queryWrapper.orderByDesc(RefUtil.fieldNameUlc(StableWaterMixStationDev::getId)); diff --git a/src/main/java/com/zhgd/xmgl/modules/universaltest/controller/UniversalTestDevController.java b/src/main/java/com/zhgd/xmgl/modules/universaltest/controller/UniversalTestDevController.java index b6ff5755a..8af920830 100644 --- a/src/main/java/com/zhgd/xmgl/modules/universaltest/controller/UniversalTestDevController.java +++ b/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 add(@RequestBody UniversalTestDev universalTestDev) { - universalTestDev.setId(null); - universalTestDevService.save(universalTestDev); + universalTestDevService.add(universalTestDev); return Result.ok(); } @@ -100,7 +99,7 @@ public class UniversalTestDevController { @ApiOperation(value = "编辑万能试验机-设备信息", notes = "编辑万能试验机-设备信息", httpMethod = "POST") @PostMapping(value = "/edit") public Result edit(@RequestBody UniversalTestDev universalTestDev) { - universalTestDevService.updateById(universalTestDev); + universalTestDevService.edit(universalTestDev); return Result.ok(); } diff --git a/src/main/java/com/zhgd/xmgl/modules/universaltest/service/IUniversalTestDevService.java b/src/main/java/com/zhgd/xmgl/modules/universaltest/service/IUniversalTestDevService.java index 26786169d..9195f9768 100644 --- a/src/main/java/com/zhgd/xmgl/modules/universaltest/service/IUniversalTestDevService.java +++ b/src/main/java/com/zhgd/xmgl/modules/universaltest/service/IUniversalTestDevService.java @@ -20,4 +20,9 @@ public interface IUniversalTestDevService extends IService { List queryList(HashMap paramMap); List countUniversalTestDev(HashMap paramMap); + + void add(UniversalTestDev universalTestDev); + + void edit(UniversalTestDev universalTestDev); + } diff --git a/src/main/java/com/zhgd/xmgl/modules/universaltest/service/impl/UniversalTestDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/universaltest/service/impl/UniversalTestDevServiceImpl.java index 734b37cd8..3dac88ded 100644 --- a/src/main/java/com/zhgd/xmgl/modules/universaltest/service/impl/UniversalTestDevServiceImpl.java +++ b/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() + .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() + .eq(UniversalTestDev::getDevSn, universalTestDev.getDevSn()) + .ne(UniversalTestDev::getId, universalTestDev.getId()) + ); + if (dev != null) { + throw new OpenAlertException("设备编码已存在"); + } + + baseMapper.updateById(universalTestDev); + } + private QueryWrapper getQueryWrapper(HashMap paramMap) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(UniversalTestDev.class, paramMap); queryWrapper.orderByDesc(RefUtil.fieldNameUlc(UniversalTestDev::getId));