版本1.4.1 人员选择xx目录 修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GNetworkRelationController.java

@@ -116,9 +116,9 @@ public class GNetworkRelationController extends BaseController {
     @ApiOperation("删除庭院管网目录中间")
 //    @PreAuthorize("@ss.hasPermi('system:networkRelation:remove')")
     @Log(title = "庭院管网目录中间" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
+    @DeleteMapping("/{ids}/{jobNum}")
     public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
-                                       @PathVariable Long[] ids) {
-        return toAjax(iGNetworkRelationService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+                                       @PathVariable Long[] ids,@PathVariable String jobNum) {
+        return toAjax(iGNetworkRelationService.deleteWithValidByIds(Arrays.asList(ids),jobNum, true) ? 1 : 0);
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GValvewellRelationController.java

@@ -111,9 +111,9 @@ public class GValvewellRelationController extends BaseController {
     @ApiOperation("删除阀井目录中间")
 //    @PreAuthorize("@ss.hasPermi('system:valvewellRelation:remove')")
     @Log(title = "阀井目录中间" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
+    @DeleteMapping("/{ids}/{jobNum}")
     public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
-                                       @PathVariable Long[] ids) {
-        return toAjax(iGValvewellRelationService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+                                       @PathVariable Long[] ids,@PathVariable String jobNum) {
+        return toAjax(iGValvewellRelationService.deleteWithValidByIds(Arrays.asList(ids),jobNum, true) ? 1 : 0);
     }
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/controller/GRegulatorBoxRelationController.java

@@ -2,7 +2,6 @@ package com.ruoyi.gas.controller;
 
 import java.util.List;
 import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
 
 import com.ruoyi.gas.domain.bo.GRegulatorBoxRelationBo;
 import com.ruoyi.gas.domain.vo.GRegulatorBoxRelationVo;
@@ -10,7 +9,7 @@ import com.ruoyi.gas.service.IGRegulatorBoxRelationService;
 import lombok.RequiredArgsConstructor;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
-import org.springframework.security.access.prepost.PreAuthorize;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
@@ -105,9 +104,9 @@ public class GRegulatorBoxRelationController extends BaseController {
     @ApiOperation("删除调压箱目录中间")
 //    @PreAuthorize("@ss.hasPermi('gas:regulatorBoxRelation:remove')")
     @Log(title = "调压箱目录中间" , businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult<Void> remove(@NotEmpty(message = "主键不能为空")
-                                       @PathVariable Long[] ids) {
-        return toAjax(iGRegulatorBoxRelationService.deleteWithValidByIds(Arrays.asList(ids), true) ? 1 : 0);
+    @DeleteMapping("/{ids}/{jobNum}")
+    public AjaxResult remove(@NotEmpty(message = "主键不能为空")
+                                       @PathVariable Long[] ids,@PathVariable String jobNum) {
+        return AjaxResult.success(iGRegulatorBoxRelationService.deleteWithValidByIds(Arrays.asList(ids),jobNum, true));
     }
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GPressureRegulatingBoxBo.java

@@ -26,6 +26,7 @@ import java.util.List;
 public class GPressureRegulatingBoxBo extends BaseEntity {
     //我的调压箱
     private String jobNum;
+
     /**
      * 序号
      */

ruoyi-gas/src/main/java/com/ruoyi/gas/domain/bo/GRegulatorBoxRelationBo.java

@@ -38,7 +38,7 @@ public class GRegulatorBoxRelationBo extends BaseEntity {
      * 关联人员
      */
     @ApiModelProperty(value = "关联人员", required = true)
-    private Long userId;
+    private String userId;
 
     /**
      * 关联调压箱目录

ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGNetworkRelationService.java

@@ -52,5 +52,5 @@ public interface IGNetworkRelationService extends IServicePlus<GNetworkRelation,
 	 * @param isValid 是否校验,true-删除前校验,false-不校验
 	 * @return
 	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+	Boolean deleteWithValidByIds(Collection<Long> ids,String jobNum, Boolean isValid);
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGRegulatorBoxRelationService.java

@@ -52,5 +52,5 @@ public interface IGRegulatorBoxRelationService extends IServicePlus<GRegulatorBo
 	 * @param isValid 是否校验,true-删除前校验,false-不校验
 	 * @return
 	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+	Boolean deleteWithValidByIds(Collection<Long> ids,String jobNum, Boolean isValid);
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGValvewellRelationService.java

@@ -54,6 +54,6 @@ public interface IGValvewellRelationService extends IServicePlus<GValvewellRelat
 	 * @param isValid 是否校验,true-删除前校验,false-不校验
 	 * @return
 	 */
-	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+	Boolean deleteWithValidByIds(Collection<Long> ids,String jobNum, Boolean isValid);
 
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GAreaServiceImpl.java

@@ -14,10 +14,9 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.gas.domain.*;
 import com.ruoyi.gas.domain.bo.GAreaBo;
 import com.ruoyi.gas.domain.bo.GAreaPhotoBo;
-import com.ruoyi.gas.domain.vo.GAreaVo;
-import com.ruoyi.gas.domain.vo.GImportVo;
-import com.ruoyi.gas.domain.vo.GPressureRegulatingBoxVo;
-import com.ruoyi.gas.domain.vo.GUserVo;
+import com.ruoyi.gas.domain.bo.GNetworkRelationBo;
+import com.ruoyi.gas.domain.bo.GRegulatorBoxRelationBo;
+import com.ruoyi.gas.domain.vo.*;
 import com.ruoyi.gas.mapper.GAreaMapper;
 import com.ruoyi.gas.mapper.GBuildingMapper;
 import com.ruoyi.gas.service.IGAreaPhotoService;
@@ -28,6 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
@@ -187,7 +187,7 @@ public class GAreaServiceImpl extends ServicePlusImpl<GAreaMapper, GArea, GAreaV
     }
 
     @Autowired
-    private GUserServiceImpl gUserService;
+    private IGNetworkRelationService networkRelationService;
 
     @Override
     public TableDataInfo<GAreaVo> queryPageList(GAreaBo bo) {
@@ -216,6 +216,14 @@ public class GAreaServiceImpl extends ServicePlusImpl<GAreaMapper, GArea, GAreaV
         lqw.like(StringUtils.isNotBlank(bo.getUserId()), GArea::getUserId, bo.getUserId());
         lqw.eq(StringUtils.isNotBlank(bo.getDistrict()), GArea::getDistrict, bo.getDistrict());
         lqw.orderByDesc(GArea::getCreateTime);
+        if (!ObjectUtils.isEmpty(bo.getJobNum())){
+            GNetworkRelationBo entity = new GNetworkRelationBo();
+            entity.setUserId(bo.getJobNum());
+            List<Long> ids = networkRelationService.queryList(entity).stream().map(GNetworkRelationVo::getRegulatorBoxId).collect(Collectors.toList());
+            if (!ObjectUtils.isEmpty(ids)) {
+                lqw.notIn(GArea::getId,ids);
+            }
+        }
         return lqw;
     }
 
@@ -281,10 +289,14 @@ public class GAreaServiceImpl extends ServicePlusImpl<GAreaMapper, GArea, GAreaV
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
+        QueryWrapper<GNetworkRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().in(GNetworkRelation::getRegulatorBoxId,ids);
+        networkRelationService.remove(queryWrapper);
         return removeByIds(ids);
     }
     @Autowired

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GNetworkRelationServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.gas.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.core.page.PagePlus;
@@ -11,10 +12,12 @@ import com.ruoyi.gas.domain.bo.GNetworkRelationBo;
 import com.ruoyi.gas.domain.vo.GNetworkRelationVo;
 import com.ruoyi.gas.mapper.GNetworkRelationMapper;
 import com.ruoyi.gas.service.IGNetworkRelationService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 import java.util.ArrayList;
@@ -89,10 +92,18 @@ public class GNetworkRelationServiceImpl extends ServicePlusImpl<GNetworkRelatio
     }
 
     @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids,String jobNum, Boolean isValid) {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }
-        return removeByIds(ids);
+        QueryWrapper<GNetworkRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().in(GNetworkRelation::getRegulatorBoxId,ids);
+        queryWrapper.lambda().eq(GNetworkRelation::getUserId,jobNum);
+        return networkRelationService.remove(queryWrapper);
     }
+
+    @Autowired
+    private IGNetworkRelationService networkRelationService;
+
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GPressureRegulatingBoxServiceImpl.java

@@ -9,17 +9,17 @@ import com.ruoyi.common.core.page.PagePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.gas.domain.GArea;
-import com.ruoyi.gas.domain.GPressureRegulatingBox;
-import com.ruoyi.gas.domain.GRegulatorBox;
-import com.ruoyi.gas.domain.GRegulatorBoxRelation;
+import com.ruoyi.gas.domain.*;
 import com.ruoyi.gas.domain.bo.GPressureRegulatingBoxBo;
 import com.ruoyi.gas.domain.bo.GPressureRegulatingBoxDetailsBo;
 import com.ruoyi.gas.domain.bo.GRegulatorBoxBo;
+import com.ruoyi.gas.domain.bo.GRegulatorBoxRelationBo;
 import com.ruoyi.gas.domain.vo.GPressureRegulatingBoxDetailsVo;
 import com.ruoyi.gas.domain.vo.GPressureRegulatingBoxExcelVo;
 import com.ruoyi.gas.domain.vo.GPressureRegulatingBoxVo;
+import com.ruoyi.gas.domain.vo.GRegulatorBoxRelationVo;
 import com.ruoyi.gas.mapper.GPressureRegulatingBoxMapper;
 import com.ruoyi.gas.service.IGPressureRegulatingBoxDetailsService;
 import com.ruoyi.gas.service.IGPressureRegulatingBoxService;
@@ -173,6 +173,14 @@ public class GPressureRegulatingBoxServiceImpl extends ServicePlusImpl<GPressure
            lqw.ge(GPressureRegulatingBox::getCreateTime, bo.getCreateTimes().get(0));
            lqw.le(GPressureRegulatingBox::getCreateTime, bo.getCreateTimes().get(1));
         }
+        if (!ObjectUtils.isEmpty(bo.getJobNum())){
+            GRegulatorBoxRelationBo entity = new GRegulatorBoxRelationBo();
+            entity.setUserId(bo.getJobNum());
+            List<Long> ids = regulatorBoxRelationService.queryList(entity).stream().map(GRegulatorBoxRelationVo::getRegulatorBoxId).collect(Collectors.toList());
+            if (!ObjectUtils.isEmpty(ids)) {
+                lqw.notIn(GPressureRegulatingBox::getId,ids);
+            }
+        }
         return lqw;
     }
     @Autowired
@@ -209,10 +217,14 @@ public class GPressureRegulatingBoxServiceImpl extends ServicePlusImpl<GPressure
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
+        QueryWrapper<GRegulatorBoxRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().in(GRegulatorBoxRelation::getRegulatorBoxId,ids);
+        regulatorBoxRelationService.remove(queryWrapper);
         return removeByIds(ids);
     }
 

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GRegulatorBoxRelationServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.gas.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.core.page.PagePlus;
@@ -10,10 +11,12 @@ import com.ruoyi.gas.domain.bo.GRegulatorBoxRelationBo;
 import com.ruoyi.gas.domain.vo.GRegulatorBoxRelationVo;
 import com.ruoyi.gas.mapper.GRegulatorBoxRelationMapper;
 import com.ruoyi.gas.service.IGRegulatorBoxRelationService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 import java.util.ArrayList;
@@ -94,10 +97,17 @@ public class GRegulatorBoxRelationServiceImpl extends ServicePlusImpl<GRegulator
     }
 
     @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids,String jobNum, Boolean isValid) {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }
-        return removeByIds(ids);
+        QueryWrapper<GRegulatorBoxRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().in(GRegulatorBoxRelation::getRegulatorBoxId,ids);
+        queryWrapper.lambda().eq(GRegulatorBoxRelation::getUserId,jobNum);
+        return regulatorBoxRelationService.remove(queryWrapper);
     }
+
+    @Autowired
+    private IGRegulatorBoxRelationService regulatorBoxRelationService;
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GValveWellPositionServiceImpl.java

@@ -14,7 +14,9 @@ import com.ruoyi.gas.domain.GRegulatorBox;
 import com.ruoyi.gas.domain.GValveWellPosition;
 import com.ruoyi.gas.domain.GValvewellRelation;
 import com.ruoyi.gas.domain.bo.GValveWellPositionBo;
+import com.ruoyi.gas.domain.bo.GValvewellRelationBo;
 import com.ruoyi.gas.domain.vo.GValveWellPositionVo;
+import com.ruoyi.gas.domain.vo.GValvewellRelationVo;
 import com.ruoyi.gas.domain.vo.GWellPositionImportVo;
 import com.ruoyi.gas.mapper.GValveWellPositionMapper;
 import com.ruoyi.gas.service.IGValveWellPositionService;
@@ -22,6 +24,7 @@ import com.ruoyi.gas.service.IGValvewellRelationService;
 import com.ruoyi.system.mapper.SysDictDataMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
@@ -38,7 +41,6 @@ import java.util.stream.Collectors;
 public class GValveWellPositionServiceImpl extends ServicePlusImpl<GValveWellPositionMapper, GValveWellPosition, GValveWellPositionVo> implements IGValveWellPositionService {
     @Resource
     private SysDictDataMapper sysDictDataMapper;
-
     @Override
     public Map<String, Object> forImportData(List<GWellPositionImportVo> list, Boolean isUpdateSupport, String operName, int n, int successNum) {
         if (ObjectUtils.isEmpty(list) || list.size() == 0) {
@@ -119,6 +121,14 @@ public class GValveWellPositionServiceImpl extends ServicePlusImpl<GValveWellPos
             lqw.ge(GValveWellPosition::getCreateTime, bo.getCreateTimes().get(0));
             lqw.le(GValveWellPosition::getCreateTime, bo.getCreateTimes().get(1));
         }
+        if (!ObjectUtils.isEmpty(bo.getJobNum())){
+            GValvewellRelationBo entity = new GValvewellRelationBo();
+            entity.setUserId(bo.getJobNum());
+            List<Long> ids = valvewellRelationService.queryList(entity).stream().map(GValvewellRelationVo::getRegulatorBoxId).collect(Collectors.toList());
+            if (!ObjectUtils.isEmpty(ids)) {
+                lqw.notIn(GValveWellPosition::getId,ids);
+            }
+        }
         return lqw;
     }
 
@@ -150,10 +160,14 @@ public class GValveWellPositionServiceImpl extends ServicePlusImpl<GValveWellPos
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
         if (isValid) {
             //TODO 做一些业务上的校验,判断是否需要校验
         }
+        QueryWrapper<GValvewellRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().in(GValvewellRelation::getRegulatorBoxId,ids);
+        valvewellRelationService.remove(queryWrapper);
         return removeByIds(ids);
     }
 

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GValvewellRelationServiceImpl.java

@@ -7,13 +7,16 @@ import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.core.page.PagePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.gas.domain.*;
+import com.ruoyi.gas.domain.bo.GNetworkRelationBo;
 import com.ruoyi.gas.domain.bo.GValveWellInspectionBo;
 import com.ruoyi.gas.domain.bo.GValveWellPositionBo;
 import com.ruoyi.gas.domain.bo.GValvewellRelationBo;
 import com.ruoyi.gas.domain.vo.GAreaVo;
+import com.ruoyi.gas.domain.vo.GNetworkRelationVo;
 import com.ruoyi.gas.domain.vo.GValveWellPositionVo;
 import com.ruoyi.gas.domain.vo.GValvewellRelationVo;
 import com.ruoyi.gas.mapper.GValvewellRelationMapper;
+import com.ruoyi.gas.service.IGValveWellInspectionService;
 import com.ruoyi.gas.service.IGValveWellPositionService;
 import com.ruoyi.gas.service.IGValvewellRelationService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +24,7 @@ import org.springframework.stereotype.Service;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 import java.util.ArrayList;
@@ -38,6 +42,7 @@ import java.util.stream.Collectors;
 @Service
 public class GValvewellRelationServiceImpl extends ServicePlusImpl<GValvewellRelationMapper, GValvewellRelation, GValvewellRelationVo> implements IGValvewellRelationService {
 
+
     @Override
     public GValvewellRelationVo queryById(Long id){
         return getVoById(id);
@@ -96,11 +101,18 @@ public class GValvewellRelationServiceImpl extends ServicePlusImpl<GValvewellRel
     }
 
     @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<Long> ids,String jobNum, Boolean isValid) {
         if(isValid){
             //TODO 做一些业务上的校验,判断是否需要校验
         }
-        return removeByIds(ids);
+        QueryWrapper<GValvewellRelation> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().in(GValvewellRelation::getRegulatorBoxId,ids);
+        queryWrapper.lambda().eq(GValvewellRelation::getUserId,jobNum);
+        return valvewellRelationService.remove(queryWrapper);
     }
 
+    @Autowired
+    private IGValvewellRelationService valvewellRelationService;
+
 }