From 6fadbb070d85f6e9157d04aea88b66ae6a823396 Mon Sep 17 00:00:00 2001 From: panshuling321 Date: Wed, 6 Apr 2022 16:08:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=8D=A1=E7=AE=A1=E7=90=86=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=86=BB=E7=BB=93=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XhpcCardClientUserController.java | 2 +- .../com/xhpc/card/domain/CardClientUser.java | 5 ++++ .../impl/XhpcCardClientUserServiceImpl.java | 8 ++--- .../src/main/resources/bootstrap.yml | 4 +-- .../mapper/IXhpcCardClientUsersMapper.xml | 30 ++++++++++++++----- 5 files changed, 34 insertions(+), 15 deletions(-) diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcCardClientUserController.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcCardClientUserController.java index 5978cff9..b8fcf2c8 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcCardClientUserController.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcCardClientUserController.java @@ -68,7 +68,7 @@ public class XhpcCardClientUserController extends BaseController { * 修改状态 */ @GetMapping("/getXhpcCardClientUserStatus") - public AjaxResult getXhpcCardClientUserStatus(Integer usersID,Integer status) { + public AjaxResult getXhpcCardClientUserStatus(@RequestParam("usersID") Integer usersID,@RequestParam("status") Integer status) { return xhpcCardClientUserService.getXhpcCardClientUserStatus(usersID,status); } diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/CardClientUser.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/CardClientUser.java index 1b82686e..2bcfe609 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/CardClientUser.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/CardClientUser.java @@ -62,4 +62,9 @@ public class CardClientUser { *逻辑删除字段（0，存在，1为删除） */ private Integer delFlag; + + /** + * 状态（0-正常，1-冻结） + */ + private Integer status; } diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardClientUserServiceImpl.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardClientUserServiceImpl.java index e3efe0df..f2175a1a 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardClientUserServiceImpl.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardClientUserServiceImpl.java @@ -65,12 +65,12 @@ public class XhpcCardClientUserServiceImpl extends BaseService implements IXhpcC } if(cardClientUser.getUsersID()==null){ Map xhpcCardClientUserById = xhpcCardClientUserMapper.getXhpcCardClientUserById(1,null, cardClientUser.getUsersName()); - if(xhpcCardClientUserById !=null &&( false ==(boolean)xhpcCardClientUserById.get("delFlag") || "0".equals(xhpcCardClientUserById.get("delFlag").toString()))){ + if(xhpcCardClientUserById !=null &&"0".equals(xhpcCardClientUserById.get("delFlag").toString())){ return AjaxResult.error("用户名称已存在"); } }else{ Map xhpcCardClientUserById = xhpcCardClientUserMapper.getXhpcCardClientUserById(1,cardClientUser.getUsersID(), cardClientUser.getUsersName()); - if(xhpcCardClientUserById !=null &&( false ==(boolean)xhpcCardClientUserById.get("delFlag") || "0".equals(xhpcCardClientUserById.get("delFlag").toString()))){ + if(xhpcCardClientUserById !=null && "0".equals(xhpcCardClientUserById.get("delFlag").toString())){ return AjaxResult.error("用户名称已存在"); } } @@ -136,12 +136,12 @@ public class XhpcCardClientUserServiceImpl extends BaseService implements IXhpcC public AjaxResult getXhpcCardClientUserStatus(Integer usersID, Integer status) { CardClientUser cardClientUser =new CardClientUser(); cardClientUser.setUsersID(usersID); - cardClientUser.setDelFlag(status); + cardClientUser.setStatus(status); int i = xhpcCardClientUserMapper.updateXhpcCardClientUser(cardClientUser); if(i==0){ return AjaxResult.error("状态改变失败"); }else{ - return AjaxResult.error("状态改变成功"); + return AjaxResult.success("状态改变成功"); } } } diff --git a/xhpc-modules/xhpc-card/src/main/resources/bootstrap.yml b/xhpc-modules/xhpc-card/src/main/resources/bootstrap.yml index eee92898..f1df16d1 100644 --- a/xhpc-modules/xhpc-card/src/main/resources/bootstrap.yml +++ b/xhpc-modules/xhpc-card/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 172.31.183.135:8848 + server-addr: 127.0.0.1:8848 config: # 配置中心地址 - server-addr: 172.31.183.135:8848 + server-addr: 127.0.0.1:8848 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/xhpc-modules/xhpc-card/src/main/resources/mapper/IXhpcCardClientUsersMapper.xml b/xhpc-modules/xhpc-card/src/main/resources/mapper/IXhpcCardClientUsersMapper.xml index f9673239..409bc3d7 100644 --- a/xhpc-modules/xhpc-card/src/main/resources/mapper/IXhpcCardClientUsersMapper.xml +++ b/xhpc-modules/xhpc-card/src/main/resources/mapper/IXhpcCardClientUsersMapper.xml @@ -26,7 +26,8 @@ ope.name as operatorName, ope.corp_no as corpNo, ccu.tenant_id as tenantId, - ccu.usersTime as usersTime + ccu.usersTime as usersTime, + ccu.status as status from t_iccard_client_users ccu join xhpc_operator ope on ope.corp_no = ccu.corpNo where ccu.del_flag=0 @@ -60,6 +61,9 @@ usersPhone, + + usersEmail, + usersAdress, @@ -75,7 +79,7 @@ corpName, - usersTime, + usersTime, status, tenant_id @@ -90,6 +94,9 @@ #{usersPhone}, + + #{usersEmail}, + #{usersAdress}, @@ -105,7 +112,7 @@ #{corpNameand}, - sysdate(), + sysdate(), 0, #{tenantId} @@ -123,18 +130,19 @@ select ccu.usersID as usersID, ccu.usersName as usersName, - ccu.usersName as usersPhone, - ccu.usersName as usersEmail, - ccu.usersName as usersAdress, + ccu.usersPwd as usersPwd, + ccu.usersPhone as usersPhone, + ccu.usersEmail as usersEmail, + ccu.usersAdress as usersAdress, ccu.usersLevel as usersLevel, ope.name as operatorName, ope.corp_no as corpNo, ccu.tenant_id as tenantId, - ccu.del_flag as delFlag, + concat(ccu.del_flag, "") as delFlag, ccu.usersTime as usersTime from t_iccard_client_users ccu join xhpc_operator ope on ope.corp_no = ccu.corpNo - where 1=1 + where ccu.status=0 and ccu.usersID=#{usersID} @@ -162,6 +170,9 @@ usersPhone= #{usersPhone}, + + usersEmail = #{usersEmail}, + usersAdress=#{usersAdress}, @@ -180,6 +191,9 @@ usersTime=#{usersTime}, + + status=#{status}, + tenant_id= #{tenantId}