修改咨询列表接口关联网格

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

@@ -48,6 +48,7 @@ public class ApiCustomConsultController {
     @GetMapping("listGridOperator")
     public Result<List<GridOperatorListResultDTO>> listGridOperator(@LoginUser TokenDto userDetail, GridOperatorListFormDTO formDto){
         ValidatorUtils.validateEntity(formDto);
+        formDto.setDeptId(userDetail.getGridId());
         return customConsultService.listPageGridOperator(formDto);
     }
 }

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

@@ -10,6 +10,7 @@ import com.elink.esua.epdc.dto.enterprise.result.EnterpriseInfoResultDTO;
 import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO;
 import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
 import com.elink.esua.epdc.feign.fallback.CustomFeignClientFallback;
+import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -105,6 +106,6 @@ public interface CustomFeignClient {
      * @author qushutong
      * @date 2020/3/3 11:26
      */
-    @GetMapping(value = "custom/gridoperatorinfo/listGridOperator", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @PostMapping(value = "custom/gridoperatorinfo/listGridOperator", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<GridOperatorListResultDTO>> listPageGridOperator(GridOperatorListFormDTO formDto);
 }

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

@@ -40,4 +40,9 @@ public class GridOperatorListFormDTO implements Serializable {
     @NotBlank(message = "时间戳不能为空")
     private String timestamp;
 
+    /**
+     * 网格id
+     */
+    private Long deptId;
+
 }

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

@@ -75,8 +75,8 @@ public class GridOperatorInfoServiceImpl extends BaseServiceImpl<GridOperatorInf
         return ConvertUtils.sourceToTarget(entityList, GridOperatorInfoDTO.class);
     }
 
-    private QueryWrapper<GridOperatorInfoEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+    private QueryWrapper<GridOperatorInfoEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<GridOperatorInfoEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -87,8 +87,8 @@ public class GridOperatorInfoServiceImpl extends BaseServiceImpl<GridOperatorInf
     @Override
     public GridOperatorInfoDTO get(String id) {
         GridOperatorInfoEntity entity = baseDao.selectById(id);
-        GridOperatorInfoDTO gridOperatorInfoDTO =  ConvertUtils.sourceToTarget(entity, GridOperatorInfoDTO.class);
-        if(StringUtils.isNotBlank(entity.getAllDeptIds())){
+        GridOperatorInfoDTO gridOperatorInfoDTO = ConvertUtils.sourceToTarget(entity, GridOperatorInfoDTO.class);
+        if (StringUtils.isNotBlank(entity.getAllDeptIds())) {
             String depts[] = entity.getAllDeptIds().split(",");
             gridOperatorInfoDTO.setAllDeptIds(depts);
         }

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

@@ -39,6 +39,7 @@
         <if test="timestamp != null and timestamp != ''">
             AND DATE_FORMAT( ei.CREATED_TIME, '%Y-%m-%d %H:%i:%s' ) &lt;= #{timestamp}
         </if>
+        AND ei.DEPT_ID = #{deptId}
         ORDER BY
             ei.CREATED_TIME DESC
        LIMIT #{pageIndex}, #{pageSize}