接口模板

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/StaffListFormDTO.java

@@ -0,0 +1,48 @@
+package com.epmet.dataaggre.dto.epmetuser.form;
+
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 巡查-各人员巡查记录列表查询-接口入参
+ * @Auth sun
+ */
+@Data
+public class StaffListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -3381286960911634231L;
+    /**
+     * 近1一个月传1； 近3个月传3【自然月分】
+     */
+    @NotBlank(message = "最近时间不能为空", groups = StaffListFormDTO.Staff.class)
+    private Integer time;
+    /**
+     * 排序字段【巡查总次数：patrolTotal；最近开始巡查时间：latestPatrolledTime】
+     */
+    @NotBlank(message = "排序条件不能为空", groups = StaffListFormDTO.Staff.class)
+    private String sortCode;
+    /**
+     * 网格id集合，为空则查询当前组织下所有网格数据
+     */
+    private Integer gridIds;
+    /**
+     * 工作人员姓名；可空
+     */
+    private String staffName;
+    /**
+     * 页码
+     * */
+    @Min(1)
+    private Integer pageNo;
+    /**
+     * 每页多少条
+     * */
+    private Integer pageSize = 20;
+    public interface Staff extends CustomerClientShowGroup {
+    }
+
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/StaffListResultDTO.java

@@ -0,0 +1,32 @@
+package com.epmet.dataaggre.dto.epmetuser.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 巡查-各人员巡查记录列表查询-接口入参
+ * @Auth sun
+ */
+@Data
+public class StaffListResultDTO implements Serializable {
+    private static final long serialVersionUID = 7129564173128153335L;
+
+    //工作人员所属网格id
+    private String gridId = "";
+    //工作人员所在网格名称，最多显示到网格的上两级
+    private String gridName = "";
+    //工作人员用户id
+    private String staffId = "";
+    //真名
+    private String staffName = "";
+    //最近巡查时间[最近一次进行中或已结束巡查的开始时间]
+    private String patrolStartTime = "";
+    //巡查总次数
+    private Integer patrolTotal = 0;
+    //性别0.未知，1男，2.女前端默认头像用
+    private String gender = "0";
+    //正在巡查中：patrolling；否则返回空字符串
+    private String status = "";
+
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java

@@ -1,8 +1,21 @@
 package com.epmet.dataaggre.controller;
 
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.dataaggre.dto.datastats.form.SubAgencyFormDTO;
+import com.epmet.dataaggre.dto.datastats.result.SubAgencyUserResultDTO;
+import com.epmet.dataaggre.dto.epmetuser.form.StaffListFormDTO;
+import com.epmet.dataaggre.dto.epmetuser.result.StaffListResultDTO;
+import com.epmet.dataaggre.service.datastats.DataStatsService;
+import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * @Author zxc
  * @DateTime 2020/12/25 上午9:45
@@ -10,4 +23,21 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("epmetuser")
 public class EpmetUserController {
+
+    @Autowired
+    private EpmetUserService epmetUserService;
+
+
+    /**
+     * @Param formDTO
+     * @Description 001、各人员巡查记录列表查询
+     * @author sun
+     */
+    @PostMapping("stafflist")
+    public Result<List<StaffListResultDTO>> staffList(@RequestBody StaffListFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, StaffListFormDTO.Staff.class);
+        return new Result<List<StaffListResultDTO>>().ok(epmetUserService.staffList(formDTO));
+    }
+
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java

@@ -1,5 +1,7 @@
 package com.epmet.dataaggre.service.epmetuser;
 
+import com.epmet.dataaggre.dto.epmetuser.form.StaffListFormDTO;
+import com.epmet.dataaggre.dto.epmetuser.result.StaffListResultDTO;
 import com.epmet.dataaggre.dto.epmetuser.result.UserInfosResultDTO;
 
 import java.util.List;
@@ -26,4 +28,10 @@ public interface EpmetUserService {
      */
     List<String> selectUserIdByCustomerId(List<String> userIds);
 
+    /**
+     * @Param formDTO
+     * @Description 001、各人员巡查记录列表查询
+     * @author sun
+     */
+    List<StaffListResultDTO> staffList(StaffListFormDTO formDTO);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -3,6 +3,8 @@ package com.epmet.dataaggre.service.epmetuser.impl;
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.dataaggre.constant.DataSourceConstant;
 import com.epmet.dataaggre.dao.epmetuser.UserBaseInfoDao;
+import com.epmet.dataaggre.dto.epmetuser.form.StaffListFormDTO;
+import com.epmet.dataaggre.dto.epmetuser.result.StaffListResultDTO;
 import com.epmet.dataaggre.dto.epmetuser.result.UserInfosResultDTO;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
 import lombok.extern.slf4j.Slf4j;
@@ -44,4 +46,15 @@ public class EpmetUserServiceImpl implements EpmetUserService {
     public List<String> selectUserIdByCustomerId(List<String> userIds) {
         return userBaseInfoDao.selectUserIdByCustomerId(userIds);
     }
+
+    /**
+     * @Param formDTO
+     * @Description 001、各人员巡查记录列表查询
+     * @author sun
+     */
+    @Override
+    public List<StaffListResultDTO> staffList(StaffListFormDTO formDTO) {
+        return null;
+    }
+
 }