-修改台账判重

master/src/main/java/com/ruoyi/project/base/controller/TBaseDeviceController.java

@@ -8,12 +8,14 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.domain.entity.SysDictData;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.project.base.domain.TBasePlant;
 import com.ruoyi.project.base.domain.TBaseRegion;
+import com.ruoyi.project.base.mapper.TBaseDeviceMapper;
 import com.ruoyi.project.base.service.ITBasePlantService;
 import com.ruoyi.project.base.service.ITBaseRegionService;
 import com.ruoyi.system.service.ISysDictTypeService;
@@ -48,6 +50,9 @@ public class TBaseDeviceController extends BaseController
     @Autowired
     private ITBaseDeviceService tBaseDeviceService;
 
+    @Autowired
+    private TBaseDeviceMapper tBaseDeviceMapper;
+
     @Autowired
     private ITBasePlantService tBasePlantService;
 
@@ -126,6 +131,10 @@ public class TBaseDeviceController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody TBaseDevice tBaseDevice)
     {
+        QueryWrapper<TBaseDevice> wrapper = new QueryWrapper<TBaseDevice>().eq("dev_code",tBaseDevice.getDevCode()).eq("plant_id",tBaseDevice.getPlantId()).eq("region_id", tBaseDevice.getRegionId()).ne("dev_id",tBaseDevice.getDevId());
+        if(CollectionUtils.isNotEmpty(tBaseDeviceMapper.selectList(wrapper))){
+            return AjaxResult.error("不可修改为已存在的数据");
+        }
         tBaseDevice.setUpdaterCode(getUserId());
         tBaseDevice.setUpdatedate(new Date());
         return toAjax(tBaseDeviceService.updateTBaseDevice(tBaseDevice));

master/src/main/java/com/ruoyi/project/base/controller/TBasePlantController.java

@@ -4,10 +4,13 @@ import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.project.base.mapper.TBasePlantMapper;
 import com.ruoyi.system.service.ISysDeptService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -40,6 +43,9 @@ public class TBasePlantController extends BaseController
     @Autowired
     private ITBasePlantService tBasePlantService;
 
+    @Autowired
+    private TBasePlantMapper tBasePlantMapper;
+
     @Autowired
     private ISysDeptService deptService;
 
@@ -113,6 +119,11 @@ public class TBasePlantController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody TBasePlant tBasePlant)
     {
+        QueryWrapper<TBasePlant> wrapper = new QueryWrapper<>();
+        wrapper.eq("plant_name", tBasePlant.getPlantName()).ne("plant_id",tBasePlant.getPlantId());
+        if (CollectionUtils.isNotEmpty(tBasePlantMapper.selectList(wrapper))){
+            return AjaxResult.error("不可修改为已存在的数据");
+        }
         tBasePlant.setUpdatedate(new Date());
         tBasePlant.setUpdaterCode(getUserId());
         return toAjax(tBasePlantService.updateTBasePlant(tBasePlant));

master/src/main/java/com/ruoyi/project/base/controller/TBaseRegionController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.project.base.controller;
 
 import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.controller.BaseController;
@@ -13,8 +14,10 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.project.base.domain.TBaseDevice;
 import com.ruoyi.project.base.domain.TBasePlant;
 import com.ruoyi.project.base.domain.TBaseRegion;
+import com.ruoyi.project.base.mapper.TBaseRegionMapper;
 import com.ruoyi.project.base.service.ITBasePlantService;
 import com.ruoyi.project.base.service.ITBaseRegionService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -43,6 +46,9 @@ public class TBaseRegionController extends BaseController {
     @Autowired
     private ITBaseRegionService tBaseRegionService;
 
+    @Autowired
+    private TBaseRegionMapper tBaseRegionMapper;
+
     @Autowired
     private ITBasePlantService tBasePlantService;
 
@@ -110,6 +116,11 @@ public class TBaseRegionController extends BaseController {
     @RepeatSubmit
     @PutMapping
     public AjaxResult edit(@RequestBody TBaseRegion tBaseRegion) {
+        QueryWrapper<TBaseRegion> wrapper = new QueryWrapper<>();
+        wrapper.eq("plant_id", tBaseRegion.getPlantId()).eq("region_name",tBaseRegion.getRegionName()).eq("region_id",tBaseRegion.getRegionId());
+        if(CollectionUtils.isNotEmpty(tBaseRegionMapper.selectList(wrapper))){
+            return AjaxResult.error("不可修改为已存在的数据");
+        }
         tBaseRegion.setUpdaterCode(getUserId());
         tBaseRegion.setUpdatedate(new Date());
         return toAjax(tBaseRegionService.updateTBaseRegion(tBaseRegion));

master/src/main/java/com/ruoyi/project/base/mapper/TBaseDeviceMapper.java

@@ -2,6 +2,7 @@ package com.ruoyi.project.base.mapper;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ruoyi.common.annotation.DataScopePlant;
 import com.ruoyi.project.base.domain.TBaseDevice;
 import com.ruoyi.project.base.domain.TBasePoint;
@@ -12,7 +13,7 @@ import com.ruoyi.project.base.domain.TBasePoint;
  * @author ruoyi
  * @date 2022-11-15
  */
-public interface TBaseDeviceMapper
+public interface TBaseDeviceMapper extends BaseMapper<TBaseDevice>
 {
     /**
      * 查询设备/管线

master/src/main/java/com/ruoyi/project/base/mapper/TBasePlantMapper.java

@@ -2,6 +2,8 @@ package com.ruoyi.project.base.mapper;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.Mapper;
 import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.annotation.DataScopePlant;
 import com.ruoyi.project.base.domain.TBasePlant;
@@ -12,7 +14,7 @@ import com.ruoyi.project.base.domain.TBasePlant;
  * @author ruoyi
  * @date 2022-11-14
  */
-public interface TBasePlantMapper
+public interface TBasePlantMapper extends BaseMapper<TBasePlant>
 {
     /**
      * 查询装置

master/src/main/java/com/ruoyi/project/base/mapper/TBaseRegionMapper.java

@@ -2,6 +2,8 @@ package com.ruoyi.project.base.mapper;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.Mapper;
 import com.ruoyi.common.annotation.DataScopePlant;
 import com.ruoyi.project.base.domain.TBaseRegion;
 import org.apache.ibatis.annotations.Param;
@@ -12,7 +14,7 @@ import org.apache.ibatis.annotations.Param;
  * @author ruoyi
  * @date 2022-11-14
  */
-public interface TBaseRegionMapper
+public interface TBaseRegionMapper extends BaseMapper<TBaseRegion>
 {
     /**
      * 查询区域

master/src/main/resources/mybatis/base/TBasePointMapper.xml

@@ -152,8 +152,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="pointId != null "> and point_id != #{pointId}</if>
             <if test="plantId != null "> and plant_id = #{plantId}</if>
-            <if test="regionId != null "> and region_id = #{regionId}</if>
-            <if test="devId != null "> and dev_id = #{devId}</if>
+<!--            <if test="regionId != null "> and region_id = #{regionId}</if>-->
+<!--            <if test="devId != null "> and dev_id = #{devId}</if>-->
             <if test="groupCode != null  and groupCode != ''"> and group_code = #{groupCode}</if>
             <if test="extendCode != null  and extendCode != ''"> and extend_code = #{extendCode}</if>
             and del_flag=0