Merge branch 'test' into patch-dependency

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

@@ -8,6 +8,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysUserInfoService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysUserPasswordService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService;
 import cn.estsh.i3plus.core.apiservice.util.SysUserPasswordUtil;
+import cn.estsh.i3plus.icloud.core.sdk.ICoreSysUserCloud;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
 import cn.estsh.i3plus.platform.common.tool.EncryptTool;
@@ -17,6 +18,7 @@ import cn.estsh.i3plus.platform.common.tool.TimeTool;
 import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.platform.common.util.FileContentTypeTool;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
+import cn.estsh.i3plus.pojo.base.bean.BaseResultBean;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
@@ -43,13 +45,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.persistence.EntityManager;
@@ -107,6 +103,9 @@ public class SysUserController extends CoreBaseController {
     @Resource(name = CommonConstWords.IMPP_REDIS_CORE)
     protected ImppRedis redisCore;
 
+    @Resource
+    private ICoreSysUserCloud iCoreSysUserCloud;
+
     /**
      * 新增系统用户
      *
@@ -880,7 +879,7 @@ public class SysUserController extends CoreBaseController {
 
     @PostMapping(value = "/query-user-andonQueryUserModel")
     @ApiOperation(value = "根据andonQueryUserModel查询系统用户")
-    public ResultBean queryUserByAndonQueryUserModel(AndonQueryUserModel andonQueryUserModel) {
+    public ResultBean queryUserByAndonQueryUserModel(@RequestBody AndonQueryUserModel andonQueryUserModel) {
         try {
             ValidatorBean.checkNotNull(andonQueryUserModel);
             if (StringUtils.isBlank(andonQueryUserModel.getOrganizeCode())) {
@@ -927,4 +926,17 @@ public class SysUserController extends CoreBaseController {
         }
     }
 
+    @PostMapping(value = "/test/iCoreSysUserCloud")
+    @ApiOperation(value = "测试")
+    public ResultBean iCoreSysUserCloudTest(@RequestBody AndonQueryUserModel andonQueryUserModel) {
+        try {
+            BaseResultBean baseResult = iCoreSysUserCloud.queryUserByAndonQueryUserModel(andonQueryUserModel);
+            return ResultBean.success().setResultObject(baseResult);
+        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
 }