获取网格内网格员公示信息接口

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomConsultController.java

@@ -1,12 +1,19 @@
 package com.elink.esua.epdc.controller;
 
+import com.elink.esua.epdc.common.token.dto.TokenDto;
+import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
+import com.elink.esua.epdc.dto.consult.form.GridOperatorListFormDTO;
+import com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO;
 import com.elink.esua.epdc.service.CustomConsultService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  *  @author: qushutong
  *  @Date: 2020/3/2 16:12
@@ -29,4 +36,18 @@ public class ApiCustomConsultController {
     public Result<String> checkConsultFlag(){
         return customConsultService.getSwitchByNewest();
     }
+
+
+    /***
+     * 获取网格内网格员公示信息
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO>>
+     * @author qushutong
+     * @date 2020/3/3 11:19
+     */
+    @GetMapping("listGridOperator")
+    public Result<List<GridOperatorListResultDTO>> listGridOperator(@LoginUser TokenDto userDetail, GridOperatorListFormDTO formDto){
+        ValidatorUtils.validateEntity(formDto);
+        return customConsultService.listPageGridOperator(formDto);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java

@@ -3,6 +3,8 @@ package com.elink.esua.epdc.feign;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.EpidemicSentryPostDTO;
+import com.elink.esua.epdc.dto.consult.form.GridOperatorListFormDTO;
+import com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO;
 import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO;
 import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO;
 import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO;
@@ -93,4 +95,14 @@ public interface CustomFeignClient {
      */
     @GetMapping(value = "custom/consultconf/checkConsultFlag", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<String> getSwitchByNewest();
+
+    /***
+     * 获取网格内网格员公示信息
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO>>
+     * @author qushutong
+     * @date 2020/3/3 11:26
+     */
+    @GetMapping(value = "custom/gridoperatorinfo/listGridOperator", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<GridOperatorListResultDTO>> listPageGridOperator(GridOperatorListFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java

@@ -4,6 +4,8 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.EpidemicSentryPostDTO;
+import com.elink.esua.epdc.dto.consult.form.GridOperatorListFormDTO;
+import com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO;
 import com.elink.esua.epdc.dto.enterprise.EnterpriseInfoDTO;
 import com.elink.esua.epdc.dto.enterprise.form.EnterpriseInfoFormDTO;
 import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO;
@@ -12,6 +14,8 @@ import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
 import com.elink.esua.epdc.feign.CustomFeignClient;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * @Description 定制化功能模块fegin
  * @Author yinzuomei
@@ -54,4 +58,9 @@ public class CustomFeignClientFallback implements CustomFeignClient {
     public Result<String> getSwitchByNewest() {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "checkConsultFlag");
     }
+
+    @Override
+    public Result<List<GridOperatorListResultDTO>> listPageGridOperator(GridOperatorListFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "listGridOperator", formDto);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomConsultService.java

@@ -1,6 +1,10 @@
 package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.consult.form.GridOperatorListFormDTO;
+import com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO;
+
+import java.util.List;
 
 /**
  *  @author: qushutong
@@ -17,4 +21,13 @@ public interface CustomConsultService {
      * @date 2020/3/2 15:53
      */
     Result<String> getSwitchByNewest();
+
+    /***
+     * 获取网格内网格员公示信息
+     * @param
+     * @return java.util.List<com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO>
+     * @author qushutong
+     * @date 2020/3/3 9:52
+     */
+    Result<List<GridOperatorListResultDTO>> listPageGridOperator(GridOperatorListFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomConsultServiceImpl.java

@@ -1,11 +1,15 @@
 package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.consult.form.GridOperatorListFormDTO;
+import com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO;
 import com.elink.esua.epdc.feign.CustomFeignClient;
 import com.elink.esua.epdc.service.CustomConsultService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  *  @author: qushutong
  *  @Date: 2020/3/2 16:16
@@ -20,4 +24,9 @@ public class CustomConsultServiceImpl implements CustomConsultService {
     public Result<String> getSwitchByNewest() {
         return customFeignClient.getSwitchByNewest();
     }
+
+    @Override
+    public Result<List<GridOperatorListResultDTO>> listPageGridOperator(GridOperatorListFormDTO formDto) {
+        return customFeignClient.listPageGridOperator(formDto);
+    }
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/form/GridOperatorListFormDTO.java

@@ -0,0 +1,43 @@
+package com.elink.esua.epdc.dto.consult.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ *  @author: qushutong
+ *  @Date: 2020/3/3 9:42
+ *  @Description: 获取网格内网格员公示信息 入参
+ */
+@Data
+public class GridOperatorListFormDTO implements Serializable {
+    private static final long serialVersionUID = 6657811237503660654L;
+
+
+    /**
+     * pageIndex : 9380
+     * pageSize : 77145
+     * timestamp : bvthA2vDrf
+     */
+
+    /**
+     * 页码，从1开始
+     */
+    @Min(value = 1, message = "页码必须大于0")
+    private Integer pageIndex;
+
+    /**
+     * 页容量，默认10页
+     */
+    @Min(value = 1, message = "每页条数必须大于必须大于0")
+    private Integer pageSize = 10;
+
+    /**
+     * 第一页查询发起时的时间
+     */
+    @NotBlank(message = "时间戳不能为空")
+    private String timestamp;
+
+}

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/result/GridOperatorListResultDTO.java

@@ -0,0 +1,35 @@
+package com.elink.esua.epdc.dto.consult.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *  @author: qushutong
+ *  @Date: 2020/3/3 9:33
+ *  @Description: 获取网格内网格员公示信息
+ */
+@Data
+public class GridOperatorListResultDTO implements Serializable {
+    private static final long serialVersionUID = -3136273091412370579L;
+
+
+    /**
+     * realName : t0vomWYcIf
+     * sex : py2l5BDyZ0
+     * mobile : 5w4uEShWqw
+     * dutyCategoryName : bHKUpRkzRv
+     * remark : MeAS4cLAcD
+     * workUnit : yspgMhIk9P
+     * faceImg : bocqTGoyRo
+     */
+
+    private String realName;
+    private String sex;
+    private String mobile;
+    private String dutyCategoryName;
+    private String remark;
+    private String workUnit;
+    private String faceImg;
+
+}

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/controller/GridOperatorInfoController.java

@@ -26,6 +26,8 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.dto.consult.GridOperatorInfoDTO;
+import com.elink.esua.epdc.dto.consult.form.GridOperatorListFormDTO;
+import com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO;
 import com.elink.esua.epdc.modules.consult.excel.GridOperatorInfoExcel;
 import com.elink.esua.epdc.modules.consult.service.GridOperatorInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -98,4 +100,16 @@ public class GridOperatorInfoController {
         ExcelUtils.exportExcelToTarget(response, null, list, GridOperatorInfoExcel.class);
     }
 
+    /***
+     * 获取网格内网格员公示信息
+     * @param formDto 
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO>>
+     * @author qushutong
+     * @date 2020/3/3 11:19
+     */
+    @GetMapping("listGridOperator")
+    public Result<List<GridOperatorListResultDTO>> listGridOperator(@RequestBody GridOperatorListFormDTO formDto){
+        return gridOperatorInfoService.listPageGridOperator(formDto);
+    }
+
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/dao/GridOperatorInfoDao.java

@@ -18,9 +18,13 @@
 package com.elink.esua.epdc.modules.consult.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.consult.form.GridOperatorListFormDTO;
+import com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO;
 import com.elink.esua.epdc.modules.consult.entity.GridOperatorInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 网格员信息
  *
@@ -29,5 +33,13 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface GridOperatorInfoDao extends BaseDao<GridOperatorInfoEntity> {
-	
+    
+    /***
+     * 获取网格内网格员公示信息
+     * @param
+     * @return java.util.List<com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO>
+     * @author qushutong
+     * @date 2020/3/3 9:57
+     */
+    List<GridOperatorListResultDTO> selectListGridOperator(GridOperatorListFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/GridOperatorInfoService.java

@@ -19,7 +19,10 @@ package com.elink.esua.epdc.modules.consult.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.consult.GridOperatorInfoDTO;
+import com.elink.esua.epdc.dto.consult.form.GridOperatorListFormDTO;
+import com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO;
 import com.elink.esua.epdc.modules.consult.entity.GridOperatorInfoEntity;
 
 import java.util.List;
@@ -100,4 +103,13 @@ public interface GridOperatorInfoService extends BaseService<GridOperatorInfoEnt
      * @return void
      **/
     void changeShowFlag(GridOperatorInfoDTO dto);
+
+    /***
+     * 获取网格内网格员公示信息
+     * @param
+     * @return java.util.List<com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO>
+     * @author qushutong
+     * @date 2020/3/3 9:52
+     */
+    Result<List<GridOperatorListResultDTO>> listPageGridOperator(GridOperatorListFormDTO formDto);
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorInfoServiceImpl.java

@@ -20,6 +20,7 @@ package com.elink.esua.epdc.modules.consult.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
@@ -27,6 +28,8 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.consult.GridOperatorInfoDTO;
+import com.elink.esua.epdc.dto.consult.form.GridOperatorListFormDTO;
+import com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO;
 import com.elink.esua.epdc.modules.consult.dao.GridOperatorInfoDao;
 import com.elink.esua.epdc.modules.consult.entity.GridOperatorInfoEntity;
 import com.elink.esua.epdc.modules.consult.redis.GridOperatorInfoRedis;
@@ -149,4 +152,12 @@ public class GridOperatorInfoServiceImpl extends BaseServiceImpl<GridOperatorInf
         updateById(gridOperatorInfoEntity);
     }
 
+    @Override
+    public Result<List<GridOperatorListResultDTO>> listPageGridOperator(GridOperatorListFormDTO formDto) {
+        int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
+        formDto.setPageIndex(pageIndex);
+        List<GridOperatorListResultDTO> list = baseDao.selectListGridOperator(formDto);
+        return new Result<List<GridOperatorListResultDTO>>().ok(list);
+    }
+
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/consult/GridOperatorInfoDao.xml

@@ -27,6 +27,21 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
-
+    <select id="selectListGridOperator" resultType="com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO">
+        SELECT
+            *,ec.DUTY_CATEGORY_NAME
+        FROM
+            epdc_grid_operator_info ei
+        LEFT JOIN epdc_grid_operator_duty_category ec ON ec.ID = ei.DUTY_CATEGORY_ID
+        AND ec.DEL_FLAG = '0'
+        WHERE
+            ei.DEL_FLAG = '0'
+        <if test="timestamp != null and timestamp != ''">
+            AND DATE_FORMAT( ei.CREATED_TIME, '%Y-%m-%d %H:%i:%s' ) &lt;= #{timestamp}
+        </if>
+        ORDER BY
+            ei.CREATED_TIME DESC
+       LIMIT #{pageIndex}, #{pageSize}
+    </select>
 
 </mapper>