From 6ae11d1fbe95721c0de2997a4d8607f3f4e4328f Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 30 Mar 2023 14:52:36 +0800
Subject: [PATCH] 巡查任务
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolTaskService.java | 9 +
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.java | 11 ++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml | 20 ++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java | 16 +++
skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/entity/DeviceReport.java | 3
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolConfigMapper.java | 3
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java | 110 ++++++++++++++++++++++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolConfigMapper.xml | 16 +++
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolConfigController.java | 4
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolTask.java | 62 ++++++++++++
10 files changed, 250 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolConfigController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolConfigController.java
index ca7d5e7..e3c3fe4 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolConfigController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolConfigController.java
@@ -37,8 +37,8 @@
@ApiOperation(value="巡查设置-分页列表查询", notes="巡查设置-分页列表查询")
@GetMapping(value = "/list")
public R<IPage<PatrolConfig>> queryPageList(PatrolConfig patrolConfig,Query query) {
-// IPage<PatrolConfig> pageList = patrolConfigService.selectPatrolConfig(Condition.getPage(query),patrolConfig);
- IPage<PatrolConfig> pageList = patrolConfigService.page(Condition.getPage(query), Condition.getQueryWrapper(patrolConfig));
+ IPage<PatrolConfig> pageList = patrolConfigService.selectPatrolConfig(Condition.getPage(query),patrolConfig);
+// IPage<PatrolConfig> pageList = patrolConfigService.page(Condition.getPage(query), Condition.getQueryWrapper(patrolConfig));
return R.data(pageList);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java
new file mode 100644
index 0000000..6812782
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java
@@ -0,0 +1,110 @@
+package cn.gistack.sm.patrol.controller;
+
+import cn.gistack.sm.patrol.entity.PatrolTask;
+import cn.gistack.sm.patrol.entity.PatrolTask;
+import cn.gistack.sm.patrol.service.IPatrolTaskService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+* @Description: 巡查任务
+*/
+@Slf4j
+@Api(tags="巡查任务")
+@RestController
+@RequestMapping("/patrol/patrolTask")
+@AllArgsConstructor
+public class PatrolTaskController extends BladeController {
+ private IPatrolTaskService patrolTaskService;
+
+ /**
+ * 分页列表查询
+ * @return
+ */
+ @ApiOperation(value="巡查任务-分页列表查询", notes="巡查任务-分页列表查询")
+ @GetMapping(value = "/list")
+ public R queryPageList(PatrolTask patrolTask, Query query) {
+ IPage<PatrolTask> pageList = patrolTaskService.selectPatrolTask(Condition.getPage(query),patrolTask);
+// IPage<PatrolTask> pageList = patrolTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(PatrolTask));
+ return R.data(pageList);
+ }
+
+ /**
+ * 获取所有巡查任务
+ */
+ @ApiOperation(value="获取所有巡查任务", notes="获取所有巡查任务")
+ @GetMapping(value = "/all")
+ public R getAll(){
+ List<PatrolTask> list = patrolTaskService.list();
+ return R.data(list);
+ }
+
+ /**
+ * 添加
+ */
+ @ApiOperation(value="巡查任务-添加", notes="巡查任务-添加")
+ @PostMapping(value = "/add")
+ public R add(@RequestBody PatrolTask patrolTask) {
+ return R.data(patrolTaskService.save(patrolTask));
+ }
+
+ /**
+ * 编辑
+ * @return
+ */
+ @ApiOperation(value="巡查任务-编辑", notes="巡查任务-编辑")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+ public R edit(@RequestBody PatrolTask patrolTask) {
+ return R.data(patrolTaskService.updateById(patrolTask));
+ }
+
+ /**
+ * 通过id删除
+ *
+ * @param id
+ * @return
+ */
+ @ApiOperation(value="巡查任务-通过id删除", notes="巡查任务-通过id删除")
+ @DeleteMapping(value = "/delete")
+ public R delete(@RequestParam(name="id",required=true) String id) {
+ return R.data(patrolTaskService.removeById(id));
+ }
+
+ /**
+ * 批量删除
+ *
+ * @param ids
+ * @return
+ */
+ @ApiOperation(value="巡查任务-批量删除", notes="巡查任务-批量删除")
+ @DeleteMapping(value = "/deleteBatch")
+ public R deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+ return R.data(patrolTaskService.removeByIds(Arrays.asList(ids.split(","))));
+ }
+
+ /**
+ * 通过id查询
+ *
+ * @param id
+ * @return
+ */
+ @ApiOperation(value="巡查任务-通过id查询", notes="巡查任务-通过id查询")
+ @GetMapping(value = "/queryById")
+ public R queryById(@RequestParam(name="id",required=true) String id) {
+ PatrolTask PatrolTask = patrolTaskService.getById(id);
+ return R.data(PatrolTask);
+ }
+
+
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolTask.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolTask.java
new file mode 100644
index 0000000..80a2496
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolTask.java
@@ -0,0 +1,62 @@
+package cn.gistack.sm.patrol.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.springblade.core.mp.base.BaseEntity;
+import org.springblade.core.tenant.mp.TenantEntity;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * @Description: 巡查类型
+ */
+@Data
+@TableName("sm_patrol_task")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="sm_patrol_task对象", description="巡查任务")
+public class PatrolTask extends TenantEntity {
+ /**标题*/
+ @ApiModelProperty(value = "标题")
+ private String title;
+
+ /**开始时间*/
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "开始时间")
+ private String startTime;
+
+ /**结束时间*/
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value = "结束时间")
+ private String endTime;
+
+ /**内容*/
+ @ApiModelProperty(value = "内容")
+ private String content;
+
+ /**巡检人员*/
+ @ApiModelProperty(value = "巡检人员")
+ private String toUserId;
+
+ /**路线id*/
+ @ApiModelProperty(value = "路线id")
+ private String routeId;
+
+ /**任务状态*/
+ @ApiModelProperty(value = "任务状态")
+ private String state;
+
+ /**任务来源*/
+ @ApiModelProperty(value = "任务来源")
+ private String source;
+
+ /**任务类型*/
+ @ApiModelProperty(value = "任务类型")
+ private String taskType;
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolConfigMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolConfigMapper.java
index 4e04d5d..6cc110e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolConfigMapper.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolConfigMapper.java
@@ -2,6 +2,7 @@
import cn.gistack.sm.patrol.entity.PatrolConfig;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -10,5 +11,5 @@
*/
public interface PatrolConfigMapper extends BaseMapper<PatrolConfig> {
- List<PatrolConfig> selectPatrolConfig(PatrolConfig patrolConfig);
+ List<PatrolConfig> selectPatrolConfig(@Param("patrolConfig") PatrolConfig patrolConfig);
}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolConfigMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolConfigMapper.xml
index d1bc28e..393aeb5 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolConfigMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolConfigMapper.xml
@@ -3,6 +3,20 @@
<mapper namespace="cn.gistack.sm.patrol.mapper.PatrolConfigMapper">
<select id="selectPatrolConfig" resultType="cn.gistack.sm.patrol.entity.PatrolConfig">
-
+ SELECT id,project_type,patrol_type_id,project_id,group_ids
+ FROM SM_PATROL_CONFIG
+ WHERE is_deleted = 0
+ <if test="patrolConfig.projectId !=null and patrolConfig.projectId !='' ">
+ AND project_id = #{patrolConfig.projectId}
+ </if>
+ <if test="patrolConfig.projectType !=null and patrolConfig.projectType !='' ">
+ AND project_type = #{patrolConfig.projectType}
+ </if>
+ <if test="patrolConfig.patrolTypeId !=null and patrolConfig.patrolTypeId !='' ">
+ AND patrol_type_id = #{patrolConfig.patrolTypeId}
+ </if>
+ <if test="patrolConfig.groupIds !=null and patrolConfig.groupIds !='' ">
+ AND FIND_IN_SET(#{patrolConfig.groupIds},group_ids)
+ </if>
</select>
</mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.java
new file mode 100644
index 0000000..d62fb72
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.java
@@ -0,0 +1,11 @@
+package cn.gistack.sm.patrol.mapper;
+
+import cn.gistack.sm.patrol.entity.PatrolTask;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface PatrolTaskMapper extends BaseMapper<PatrolTask> {
+ List<PatrolTask> selectPatrolTask(@Param("patrolTask") PatrolTask patrolTask);
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
new file mode 100644
index 0000000..fcfbdc3
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.gistack.sm.patrol.mapper.PatrolTaskMapper">
+
+
+ <select id="selectPatrolTask" resultType="cn.gistack.sm.patrol.entity.PatrolTask">
+ SELECT id,title,start_time,end_time,content,to_user_id,route_id,state,source,task_type
+ FROM sm_patrol_task
+ WHERE is_deleted = 0
+ <if test="patrolTask.title !=null and patrolTask.title!=''">
+ AND title LIKE CONCAT('%',#{patrolTask.title},'%')
+ </if>
+ <if test="patrolTask.startTime !=null and patrolTask.startTime !=''">
+ AND DATE_FORMAT(start_time,'%Y-%m-%d') >= #{patrolTask.startTime}
+ </if>
+ <if test="patrolTask.endTime !=null and patrolTask.endTime !=''">
+ AND DATE_FORMAT(end_time,'%Y-%m-%d') <= #{patrolTask.endTime}
+ </if>
+ </select>
+</mapper>
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolTaskService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolTaskService.java
new file mode 100644
index 0000000..9156b54
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolTaskService.java
@@ -0,0 +1,9 @@
+package cn.gistack.sm.patrol.service;
+
+import cn.gistack.sm.patrol.entity.PatrolTask;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseService;
+
+public interface IPatrolTaskService extends BaseService<PatrolTask> {
+ IPage<PatrolTask> selectPatrolTask(IPage<PatrolTask> page, PatrolTask patrolTask);
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java
new file mode 100644
index 0000000..d6dee8b
--- /dev/null
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java
@@ -0,0 +1,16 @@
+package cn.gistack.sm.patrol.service.impl;
+
+import cn.gistack.sm.patrol.entity.PatrolTask;
+import cn.gistack.sm.patrol.mapper.PatrolTaskMapper;
+import cn.gistack.sm.patrol.service.IPatrolTaskService;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+public class PatrolTaskServiceImpl extends BaseServiceImpl<PatrolTaskMapper, PatrolTask> implements IPatrolTaskService {
+ @Override
+ public IPage<PatrolTask> selectPatrolTask(IPage<PatrolTask> page, PatrolTask patrolTask) {
+ return page.setRecords(baseMapper.selectPatrolTask(patrolTask));
+ }
+}
diff --git a/skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/entity/DeviceReport.java b/skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/entity/DeviceReport.java
index 9ba91d6..7efda50 100644
--- a/skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/entity/DeviceReport.java
+++ b/skjcmanager/skjcmanager-service/skjcmanger-app/src/main/java/cn/gistack/app/jcsb/entity/DeviceReport.java
@@ -73,6 +73,9 @@
@ApiModelProperty("时段雨量")
private String temporalRainfall;
+ /**
+ * 记录时间
+ */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date recordTime;
--
Gitblit v1.9.3