巡检路线/点修改

src/main/java/com/zhgd/xmgl/modules/checking/controller/XzCheckingRouteController.java

@@ -63,7 +63,6 @@ public class XzCheckingRouteController {
      */
     @OperLog(operModul = "巡检路线管理", operType = "查询", operDesc = "列表查询巡检路线信息")
     @ApiOperation(value = "列表查询星纵-巡检路线信息", notes = "列表查询星纵-巡检路线信息", httpMethod = "GET")
-
     @GetMapping(value = "/list")
     public Result<List<XzCheckingRoute>> queryList(@ApiIgnore @RequestParam HashMap<String, Object> paramMap) {
         return Result.success(xzCheckingRouteService.queryList(paramMap));

src/main/java/com/zhgd/xmgl/modules/checking/service/impl/CheckingPointServiceImpl.java

@@ -1,11 +1,13 @@
 package com.zhgd.xmgl.modules.checking.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.qrcode.QrCodeUtil;
 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -13,20 +15,24 @@ import com.gexin.fastjson.JSON;
 import com.gexin.fastjson.JSONObject;
 import com.zhgd.jeecg.common.execption.OpenAlertException;
 import com.zhgd.jeecg.common.execption.OpenPromptException;
+import com.zhgd.xmgl.constant.Cts;
 import com.zhgd.xmgl.modules.basicdata.service.INoticeService;
 import com.zhgd.xmgl.modules.checking.entity.CheckingPoint;
 import com.zhgd.xmgl.modules.checking.entity.CheckingPointInfo;
 import com.zhgd.xmgl.modules.checking.entity.XzCheckingRouteTask;
+import com.zhgd.xmgl.modules.checking.entity.XzCheckingRouteToPoint;
 import com.zhgd.xmgl.modules.checking.entity.qo.ProjectSnQO;
 import com.zhgd.xmgl.modules.checking.entity.vo.TaskDetailPageVo;
 import com.zhgd.xmgl.modules.checking.mapper.CheckingPointInfoMapper;
 import com.zhgd.xmgl.modules.checking.mapper.CheckingPointMapper;
 import com.zhgd.xmgl.modules.checking.service.CheckingPointService;
+import com.zhgd.xmgl.modules.checking.service.IXzCheckingRouteToPointService;
 import com.zhgd.xmgl.util.PageUtil;
 import com.zhgd.xmgl.util.RegionUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -54,6 +60,9 @@ public class CheckingPointServiceImpl extends ServiceImpl<CheckingPointMapper, C
     String basePath;
     @Autowired
     XzCheckingRouteTaskServiceImpl xzCheckingRouteTaskService;
+    @Lazy
+    @Autowired
+    IXzCheckingRouteToPointService xzCheckingRouteToPointService;
 
     @Override
     public IPage<CheckingPoint> selectCheckingPointPage(ProjectSnQO projectSnQo) {
@@ -128,7 +137,6 @@ public class CheckingPointServiceImpl extends ServiceImpl<CheckingPointMapper, C
         return userIds;
     }
 
-
     @Override
     public void edit(CheckingPoint checkingPoint) {
         // 生成指定url对应的二维码到文件，宽和高都是300像素
@@ -153,6 +161,10 @@ public class CheckingPointServiceImpl extends ServiceImpl<CheckingPointMapper, C
 
     @Override
     public void deleteProjectBim(Long id) {
+        List<XzCheckingRouteToPoint> toPointList = xzCheckingRouteToPointService.list(new QueryWrapper<XzCheckingRouteToPoint>().lambda().eq(XzCheckingRouteToPoint::getCheckingPointId, id).last(Cts.IGNORE_DATA_SCOPE_CONDITION));
+        if (CollUtil.isNotEmpty(toPointList)) {
+            throw new OpenAlertException("删除巡检点失败，有巡检路线使用该巡检点");
+        }
         CheckingPoint checkingPoint = checkingPointMapper.selectById(id);
         checkingPointInfoMapper.delete(new LambdaQueryWrapper<CheckingPointInfo>().eq(CheckingPointInfo::getCheckingPointId, id));
         removeById(id);

src/main/java/com/zhgd/xmgl/modules/checking/service/impl/XzCheckingRouteServiceImpl.java

@@ -10,19 +10,25 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.constant.Cts;
+import com.zhgd.xmgl.modules.checking.entity.CheckingPointInfo;
 import com.zhgd.xmgl.modules.checking.entity.XzCheckingRoute;
 import com.zhgd.xmgl.modules.checking.entity.XzCheckingRouteTask;
 import com.zhgd.xmgl.modules.checking.entity.XzCheckingRouteToPoint;
 import com.zhgd.xmgl.modules.checking.mapper.XzCheckingRouteMapper;
 import com.zhgd.xmgl.modules.checking.mapper.XzCheckingRouteTaskMapper;
 import com.zhgd.xmgl.modules.checking.mapper.XzCheckingRouteToPointMapper;
+import com.zhgd.xmgl.modules.checking.service.CheckingPointInfoService;
 import com.zhgd.xmgl.modules.checking.service.IXzCheckingRouteService;
+import com.zhgd.xmgl.modules.checking.service.IXzCheckingRouteTaskService;
+import com.zhgd.xmgl.modules.checking.service.IXzCheckingRouteToPointService;
 import com.zhgd.xmgl.util.DateUtils;
 import com.zhgd.xmgl.util.PageUtil;
 import com.zhgd.xmgl.util.RefUtil;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -40,6 +46,15 @@ import static com.zhgd.xmgl.modules.checking.enums.XzCheckingRouteFrequencyTypeE
 @Service
 @Transactional(rollbackFor = Exception.class)
 public class XzCheckingRouteServiceImpl extends ServiceImpl<XzCheckingRouteMapper, XzCheckingRoute> implements IXzCheckingRouteService {
+    @Lazy
+    @Autowired
+    CheckingPointInfoService checkingPointInfoService;
+    @Lazy
+    @Autowired
+    IXzCheckingRouteTaskService xzCheckingRouteTaskService;
+     @Lazy
+    @Autowired
+     IXzCheckingRouteToPointService xzCheckingRouteToPointService;
     @Autowired
     private XzCheckingRouteMapper xzCheckingRouteMapper;
     @Autowired
@@ -71,7 +86,7 @@ public class XzCheckingRouteServiceImpl extends ServiceImpl<XzCheckingRouteMappe
             queryWrapper.ge(alias + RefUtil.fieldNameUlc(XzCheckingRoute::getEndTime), DateUtil.formatDate(DateUtil.parseDate(inspectTimeBegin)));
         }
         if (StrUtil.isNotBlank(inspectTimeEnd)) {
-            queryWrapper.le(alias + RefUtil.fieldNameUlc(XzCheckingRoute::getStartTime),  DateUtil.formatDate(DateUtil.parseDate(inspectTimeEnd)));
+            queryWrapper.le(alias + RefUtil.fieldNameUlc(XzCheckingRoute::getStartTime), DateUtil.formatDate(DateUtil.parseDate(inspectTimeEnd)));
         }
         queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzCheckingRoute::getCreateDate));
         return queryWrapper;
@@ -155,9 +170,12 @@ public class XzCheckingRouteServiceImpl extends ServiceImpl<XzCheckingRouteMappe
     }
 
     private void saveRouteToPoint(XzCheckingRoute xzCheckingRoute) {
+        List<XzCheckingRouteToPoint> routeToPointList = xzCheckingRoute.getRouteToPointList();
+        if (CollUtil.isEmpty(routeToPointList)) {
+            throw new OpenAlertException("巡检点列表为空");
+        }
         xzCheckingRouteToPointMapper.delete(new LambdaQueryWrapper<XzCheckingRouteToPoint>()
                 .eq(XzCheckingRouteToPoint::getXzCheckingRouteId, xzCheckingRoute.getId()));
-        List<XzCheckingRouteToPoint> routeToPointList = xzCheckingRoute.getRouteToPointList();
         if (CollUtil.isNotEmpty(routeToPointList)) {
             Set<Integer> sortSet = routeToPointList.stream().map(XzCheckingRouteToPoint::getSort).collect(Collectors.toSet());
             if (sortSet.size() != routeToPointList.size()) {
@@ -189,6 +207,10 @@ public class XzCheckingRouteServiceImpl extends ServiceImpl<XzCheckingRouteMappe
             throw new OpenAlertException("未找到对应实体");
         }
         baseMapper.deleteById(id);
+        List<XzCheckingRouteTask> tasks = xzCheckingRouteTaskService.list(new QueryWrapper<XzCheckingRouteTask>().lambda().eq(XzCheckingRouteTask::getXzCheckingRouteId, id));
+        xzCheckingRouteTaskService.remove(new QueryWrapper<XzCheckingRouteTask>().lambda().eq(XzCheckingRouteTask::getXzCheckingRouteId, id));
+        xzCheckingRouteToPointService.remove(new QueryWrapper<XzCheckingRouteToPoint>().lambda().eq(XzCheckingRouteToPoint::getXzCheckingRouteId, id));
+        checkingPointInfoService.remove(new QueryWrapper<CheckingPointInfo>().lambda().in(CheckingPointInfo::getXzCheckingRouteTaskId, tasks.stream().map(XzCheckingRouteTask::getId).collect(Collectors.toList())));
     }
 
     @Override

src/main/java/com/zhgd/xmgl/modules/checking/service/impl/XzCheckingRouteTaskServiceImpl.java

@@ -59,8 +59,8 @@ public class XzCheckingRouteTaskServiceImpl extends ServiceImpl<XzCheckingRouteT
             queryWrapper.apply("find_in_set({0},xcr.inspect_user_ids)", checkingPointUserId);
         }
         if (StrUtil.isNotBlank(date)) {
-            queryWrapper.le("xcr.start_time", date);
+            queryWrapper.le("t.start_time", date);
-            queryWrapper.ge("xcr.end_time", date);
+            queryWrapper.ge("t.end_time", date);
         }
         queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzCheckingRouteTask::getId));
         return queryWrapper;