1.志愿者 - banner管理，增加banner类型数据字典项。

2.增加接口默认网格查询。

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

@@ -0,0 +1,34 @@
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.service.AdminService;
+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;
+
+/**
+ * 字典
+ * @Auther: zhangyong
+ * @Date: 2020-06-02 11:05
+ */
+@RestController
+@RequestMapping("dic")
+public class ApiDicController {
+
+    @Autowired
+    private AdminService adminService;
+
+    /*
+     * 获取默认网格信息
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
+     * @Author zhangyong
+     * @Date 11:07 2020-06-02
+     **/
+    @GetMapping("/getDefaultGridInfo")
+    public Result<String> getDefaultGridInfo() {
+        String dicType = "default_grid";
+        return adminService.getDefaultGridInfo(dicType);
+    }
+}

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

@@ -98,4 +98,15 @@ public interface AdminFeignClient {
      **/
     @GetMapping("sys/dict/listSimple/{dictType}")
     Result<List<SysSimpleDictDTO>> getListSimpleDictInfo(@PathVariable("dictType") String dictType);
+
+    /**
+     * 根据数据字典类型获取 获取默认网格信息
+     *
+     * @param dictType 数据字典类型
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<ParentAndAllDeptDTO>
+     * @Author zhangyong
+     * @Date 18:40 2020-06-02
+     */
+    @GetMapping("/sys/dict/listSimple/{dictType}")
+    Result<List<SysSimpleDictDTO>> getDefaultGridInfoByDicType(@PathVariable("dictType") String dictType);
 }

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

@@ -53,4 +53,9 @@ public class AdminFeignClientFallback implements AdminFeignClient {
     public Result<List<SysSimpleDictDTO>> getListSimpleDictInfo(String dictType) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getListSimpleDictInfo", dictType);
     }
+
+    @Override
+    public Result<List<SysSimpleDictDTO>> getDefaultGridInfoByDicType(String dictType) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDefaultGridInfoByDicType", dictType);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java

@@ -20,4 +20,13 @@ public interface AdminService {
      * @date 2019/9/11 09:46
      */
     Result<String> getCompleteDeptName(Long gridId);
+
+    /*
+     * 根据字典类型 获取网格信息
+     * @param dicType
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
+     * @Author zhangyong
+     * @Date 11:08 2020-06-02
+     **/
+    Result<String> getDefaultGridInfo(String dicType);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java

@@ -2,11 +2,14 @@ package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.CompleteDeptDTO;
+import com.elink.esua.epdc.dto.SysSimpleDictDTO;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.service.AdminService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * @author yujintao
  * @email yujintao@elink-cn.com
@@ -33,4 +36,14 @@ public class AdminServiceImpl implements AdminService {
                 .concat(completeDept.getGrid());
         return new Result().ok(deptName);
     }
+
+    @Override
+    public Result<String> getDefaultGridInfo(String dicType) {
+        Result<List<SysSimpleDictDTO>> listResult = adminFeignClient.getDefaultGridInfoByDicType(dicType);
+        if (!listResult.success() || null == listResult) {
+            return new Result().error("查询默认网格信息失败");
+        }
+        String defaultGrid = listResult.getData().get(0).getDictValue();
+        return new Result<String>().ok(defaultGrid);
+    }
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java

@@ -26,6 +26,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
+import com.elink.esua.epdc.dto.SysSimpleDictDTO;
 import com.elink.esua.epdc.modules.activity.excel.ActBannerExcel;
 import com.elink.esua.epdc.modules.activity.service.ActBannerService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -103,4 +104,16 @@ public class ActBannerController {
         ExcelUtils.exportExcelToTarget(response, null, list, ActBannerExcel.class);
     }
 
+    /**
+     * 根据数据字典类型获取简版数据字典列表，用于页面下拉菜单
+     *
+     * @param dictType
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.SysSimpleDictDTO>>
+     * @Author zhangyong
+     * @Date 15:13 2020-06-02
+     **/
+    @GetMapping("getBannerType/{dictType}")
+    public Result<List<SysSimpleDictDTO>> listSimpleDictInfo(@PathVariable("dictType") String dictType){
+        return actBannerService.getListSimpleDictInfo(dictType);
+    }
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java

@@ -23,6 +23,7 @@ import com.elink.esua.epdc.activity.result.EpdcAppActBannerResultDTO;
 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.SysSimpleDictDTO;
 import com.elink.esua.epdc.modules.activity.entity.ActBannerEntity;
 
 import java.util.List;
@@ -142,4 +143,14 @@ public interface ActBannerService extends BaseService<ActBannerEntity> {
      * @Date 18:27 2020-05-25
      **/
     Result<List<EpdcAppActBannerResultDTO>> getBannerList(EpdcAppActBannerFormDTO formDto);
+
+    /**
+     * 根据数据字典类型获取简版数据字典列表，用于页面下拉菜单
+     *
+     * @param dictType
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.SysSimpleDictDTO>>
+     * @Author zhangyong
+     * @Date 15:13 2020-06-02
+     **/
+    Result<List<SysSimpleDictDTO>> getListSimpleDictInfo(String dictType);
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java

@@ -29,10 +29,12 @@ 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.utils.Result;
 import com.elink.esua.epdc.constant.ActStateConstant;
+import com.elink.esua.epdc.dto.SysSimpleDictDTO;
 import com.elink.esua.epdc.modules.activity.dao.ActBannerDao;
 import com.elink.esua.epdc.modules.activity.entity.ActBannerEntity;
 import com.elink.esua.epdc.modules.activity.redis.ActBannerRedis;
 import com.elink.esua.epdc.modules.activity.service.ActBannerService;
+import com.elink.esua.epdc.modules.feign.AdminFeignClient;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -55,6 +57,9 @@ public class ActBannerServiceImpl extends BaseServiceImpl<ActBannerDao, ActBanne
     @Autowired
     private ActBannerRedis actBannerRedis;
 
+    @Autowired
+    private AdminFeignClient adminFeignClient;
+
     @Override
     public PageData<ActBannerDTO> page(Map<String, Object> params) {
         IPage<ActBannerEntity> page = baseDao.selectPage(
@@ -172,4 +177,8 @@ public class ActBannerServiceImpl extends BaseServiceImpl<ActBannerDao, ActBanne
         return new Result().ok(data);
     }
 
+    @Override
+    public Result<List<SysSimpleDictDTO>> getListSimpleDictInfo(String dictType) {
+        return adminFeignClient.getListSimpleDictInfo(dictType);
+    }
 }

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java

@@ -0,0 +1,29 @@
+package com.elink.esua.epdc.modules.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.SysSimpleDictDTO;
+import com.elink.esua.epdc.modules.feign.fallback.AdminFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+import java.util.List;
+
+/**
+ * @author zhangyong
+ * @date 15:13 2020-06-02
+ */
+@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class)
+public interface AdminFeignClient {
+    /**
+     * 根据数据字典类型获取简版数据字典列表，用于页面下拉菜单
+     *
+     * @param dictType
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.SysSimpleDictDTO>>
+     * @Author zhangyong
+     * @Date 15:27 2020-05-27
+     **/
+    @GetMapping("sys/dict/listSimple/{dictType}")
+    Result<List<SysSimpleDictDTO>> getListSimpleDictInfo(@PathVariable("dictType") String dictType);
+}

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java

@@ -0,0 +1,24 @@
+package com.elink.esua.epdc.modules.feign.fallback;
+
+
+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.SysSimpleDictDTO;
+import com.elink.esua.epdc.modules.feign.AdminFeignClient;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author zhangyong
+ * @date 15:13 2020-06-02
+ */
+@Component
+public class AdminFeignClientFallback implements AdminFeignClient {
+
+    @Override
+    public Result<List<SysSimpleDictDTO>> getListSimpleDictInfo(String dictType) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getListSimpleDictInfo", dictType);
+    }
+}