From af32a23e51c2a4cad6122bbe6bd922423aef8c70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Tue, 3 Mar 2020 15:20:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=92=A8=E8=AF=A2=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=E5=85=B3=E8=81=94=E7=BD=91=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/controller/ApiCustomConsultController.java | 1 + .../java/com/elink/esua/epdc/feign/CustomFeignClient.java | 3 ++- .../epdc/dto/consult/form/GridOperatorListFormDTO.java | 5 +++++ .../consult/service/impl/GridOperatorInfoServiceImpl.java | 8 ++++---- .../main/resources/mapper/consult/GridOperatorInfoDao.xml | 1 + 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomConsultController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomConsultController.java index 037463f43..1f3c4fe94 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomConsultController.java +++ b/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> listGridOperator(@LoginUser TokenDto userDetail, GridOperatorListFormDTO formDto){ ValidatorUtils.validateEntity(formDto); + formDto.setDeptId(userDetail.getGridId()); return customConsultService.listPageGridOperator(formDto); } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java index 4f6ede0f8..5b521b8a1 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java +++ b/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> listPageGridOperator(GridOperatorListFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/form/GridOperatorListFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/form/GridOperatorListFormDTO.java index 821276083..570e9ef0e 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/form/GridOperatorListFormDTO.java +++ b/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; + } diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorInfoServiceImpl.java index 6f65c1c79..4477e61b0 100755 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/GridOperatorInfoServiceImpl.java +++ b/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 getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -87,8 +87,8 @@ public class GridOperatorInfoServiceImpl extends BaseServiceImpl AND DATE_FORMAT( ei.CREATED_TIME, '%Y-%m-%d %H:%i:%s' ) <= #{timestamp} + AND ei.DEPT_ID = #{deptId} ORDER BY ei.CREATED_TIME DESC LIMIT #{pageIndex}, #{pageSize}