一键服务和解码锦水模块 init

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

@@ -30,11 +30,26 @@ public class ApiCustomInfoController {
      * @Author zhangyong
      * @Date 13:37 2020-05-20
      **/
+    @Deprecated
     @GetMapping("module/list")
     public Result<List<EpdcModuleResultDTO>> listModule() {
         return customService.listModule();
     }
 
+    /**
+     *
+     * 根据模块分类获取模块
+     *
+     * @params [moduleCategory]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcModuleResultDTO>>
+     * @author liuchuang
+     * @since 2020/7/15 17:43
+     */
+    @GetMapping("module/list/{moduleCategory}")
+    public Result<List<EpdcModuleResultDTO>> getModuleByModuleCategory(@PathVariable("moduleCategory") String moduleCategory) {
+        return customService.listOfModuleByModuleCategory(moduleCategory);
+    }
+
     /**
      *  移动端获取 了解锦水-硬核管理接口
      *

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

@@ -41,9 +41,22 @@ public interface CustomFeignClient {
 	 * @Author zhangyong
 	 * @Date 10:42 2020-05-20
 	 **/
+	@Deprecated
 	@GetMapping(value = "custom/epdc-app/module/list", consumes = MediaType.APPLICATION_JSON_VALUE)
 	Result<List<EpdcModuleResultDTO>> selectListModule();
 
+	/**
+	 *
+	 * 根据模块分类获取模块
+	 *
+	 * @params [moduleCategory]
+	 * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcModuleResultDTO>>
+	 * @author liuchuang
+	 * @since 2020/7/15 17:43
+	 */
+	@GetMapping("custom/epdc-app/module/list/{moduleCategory}")
+	Result<List<EpdcModuleResultDTO>> listOfModuleByModuleCategory(@PathVariable("moduleCategory") String moduleCategory);
+
 	/**
 	 *  移动端获取 了解锦水-硬核管理接口
 	 * @param formDTO

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

@@ -10,6 +10,7 @@ import com.elink.esua.epdc.dto.form.EpiDemicReportFormDTO;
 import com.elink.esua.epdc.dto.result.*;
 import com.elink.esua.epdc.feign.CustomFeignClient;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.List;
 
@@ -31,6 +32,11 @@ public class CustomFeignClientFallback implements CustomFeignClient {
 		return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "selectListModule", null);
 	}
 
+	@Override
+    public Result<List<EpdcModuleResultDTO>> listOfModuleByModuleCategory(String moduleCategory) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getModuleByModuleCategory", moduleCategory);
+    }
+
 	@Override
 	public Result<List<EpdcDeptInfoResultDTO>> selectListDeptInfo(EpdcDeptInfoFormDTO formDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "selectListDeptInfo", formDTO);

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

@@ -42,8 +42,20 @@ public interface CustomService {
 	 * @Author zhangyong
 	 * @Date 10:42 2020-05-20
 	 **/
+	@Deprecated
 	Result<List<EpdcModuleResultDTO>> listModule();
 
+	/**
+	 *
+	 * 根据模块分类获取模块
+	 *
+	 * @params [moduleCategory]
+	 * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcModuleResultDTO>>
+	 * @author liuchuang
+	 * @since 2020/7/15 17:44
+	 */
+	Result<List<EpdcModuleResultDTO>> listOfModuleByModuleCategory(String moduleCategory);
+
 	/**
 	 *  移动端获取 了解锦水-硬核管理接口
      *

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

@@ -89,6 +89,11 @@ public class CustomServiceImpl implements CustomService {
 		return customFeignClient.selectListModule();
 	}
 
+	@Override
+	public Result<List<EpdcModuleResultDTO>> listOfModuleByModuleCategory(String moduleCategory) {
+		return customFeignClient.listOfModuleByModuleCategory(moduleCategory);
+	}
+
 	@Override
 	public Result<List<EpdcDeptInfoResultDTO>> listDeptInfo(EpdcDeptInfoFormDTO formDTO) {
 		return customFeignClient.selectListDeptInfo(formDTO);

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/ModuleDTO.java

@@ -98,4 +98,9 @@ public class ModuleDTO implements Serializable {
      */
 	private Date updatedTime;
 
+	/**
+	 * 模块分类
+	 */
+	private String moduleCategory;
+
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/module/controller/EpdcAppModuleController.java

@@ -6,6 +6,7 @@ import com.elink.esua.epdc.dto.result.EpdcModuleResultDTO;
 import com.elink.esua.epdc.modules.module.service.ModuleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -32,8 +33,24 @@ public class EpdcAppModuleController {
      * @Author zhangyong
      * @Date 10:42 2020-05-20
      **/
+    @Deprecated
     @GetMapping("list")
     public Result<List<EpdcModuleResultDTO>> listModule() {
         return moduleService.listModule();
     }
+
+    /**
+     *
+     * 根据模块类别获取模块
+     *
+     * @params []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcModuleResultDTO>>
+     * @author liuchuang
+     * @since 2020/7/15 17:33
+     */
+    @GetMapping("list/{moduleCategory}")
+    public Result<List<EpdcModuleResultDTO>> getModuleByModuleCategory(@PathVariable("moduleCategory") String moduleCategory) {
+        List<EpdcModuleResultDTO> data = moduleService.listOfModuleByModuleCategory(moduleCategory);
+        return new Result<List<EpdcModuleResultDTO>>().ok(data);
+    }
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/module/controller/ModuleController.java

@@ -27,6 +27,7 @@ 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.ModuleDTO;
 import com.elink.esua.epdc.dto.SysSimpleDictDTO;
+import com.elink.esua.epdc.dto.result.EpdcModuleResultDTO;
 import com.elink.esua.epdc.modules.module.excel.ModuleExcel;
 import com.elink.esua.epdc.modules.module.service.ModuleService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -102,4 +103,19 @@ public class ModuleController {
     public Result<List<SysSimpleDictDTO>> getListSimpleByDictType(@PathVariable("dictType") String dictType) {
         return moduleService.getListSimpleByDictType(dictType);
     }
+
+    /**
+     *
+     * 获取消息通知分类
+     *
+     * @params []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.ModuleDTO>>
+     * @author liuchuang
+     * @since 2020/7/15 16:49
+     */
+    @GetMapping("noticeCategory")
+    public Result<List<EpdcModuleResultDTO>> getNoticeCategory() {
+        List<EpdcModuleResultDTO> data = moduleService.listOfModuleByModuleCategory(null);
+        return new Result<List<EpdcModuleResultDTO>>().ok(data);
+    }
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/module/dao/ModuleDao.java

@@ -54,13 +54,17 @@ public interface ModuleDao extends BaseDao<ModuleEntity> {
      **/
     int getModuleCodeCount(String moduleCode);
 
-    /*
+    @Deprecated
-     * 移动端获取 了解锦水-模块管理接口
+    List<EpdcModuleResultDTO> selectlistModule();
+
+    /**
+     *
+     * 通知模块类别
      *
-     * @param
+     * @params []
      * @return java.util.List<com.elink.esua.epdc.dto.result.EpdcModuleResultDTO>
-     * @Author zhangyong
+     * @author liuchuang
-     * @Date 10:42 2020-05-20
+     * @since 2020/7/15 17:02
-     **/
+     */
-    List<EpdcModuleResultDTO> selectListModule();
+    List<EpdcModuleResultDTO> selectListModuleByModuleCategory(String moduleCategory);
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/module/entity/ModuleEntity.java

@@ -68,4 +68,9 @@ public class ModuleEntity extends BaseEpdcEntity {
      */
 	private String remark;
 
+	/**
+	 * 模块分类
+	 */
+	private String moduleCategory;
+
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/module/service/ModuleService.java

@@ -105,13 +105,17 @@ public interface ModuleService extends BaseService<ModuleEntity> {
      **/
     Result<List<SysSimpleDictDTO>> getListSimpleByDictType(String dictType);
 
-    /*
+    @Deprecated
-     * 移动端获取 了解锦水-模块管理接口
+    Result<List<EpdcModuleResultDTO>> listModule();
+
+    /**
+     *
+     * 通知模块类别
      *
-     * @param
+     * @params [moduleCategory]
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcModuleResultDTO>>
-     * @Author zhangyong
+     * @author liuchuang
-     * @Date 10:42 2020-05-20
+     * @since 2020/7/15 17:09
-     **/
+     */
-    Result<List<EpdcModuleResultDTO>> listModule();
+    List<EpdcModuleResultDTO> listOfModuleByModuleCategory(String moduleCategory);
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/module/service/impl/ModuleServiceImpl.java

@@ -119,8 +119,13 @@ public class ModuleServiceImpl extends BaseServiceImpl<ModuleDao, ModuleEntity>
 
     @Override
     public Result<List<EpdcModuleResultDTO>> listModule() {
-        List<EpdcModuleResultDTO> data = baseDao.selectListModule();
+        List<EpdcModuleResultDTO> data = baseDao.selectlistModule();
-        return new Result().ok(data);
+        return new Result<List<EpdcModuleResultDTO>>().ok(data);
+    }
+
+    @Override
+    public List<EpdcModuleResultDTO> listOfModuleByModuleCategory(String moduleCategory) {
+        return baseDao.selectListModuleByModuleCategory(moduleCategory);
     }
 
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/module/ModuleDao.xml

@@ -27,7 +27,8 @@
             IMG_URL imgUrl,
             SORT sort,
             ENABLE_FLAG enableFlag,
-            REMARK remark
+            REMARK remark,
+            MODULE_CATEGORY moduleCategory
         FROM
             epdc_module
         WHERE DEL_FLAG = 0
@@ -47,7 +48,7 @@
        AND DEL_FLAG = 0
     </select>
 
-    <select id="selectListModule" resultType="com.elink.esua.epdc.dto.result.EpdcModuleResultDTO">
+    <select id="selectlistModule" resultType="com.elink.esua.epdc.dto.result.EpdcModuleResultDTO">
         SELECT
         ID id,
         NAME `name`,
@@ -58,6 +59,24 @@
         epdc_module
         WHERE DEL_FLAG = 0
         AND ENABLE_FLAG = 1
+        AND MODULE_CODE IN('notice_impression', 'notice_taste', 'module_hardcore', 'notice_warning', 'module_file')
+        ORDER BY SORT,CREATED_TIME
+    </select>
+
+    <select id="selectListModuleByModuleCategory" resultType="com.elink.esua.epdc.dto.result.EpdcModuleResultDTO">
+        SELECT
+            ID id,
+            NAME `name`,
+            MODULE_CODE moduleCode,
+            IMG_URL imgUrl,
+            SORT sort
+        FROM
+          epdc_module
+        WHERE DEL_FLAG = 0
+          AND ENABLE_FLAG = 1
+          <if test="moduleCategory != null and moduleCategory.trim() != ''">
+              AND MODULE_CATEGORY = #{moduleCategory}
+          </if>
         ORDER BY SORT,CREATED_TIME
     </select>
 </mapper>

esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/NoticeDTO.java

@@ -144,4 +144,9 @@ public class NoticeDTO implements Serializable {
      * 锦水-消息通知分类
      */
     private String noticeCategory;
+
+    /**
+     * 联系方式
+     */
+    private String mobile;
 }

esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeListResultDTO.java

@@ -48,4 +48,9 @@ public class EpdcNoticeListResultDTO implements Serializable {
      * 通知内容
      */
     private String noticeContent;
+
+    /**
+     * 联系电话
+     */
+    private String mobile;
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/entity/NoticeEntity.java

@@ -111,4 +111,9 @@ public class NoticeEntity extends BaseEpdcEntity {
      * 锦水-消息通知分类
      */
     private String noticeCategory;
+
+    /**
+     * 联系方式
+     */
+    private String mobile;
 }

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml

@@ -109,7 +109,8 @@
             en.RELEASE_TIME AS noticeTime,
             SUBSTRING_INDEX(en.ALL_DEPT_NAMES,'-',-1) AS deptName,
             en.NOTICE_IMAGE_URL imgUrl,
-            en.NOTICE_CONTENT noticeContent
+            en.NOTICE_CONTENT noticeContent,
+            en.MOBILE as mobile
         FROM
             epdc_notice en
         RIGHT JOIN epdc_notice_department nd ON en.ID = nd.NOTICE_ID

esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml

@@ -199,7 +199,7 @@
 
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
-                <nacos.ip></nacos.ip>
+                <nacos.ip>47.104.224.45</nacos.ip>
                 <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
 
                 <fastdfs.server-addr></fastdfs.server-addr>