小程序首页可配置接口

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<java.lang.String>
      * @author qushutong
      * @date 2020/3/2 16:03
      */
-    @GetMapping("checkConsultFlag")
+    @GetMapping("consult/checkConsultFlag")
     public Result<String> 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<List<GridOperatorListResultDTO>> 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<java.lang.String>
+     * @author qushutong
+     * @date 2020/3/6 16:04
+     */
+    @GetMapping("majorFunction/checkState")
+    public Result<List<CheckStateResultDTO>> checkState(){
+        return customConsultService.getCheckState();
+    }
+
+
 }

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<List<GridOperatorListResultDTO>> listPageGridOperator(GridOperatorListFormDTO formDto);
+
+
+    /***
+     * 小程序首页配置
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
+     * @author qushutong
+     * @date 2020/3/6 16:06
+     */
+    @GetMapping(value = "custom/majorfunctionconf/checkState", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<CheckStateResultDTO>> getCheckState();
 }

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<List<GridOperatorListResultDTO>> listPageGridOperator(GridOperatorListFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "listGridOperator", formDto);
     }
+
+    @Override
+    public Result<List<CheckStateResultDTO>> getCheckState() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "checkState");
+    }
 }

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<List<GridOperatorListResultDTO>> listPageGridOperator(GridOperatorListFormDTO formDto);
+
+    /***
+     * 小程序首页配置
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
+     * @author qushutong
+     * @date 2020/3/6 16:06
+     */
+    Result<List<CheckStateResultDTO>> getCheckState();
 }

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<List<GridOperatorListResultDTO>> listPageGridOperator(GridOperatorListFormDTO formDto) {
         return customFeignClient.listPageGridOperator(formDto);
     }
+
+    @Override
+    public Result<List<CheckStateResultDTO>> getCheckState() {
+        return customFeignClient.getCheckState();
+    }
 }

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;
+
+}

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<java.lang.String>
+     * @author qushutong
+     * @date 2020/3/6 16:04
+     */
+    @GetMapping("checkState")
+    public Result<List<CheckStateResultDTO>> checkState(){
+        return majorFunctionConfService.getCheckState();
+    }
 }

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<MajorFunctionConfE
      * @date 2020-03-06
      */
     void delete(String[] ids);
+
+    /***
+     * 小程序首页配置
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
+     * @author qushutong
+     * @date 2020/3/6 16:06
+     */
+    Result<List<CheckStateResultDTO>> getCheckState();
 }

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;
@@ -84,6 +87,13 @@ public class MajorFunctionConfServiceImpl extends BaseServiceImpl<MajorFunctionC
     @Transactional(rollbackFor = Exception.class)
     public void save(MajorFunctionConfDTO dto) {
         MajorFunctionConfEntity entity = ConvertUtils.sourceToTarget(dto, MajorFunctionConfEntity.class);
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq(StringUtils.isNotBlank(dto.getCode()), "code", dto.getCode());
+
+        Integer integer = baseDao.selectCount(queryWrapper);
+        if (integer > 0) {
+            throw new RenException("功能编码重复");
+        }
         insert(entity);
     }
 
@@ -101,4 +111,12 @@ public class MajorFunctionConfServiceImpl extends BaseServiceImpl<MajorFunctionC
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public Result<List<CheckStateResultDTO>> getCheckState() {
+        QueryWrapper queryWrapper = new QueryWrapper();
+        List list = baseDao.selectList(queryWrapper);
+        List<CheckStateResultDTO> checkStateResultDTOS = ConvertUtils.sourceToTarget(list, CheckStateResultDTO.class);
+        return new Result<List<CheckStateResultDTO>>().ok(checkStateResultDTOS);
+    }
+
 }