巡检流程修改，去除报备步骤

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/controller/ImsDutyRecController.java

@@ -187,10 +187,6 @@ public class ImsDutyRecController {
         return R.data(imsDutyRecService.testClassDate(id, type));
     }
 
-
-    /**
-     * 新增：突发事件记录
-     */
     @PostMapping("/addEmergency")
     @ApiOperationSupport(order = 6)
     @ApiOperation(value = "新增突发事件", notes = "传入imsDutyEmergencyEntity")
@@ -198,9 +194,6 @@ public class ImsDutyRecController {
         return iImsDutyEmergencyService.saveEntity(imsDutyEmergencyEntity);
     }
 
-    /**
-     * 删除：突发事件记录
-     */
     @PostMapping("/deleteEmergency")
     @ApiOperationSupport(order = 6)
     @ApiOperation(value = "删除突发事件记录", notes = "传入imsDutyEmergencyEntity")
@@ -209,14 +202,10 @@ public class ImsDutyRecController {
         return iImsDutyEmergencyService.deleteEntity(imsDutyEmergencyEntity);
     }
 
-    /**
+    @GetMapping("/queryEmergency")
-     * 查询：突发事件记录
-     */
-    @PostMapping("/queryEmergency")
-    @ApiOperationSupport(order = 6)
     @ApiOperation(value = "查询突发事件记录", notes = "传入imsDutyEmergencyEntity")
-    public R queryEmergency(@Valid @RequestBody ImsDutyEmergencyVo imsDutyEmergencyVo, Query query) {
+    public R<IPage> queryEmergency(ImsDutyEmergencyEntity imsDutyEmergencyEntity, Query query) {
-        return iImsDutyEmergencyService.queryEntity(imsDutyEmergencyVo, query);
+        return iImsDutyEmergencyService.queryEmergency(imsDutyEmergencyEntity, query);
     }
 
 

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/IImsDutyEmergencyService.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.hzinfo_inspect.duty.entity.ImsDutyEmergencyEntity;
-import org.springblade.hzinfo_inspect.duty.vo.ImsDutyEmergencyVo;
 
 
 /**
@@ -19,6 +18,6 @@ public interface IImsDutyEmergencyService extends IService<ImsDutyEmergencyEntit
 
     R deleteEntity(ImsDutyEmergencyEntity imsDutyEmergencyEntity);
 
-	R queryEntity(ImsDutyEmergencyVo imsDutyEmergencyVo, Query query);
+    R queryEmergency(ImsDutyEmergencyEntity entity, Query query);
 
 }

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyEmergencyServiceImpl.java

@@ -2,13 +2,10 @@ package org.springblade.hzinfo_inspect.duty.service.impl;
 
 
 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.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -21,7 +18,6 @@ import org.springblade.hzinfo_inspect.duty.enums.DutyMainStatus;
 import org.springblade.hzinfo_inspect.duty.mapper.ImsDutyEmergencyMapper;
 import org.springblade.hzinfo_inspect.duty.mapper.ImsDutyMainMapper;
 import org.springblade.hzinfo_inspect.duty.service.IImsDutyEmergencyService;
-import org.springblade.hzinfo_inspect.duty.vo.ImsDutyEmergencyVo;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -70,64 +66,26 @@ public class ImsDutyEmergencyServiceImpl extends ServiceImpl<ImsDutyEmergencyMap
     }
 
     @Override
-    public R queryEntity(ImsDutyEmergencyVo imsDutyEmergencyVo, Query query) {
+    public R queryEmergency(ImsDutyEmergencyEntity entity, Query query) {
-//        QueryWrapper<ImsDutyEmergencyEntity> queryWrapper = getQueryWrapper(imsDutyEmergencyVo);
+        IPage<ImsDutyEmergencyEntity> pageList = this.page(Condition.getPage(query), Condition.getQueryWrapper(entity));
-        IPage<ImsDutyEmergencyEntity> imsDutyEmergencyEntityIPage = baseMapper.selectPage(Condition.getPage(query), new LambdaQueryWrapper<>());
+        if (pageList.getTotal() == 0) {
-        List<ImsDutyEmergencyEntity> records = imsDutyEmergencyEntityIPage.getRecords();
+            return R.data(pageList);
-        List<ImsDutyEmergencyEntity> collect;
+        }
-        if (CollectionUtils.isNotEmpty(records)) {
+        List<ImsDutyEmergencyEntity> resultList = pageList.getRecords().stream().map(obj -> {
-            collect = records.stream().map(sig -> {
+            R<User> user = userClient.userInfoById(obj.getRegistrant());
-                R<User> user = userClient.userInfoById(sig.getRegistrant());
             if (user.isSuccess() && ObjectUtils.isNotEmpty(user.getData())) {
-                    sig.setRegistrantName(user.getData().getName());
+                obj.setRegistrantName(user.getData().getName());
             }
-                R<User> userR = userClient.userInfoById(sig.getChargePerson());
+            R<User> userR = userClient.userInfoById(obj.getChargePerson());
             if (userR.isSuccess() && ObjectUtils.isNotEmpty(userR.getData())) {
-                    sig.setChargePersonName(userR.getData().getName());
+                obj.setChargePersonName(userR.getData().getName());
             }
-                ImsDutyClassEntity classEntity = imsDutyClassService.getById(sig.getDutyClass());
+            ImsDutyClassEntity classEntity = imsDutyClassService.getById(obj.getDutyClass());
-                sig.setDutyClassName(classEntity.getClassName());
+            obj.setDutyClassName(classEntity == null ? "未知" : classEntity.getClassName());
-                return sig;
+            return obj;
         }).collect(Collectors.toList());
-            imsDutyEmergencyEntityIPage.setRecords(collect);
+        pageList.setRecords(resultList);
-        }
+        return R.data(pageList);
-        return R.data(imsDutyEmergencyEntityIPage);
-    }
-
-    private QueryWrapper<ImsDutyEmergencyEntity> getQueryWrapper(ImsDutyEmergencyVo imsDutyEmergencyVo) {
-        QueryWrapper<ImsDutyEmergencyEntity> queryWrapper = new QueryWrapper();
-        if (ObjectUtils.isNotEmpty(imsDutyEmergencyVo.getId())) {
-            queryWrapper.lambda().in(ImsDutyEmergencyEntity::getId, imsDutyEmergencyVo.getId());
-        }
-        if (ObjectUtils.isNotEmpty(imsDutyEmergencyVo.getDutyStartTime())) {
-            queryWrapper.lambda().ge(ImsDutyEmergencyEntity::getDutyTime, imsDutyEmergencyVo.getDutyStartTime());
-        }
-        if (ObjectUtils.isNotEmpty(imsDutyEmergencyVo.getDutyEndTime())) {
-            queryWrapper.lambda().le(ImsDutyEmergencyEntity::getDutyTime, imsDutyEmergencyVo.getDutyEndTime());
-        }
-        if (CollectionUtils.isNotEmpty(imsDutyEmergencyVo.getDutyClass())) {
-            queryWrapper.lambda().in(ImsDutyEmergencyEntity::getDutyClass, imsDutyEmergencyVo.getDutyClass());
-        }
-        if (CollectionUtils.isNotEmpty(imsDutyEmergencyVo.getChargePerson())) {
-            queryWrapper.lambda().in(ImsDutyEmergencyEntity::getChargePerson, imsDutyEmergencyVo.getChargePerson());
     }
-        if (CollectionUtils.isNotEmpty(imsDutyEmergencyVo.getRegistrant())) {
-            queryWrapper.lambda().in(ImsDutyEmergencyEntity::getRegistrant, imsDutyEmergencyVo.getRegistrant());
-        }
-        if (CollectionUtils.isNotEmpty(imsDutyEmergencyVo.getRegistrant())) {
-            queryWrapper.lambda().in(ImsDutyEmergencyEntity::getRegistrant, imsDutyEmergencyVo.getRegistrant());
-        }
-        if (StringUtils.isNotEmpty(imsDutyEmergencyVo.getEventTitle())) {
-            queryWrapper.lambda().like(ImsDutyEmergencyEntity::getEventTitle, imsDutyEmergencyVo.getEventTitle());
-        }
-        if (StringUtils.isNotEmpty(imsDutyEmergencyVo.getEventInfo())) {
-            queryWrapper.lambda().like(ImsDutyEmergencyEntity::getEventInfo, imsDutyEmergencyVo.getEventInfo());
-        }
-        if (StringUtils.isNotEmpty(imsDutyEmergencyVo.getEventType())) {
-            queryWrapper.lambda().like(ImsDutyEmergencyEntity::getEventType, imsDutyEmergencyVo.getEventType());
-        }
-        return queryWrapper;
-    }
-
 
 }

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/plan/service/impl/PlanServiceImpl.java

@@ -1,6 +1,5 @@
 package org.springblade.hzinfo_inspect.plan.service.impl;
 
-import org.springblade.system.feign.ISysClient;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -9,7 +8,12 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.common.collect.Lists;
-//import com.hnac.hzims.operational.duty.feign.IDutyClassClient;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.hzinfo_inspect.obj.entity.ObjectEntity;
 import org.springblade.hzinfo_inspect.obj.entity.TemplateEntity;
 import org.springblade.hzinfo_inspect.obj.services.ObjectService;
@@ -28,12 +32,7 @@ import org.springblade.hzinfo_inspect.task.job.service.ITaskJobService;
 import org.springblade.hzinfo_inspect.task.job.service.impl.ConcurrentTaskServcie;
 import org.springblade.hzinfo_inspect.task.job.service.impl.SeizeTaskService;
 import org.springblade.hzinfo_inspect.task.service.ITaskService;
-import org.springblade.core.log.exception.ServiceException;
+import org.springblade.system.feign.ISysClient;
-import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.system.user.cache.UserCache;
 import org.springblade.system.user.entity.User;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -86,9 +85,9 @@ public class PlanServiceImpl extends BaseServiceImpl<PlanMapper, PlanEntity> imp
 //	private static final String TASK_END_REMIND_KEY = "taskEndRemind";
 
 
-
     /**
      * 删除巡检计划，删除巡检计划相关的所有信息
+     *
      * @param id
      * @return
      */
@@ -124,6 +123,7 @@ public class PlanServiceImpl extends BaseServiceImpl<PlanMapper, PlanEntity> imp
 
     /**
      * 新增巡检计划 并审核、生成任务
+     *
      * @param plan
      * @return 返回taskId list
      */
@@ -149,6 +149,7 @@ public class PlanServiceImpl extends BaseServiceImpl<PlanMapper, PlanEntity> imp
 
     /**
      * 校验提交参数
+     *
      * @param plan
      */
     private void checkInputParam(PlanVO plan) {
@@ -169,6 +170,7 @@ public class PlanServiceImpl extends BaseServiceImpl<PlanMapper, PlanEntity> imp
 
     /**
      * 插入巡检计划相关表
+     *
      * @param modify 是否是修改
      * @param plan
      * @return
@@ -252,6 +254,7 @@ public class PlanServiceImpl extends BaseServiceImpl<PlanMapper, PlanEntity> imp
     /**
      * 插入巡检计划相关表
      * 对象模板信息来源于路径
+     *
      * @param modify 是否是修改
      * @param plan
      * @return
@@ -347,6 +350,7 @@ public class PlanServiceImpl extends BaseServiceImpl<PlanMapper, PlanEntity> imp
 
     /**
      * hld 保存巡检计划
+     *
      * @param plan
      * @return
      */
@@ -416,6 +420,7 @@ public class PlanServiceImpl extends BaseServiceImpl<PlanMapper, PlanEntity> imp
     /**
      * 生成当天任务
      * 如果计划开始时间小于等于当天则产生当天任务
+     *
      * @param planId 计划id
      */
     @Transactional(rollbackFor = Exception.class)
@@ -456,6 +461,7 @@ public class PlanServiceImpl extends BaseServiceImpl<PlanMapper, PlanEntity> imp
 
     /**
      * 查看巡检计划
+     *
      * @param id
      */
     @Override

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/task/controller/TaskRecordController.java

@@ -5,27 +5,28 @@ package org.springblade.hzinfo_inspect.task.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.hzinfo_inspect.task.entity.TaskRecordEntity;
-import org.springblade.hzinfo_inspect.task.service.ITaskRecordService;
-import org.springblade.hzinfo_inspect.task.service.ITaskService;
-import org.springblade.hzinfo_inspect.task.vo.TaskListQuery;
-import org.springblade.hzinfo_inspect.task.vo.TaskRecordAddVO;
-import org.springblade.hzinfo_inspect.task.vo.TaskVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.hzinfo_inspect.task.entity.TaskRecordEntity;
+import org.springblade.hzinfo_inspect.task.service.ITaskRecordService;
+import org.springblade.hzinfo_inspect.task.service.ITaskService;
+import org.springblade.hzinfo_inspect.task.vo.TaskListQuery;
+import org.springblade.hzinfo_inspect.task.vo.TaskRecordAddVO;
+import org.springblade.hzinfo_inspect.task.vo.TaskVo;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
 /**
  * 巡检报备
+ *
  * @author ninglong
  *
  */
@@ -50,11 +51,6 @@ public class TaskRecordController {
         return R.data(pages);
     }
 
-    /**
-     * 插入巡检任务报备信息
-     * @param itr 巡检任务报备实例
-     * @return 结果整型数
-     */
     @PostMapping("/addTaskRecord")
     @ApiOperation(value = "巡检任务报备", notes = "巡检任务报备")
     public R<Boolean> addTaskRecord(@RequestBody TaskRecordAddVO itr) {

HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/task/job/service/TaskJobService.java

@@ -6,12 +6,22 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.common.collect.Lists;
+import com.xxl.job.core.log.XxlJobLogger;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.tool.utils.CollectionUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.hzinfo_inspect.obj.entity.*;
 import org.springblade.hzinfo_inspect.obj.services.*;
 import org.springblade.hzinfo_inspect.plan.PlanContants.PlanCycleEnum;
 import org.springblade.hzinfo_inspect.plan.PlanContants.PlanTypeEnum;
 import org.springblade.hzinfo_inspect.plan.entity.*;
-import org.springblade.hzinfo_inspect.plan.service.*;
+import org.springblade.hzinfo_inspect.plan.service.IPlanObjectTemplateService;
+import org.springblade.hzinfo_inspect.plan.service.IPlanOrgService;
+import org.springblade.hzinfo_inspect.plan.service.IPlanPositionService;
+import org.springblade.hzinfo_inspect.plan.service.IPlanUserService;
 import org.springblade.hzinfo_inspect.task.TaskContants;
 import org.springblade.hzinfo_inspect.task.TaskContants.ClaimStatusEnum;
 import org.springblade.hzinfo_inspect.task.entity.*;
@@ -19,13 +29,6 @@ import org.springblade.hzinfo_inspect.task.service.ITaskObjectProjectContentServ
 import org.springblade.hzinfo_inspect.task.service.ITaskObjectProjectService;
 import org.springblade.hzinfo_inspect.task.service.ITaskObjectService;
 import org.springblade.hzinfo_inspect.task.service.ITaskService;
-import com.xxl.job.core.log.XxlJobLogger;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springblade.core.log.exception.ServiceException;
-import org.springblade.core.tool.utils.CollectionUtil;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +45,7 @@ import java.util.stream.Collectors;
 
 /**
  * 任务派发处理逻辑
+ *
  * @author ninglong
  * @create 2020-08-26 17:06
  */
@@ -89,6 +93,7 @@ public class TaskJobService {
 
     /**
      * 根据计划用户获取接任务的人
+     *
      * @param planUserId
      * @param taskId
      */
@@ -103,6 +108,7 @@ public class TaskJobService {
 
     /**
      * 从巡检计划和任务获取信息插入巡检任务对象表以及对应的历史数据表
+     *
      * @param plan 巡检计划实例
      * @param task 巡检任务实例
      * @return
@@ -175,8 +181,10 @@ public class TaskJobService {
         }
         return result;
     }
+
     /**
      * 从巡检任务、巡检计划对象模板、巡检模板项目获取信息插入巡检任务项目表以及对应的历史数据表
+     *
      * @param objectId 巡检计划对象模板实例
      * @param project  巡检模板项目实例
      * @return
@@ -210,13 +218,16 @@ public class TaskJobService {
 
     /**
      * 从巡检任务、巡检计划对象模板、巡检项目内容获取信息插入巡检任务内容表以及对应的历史数据表
+     *
      * @param objectId 巡检计划对象模板实例
      * @param content  巡检项目内容实例
      * @return
      */
     private String distributeTaskContents(TaskEntity task, Long objectId, ProjectContentEntity content) {
         ContentEntity ioc = contentService.getById(content.getContentId());
-        if(ioc == null) {return "巡检内容id="+content.getContentId()+"找不到记录";}
+        if (ioc == null) {
+            return "巡检内容id=" + content.getContentId() + "找不到记录";
+        }
         TaskObjectProjectContentEntity itopc = new TaskObjectProjectContentEntity();
         itopc.setTaskId(task.getId());
         itopc.setObjectId(objectId);
@@ -244,6 +255,7 @@ public class TaskJobService {
 
     /**
      * 根据巡检计划返回与计划有关的所有用户
+     *
      * @param plan 巡检计划实例
      * @return 计划相关用户集合
      */
@@ -284,8 +296,7 @@ public class TaskJobService {
             if (Func.isNotEmpty(plan.getExecTimeJson())) {
                 /** 多次计划执行时间 **/
                 timeJsonArray = JSON.parseArray(plan.getExecTimeJson());
-			}
+            } else {
-			else{
                 throw new ServiceException("巡检计划未设置值班班次: plan = " + plan.toString());
             }
             for (int i = 0; i < plan.getTaskTimesADay(); i++) {
@@ -340,6 +351,7 @@ public class TaskJobService {
 
     /**
      * 根据计划信息设置任务信息
+     *
      * @param plan         巡检计划实例
      * @param totalTaskNum 任务数 并发任务有多少个人做任务就生成多少个任务，抢占任务只生成一个
      * @return 巡检任务实例
@@ -401,7 +413,12 @@ public class TaskJobService {
             log.info("计划id={}本周期batchNumber={}的任务已生成", plan.getId(), task.getBatchNumber());
             return null;
         }
+        // 自动报备
+        task.setKeepOnRecord(TaskContants.keepOnRecordEnum.yes.getType());
+        task.setStartTime(LocalDateTime.now());
+        task.setStatus(Integer.valueOf(TaskContants.TaskStatusEnum.UNDERWAY_STATUS.getStatus()));
         taskService.save(task);
+
         return task;
     }
 

hnac-framework-boot/src/main/resources/application-local.yml

@@ -12,7 +12,7 @@ spring:
           password: 1qaz2WSX!
         slave:
           url: jdbc:mysql://192.168.1.58:3576/hzinfo_ris_pxhd?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
-          username: root
+          username: hzinfo
           password: 1qaz2WSX!
         tdengine:
           db-type: postgresql