网格员巡查

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

@@ -0,0 +1,94 @@
+package com.epmet.user.result;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/6/7 2:57 下午
+ * @DESC
+ */
+@Data
+public class GridManagerListYuShanResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -2770911125810373090L;
+
+    /**
+     * 工作人员id
+     */
+    private String staffId;
+
+    /**
+     * 工作人员手机号
+     */
+    private String mobile;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 网格ID
+     */
+    private String gridId;
+
+    /**
+     * 正在巡查：patrolling；否则返回空字符串
+     */
+    private String status;
+
+    /**
+     * 网格名称，最多显示上两级
+     */
+    private String gridName;
+
+    /**
+     * 姓名
+     */
+    private String staffName;
+
+    /**
+     * 巡查时长
+     */
+    private Integer patrolDuration;
+
+    /**
+     * 巡查次数
+     */
+    private Integer patrolCount;
+
+    /**
+     * 中心点位
+     */
+    @JsonIgnore
+    private String centerMark;
+
+    /**
+     * 经纬度赋值状态
+     */
+    @JsonIgnore
+    private Boolean llStatus;
+
+    public GridManagerListYuShanResultDTO() {
+        this.staffId = "";
+        this.longitude = "";
+        this.latitude = "";
+        this.gridId = "";
+        this.status = "";
+        this.gridName = "";
+        this.staffName = "";
+        this.centerMark = "";
+        this.llStatus = false;
+        this.patrolDuration = NumConstant.ZERO;
+        this.patrolCount = NumConstant.ZERO;
+    }
+}

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

@@ -11,6 +11,7 @@ import com.epmet.user.result.GridManagerListResultDTO;
 import com.epmet.dto.result.PatrolTrackResultDTO;
 import com.epmet.dto.result.RecordListResultDTO;
 import com.epmet.dto.result.PatrolCountResultDTO;
+import com.epmet.user.result.GridManagerListYuShanResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -77,4 +78,16 @@ public class StaffPatrolDetailController {
         return new Result<PatrolCountResultDTO>().ok(staffPatrolService.patrolCount(formDTO));
     }
 
+    /**
+     * @Description  网格员分布-榆山
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/25 3:00 下午
+     */
+    @PostMapping("gridmanagerlist-yushan")
+    public Result<List<GridManagerListYuShanResultDTO>> gridManagerListYuShan(@RequestBody GridManagerListFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO, GridManagerListFormDTO.GridManagerListForm.class);
+        return new Result<List<GridManagerListYuShanResultDTO>>().ok(staffPatrolService.gridManagerListYuShan(formDTO));
+    }
+
 }

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

@@ -8,6 +8,7 @@ import com.epmet.user.result.GridManagerListResultDTO;
 import com.epmet.dto.result.PatrolTrackResultDTO;
 import com.epmet.dto.result.RecordListResultDTO;
 import com.epmet.dto.result.PatrolCountResultDTO;
+import com.epmet.user.result.GridManagerListYuShanResultDTO;
 
 import java.util.List;
 
@@ -27,6 +28,14 @@ public interface StaffPatrolDetailService{
      */
     List<GridManagerListResultDTO> gridManagerList(GridManagerListFormDTO formDTO);
 
+    /**
+     * @Description  网格员分布-榆山
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/25 3:00 下午
+     */
+    List<GridManagerListYuShanResultDTO> gridManagerListYuShan(GridManagerListFormDTO formDTO);
+
     /**
      * @Description  002、查看巡查记录
      * @Param formDTO

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

@@ -19,6 +19,7 @@ import com.epmet.dto.form.RecordListFormDTO;
 import com.epmet.dto.form.PatrolCountFormDTO;
 import com.epmet.user.result.GridManagerListResultDTO;
 import com.epmet.dto.result.PatrolCountResultDTO;
+import com.epmet.user.result.GridManagerListYuShanResultDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -136,6 +137,34 @@ public class StaffPatrolDetailServiceImpl implements StaffPatrolDetailService {
         return result;
     }
 
+    /**
+     * @Description  网格员分布-榆山
+     * @Param formDTO
+     * @author zxc
+     * @date 2021/8/25 3:00 下午
+     */
+    @Override
+    public List<GridManagerListYuShanResultDTO> gridManagerListYuShan(GridManagerListFormDTO formDTO) {
+        List<GridManagerListResultDTO> resultTwo = this.gridManagerList(formDTO);
+        List<GridManagerListYuShanResultDTO> result = ConvertUtils.sourceToTarget(resultTwo, GridManagerListYuShanResultDTO.class);
+        Result<List<PatrolYuShanResultDTO>> listResult = epmetUserOpenFeignClient.patrolInfo(formDTO.getAgencyId());
+        if (!listResult.success()){
+            throw new RenException("查询巡查次数和时长失败");
+        }
+        List<PatrolYuShanResultDTO> data = listResult.getData();
+        if (!CollectionUtils.isEmpty(data)){
+            result.forEach(r -> {
+                data.forEach(d -> {
+                    if (r.getGridId().equals(d.getGridId()) && r.getStaffId().equals(d.getStaffId())){
+                        r.setPatrolCount(d.getPatrolCount());
+                        r.setPatrolDuration(d.getPatrolDuration());
+                    }
+                });
+            });
+        }
+        return result;
+    }
+
     /**
      * @Description  根据中心点位截取经纬度
      * @Param centMark

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml

@@ -341,7 +341,7 @@
               AND cg.AREA_CODE LIKE CONCAT(#{areaCode},'%')
           </if>
            <if test="agencyId != null and agencyId != ''">
-              AND cg.ALL_PARENT_IDS LIKE CONCAT(#{agencyId}, '%')
+              AND cg.ALL_PARENT_IDS LIKE CONCAT('%',#{agencyId}, '%')
           </if>
     </select>