完善andon查询用户的接口

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java

@@ -433,4 +433,15 @@ public interface ISysUserService {
      */
     @ApiOperation(value = "获取批量账号信息", notes = "查询用户信息-批量根据登录名称查询")
     List<SysUser> findSysUserByLoginName(List<String> userLoginNamegenList);
+
+
+    /**
+     * 根据用户名或者登录名分页查询
+     * @param userLoginName
+     * @param userName
+     * @param pager
+     * @return
+     */
+    @ApiOperation(value = "获取批量账号信息", notes = "查询用户信息-批量根据登录名称查询")
+    ListPager<SysUser> findSysUserByName(String userLoginName,String userName ,Pager pager);
 }

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

@@ -873,6 +873,10 @@ public class WhiteController extends CoreBaseController {
             ValidatorBean.checkNotNull(newPwd, "新密码不能为空");
             ValidatorBean.checkNotNull(loginName, "用户名不能为空");
 
+            if (password.equals(newPwd)){
+                return ResultBean.fail("新旧密码不能相同");
+            }
+
             userPasswordService.updatePasswordWizoutSession(loginName, password, newPwd.trim());
             return ResultBean.success("修改密码成功，请重新登陆").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException busExcep) {
@@ -1330,4 +1334,19 @@ public class WhiteController extends CoreBaseController {
         }
         return userInfo.get();
     }
+
+    @GetMapping(value = "/query-user-by-name")
+    @ApiOperation(value = "根据用户名或登录名查询")
+    public ResultBean queryUserByName(String userLoginName,String userName ,Pager pager) {
+        try {
+            if (ObjectUtils.isEmpty(pager)) {
+                pager = Pager.defaultPager();
+            }
+            return ResultBean.success("操作成功").setListPager(sysUserService.findSysUserByName(userLoginName,userName,pager)).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
 }

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

@@ -354,6 +354,10 @@ public class SysUserController extends CoreBaseController {
             ValidatorBean.checkNotNull(password, "旧密码不能为空");
             ValidatorBean.checkNotNull(newPwd, "新密码不能为空");
 
+            if (password.equals(newPwd)){
+                return ResultBean.fail("新旧密码不能一样");
+            }
+
             userPasswordService.updatePassword(sessionUser.getUser().getId(), password, newPwd.trim());
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException busExcep) {
@@ -909,4 +913,19 @@ public class SysUserController extends CoreBaseController {
         }
     }
 
+    @GetMapping(value = "/query-user-by-name")
+    @ApiOperation(value = "根据用户名或登录名查询")
+    public ResultBean queryUserByName(String userLoginName,String userName ,Pager pager) {
+        try {
+            if (ObjectUtils.isEmpty(pager)) {
+                pager = Pager.defaultPager();
+            }
+            return ResultBean.success("操作成功").setListPager(sysUserService.findSysUserByName(userLoginName,userName,pager)).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java

@@ -1061,6 +1061,15 @@ public class SysUserService implements ISysUserService {
         return userRDao.findByHqlWhere(ddlPackBean);
     }
 
+    @Override
+    public ListPager<SysUser> findSysUserByName(String userLoginName, String userName, Pager pager) {
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+        DdlPreparedPack.getStringRightLikerPack(userLoginName,"userLoginName",ddlPackBean);
+        DdlPreparedPack.getStringRightLikerPack(userName,"userName",ddlPackBean);
+        pager = PagerHelper.getPager(pager, userRDao.findByHqlWhereCount(ddlPackBean));
+        return new ListPager(userRDao.findByHqlWherePage(ddlPackBean, pager), pager);
+    }
+
 
     /**
      * 账号数据排序

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/SysUserPasswordUtil.java

@@ -639,11 +639,9 @@ public class SysUserPasswordUtil {
             }
         } catch (ImppBusiException e) {
 //            throw e;
-            e.printStackTrace();
             return ResultBean.fail(e);
         } catch (Exception e) {
             LOGGER.error("长时间未登录处理异常，异常信息：{}", e.getMessage());
-            e.printStackTrace();
             return ResultBean.fail(e);
         }
         return ResultBean.success();
@@ -668,7 +666,6 @@ public class SysUserPasswordUtil {
             return ResultBean.fail(e);
         } catch (Exception e) {
             LOGGER.error("首次登录验证出错，异常信息：{}", e.getMessage());
-            e.printStackTrace();
             return ResultBean.fail(e);
         }
         return ResultBean.success();