类别管理

epdc-cloud-events/pom.xml

@@ -100,6 +100,12 @@
             <artifactId>epdc-commons-points-tools</artifactId>
             <version>1.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.esua.epdc.yushan</groupId>
+            <artifactId>epdc-cloud-analysis-pc-client</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
 
         <!-- 上报网格平台 -->
 <!--        <dependency>-->
@@ -181,10 +187,10 @@
                 <spring.redis.password>epdc!redis@master1405</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/yushan_esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5eguiv2827bdye798o.mysql.rds.aliyuncs.com:10001/yushan_esua_epdc_events?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epdcyushan</spring.datasource.druid.username>
+                <spring.datasource.druid.username>yushan_epdc_test</spring.datasource.druid.username>
-                <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.password>elink-epdc@yushan</spring.datasource.druid.password>
 
                 <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>

epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/category/controller/CategoryController.java

@@ -26,6 +26,7 @@ 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.category.CategoryDTO;
 import com.elink.esua.epdc.dto.category.CategoryOption;
+import com.elink.esua.epdc.dto.category.EpmetCategoryCodeOption;
 import com.elink.esua.epdc.dto.form.CategoryInfoFormDTO;
 import com.elink.esua.epdc.dto.result.CategoryInfoResultDTO;
 import com.elink.esua.epdc.modules.category.excel.CategoryExcel;
@@ -144,4 +145,17 @@ public class CategoryController {
         List<CategoryInfoResultDTO> data = categoryService.listCategoryInfo(formDTO);
         return new Result<List<CategoryInfoResultDTO>>().ok(data);
     }
+
+    /**
+     * @Description  获取分类编码树
+     * @Author songyunpeng
+     * @Date  2021/1/7
+     * @Param []
+     * @return com.elink.esua.epdc.getdeptinfocommons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.DeptCodeOption>
+     **/
+    @GetMapping("getCategoryCode")
+    public Result<EpmetCategoryCodeOption> getCategoryCode(){
+        return categoryService.getCategoryCode();
+    }
+
 }

epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java

@@ -109,4 +109,8 @@ public class CategoryEntity extends BaseEntity {
 	 */
 	private String enableFlag;
 
+	private String epmetCategoryCode;
+
+	private String epmetCategoryName;
+
 }

epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/category/service/CategoryService.java

@@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.category.CategoryDTO;
 import com.elink.esua.epdc.dto.category.CategoryOption;
+import com.elink.esua.epdc.dto.category.EpmetCategoryCodeOption;
 import com.elink.esua.epdc.dto.form.CategoryInfoFormDTO;
 import com.elink.esua.epdc.dto.result.CategoryInfoResultDTO;
 import com.elink.esua.epdc.modules.category.entity.CategoryEntity;
@@ -131,4 +132,13 @@ public interface CategoryService extends BaseService<CategoryEntity> {
      * @Date 2019/12/4 9:43
      **/
     List<CategoryInfoResultDTO> listCategoryInfo(CategoryInfoFormDTO formDTO);
+
+    /**
+     * @Description  获取分类编码树
+     * @Author songyunpeng
+     * @Date  2021/3/23
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.EpmetCategoryCodeOption>
+     **/
+    Result<EpmetCategoryCodeOption> getCategoryCode();
 }

epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java

@@ -37,12 +37,14 @@ import com.elink.esua.epdc.commons.tools.utils.TreeUtils;
 import com.elink.esua.epdc.dto.category.CategoryDTO;
 import com.elink.esua.epdc.dto.category.CategoryOption;
 import com.elink.esua.epdc.dto.category.CategoryTreeDTO;
+import com.elink.esua.epdc.dto.category.EpmetCategoryCodeOption;
 import com.elink.esua.epdc.dto.form.CategoryInfoFormDTO;
 import com.elink.esua.epdc.dto.result.CategoryInfoResultDTO;
 import com.elink.esua.epdc.modules.category.dao.CategoryDao;
 import com.elink.esua.epdc.modules.category.entity.CategoryEntity;
 import com.elink.esua.epdc.modules.category.redis.CategoryRedis;
 import com.elink.esua.epdc.modules.category.service.CategoryService;
+import com.elink.esua.epdc.modules.feign.AnalysisFeignClient;
 import com.elink.esua.epdc.modules.rocketmq.dto.CategoryModifyDTO;
 import com.elink.esua.epdc.modules.rocketmq.producer.CategoryModifyProducer;
 import com.google.common.collect.Lists;
@@ -85,6 +87,9 @@ public class CategoryServiceImpl extends BaseServiceImpl<CategoryDao, CategoryEn
 
 	public static int Guid=100;//id自增值
 
+	@Autowired
+	private AnalysisFeignClient analysisFeignClient;
+
 	@Autowired
 	private CategoryModifyProducer categoryModifyProducer;
 
@@ -627,6 +632,11 @@ public class CategoryServiceImpl extends BaseServiceImpl<CategoryDao, CategoryEn
         return result;
     }
 
+	@Override
+	public Result<EpmetCategoryCodeOption> getCategoryCode() {
+		return analysisFeignClient.getCategoryCode();
+	}
+
     /**
      * @param
      * @return void

epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/feign/AnalysisFeignClient.java

@@ -0,0 +1,30 @@
+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.category.EpmetCategoryCodeOption;
+import com.elink.esua.epdc.modules.feign.fallback.AnalysisFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+
+/**
+ * 数据分析模块调用
+ *
+ * @Author：liuchuang
+ * @Date：2020/9/9 15:41
+ */
+@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = AnalysisFeignClientFallback.class,url = "http://localhost:9077")
+public interface AnalysisFeignClient {
+
+    /**
+     * @Description  组织机构编码获取
+     * @Author songyunpeng
+     * @Date  2021/1/7
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    @GetMapping(value = "analysis/category/getCategoryCode", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<EpmetCategoryCodeOption> getCategoryCode();
+
+}

epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AnalysisFeignClientFallback.java

@@ -0,0 +1,22 @@
+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.category.EpmetCategoryCodeOption;
+import com.elink.esua.epdc.modules.feign.AnalysisFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author：songyunpeg
+ * @Date：2020/9/9 15:42
+ */
+@Component
+public class AnalysisFeignClientFallback implements AnalysisFeignClient {
+
+
+    @Override
+    public Result<EpmetCategoryCodeOption> getCategoryCode() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getCategoryCode");
+    }
+}