Merge remote-tracking branch 'origin/dev' into test

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

@@ -3,6 +3,8 @@ package cn.estsh.i3plus.core.apiservice.controller.base;
 import cn.estsh.i3plus.core.api.iservice.base.ISynchronizedService;
 import cn.estsh.i3plus.core.api.iservice.base.ISystemInitService;
 import cn.estsh.i3plus.core.api.iservice.busi.*;
+import cn.estsh.i3plus.core.apiservice.controller.busi.PersonnelController;
+import cn.estsh.i3plus.core.apiservice.controller.busi.SysUserInfoController;
 import cn.estsh.i3plus.core.apiservice.util.SysUserPasswordUtil;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
@@ -57,6 +59,12 @@ public class WhiteController extends CoreBaseController {
     public static final Logger LOGGER = LoggerFactory.getLogger(WhiteController.class);
 
     @Autowired
+    private PersonnelController personnelController;
+
+    @Autowired
+    private SysUserInfoController sysUserInfoController;
+
+    @Autowired
     private ISysLocaleLanguageService sysLocaleLanguageService;
 
     @Autowired
@@ -658,4 +666,49 @@ public class WhiteController extends CoreBaseController {
     public void sendTestMq(String paramStr) {
         rabbitTemplate.convertAndSend(PlatformConstWords.QUEUE_IMPP_DEMO, paramStr);
     }
+
+    /********************************************SWEB所需接口*******************************************/
+    /**
+     * 添加用户信息
+     * @param model 用户信息
+     * @return 处理结果
+     */
+    @PostMapping(value = "/user/insert")
+    @ApiOperation(value = "添加用户信息", notes = "返回内容添加用户信息")
+    public ResultBean insertUserDetailModel(@RequestBody UserDetailModel model) {
+        return personnelController.insertUserDetailModel(model);
+    }
+
+    /**
+     * 修改用户信息
+     * @param model 用户信息
+     * @return 处理结果
+     */
+    @PutMapping(value = "/user/update")
+    @ApiOperation(value = "修改用户信息", notes = "返回内容添加用户信息")
+    public ResultBean updateUserDetailModel(@RequestBody UserDetailModel model) {
+        return personnelController.updateUserDetailModel(model);
+    }
+
+    /**
+     * 删除用户信息
+     * @param id 用户id
+     * @return 处理结果
+     */
+    @DeleteMapping(value = "/user/delete/{id}")
+    @ApiOperation(value = "删除用户信息", notes = "根据用户信息id删除信息")
+    public ResultBean deleteSysUserInfo(@PathVariable("id") String id) {
+        return personnelController.deleteSysUserInfo(id);
+    }
+
+    /**
+     * 查询用户信息
+     * @param cloudPagerModel 查询条件
+     * @return 处理结果
+     */
+    @PostMapping(value="/user/query")
+    @ApiOperation(value="查询用户信息",notes="复杂查询用户信息带分页")
+    public ResultBean querySysUserInfo(@RequestBody CloudPagerModel<SysUserInfo> cloudPagerModel) {
+        return sysUserInfoController.querySysUserInfo(cloudPagerModel.getObj(), cloudPagerModel.getPager());
+    }
 }