分析模块修改

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

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.controller;
 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.service.AnalysisIssueService;
 import com.elink.esua.epdc.service.AnalysisItemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -19,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class ApiAnalysisIssueController {
 
     @Autowired
-    private AnalysisItemService analysisIssueService;
+    private AnalysisIssueService analysisIssueService;
 
 
     /**

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

@@ -0,0 +1,37 @@
+package com.elink.esua.epdc.controller;
+
+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.service.AnalysisItemService;
+import com.elink.esua.epdc.service.AnalysisUserService;
+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;
+
+/**
+ * 移动端接口-数据分析模块(项目)
+ * @Author LPF
+ * @Date 2019/11/18 13:32
+ */
+@RestController
+@RequestMapping("analysis/user")
+public class ApiAnalysisUserController {
+
+    @Autowired
+    private AnalysisUserService analysisUserService;
+
+
+    /**
+     * 测试demo
+
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<>
+     * @Author: lipengfei
+     * @Date: 2019/11/19 16:34
+     */
+    @GetMapping("test")
+    public Result test(@LoginUser TokenDto tokenDto) {
+        return analysisUserService.test();
+    }
+}

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

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.GetMapping;
  * @Author LPF
  * @Date 2019/11/18 16:39
  */
-@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = AnalysisIssueFeignClientFallback.class, configuration = FeignRequestInterceptor.class)
+@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = AnalysisIssueFeignClientFallback.class, configuration = FeignRequestInterceptor.class)
 public interface AnalysisIssueFeignClient {
 
 

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

@@ -3,26 +3,17 @@ 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.config.FeignRequestInterceptor;
-import com.elink.esua.epdc.dto.evaluate.form.EvaluateOfficerAppFormDTO;
-import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionAppFormDTO;
-import com.elink.esua.epdc.dto.evaluate.form.EvaluateSubmitFormDTO;
-import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO;
-import com.elink.esua.epdc.dto.evaluate.result.EvaluateOptionAppResultDTO;
 import com.elink.esua.epdc.feign.fallback.AnalysisItemFeignClientFallback;
-import com.elink.esua.epdc.feign.fallback.EvaluateFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-
-import java.util.List;
 
 /**
  * 评价模块调用-移动app端
  * @Author LPF
  * @Date 2019/11/18 16:39
  */
-@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = AnalysisItemFeignClientFallback.class, configuration = FeignRequestInterceptor.class)
+@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = AnalysisItemFeignClientFallback.class, configuration = FeignRequestInterceptor.class)
 public interface AnalysisItemFeignClient {
 
 

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

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.GetMapping;
  * @Author LPF
  * @Date 2019/11/18 16:39
  */
-@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = AnalysisTopicFeignClientFallback.class, configuration = FeignRequestInterceptor.class)
+@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = AnalysisTopicFeignClientFallback.class, configuration = FeignRequestInterceptor.class)
 public interface AnalysisTopicFeignClient {
 
 

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

@@ -0,0 +1,33 @@
+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.config.FeignRequestInterceptor;
+import com.elink.esua.epdc.feign.fallback.AnalysisIssueFeignClientFallback;
+import com.elink.esua.epdc.feign.fallback.AnalysisUserFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+
+/**
+ * 评价模块调用-移动app端
+ * @Author LPF
+ * @Date 2019/11/18 16:39
+ */
+@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = AnalysisUserFeignClientFallback.class, configuration = FeignRequestInterceptor.class)
+public interface AnalysisUserFeignClient {
+
+
+
+    /**
+     * 测试
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author: lipengfei
+     * @Date: 2019/11/19 16:42
+     */
+    @GetMapping(value = "analysis/user/test", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result test();
+
+
+
+}

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

@@ -17,7 +17,7 @@ public class AnalysisIssueFeignClientFallback implements AnalysisIssueFeignClien
 
     @Override
     public Result test() {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "test");
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "test");
     }
 
 }

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

@@ -3,17 +3,9 @@ package com.elink.esua.epdc.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.evaluate.form.EvaluateOfficerAppFormDTO;
-import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionAppFormDTO;
-import com.elink.esua.epdc.dto.evaluate.form.EvaluateSubmitFormDTO;
-import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO;
-import com.elink.esua.epdc.dto.evaluate.result.EvaluateOptionAppResultDTO;
 import com.elink.esua.epdc.feign.AnalysisItemFeignClient;
-import com.elink.esua.epdc.feign.EvaluateFeignClient;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * @Author LPF
  * @Date 2019/11/18 16:39
@@ -24,7 +16,7 @@ public class AnalysisItemFeignClientFallback implements AnalysisItemFeignClient
 
     @Override
     public Result test() {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "test");
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "test");
     }
 
 }

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

@@ -17,7 +17,7 @@ public class AnalysisTopicFeignClientFallback implements AnalysisTopicFeignClien
 
     @Override
     public Result test() {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "test");
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "test");
     }
 
 }

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

@@ -0,0 +1,23 @@
+package com.elink.esua.epdc.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.feign.AnalysisIssueFeignClient;
+import com.elink.esua.epdc.feign.AnalysisUserFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author LPF
+ * @Date 2019/11/18 16:39
+ */
+@Component
+public class AnalysisUserFeignClientFallback implements AnalysisUserFeignClient {
+
+
+    @Override
+    public Result test() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "test");
+    }
+
+}

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

@@ -0,0 +1,22 @@
+package com.elink.esua.epdc.service;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+
+/**
+ * 项目模块-数据分析移动端
+ * @Author LPF
+ * @Date 2019/11/18 13:34
+ */
+public interface AnalysisUserService {
+
+
+    /**
+     * 测试模块
+     * @Return: com.elink.esua.epdc.commons.tools.utils.Result<>
+     * @Author: lipengfei
+     * @Date: 2019/11/19 16:37
+     */
+    Result test();
+
+
+}

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

@@ -2,20 +2,11 @@ package com.elink.esua.epdc.service.impl;
 
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.evaluate.form.EvaluateOfficerAppFormDTO;
-import com.elink.esua.epdc.dto.evaluate.form.EvaluateOptionAppFormDTO;
-import com.elink.esua.epdc.dto.evaluate.form.EvaluateSubmitFormDTO;
-import com.elink.esua.epdc.dto.evaluate.result.EvaluateOfficerAppResultDTO;
-import com.elink.esua.epdc.dto.evaluate.result.EvaluateOptionAppResultDTO;
 import com.elink.esua.epdc.feign.AnalysisItemFeignClient;
-import com.elink.esua.epdc.feign.EvaluateFeignClient;
 import com.elink.esua.epdc.service.AnalysisItemService;
-import com.elink.esua.epdc.service.EvaluateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * 项目模块-移动app端
  * @Author LPF

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

@@ -0,0 +1,29 @@
+package com.elink.esua.epdc.service.impl;
+
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.feign.AnalysisIssueFeignClient;
+import com.elink.esua.epdc.feign.AnalysisUserFeignClient;
+import com.elink.esua.epdc.service.AnalysisIssueService;
+import com.elink.esua.epdc.service.AnalysisUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 项目模块-移动app端
+ * @Author LPF
+ * @Date 2019/11/18 16:34
+ */
+@Service
+public class AnalysisUserServiceImpl implements AnalysisUserService {
+
+    @Autowired
+    private AnalysisUserFeignClient analysisUserFeignClient;
+
+
+
+    @Override
+    public Result test() {
+        return analysisUserFeignClient.test();
+    }
+}