controller命名修改

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectAssistFormDTO.java → epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ProjectApplyAssistFormDTO.java

@@ -5,7 +5,7 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 
 @Data
-public class ProjectAssistFormDTO {
+public class ProjectApplyAssistFormDTO {
 
     private String customerId;
 

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/ApiService.java

@@ -7,18 +7,16 @@ import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.SpringContextUtils;
 import com.epmet.constant.ThirdPlatformActions;
-import com.epmet.dao.PaUserDao;
 import com.epmet.dao.ThirdplatformActionDao;
 import com.epmet.dao.ThirdplatformCustomerRegisterDao;
 import com.epmet.dao.ThirdplatformDao;
-import com.epmet.dto.form.ProjectAssistFormDTO;
+import com.epmet.dto.form.ProjectApplyAssistFormDTO;
 import com.epmet.dto.form.TPFDemoFormDTO;
 import com.epmet.entity.ThirdplatformActionEntity;
 import com.epmet.entity.ThirdplatformCustomerRegisterEntity;
 import com.epmet.entity.ThirdplatformEntity;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.http.HttpMethod;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -180,7 +178,7 @@ public abstract class ApiService {
      * @author wxz
      * @date 2021.03.16 09:28
     */
-    public ProjectAssistResult projectAssist(ProjectAssistFormDTO formDTO) {
+    public ProjectAssistResult projectAssist(ProjectApplyAssistFormDTO formDTO) {
         return null;
     }
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/DemoApiService.java

@@ -2,10 +2,7 @@ package com.epmet.apiservice.impl;
 
 import com.epmet.apiservice.ApiService;
 import com.epmet.apiservice.result.ProjectAssistResult;
-import com.epmet.commons.tools.exception.RenException;
-import com.epmet.constant.ApiServiceActions;
-import com.epmet.dto.form.ProjectAssistFormDTO;
-import com.epmet.dto.form.TPFDemoFormDTO;
+import com.epmet.dto.form.ProjectApplyAssistFormDTO;
 import com.epmet.feign.OperCrmOpenFeignClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -24,7 +21,7 @@ public class DemoApiService extends ApiService {
     private OperCrmOpenFeignClient operCrmOpenFeignClient;
 
     @Override
-    public ProjectAssistResult projectAssist(ProjectAssistFormDTO formDTO) {
+    public ProjectAssistResult projectAssist(ProjectApplyAssistFormDTO formDTO) {
         logger.info("DemoApiService发送项目协助到第三方平台成功");
         return null;
     }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/apiservice/impl/LuzhouGridPlatformApiService.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.epmet.apiservice.ApiService;
 import com.epmet.apiservice.result.ProjectAssistResult;
 import com.epmet.constant.ThirdPlatformActions;
-import com.epmet.dto.form.ProjectAssistFormDTO;
+import com.epmet.dto.form.ProjectApplyAssistFormDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
@@ -15,7 +15,7 @@ import org.springframework.stereotype.Component;
 public class LuzhouGridPlatformApiService extends ApiService {
 
     @Override
-    public ProjectAssistResult projectAssist(ProjectAssistFormDTO formDTO) {
+    public ProjectAssistResult projectAssist(ProjectApplyAssistFormDTO formDTO) {
         String platformId = formDTO.getPlatformId();
         String result = sendPostRequest(platformId, ThirdPlatformActions.PROJECT_ASSIST, "{}", null);
         ProjectAssistResult projectAssistResult = null;

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/BizController.java → epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ProjectController.java

@@ -2,7 +2,7 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.dto.form.ProjectAssistFormDTO;
+import com.epmet.dto.form.ProjectApplyAssistFormDTO;
 import com.epmet.dto.form.TPFDemoFormDTO;
 import com.epmet.service.ProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,16 +11,14 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.lang.management.MemoryManagerMXBean;
-
 /**
- * 对接第三方平台业务相关的controller
+ * 对接第三方平台业务Project相关的controller
  * 我们系统当中每一个需要发送到第三方平台的操作，只对应这里的一个方法，根据参数传入platformId，内部根据配置获取指定的APiService进行具体平台的调用
  * 每一个平台都有自己的ApiSerivce
  */
 @RestController
-@RequestMapping("biz")
-public class BizController {
+@RequestMapping("project")
+public class ProjectController {
 
     @Autowired
     private ProjectService projectService;
@@ -39,13 +37,13 @@ public class BizController {
     }
 
     /**
-     * @Description 发送项目协同处理方法
+     * @Description 请求项目协助
      * @return
      * @author wxz
      * @date 2021.03.15 21:13
     */
-    @PostMapping("project-assist")
-    public Result projectAssist(@RequestBody ProjectAssistFormDTO formDTO) {
+    @PostMapping("apply-assist")
+    public Result applyAssist(@RequestBody ProjectApplyAssistFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         projectService.projectAssist(formDTO);
         return new Result();

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ProjectService.java

@@ -1,8 +1,7 @@
 package com.epmet.service;
 
-import com.epmet.dto.form.ProjectAssistFormDTO;
+import com.epmet.dto.form.ProjectApplyAssistFormDTO;
 import com.epmet.dto.form.TPFDemoFormDTO;
-import org.springframework.stereotype.Service;
 
 /**
  * 该service用于封装project相关的代码
@@ -11,5 +10,5 @@ public interface ProjectService {
 
     String demoAction(TPFDemoFormDTO formDTO);
 
-    void projectAssist(ProjectAssistFormDTO formDTO);
+    void projectAssist(ProjectApplyAssistFormDTO formDTO);
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -2,8 +2,7 @@ package com.epmet.service.impl;
 
 import com.epmet.apiservice.ApiService;
 import com.epmet.apiservice.result.ProjectAssistResult;
-import com.epmet.commons.tools.exception.RenException;
-import com.epmet.dto.form.ProjectAssistFormDTO;
+import com.epmet.dto.form.ProjectApplyAssistFormDTO;
 import com.epmet.dto.form.TPFDemoFormDTO;
 import com.epmet.service.ApiServiceSelector;
 import com.epmet.service.ProjectService;
@@ -25,12 +24,13 @@ public class ProjectServiceImpl implements ProjectService, ApiServiceSelector {
     }
 
     @Override
-    public void projectAssist(ProjectAssistFormDTO formDTO) {
+    public void projectAssist(ProjectApplyAssistFormDTO formDTO) {
         String customerId = formDTO.getCustomerId();
         String platformId = formDTO.getPlatformId();
 
-        // 注意，此处会如果找不到对应的ApiService会抛出异常
+        // 根据平台ID找到注意，此处会如果找不到对应的ApiService会抛出异常
         ApiService apiService = selectApiService(platformId);
+        // 判断该客户是否注册了该平台，如果没有的话，抛出异常
         apiService.judgeRegistered(customerId, platformId);
 
         System.out.println(apiService);