全部调整Mono

src/main/java/com/hr/controller/AggregateController.java

@@ -18,6 +18,7 @@ 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.RestController;
+import reactor.core.publisher.Mono;
 
 /**
  * 三方调用聚合接口
@@ -39,31 +40,31 @@ public class AggregateController {
     private IpInterfaceService ipInterfaceService;
 
     @PostMapping("/openApi")
-    public BaseReturnDto<Object> aggregate(@RequestBody AggregateRequest req) {
+    public Mono<BaseReturnDto<Object>> aggregate(@RequestBody AggregateRequest req) {
         String accountNo = req.getAccountNo();
         String interfaceCode = req.getInterfaceCode();
         IpAccountVO ipAccount = ipAccountService.queryByAccountNo(accountNo);
         if(ipAccount == null){
-            return BaseReturnDto.error("账户不存在");
+            return Mono.just(BaseReturnDto.error("账户不存在"));
         }
         if(!ipAccount.getStatus().equals("normal")){
-            return BaseReturnDto.error("账户已禁用");
+            return Mono.just(BaseReturnDto.error("账户已禁用"));
         }
         IpInterfaceVO ipInterfaceVO = ipInterfaceService.queryByInterfaceCode(interfaceCode);
         if(ipInterfaceVO == null){
-            return BaseReturnDto.error("接口不存在");
+            return Mono.just(BaseReturnDto.error("接口不存在"));
         }
         if(!ipInterfaceVO.getStatus().equals("normal")){
-            return BaseReturnDto.error("接口已禁用");
+            return Mono.just(BaseReturnDto.error("接口已禁用"));
         }
         AggregateQueryDTO dto = ipTokenInterfaceService.queryConfigByInterfaceCodeAndAccountNo(ipAccount.getId(), ipInterfaceVO.getId());
         IpTokenPO ipTokenPO = dto.getIpTokenPO();
         if(!ipTokenPO.getToken().equals(req.getToken())){
-            return BaseReturnDto.error("token错误");
+            return Mono.just(BaseReturnDto.error("token错误"));
         }
         IpInterfacePO ipInterfacePO = new IpInterfacePO();
         BeanUtils.copyProperties(ipInterfaceVO, ipInterfacePO);
         dto.setIpInterfacePO(ipInterfacePO);
-        return bizHandlerFactory.dispatch(req,dto);
+        return Mono.just(bizHandlerFactory.dispatch(req,dto));
     }
 }

src/main/java/com/hr/controller/DemoController.java

@@ -64,14 +64,14 @@ public class DemoController {
     private OSSUtil oSSUtil;
 
     @GetMapping("aa")
-    public MyDto aa(ServerHttpRequest request) {
+    public Mono<MyDto> aa(ServerHttpRequest request) {
 
         sv.savee();
         LoginUser u= TokenUtil.getUser();
         if(u==null){
             throw new RuntimeException("没有找到用户");
         }
-        return  MyDto.success(u);
+        return  Mono.just(MyDto.success(u));
     }
 
     @PostMapping("listdict")
@@ -116,7 +116,7 @@ public class DemoController {
     }
 
     @PostMapping("listname8")
-    public TestDemoDto list5668(@RequestBody TestDemoDto dto) {
+    public Mono<TestDemoDto> list5668(@RequestBody TestDemoDto dto) {
         log.info("接收的DTO8=:{}", dto);
 
         Boolean baaa=redisService.hasKey("aaa");
@@ -125,7 +125,7 @@ public class DemoController {
         TestDemoDto dto1 = new TestDemoDto();
         dto1.setName("直接返回Dto");
         dto1.setAge(26);
-        return dto1;
+        return Mono.just(dto1);
     }
 
     @GetMapping("listname6")
@@ -153,7 +153,8 @@ public class DemoController {
 
     @GetMapping("listname5")
     public Mono<Void> export(ServerHttpResponse response) {
-
+        LoginUser u= TokenUtil.getUser();
+        log.info("user:{}",u);
         ExcelUtil<DemoExcelDto> util = new ExcelUtil<DemoExcelDto>(DemoExcelDto.class);
         List<DemoExcelDto> list = new ArrayList<>();
         DemoExcelDto d1 = new DemoExcelDto();

src/main/java/com/hr/controller/EsignController.java

@@ -10,6 +10,7 @@ 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.RestController;
+import reactor.core.publisher.Mono;
 
 /**
  * @author yaoy
@@ -27,8 +28,8 @@ public class EsignController {
      * @return
      */
     @PostMapping("platform")
-    public BaseReturnDto<EsignReturnDto> platformSignByPdfStream(@RequestBody EsignParmDto parm){
-        return esignService.platformSignByPdfStream(parm);
+    public Mono<BaseReturnDto<EsignReturnDto>> platformSignByPdfStream(@RequestBody EsignParmDto parm){
+        return Mono.just(esignService.platformSignByPdfStream(parm));
     }
 
 
@@ -38,8 +39,8 @@ public class EsignController {
      * @return
      */
     @PostMapping("hrSign")
-    public BaseReturnDto<EsignReturnDto> hrSignByPdfStream(@RequestBody EsignParmDto parm){
-        return esignService.hrSignByPdfStream(parm);
+    public Mono<BaseReturnDto<EsignReturnDto>> hrSignByPdfStream(@RequestBody EsignParmDto parm){
+        return Mono.just(esignService.hrSignByPdfStream(parm));
     }
 
 }

src/main/java/com/hr/controller/IpAccountController.java

@@ -14,6 +14,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.web.bind.annotation.*;
+import reactor.core.publisher.Mono;
 
 /**
  * 账户管理
@@ -35,9 +36,9 @@ public class IpAccountController{
      */
     @Operation(summary = "分页查询")
     @GetMapping("/list")
-    public BasePageResult<IpAccountVO> paginQuery(IpAccountParam ipAccountParam){
+    public Mono<BasePageResult<IpAccountVO>> paginQuery(IpAccountParam ipAccountParam){
         BasePageResult<IpAccountVO> ipAccountPOS = ipAccountService.paginQuery(ipAccountParam, ipAccountParam.getPageNum(), ipAccountParam.getPageSize());
-        return ipAccountPOS;
+        return Mono.just(ipAccountPOS);
     }
     
     /** 
@@ -48,10 +49,10 @@ public class IpAccountController{
      */
     @Operation(summary = "新增/更新数据")
     @PostMapping("/saveOrUpdate")
-    public BaseReturnDto<IpAccountVO> saveOrUpdate(@RequestBody IpAccountParam accountParam){
+    public Mono<BaseReturnDto<IpAccountVO>> saveOrUpdate(@RequestBody IpAccountParam accountParam){
         LoginUser user= TokenUtil.getUser();
         ipAccountService.saveOrUpdate(accountParam,user.getUsername(),user.getUserid());
-        return BaseReturnDto.success();
+        return Mono.just(BaseReturnDto.success());
     }
 
     /** 
@@ -62,9 +63,9 @@ public class IpAccountController{
      */
     @Operation(summary = "通过主键删除数据")
     @DeleteMapping("/delete/{id}")
-    public BaseReturnDto<Boolean> deleteById(@PathVariable Long id){
+    public Mono<BaseReturnDto<Boolean>> deleteById(@PathVariable Long id){
         LoginUser user = TokenUtil.getUser();
-        return BaseReturnDto.success(ipAccountService.deleteById(id,user));
+        return Mono.just(BaseReturnDto.success(ipAccountService.deleteById(id,user)));
     }
 
     /**
@@ -75,8 +76,8 @@ public class IpAccountController{
      */
     @Operation(summary = "修改状态")
     @PostMapping("/switchStatus")
-    public BaseReturnDto<Boolean> switchStatus(@RequestBody SwitchStatusParam switchStatusParam){
+    public Mono<BaseReturnDto<Boolean>> switchStatus(@RequestBody SwitchStatusParam switchStatusParam){
         LoginUser user = TokenUtil.getUser();
-        return BaseReturnDto.success(ipAccountService.switchStatus(switchStatusParam,user));
+        return Mono.just(BaseReturnDto.success(ipAccountService.switchStatus(switchStatusParam,user)));
     }
 }

src/main/java/com/hr/controller/IpInterfaceCallbackController.java

@@ -14,6 +14,7 @@ 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;
+import reactor.core.publisher.Mono;
 
 import java.util.List;
 
@@ -33,8 +34,8 @@ public class IpInterfaceCallbackController {
      */
     @Operation(summary = "分页查询接口调用记录")
     @GetMapping("/list")
-    public BasePageResult<IpInterfaceCallVO> queryList(InterfaceCalledQueryParam ipInterfaceCalledQueryParam){
-        return ipOrderService.queryList(ipInterfaceCalledQueryParam);
+    public Mono<BasePageResult<IpInterfaceCallVO>> queryList(InterfaceCalledQueryParam ipInterfaceCalledQueryParam){
+        return Mono.just(ipOrderService.queryList(ipInterfaceCalledQueryParam));
     }
 
     /**
@@ -44,9 +45,9 @@ public class IpInterfaceCallbackController {
      */
     @Operation(summary = "查询接口调用详情")
     @GetMapping("/detail/{id}")
-    public BaseReturnDto<InterfaceCalledDetail> interfaceDetail(@PathVariable Long id){
+    public Mono<BaseReturnDto<InterfaceCalledDetail>> interfaceDetail(@PathVariable Long id){
         InterfaceCalledDetail vo = ipOrderService.interfaceDetail(id);
-        return BaseReturnDto.success(vo);
+        return Mono.just(BaseReturnDto.success(vo));
     }
 
 
@@ -57,8 +58,8 @@ public class IpInterfaceCallbackController {
      */
     @Operation(summary = "查询接口回调记录")
     @GetMapping("/callback/history/{id}")
-    public BaseReturnDto<List<CallbackHistoryVO>> queryList(@PathVariable long id){
+    public Mono<BaseReturnDto<List<CallbackHistoryVO>>> queryList(@PathVariable long id){
         List<CallbackHistoryVO> list = ipOrderService.callbackHistory(id);
-        return BaseReturnDto.success(list);
+        return Mono.just(BaseReturnDto.success(list));
     }
 }

src/main/java/com/hr/controller/IpInterfaceController.java

@@ -19,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.web.bind.annotation.*;
+import reactor.core.publisher.Mono;
 
 import java.util.List;
 
@@ -44,9 +45,9 @@ public class IpInterfaceController {
      */
     @Operation(summary = "分页查询")
     @GetMapping("/list")
-    public BasePageResult<IpInterfaceVO> paginQuery(IpInterfaceParam ipInterfaceParam){
+    public Mono<BasePageResult<IpInterfaceVO>> paginQuery(IpInterfaceParam ipInterfaceParam){
         BasePageResult<IpInterfaceVO> ipAccountPOS = ipInterfaceService.paginQuery(ipInterfaceParam, ipInterfaceParam.getPageNum(), ipInterfaceParam.getPageSize());
-        return ipAccountPOS;
+        return Mono.just(ipAccountPOS);
     }
     
     /** 
@@ -57,13 +58,13 @@ public class IpInterfaceController {
      */
     @Operation(summary = "新增/更新数据")
     @PostMapping("/saveOrUpdate")
-    public BaseReturnDto<IpAccountVO> saveOrUpdate(@RequestBody IpInterfaceParam ipInterfaceParam){
+    public Mono<BaseReturnDto<IpAccountVO>> saveOrUpdate(@RequestBody IpInterfaceParam ipInterfaceParam){
         LoginUser user= TokenUtil.getUser();
         if(user==null || user.getUserid()==null || user.getUserid()==0L){
             throw new RuntimeException("没有找到用户信息");
         }
         ipInterfaceService.saveOrUpdate(ipInterfaceParam,user.getUsername(),user.getUserid());
-        return BaseReturnDto.success();
+        return Mono.just(BaseReturnDto.success());
     }
 
     /** 
@@ -74,9 +75,9 @@ public class IpInterfaceController {
      */
     @Operation(summary = "通过主键删除数据")
     @DeleteMapping("/delete/{id}")
-    public BaseReturnDto<Boolean> deleteById(@PathVariable Long id){
+    public Mono<BaseReturnDto<Boolean>> deleteById(@PathVariable Long id){
         LoginUser user = TokenUtil.getUser();
-        return BaseReturnDto.success(ipInterfaceService.deleteById(id,user));
+        return Mono.just(BaseReturnDto.success(ipInterfaceService.deleteById(id,user)));
     }
 
     /**
@@ -86,8 +87,8 @@ public class IpInterfaceController {
      */
     @Operation(summary = "修改状态")
     @PostMapping("/switchStatus")
-    public BaseReturnDto<Boolean> switchStatus(@RequestBody SwitchStatusParam switchStatusParam){
-        return BaseReturnDto.success(ipInterfaceService.switchStatus(switchStatusParam));
+    public Mono<BaseReturnDto<Boolean>> switchStatus(@RequestBody SwitchStatusParam switchStatusParam){
+        return Mono.just(BaseReturnDto.success(ipInterfaceService.switchStatus(switchStatusParam)));
     }
 
 
@@ -97,8 +98,8 @@ public class IpInterfaceController {
      */
     @Operation(summary = "接口下拉列表")
     @PostMapping("/optionList")
-    public BaseReturnDto<List<NameValueVO>> optionList(){
-        return BaseReturnDto.success(ipInterfaceService.optionList());
+    public Mono<BaseReturnDto<List<NameValueVO>>> optionList(){
+        return Mono.just(BaseReturnDto.success(ipInterfaceService.optionList()));
     }
 
     /**
@@ -106,10 +107,10 @@ public class IpInterfaceController {
      */
     @Operation(summary = "账号配置接口")
     @PostMapping("/interfaceConfig")
-    public BaseReturnDto interfaceConfig(@RequestBody InterfaceConfigParam param){
+    public Mono<BaseReturnDto> interfaceConfig(@RequestBody InterfaceConfigParam param){
         LoginUser user = TokenUtil.getUser();
         ipTokenInterfaceService.interfaceConfig(param,user);
-        return BaseReturnDto.success();
+        return Mono.just(BaseReturnDto.success());
     }
 
 
@@ -118,13 +119,13 @@ public class IpInterfaceController {
      */
     @Operation(summary = "生成 token")
     @PostMapping("/token/generate")
-    public BaseReturnDto<SecretVO> generateToken(){
+    public Mono<BaseReturnDto<SecretVO>> generateToken(){
         SecretVO vo = new SecretVO();
         String secret = RandomStringUtils.random(64, "0123456789abcdef");
         String token = RandomStringUtils.random(32, "0123456789abcdef");
         vo.setToken(token);
         vo.setSecret(secret);
-        return BaseReturnDto.success(vo);
+        return Mono.just(BaseReturnDto.success(vo));
     }
 
 
@@ -133,10 +134,10 @@ public class IpInterfaceController {
      */
     @Operation(summary = "删除账号关联的接口")
     @DeleteMapping("/delAccountInterface/{id}")
-    public BaseReturnDto delAccountInterface(@PathVariable Long id){
+    public Mono<BaseReturnDto> delAccountInterface(@PathVariable Long id){
         LoginUser user = TokenUtil.getUser();
         ipTokenInterfaceService.delAccountInterface(id,user);
-        return BaseReturnDto.success();
+        return Mono.just(BaseReturnDto.success());
     }
 
     /**
@@ -144,9 +145,9 @@ public class IpInterfaceController {
      */
     @Operation(summary = "查询账号下关联的接口列表")
     @PostMapping("/account/ref/list")
-    public BasePageResult<AccountInterfaceVO> accountInterfaceList(@RequestBody AccountInterfaceParam pageParam){
+    public Mono<BasePageResult<AccountInterfaceVO>> accountInterfaceList(@RequestBody AccountInterfaceParam pageParam){
         BasePageResult<AccountInterfaceVO> result = ipTokenInterfaceService.accountInterfaceList(pageParam);
-        return result;
+        return Mono.just(result);
     }
 
     /**
@@ -156,7 +157,7 @@ public class IpInterfaceController {
      */
     @Operation(summary = "修改状态")
     @PostMapping("/account/interface/ref/switchStatus")
-    public BaseReturnDto<Boolean> accountInterfaceRefSwitch(@RequestBody SwitchStatusParam switchStatusParam){
-        return BaseReturnDto.success(ipTokenInterfaceService.switchStatus(switchStatusParam));
+    public Mono<BaseReturnDto<Boolean>> accountInterfaceRefSwitch(@RequestBody SwitchStatusParam switchStatusParam){
+        return Mono.just(BaseReturnDto.success(ipTokenInterfaceService.switchStatus(switchStatusParam)));
     }
 }

src/main/java/com/hr/controller/TestCallBackController.java

@@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import reactor.core.publisher.Mono;
 
 @RestController
 @RequestMapping("/callback")
@@ -15,12 +16,12 @@ public class TestCallBackController {
     private BizHandlerFactory bizHandlerFactory;
 
     @RequestMapping("/test")
-    public Boolean test(@RequestBody JSONObject json) {
+    public Mono<Boolean> test(@RequestBody JSONObject json) {
         // 根据序列号查询到对应的业务id
         String businessNo = "aabbccddee";
         String interfaceNo = "aiwen";
         Boolean result = bizHandlerFactory.doCallBack(interfaceNo,businessNo,json);
-        return result;
+        return Mono.just(result);
 
     }