大屏巡查

epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/GridManagerListFormDTO.java

@@ -0,0 +1,25 @@
+package com.epmet.user.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/6/7 2:57 下午
+ * @DESC
+ */
+@Data
+public class GridManagerListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -7624307754570242679L;
+
+    public interface GridManagerListForm{}
+
+    @NotBlank(message = "组织ID不能为空",groups = GridManagerListForm.class)
+    private String agencyId;
+
+    @NotBlank(message = "行政区域编码不能为空",groups = GridManagerListForm.class)
+    private String areaCode;
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/PatrolTrackFormDTO.java

@@ -0,0 +1,23 @@
+package com.epmet.user.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/6/7 3:27 下午
+ * @DESC
+ */
+@Data
+public class PatrolTrackFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 5074643104620363029L;
+
+    public interface PatrolTrackForm{}
+
+    @NotBlank(message = "巡查记录ID不能为空",groups = PatrolTrackForm.class)
+    private String staffPatrolRecId;
+
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/form/RecordListFormDTO.java

@@ -0,0 +1,26 @@
+package com.epmet.user.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/6/7 3:09 下午
+ * @DESC
+ */
+@Data
+public class RecordListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1034587652692011650L;
+
+    public interface RecordListForm{}
+
+    @NotBlank(message = "staffId不能为空",groups = RecordListForm.class)
+    private String staffId;
+
+    @NotBlank(message = "网格ID不能为空",groups = RecordListForm.class)
+    private String gridId;
+
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/GridManagerListResultDTO.java

@@ -0,0 +1,52 @@
+package com.epmet.user.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/6/7 2:57 下午
+ * @DESC
+ */
+@Data
+public class GridManagerListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3606724812822179356L;
+
+    /**
+     * 工作人员id
+     */
+    private String staffId;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 网格ID
+     */
+    private String gridId;
+
+    /**
+     * 正在巡查：patrolling；否则返回空字符串
+     */
+    private String status;
+
+    /**
+     * 网格名称，最多显示上两级
+     */
+    private String gridName;
+
+    /**
+     * 姓名
+     */
+    private String staffName;
+
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/PatrolTrackResultDTO.java

@@ -0,0 +1,26 @@
+package com.epmet.user.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/6/7 3:29 下午
+ * @DESC
+ */
+@Data
+public class PatrolTrackResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 5147586435344204616L;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+}

epmet-module/data-report/data-report-client/src/main/java/com/epmet/user/result/RecordListResultDTO.java

@@ -0,0 +1,36 @@
+package com.epmet.user.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/6/7 3:14 下午
+ * @DESC
+ */
+@Data
+public class RecordListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -1021736989973649009L;
+
+    /**
+     * 巡查记录id
+     */
+    private String staffPatrolRecId;
+
+    /**
+     * 开始时间；yyyy-MM-dd HH:mm
+     */
+    private String patrolStartTime;
+
+    /**
+     * 结束时间；yyyy-MM-dd HH:mm
+     */
+    private String patrolEndTime;
+
+    /**
+     * 正在巡查：patrolling；已结束：end
+     */
+    private String status;
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/user/StaffPatrolDetailController.java

@@ -1,9 +1,19 @@
 package com.epmet.datareport.controller.user;
 
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.datareport.service.user.StaffPatrolDetailService;
+import com.epmet.user.form.GridManagerListFormDTO;
+import com.epmet.user.form.PatrolTrackFormDTO;
+import com.epmet.user.form.RecordListFormDTO;
+import com.epmet.user.result.GridManagerListResultDTO;
+import com.epmet.user.result.PatrolTrackResultDTO;
+import com.epmet.user.result.RecordListResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * 工作人员巡查记录明细
  *
@@ -11,10 +21,46 @@ import org.springframework.web.bind.annotation.*;
  * @since v1.0.0 2021-06-07
  */
 @RestController
-@RequestMapping("staffpatroldetail")
+@RequestMapping("staffpatrol")
 public class StaffPatrolDetailController {
     
     @Autowired
-    private StaffPatrolDetailService staffPatrolDetailService;
+    private StaffPatrolDetailService staffPatrolService;
+
+    /**
+     * @Description  001、网格员分布
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/6/7 3:06 下午
+     */
+    @PostMapping("gridmanagerlist")
+    public Result<List<GridManagerListResultDTO>> gridManagerList(@RequestBody GridManagerListFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, GridManagerListFormDTO.GridManagerListForm.class);
+        return new Result<List<GridManagerListResultDTO>>().ok(staffPatrolService.gridManagerList(formDTO));
+    }
+
+    /**
+     * @Description  002、查看巡查记录
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/6/7 3:25 下午
+     */
+    @PostMapping("recordlist")
+    public Result<List<RecordListResultDTO>> recordList(@RequestBody RecordListFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, RecordListFormDTO.RecordListForm.class);
+        return new Result<List<RecordListResultDTO>>().ok(staffPatrolService.recordList(formDTO));
+    }
+
+    /**
+     * @Description  003、巡查轨迹
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/6/7 3:35 下午
+     */
+    @PostMapping("patroltrack")
+    public Result<List<PatrolTrackResultDTO>> patrolTrack(@RequestBody PatrolTrackFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, PatrolTrackFormDTO.PatrolTrackForm.class);
+        return new Result<List<PatrolTrackResultDTO>>().ok(staffPatrolService.patrolTrack(formDTO));
+    }
 
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/user/StaffPatrolDetailDao.java

@@ -19,7 +19,11 @@ package com.epmet.datareport.dao.user;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.datareport.entity.user.StaffPatrolDetailEntity;
+import com.epmet.user.result.PatrolTrackResultDTO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 工作人员巡查记录明细
@@ -30,4 +34,12 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface StaffPatrolDetailDao extends BaseDao<StaffPatrolDetailEntity> {
 
+    /**
+     * @Description  查询巡查轨迹
+     * @Param staffPatrolRecId
+     * @author zxc
+     * @date 2021/6/7 5:13 下午
+     */
+    List<PatrolTrackResultDTO> selectPatrolTrack(@Param("staffPatrolRecId") String staffPatrolRecId);
+
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/user/StaffPatrolRecordDao.java

@@ -19,8 +19,12 @@ package com.epmet.datareport.dao.user;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.datareport.entity.user.StaffPatrolRecordEntity;
+import com.epmet.user.form.RecordListFormDTO;
+import com.epmet.user.result.RecordListResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 工作人员巡查主记录
  *
@@ -30,4 +34,12 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface StaffPatrolRecordDao extends BaseDao<StaffPatrolRecordEntity> {
 
+    /**
+     * @Description  巡查记录查询
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/6/7 5:29 下午
+     */
+    List<RecordListResultDTO> recordList(RecordListFormDTO formDTO);
+	
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/StaffPatrolDetailService.java

@@ -2,6 +2,14 @@ package com.epmet.datareport.service.user;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.datareport.entity.user.StaffPatrolDetailEntity;
+import com.epmet.user.form.GridManagerListFormDTO;
+import com.epmet.user.form.PatrolTrackFormDTO;
+import com.epmet.user.form.RecordListFormDTO;
+import com.epmet.user.result.GridManagerListResultDTO;
+import com.epmet.user.result.PatrolTrackResultDTO;
+import com.epmet.user.result.RecordListResultDTO;
+
+import java.util.List;
 
 /**
  * 工作人员巡查记录明细
@@ -9,6 +17,30 @@ import com.epmet.datareport.entity.user.StaffPatrolDetailEntity;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-06-07
  */
-public interface StaffPatrolDetailService extends BaseService<StaffPatrolDetailEntity> {
+public interface StaffPatrolDetailService{
+
+    /**
+     * @Description  001、网格员分布
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/6/7 3:06 下午
+     */
+    List<GridManagerListResultDTO> gridManagerList(GridManagerListFormDTO formDTO);
+
+    /**
+     * @Description  002、查看巡查记录
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/6/7 3:25 下午
+     */
+    List<RecordListResultDTO> recordList(RecordListFormDTO formDTO);
+
+    /**
+     * @Description  003、巡查轨迹
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/6/7 3:35 下午
+     */
+    List<PatrolTrackResultDTO> patrolTrack(PatrolTrackFormDTO formDTO);
 
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/StaffPatrolDetailServiceImpl.java

@@ -1,11 +1,21 @@
 package com.epmet.datareport.service.user.impl;
 
-import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.datareport.dao.user.StaffPatrolDetailDao;
-import com.epmet.datareport.entity.user.StaffPatrolDetailEntity;
+import com.epmet.datareport.dao.user.StaffPatrolRecordDao;
 import com.epmet.datareport.service.user.StaffPatrolDetailService;
+import com.epmet.user.form.GridManagerListFormDTO;
+import com.epmet.user.form.PatrolTrackFormDTO;
+import com.epmet.user.form.RecordListFormDTO;
+import com.epmet.user.result.GridManagerListResultDTO;
+import com.epmet.user.result.PatrolTrackResultDTO;
+import com.epmet.user.result.RecordListResultDTO;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 工作人员巡查记录明细
@@ -15,6 +25,53 @@ import org.springframework.stereotype.Service;
  */
 @Service
 @Slf4j
-public class StaffPatrolDetailServiceImpl extends BaseServiceImpl<StaffPatrolDetailDao, StaffPatrolDetailEntity> implements StaffPatrolDetailService {
+public class StaffPatrolDetailServiceImpl implements StaffPatrolDetailService {
+
+    @Autowired
+    private StaffPatrolDetailDao staffPatrolDetailDao;
+
+    @Autowired
+    private StaffPatrolRecordDao staffPatrolRecordDao;
+
+    /**
+     * @Description  001、网格员分布
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/6/7 3:06 下午
+     */
+    @Override
+    public List<GridManagerListResultDTO> gridManagerList(GridManagerListFormDTO formDTO) {
 
+        return null;
+    }
+
+    /**
+     * @Description  002、查看巡查记录
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/6/7 3:25 下午
+     */
+    @Override
+    public List<RecordListResultDTO> recordList(RecordListFormDTO formDTO) {
+        List<RecordListResultDTO> result = staffPatrolRecordDao.recordList(formDTO);
+        if (!CollectionUtils.isEmpty(result)){
+            return result;
+        }
+        return new ArrayList<>();
+    }
+
+    /**
+     * @Description  003、巡查轨迹
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/6/7 3:35 下午
+     */
+    @Override
+    public List<PatrolTrackResultDTO> patrolTrack(PatrolTrackFormDTO formDTO) {
+        List<PatrolTrackResultDTO> results = staffPatrolDetailDao.selectPatrolTrack(formDTO.getStaffPatrolRecId());
+        if (!CollectionUtils.isEmpty(results)){
+            return results;
+        }
+        return new ArrayList<>();
+    }
 }

epmet-module/data-report/data-report-server/src/main/resources/mapper/user/StaffPatrolDetailDao.xml

@@ -3,4 +3,16 @@
 
 <mapper namespace="com.epmet.datareport.dao.user.StaffPatrolDetailDao">
 
+    <!-- 查询巡查轨迹 -->
+    <select id="selectPatrolTrack" resultType="com.epmet.user.result.PatrolTrackResultDTO">
+        SELECT
+            LATITUDE,
+            LONGITUDE
+        FROM
+            staff_patrol_detail
+        WHERE
+            STAFF_PATROL_REC_ID = #{staffPatrolRecId}
+          AND DEL_FLAG = 0
+        ORDER BY SERIAL_NUM
+    </select>
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/user/StaffPatrolRecordDao.xml

@@ -3,4 +3,17 @@
 
 <mapper namespace="com.epmet.datareport.dao.user.StaffPatrolRecordDao">
 
+    <!-- 巡查记录查询 -->
+    <select id="recordList" resultType="com.epmet.user.result.RecordListResultDTO">
+        SELECT
+            ID AS staffPatrolRecId,
+            DATE_FORMAT(PATROL_START_TIME,'%Y-%m-%d %H:%i:%s') AS patrolStartTime,
+            DATE_FORMAT(PATROL_END_TIME,'%Y-%m-%d %H:%i:%s') AS patrolEndTime,
+            `STATUS`
+        FROM staff_patrol_record
+        WHERE DEL_FLAG = 0
+          AND GRID_ID = #{gridId}
+          AND STAFF_ID = #{staffId}
+        ORDER BY CREATED_TIME DESC
+    </select>
 </mapper>