Merge branch 'feat-1002570-2' into 'master'

内部接口换外部接口

See merge request rays/pcloud-book!544

pcloud-facade-book/src/main/java/com/pcloud/book/personlstage/service/PersonalStageService.java

@@ -22,7 +22,4 @@ public interface PersonalStageService {
     @PostMapping("createUserReplaceCode")
     void createUserReplaceCode(@RequestBody @ApiParam("方案阶段跳转") UserReplaceCodeDTO userReplaceCodeDTO);
 
-    @ApiOperation("获取用户替换")
-    @GetMapping("getUserReplaceMap")
-    ResponseEntity<ResponseDto<Map<String,String>>> getUserReplaceMap(@RequestParam("wxId") @ApiParam("用户id") String wxId,@RequestParam("robotId") @ApiParam("机器人id") String robotId);
 }

pcloud-service-book/src/main/java/com/pcloud/book/personalstage/facade/PersonalStageFacade.java

@@ -319,4 +319,10 @@ public class PersonalStageFacade {
         return new ResponseDto<>(personalStageBiz.getAllReplaceCode());
     }
 
+    @ApiOperation("获取用户替换map")
+    @GetMapping("getUserReplaceMap")
+    public ResponseDto<?> getUserReplaceMap(@RequestParam("wxId") @ApiParam("用户id") String wxId, @RequestParam("robotId") @ApiParam("机器人id") String robotId){
+        return new ResponseDto<>(personalStageBiz.getUserReplaceMap(wxId,robotId));
+    }
+
 }

pcloud-service-book/src/main/java/com/pcloud/book/personalstage/service/impl/PersonalStageServiceImpl.java

@@ -3,22 +3,15 @@ package com.pcloud.book.personalstage.service.impl;
 import com.pcloud.book.personalstage.biz.PersonalStageBiz;
 import com.pcloud.book.personlstage.dto.UserReplaceCodeDTO;
 import com.pcloud.book.personlstage.service.PersonalStageService;
-import com.pcloud.common.dto.ResponseDto;
 import com.pcloud.common.exceptions.BizException;
-import com.pcloud.common.permission.PermissionException;
-import com.pcloud.common.utils.ResponseHandleUtil;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Map;
 
 @RestController("personalStageService")
 @RequestMapping("personalStageService")
@@ -36,10 +29,4 @@ public class PersonalStageServiceImpl implements PersonalStageService {
         personalStageBiz.createUserReplaceCode(userReplaceCodeDTO);
     }
 
-    @ApiOperation("获取用户替换map")
-    @GetMapping("getUserReplaceMap")
-    @Override
-    public ResponseEntity<ResponseDto<Map<String,String>>> getUserReplaceMap(@RequestParam("wxId") @ApiParam("用户id") String wxId, @RequestParam("robotId") @ApiParam("机器人id") String robotId){
-        return ResponseHandleUtil.toResponse(personalStageBiz.getUserReplaceMap(wxId,robotId));
-    }
 }