From cda6112316f887d737fdc20c34100d3dc88e8368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Fri, 6 Mar 2020 16:58:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E5=8F=AF=E9=85=8D=E7=BD=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiCustomConsultController.java | 25 ++++++++++++++--- .../esua/epdc/feign/CustomFeignClient.java | 13 ++++++++- .../fallback/CustomFeignClientFallback.java | 7 ++++- .../epdc/service/CustomConsultService.java | 10 +++++++ .../impl/CustomConsultServiceImpl.java | 6 ++++ .../consult/result/CheckStateResultDTO.java | 28 +++++++++++++++++++ .../MajorFunctionConfController.java | 13 +++++++++ .../service/MajorFunctionConfService.java | 11 ++++++++ .../impl/MajorFunctionConfServiceImpl.java | 22 +++++++++++++-- 9 files changed, 127 insertions(+), 8 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/result/CheckStateResultDTO.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 index 1f3c4fe94..ef14a1d51 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 @@ -4,6 +4,7 @@ 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.result.CheckStateResultDTO; 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; @@ -20,19 +21,19 @@ import java.util.List; * @Description: 客服咨询相关 */ @RestController -@RequestMapping("custom/consult") +@RequestMapping("custom") 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") + @GetMapping("consult/checkConsultFlag") public Result checkConsultFlag(){ return customConsultService.getSwitchByNewest(); } @@ -45,10 +46,26 @@ public class ApiCustomConsultController { * @author qushutong * @date 2020/3/3 11:19 */ - @GetMapping("listGridOperator") + @GetMapping("consult/listGridOperator") public Result> listGridOperator(@LoginUser TokenDto userDetail, GridOperatorListFormDTO formDto){ ValidatorUtils.validateEntity(formDto); formDto.setDeptId(userDetail.getGridId()); return customConsultService.listPageGridOperator(formDto); } + + + + /*** + * 获取首页菜单按钮状态（主要包括咨询和干部评价） + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author qushutong + * @date 2020/3/6 16:04 + */ + @GetMapping("majorFunction/checkState") + public Result> checkState(){ + return customConsultService.getCheckState(); + } + + } 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 5b521b8a1..80cb04290 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 @@ -3,6 +3,7 @@ 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.result.CheckStateResultDTO; 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; @@ -10,7 +11,6 @@ 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; @@ -108,4 +108,15 @@ public interface CustomFeignClient { */ @PostMapping(value = "custom/gridoperatorinfo/listGridOperator", consumes = MediaType.APPLICATION_JSON_VALUE) Result> listPageGridOperator(GridOperatorListFormDTO formDto); + + + /*** + * 小程序首页配置 + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author qushutong + * @date 2020/3/6 16:06 + */ + @GetMapping(value = "custom/majorfunctionconf/checkState", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> getCheckState(); } 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 48c12415f..fb8298398 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 @@ -4,9 +4,9 @@ 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.result.CheckStateResultDTO; 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; import com.elink.esua.epdc.dto.form.CompleteRequisiteInfoDTO; @@ -63,4 +63,9 @@ public class CustomFeignClientFallback implements CustomFeignClient { public Result> listPageGridOperator(GridOperatorListFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "listGridOperator", formDto); } + + @Override + public Result> getCheckState() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "checkState"); + } } 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 index d1406119b..6146c242f 100644 --- 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 @@ -1,6 +1,7 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.consult.result.CheckStateResultDTO; import com.elink.esua.epdc.dto.consult.form.GridOperatorListFormDTO; import com.elink.esua.epdc.dto.consult.result.GridOperatorListResultDTO; @@ -30,4 +31,13 @@ public interface CustomConsultService { * @date 2020/3/3 9:52 */ Result> listPageGridOperator(GridOperatorListFormDTO formDto); + + /*** + * 小程序首页配置 + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author qushutong + * @date 2020/3/6 16:06 + */ + Result> getCheckState(); } 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 index 1c2559002..703c208b6 100644 --- 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 @@ -1,6 +1,7 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.consult.result.CheckStateResultDTO; 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; @@ -29,4 +30,9 @@ public class CustomConsultServiceImpl implements CustomConsultService { public Result> listPageGridOperator(GridOperatorListFormDTO formDto) { return customFeignClient.listPageGridOperator(formDto); } + + @Override + public Result> getCheckState() { + return customFeignClient.getCheckState(); + } } diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/result/CheckStateResultDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/result/CheckStateResultDTO.java new file mode 100644 index 000000000..3341766d1 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/result/CheckStateResultDTO.java @@ -0,0 +1,28 @@ +package com.elink.esua.epdc.dto.consult.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author: qushutong + * @Date: 2020/3/6 16:27 + * @Description: 前端小程序可配置首页 + */ +@Data +public class CheckStateResultDTO implements Serializable { + private static final long serialVersionUID = -8559260405823478733L; + + /** + * availableFlag : 1 + * externalFlag : 0 + * externalUrl : http://pyt.kuntowcd.vztgvnx + * name : cadreEvaluationState + */ + + private String availableFlag; + private String externalFlag; + private String externalUrl; + private String name; + +} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/controller/MajorFunctionConfController.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/controller/MajorFunctionConfController.java index ed25f7e09..257299333 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/controller/MajorFunctionConfController.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/controller/MajorFunctionConfController.java @@ -26,6 +26,7 @@ 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.MajorFunctionConfDTO; +import com.elink.esua.epdc.dto.consult.result.CheckStateResultDTO; import com.elink.esua.epdc.modules.consult.excel.MajorFunctionConfExcel; import com.elink.esua.epdc.modules.consult.service.MajorFunctionConfService; import org.springframework.beans.factory.annotation.Autowired; @@ -91,4 +92,16 @@ public class MajorFunctionConfController { ExcelUtils.exportExcelToTarget(response, null, list, MajorFunctionConfExcel.class); } + + /*** + * 获取首页菜单按钮状态（主要包括咨询和干部评价） + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author qushutong + * @date 2020/3/6 16:04 + */ + @GetMapping("checkState") + public Result> checkState(){ + return majorFunctionConfService.getCheckState(); + } } \ 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/MajorFunctionConfService.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/MajorFunctionConfService.java index 91178e62d..18f1e84d3 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/MajorFunctionConfService.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/MajorFunctionConfService.java @@ -19,7 +19,9 @@ 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.MajorFunctionConfDTO; +import com.elink.esua.epdc.dto.consult.result.CheckStateResultDTO; import com.elink.esua.epdc.modules.consult.entity.MajorFunctionConfEntity; import java.util.List; @@ -92,4 +94,13 @@ public interface MajorFunctionConfService extends BaseService + * @author qushutong + * @date 2020/3/6 16:06 + */ + Result> getCheckState(); } \ 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/MajorFunctionConfServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/MajorFunctionConfServiceImpl.java index 498ecafe3..057af702e 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/MajorFunctionConfServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/MajorFunctionConfServiceImpl.java @@ -20,10 +20,13 @@ 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.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.consult.MajorFunctionConfDTO; +import com.elink.esua.epdc.dto.consult.result.CheckStateResultDTO; import com.elink.esua.epdc.modules.consult.dao.MajorFunctionConfDao; import com.elink.esua.epdc.modules.consult.entity.MajorFunctionConfEntity; import com.elink.esua.epdc.modules.consult.redis.MajorFunctionConfRedis; @@ -65,8 +68,8 @@ public class MajorFunctionConfServiceImpl 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); @@ -84,6 +87,13 @@ public class MajorFunctionConfServiceImpl extends BaseServiceImpl 0) { + throw new RenException("功能编码重复"); + } insert(entity); } @@ -101,4 +111,12 @@ public class MajorFunctionConfServiceImpl extends BaseServiceImpl> getCheckState() { + QueryWrapper queryWrapper = new QueryWrapper(); + List list = baseDao.selectList(queryWrapper); + List checkStateResultDTOS = ConvertUtils.sourceToTarget(list, CheckStateResultDTO.class); + return new Result>().ok(checkStateResultDTOS); + } + } \ No newline at end of file