Merge remote-tracking branch 'origin/master'

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java

@@ -1,7 +1,12 @@
 package cn.estsh.i3plus.core.apiservice.controller;
 
 import cn.estsh.i3plus.icloud.core.sdk.ICoreDemoCloud;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.BaseModelBean;
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
+import cn.estsh.i3plus.pojo.platform.bean.SysRole;
+import cn.estsh.i3plus.pojo.platform.bean.SysUser;
 import cn.estsh.impp.framework.boot.util.ResultBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -10,6 +15,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Map;
+
 @RestController
 @RequestMapping("/cloud")
 @Api(description="分布式服务测试")
@@ -36,12 +43,12 @@ public class DemoCloudController {
             LOGGER.error("XXXX --> post调用出错：" + e.getMessage(),e);
         }
         try {
-            iCoreDemoCloud.testPut("testPut = " + test);
+            iCoreDemoCloud.testPut("testPut = " + test,"name");
         }catch (Exception e){
             LOGGER.error("XXXX --> testPut调用出错：" + e.getMessage(),e);
         }
         try {
-            iCoreDemoCloud.testDelete("delete = " + test);
+            iCoreDemoCloud.testDelete(new Pager(),"delete = " + test);
         }catch (Exception e){
             LOGGER.error("XXXX --> delete调用出错：" + e.getMessage(),e);
         }
@@ -64,24 +71,54 @@ public class DemoCloudController {
         return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
     }
 
-    @PostMapping(value="/test-put")
+    @PutMapping(value="/test-put")
     @ApiOperation(value="put接受数据",notes = "put接受数据")
-    public ResultBean testPut(String test) {
-        LOGGER.info("【put接受数据】{}", test);
+    public ResultBean testPut(String test,String name) {
+        LOGGER.info("【put接受数据】param1:{},param2:{}", test,name);
         return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
     }
 
     @DeleteMapping(value="/test-delete")
     @ApiOperation(value="delete接受数据",notes = "delete接受数据")
-    public ResultBean testDelete(String test) {
-        LOGGER.info("【delete接受数据】{}",test);
+    public ResultBean testDelete(
+            @RequestBody Pager pager,
+            @RequestParam("test") String test) {
+        LOGGER.info("【delete接受数据】pager:{},test:{}",pager,test);
         return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
     }
 
     @PutMapping(value="/test-cloud-put")
     @ApiOperation(value="测试cloudput",notes = "测试cloudput")
-    public ResultBean putTestCloud(String test) {
-        LOGGER.info("【put--->{}",test);
+    public ResultBean putTestCloud(String test,String name) {
+        LOGGER.info("【put接受数据】test:{},name:{}",test,name);
         return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
     }
+
+    @PostMapping(value="/test-object")
+    @ApiOperation(value="测试单对象")
+    public ResultBean testObject(@RequestBody Pager pager) {
+        LOGGER.info("【object接受数据】{}" ,pager);
+        return ResultBean.success("返回：" + pager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+    }
+
+    @PostMapping(value="/test-map")
+    @ApiOperation(value="测试get",notes = "测试get")
+    public ResultBean testFeignMap(@RequestBody Map<String,String> map) {
+        LOGGER.info("【map接受数据】{}" ,map);
+        return ResultBean.success("返回：" + map).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+    }
+
+    @PostMapping(value="/test-arr")
+    @ApiOperation(value="测试arr",notes = "测试arr")
+    public ResultBean testFeignArr(@RequestBody String[] arr) {
+        LOGGER.info("【arr接受数据】{}" ,arr);
+        return ResultBean.success("返回：" + arr).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+    }
+
+    @PostMapping(value="/test-more-object")
+    @ApiOperation(value="测试多对象模型",notes = "测试多对象模型")
+    public ResultBean testFeignMoreObj(@RequestBody BaseModelBean<SysRole> roleBean) {
+        LOGGER.info("【more-obj接受多对象模型】objBean:{},pager:{}" ,roleBean.getObj(),roleBean.getPager());
+        return ResultBean.success("返回：" + roleBean).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+    }
 }