From d34bbe87a9b087beed6ffa997d7256b526e90391 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Mon, 2 Mar 2020 16:49:25 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=92=A8=E8=AF=A2=E5=85=A5?= =?UTF-8?q?=E5=8F=A3=E6=98=AF=E5=90=A6=E5=BC=80=E5=90=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiCustomConsultController.java | 32 +++++++++++++++++++ .../esua/epdc/feign/CustomFeignClient.java | 10 ++++++ .../fallback/CustomFeignClientFallback.java | 5 +++ .../epdc/service/CustomConsultService.java | 20 ++++++++++++ .../impl/CustomConsultServiceImpl.java | 23 +++++++++++++ .../controller/ConsultConfController.java | 13 +++++++- .../modules/consult/dao/ConsultConfDao.java | 10 +++++- .../consult/service/ConsultConfService.java | 9 ++++++ .../service/impl/ConsultConfServiceImpl.java | 9 ++++-- .../mapper/consult/ConsultConfDao.xml | 12 ++++++- 10 files changed, 138 insertions(+), 5 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomConsultController.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomConsultService.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomConsultServiceImpl.java 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 new file mode 100644 index 000000000..9b9bdfc49 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomConsultController.java @@ -0,0 +1,32 @@ +package com.elink.esua.epdc.controller; + +import com.elink.esua.epdc.commons.tools.utils.Result; +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; + +/** + * @author: qushutong + * @Date: 2020/3/2 16:12 + * @Description: 客服咨询相关 + */ +@RestController +@RequestMapping("custom/consult") +public class ApiCustomConsultController { + + @Autowired + private CustomConsultService customConsultService; + /*** + * 首页咨询入口是否开启 + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author qushutong + * @date 2020/3/2 16:03 + */ + @GetMapping("checkConsultFlag") + public Result checkConsultFlag(){ + return customConsultService.getSwitchByNewest(); + } +} 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 76e0de56e..94b0d5f5b 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 @@ -83,4 +83,14 @@ public interface CustomFeignClient { */ @PostMapping(value = "custom/enterpriseinfo/completeRequisiteInfo", consumes = MediaType.APPLICATION_JSON_VALUE) Result completeRequisiteInfo(@RequestBody CompleteRequisiteInfoDTO fromDto); + + /*** + * + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author qushutong + * @date 2020/3/2 16:21 + */ + @GetMapping(value = "custom/consultconf/checkConsultFlag", consumes = MediaType.APPLICATION_JSON_VALUE) + Result getSwitchByNewest(); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java index 2cc170f57..745f187db 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java @@ -49,4 +49,9 @@ public class CustomFeignClientFallback implements CustomFeignClient { public Result completeRequisiteInfo(CompleteRequisiteInfoDTO fromDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "completeRequisiteInfo", fromDto); } + + @Override + public Result getSwitchByNewest() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getSwitchByNewest"); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomConsultService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomConsultService.java new file mode 100644 index 000000000..ef177a579 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomConsultService.java @@ -0,0 +1,20 @@ +package com.elink.esua.epdc.service; + +import com.elink.esua.epdc.commons.tools.utils.Result; + +/** + * @author: qushutong + * @Date: 2020/3/2 16:16 + * @Description: 咨询相关 + */ +public interface CustomConsultService { + + /*** + * 咨询公示，首页开关 + * @param + * @return java.lang.String + * @author qushutong + * @date 2020/3/2 15:53 + */ + Result getSwitchByNewest(); +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomConsultServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomConsultServiceImpl.java new file mode 100644 index 000000000..656769674 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomConsultServiceImpl.java @@ -0,0 +1,23 @@ +package com.elink.esua.epdc.service.impl; + +import com.elink.esua.epdc.commons.tools.utils.Result; +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; + +/** + * @author: qushutong + * @Date: 2020/3/2 16:16 + * @Description: 咨询相关 + */ +@Service +public class CustomConsultServiceImpl implements CustomConsultService { + @Autowired + private CustomFeignClient customFeignClient; + + @Override + public Result getSwitchByNewest() { + return customFeignClient.getSwitchByNewest(); + } +} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/controller/ConsultConfController.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/controller/ConsultConfController.java index f8d13c8b5..eebf9230f 100755 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/controller/ConsultConfController.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/controller/ConsultConfController.java @@ -90,5 +90,16 @@ public class ConsultConfController { List list = consultConfService.list(params); ExcelUtils.exportExcelToTarget(response, null, list, ConsultConfExcel.class); } - + + /*** + * 首页咨询入口是否开启 + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author qushutong + * @date 2020/3/2 16:03 + */ + @GetMapping("checkConsultFlag") + public Result checkConsultFlag(){ + return new Result().ok(consultConfService.getSwitchByNewest()); + } } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/dao/ConsultConfDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/dao/ConsultConfDao.java index b9e39ae7d..3626c52da 100755 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/dao/ConsultConfDao.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/dao/ConsultConfDao.java @@ -29,5 +29,13 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ConsultConfDao extends BaseDao { - + + /*** + * 咨询公示，首页开关 + * @param + * @return + * @author qushutong + * @date 2020/3/2 15:56 + */ + String selectOneSwitchByNewest(); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/ConsultConfService.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/ConsultConfService.java index b0d7cead1..38bbbe786 100755 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/ConsultConfService.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/ConsultConfService.java @@ -92,4 +92,13 @@ public interface ConsultConfService extends BaseService { * @date 2020-03-02 */ void delete(String[] ids); + + /*** + * 咨询公示，首页开关 + * @param + * @return java.lang.String + * @author qushutong + * @date 2020/3/2 15:53 + */ + String getSwitchByNewest(); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/ConsultConfServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/ConsultConfServiceImpl.java index c695711a5..df2f0a6fb 100755 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/ConsultConfServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/ConsultConfServiceImpl.java @@ -65,8 +65,8 @@ public class ConsultConfServiceImpl 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); @@ -101,4 +101,9 @@ public class ConsultConfServiceImpl extends BaseServiceImpl - + \ No newline at end of file