From bdd97893748c625b7d77ac9979b95d538c961a41 Mon Sep 17 00:00:00 2001 From: wen <1455474577@qq.com> Date: Thu, 24 Feb 2022 18:19:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=8D=A1=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E7=AB=AF=E7=94=A8=E6=88=B7=E5=A2=9E=E5=88=A0=E6=94=B9=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=8C=E6=9F=A5=E6=9A=82=E6=97=B6=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=B2=A1=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../card/controller/XhpcCardController.java | 54 +++++ .../domain/queryClientUsersCondition.java | 21 ++ .../card/mapper/TIccardClientUsersMapper.java | 31 +++ .../xhpc/card/pojo/TIccardClientUsers.java | 80 ++++++++ .../xhpc/card/service/IXhpcCardService.java | 37 ++++ .../service/impl/XhpcCardServiceImpl.java | 33 +++ .../mapper/TIccardClientUsersMapper.xml | 190 ++++++++++++++++++ 7 files changed, 446 insertions(+) create mode 100644 xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/queryClientUsersCondition.java create mode 100644 xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/TIccardClientUsersMapper.java create mode 100644 xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/TIccardClientUsers.java create mode 100644 xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardClientUsersMapper.xml diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcCardController.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcCardController.java index 3723390d..fa1d6acc 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcCardController.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/controller/XhpcCardController.java @@ -1,6 +1,7 @@ package com.xhpc.card.controller; import com.xhpc.card.domain.*; +import com.xhpc.card.pojo.TIccardClientUsers; import com.xhpc.card.service.IXhpcCardService; import com.xhpc.common.core.domain.R; import com.xhpc.common.core.web.controller.BaseController; @@ -201,5 +202,58 @@ public class XhpcCardController extends BaseController { return xhpcCardService.removeBinding(cardRecordId); } + /** + * Query client users + * + * @author WH + * @date 2022/2/16 10:10 + * @since version-1.0 + */ + @GetMapping("/card/client/user") + public R queryClientUsers(queryClientUsersCondition queryCondition) { + + return xhpcCardService.queryClientUsers(queryCondition); + } + + /** + * add a client user + * + * @author WH + * @date 2022/2/24 17:36 + * @since version-1.0 + */ + @PostMapping("/card/client/user") + public R addClientUser(@RequestBody TIccardClientUsers userInfo) { + + return xhpcCardService.addClientUser(userInfo); + } + + + /** + * update client user info + * + * @author WH + * @date 2022/2/24 17:20 + * @since version-1.0 + */ + @PatchMapping("/card/client/user") + public R updateClientUserInfo(@RequestBody TIccardClientUsers userInfo) { + + return xhpcCardService.updateClientUser(userInfo); + } + + /** + * update client user info + * + * @author WH + * @date 2022/2/24 17:36 + * @since version-1.0 + */ + @DeleteMapping("/card/client/user") + public R deleteClientUser(Integer userId) { + + return xhpcCardService.deleteClientUser(userId); + } + } diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/queryClientUsersCondition.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/queryClientUsersCondition.java new file mode 100644 index 00000000..4be51e6c --- /dev/null +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/queryClientUsersCondition.java @@ -0,0 +1,21 @@ +package com.xhpc.card.domain; + +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 条件集合 + * + * @author WH + * @date 2022/2/24 18:15 + * @since version-1.0 + */ +@Data +@NoArgsConstructor +public class queryClientUsersCondition { + + private Long currentPage; + private Long items; + private String tenantId; + +} diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/TIccardClientUsersMapper.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/TIccardClientUsersMapper.java new file mode 100644 index 00000000..8dead67d --- /dev/null +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/mapper/TIccardClientUsersMapper.java @@ -0,0 +1,31 @@ +package com.xhpc.card.mapper; + +import com.xhpc.card.domain.queryClientUsersCondition; +import com.xhpc.card.pojo.TIccardClientUsers; + +import java.util.List; + +public interface TIccardClientUsersMapper { + + int deleteByPrimaryKey(Integer usersid); + + int insert(TIccardClientUsers record); + + int insertSelective(TIccardClientUsers record); + + TIccardClientUsers selectByPrimaryKey(Integer usersid); + + int updateByPrimaryKeySelective(TIccardClientUsers record); + + int updateByPrimaryKey(TIccardClientUsers record); + + /** + * query users by query condition + * + * @author WH + * @date 2022/2/24 18:11 + * @since version-1.0 + */ + List selectByCondition(queryClientUsersCondition queryCondition); + +} \ No newline at end of file diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/TIccardClientUsers.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/TIccardClientUsers.java new file mode 100644 index 00000000..65c33956 --- /dev/null +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/pojo/TIccardClientUsers.java @@ -0,0 +1,80 @@ +package com.xhpc.card.pojo; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * t_iccard_client_users + * + * @author + */ +@Data +public class TIccardClientUsers implements Serializable { + + private Integer usersid; + + /** + * 命名规则:字母数字组合 + */ + private String usersname; + + /** + * 用户密码 + */ + private String userspwd; + + /** + * 用户电话 + */ + private String usersphone; + + /** + * 用户Email + */ + private String usersemail; + + /** + * 用户地址 + */ + private String usersadress; + + /** + * 用户级别 3.运营商管理员 4.平台管理员 + */ + private Byte userslevel; + + /** + * 所属运营商id,对应xhpc_operator.operator_id + */ + private Integer userscorp; + + /** + * 所属运营商前缀 + */ + private String corpno; + + /** + * 所属运营商名称 + */ + private String corpname; + + /** + * 添加日期 + */ + private Date userstime; + + /** + * 租户id + */ + private String tenantId; + + /** + * 逻辑删除字段（0，存在，1为删除） + */ + private Integer delFlag; + + private static final long serialVersionUID = 1L; + +} \ No newline at end of file diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/IXhpcCardService.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/IXhpcCardService.java index 7093067c..f0c2bb11 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/IXhpcCardService.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/IXhpcCardService.java @@ -1,6 +1,7 @@ package com.xhpc.card.service; import com.xhpc.card.domain.*; +import com.xhpc.card.pojo.TIccardClientUsers; import com.xhpc.common.core.domain.R; import java.util.List; @@ -158,4 +159,40 @@ public interface IXhpcCardService { */ R removeBinding(Long cardRecordId); + /** + * add a client user info + * + * @author WH + * @date 2022/2/24 17:15 + * @since version-1.0 + */ + R addClientUser(TIccardClientUsers userInfo); + + /** + * update the client user info + * + * @author WH + * @date 2022/2/24 17:20 + * @since version-1.0 + */ + R updateClientUser(TIccardClientUsers userInfo); + + /** + * delete the client user by user id + * + * @author WH + * @date 2022/2/24 17:27 + * @since version-1.0 + */ + R deleteClientUser(Integer userInfo); + + /** + * query client users by query condition + * + * @author WH + * @date 2022/2/24 17:39 + * @since version-1.0 + */ + R queryClientUsers(queryClientUsersCondition queryCondition); + } diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java index 68a6daab..268186f2 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java @@ -53,6 +53,8 @@ public class XhpcCardServiceImpl implements IXhpcCardService { private TIccardLogMapper tIccardLogMapper; @Resource private XhpcRechargeOrderMapper xhpcRechargeOrderMapper; + @Resource + private TIccardClientUsersMapper tIccardClientUsersMapper; @Override public R cardStartup(String cardno, String serialNumber, String rateModelId) { @@ -658,6 +660,37 @@ public class XhpcCardServiceImpl implements IXhpcCardService { return R.ok(); } + @Override + public R addClientUser(TIccardClientUsers userInfo) { + + userInfo.setUsersid(null); + tIccardClientUsersMapper.insertSelective(userInfo); + return R.ok(); + } + + @Override + public R updateClientUser(TIccardClientUsers userInfo) { + + tIccardClientUsersMapper.updateByPrimaryKeySelective(userInfo); + return R.ok(); + } + + @Override + public R deleteClientUser(Integer userId) { + + TIccardClientUsers user = tIccardClientUsersMapper.selectByPrimaryKey(userId); + user.setDelFlag(1); + tIccardClientUsersMapper.updateByPrimaryKey(user); + return R.ok(); + } + + @Override + public R queryClientUsers(queryClientUsersCondition queryCondition) { + + List usersList = tIccardClientUsersMapper.selectByCondition(queryCondition); + return R.ok(usersList); + } + /** * 用于QueryRechargeRecord方法封装DTO数据 * diff --git a/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardClientUsersMapper.xml b/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardClientUsersMapper.xml new file mode 100644 index 00000000..31fad276 --- /dev/null +++ b/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardClientUsersMapper.xml @@ -0,0 +1,190 @@ + + + + + + + + + + + + + + + + + + + + + usersID + , usersName, usersPwd, usersPhone, usersEmail, usersAdress, usersLevel, usersCorp, + corpNo, corpName, usersTime, tenant_id, del_flag + + + + + delete + from t_iccard_client_users + where usersID = #{usersid,jdbcType=INTEGER} + + + insert into t_iccard_client_users (usersName, usersPwd, usersPhone, + usersEmail, usersAdress, usersLevel, + usersCorp, corpNo, corpName, + usersTime, tenant_id, del_flag) + values (#{usersname,jdbcType=VARCHAR}, #{userspwd,jdbcType=VARCHAR}, #{usersphone,jdbcType=VARCHAR}, + #{usersemail,jdbcType=VARCHAR}, #{usersadress,jdbcType=VARCHAR}, #{userslevel,jdbcType=TINYINT}, + #{userscorp,jdbcType=INTEGER}, #{corpno,jdbcType=VARCHAR}, #{corpname,jdbcType=VARCHAR}, + #{userstime,jdbcType=TIMESTAMP}, #{tenantId,jdbcType=VARCHAR}, #{delFlag,jdbcType=INTEGER}) + + + insert into t_iccard_client_users + + + usersName, + + + usersPwd, + + + usersPhone, + + + usersEmail, + + + usersAdress, + + + usersLevel, + + + usersCorp, + + + corpNo, + + + corpName, + + + usersTime, + + + tenant_id, + + + del_flag, + + + + + #{usersname,jdbcType=VARCHAR}, + + + #{userspwd,jdbcType=VARCHAR}, + + + #{usersphone,jdbcType=VARCHAR}, + + + #{usersemail,jdbcType=VARCHAR}, + + + #{usersadress,jdbcType=VARCHAR}, + + + #{userslevel,jdbcType=TINYINT}, + + + #{userscorp,jdbcType=INTEGER}, + + + #{corpno,jdbcType=VARCHAR}, + + + #{corpname,jdbcType=VARCHAR}, + + + #{userstime,jdbcType=TIMESTAMP}, + + + #{tenantId,jdbcType=VARCHAR}, + + + #{delFlag,jdbcType=INTEGER}, + + + + + update t_iccard_client_users + + + usersName = #{usersname,jdbcType=VARCHAR}, + + + usersPwd = #{userspwd,jdbcType=VARCHAR}, + + + usersPhone = #{usersphone,jdbcType=VARCHAR}, + + + usersEmail = #{usersemail,jdbcType=VARCHAR}, + + + usersAdress = #{usersadress,jdbcType=VARCHAR}, + + + usersLevel = #{userslevel,jdbcType=TINYINT}, + + + usersCorp = #{userscorp,jdbcType=INTEGER}, + + + corpNo = #{corpno,jdbcType=VARCHAR}, + + + corpName = #{corpname,jdbcType=VARCHAR}, + + + usersTime = #{userstime,jdbcType=TIMESTAMP}, + + + tenant_id = #{tenantId,jdbcType=VARCHAR}, + + + del_flag = #{delFlag,jdbcType=INTEGER}, + + + where usersID = #{usersid,jdbcType=INTEGER} + + + update t_iccard_client_users + set usersName = #{usersname,jdbcType=VARCHAR}, + usersPwd = #{userspwd,jdbcType=VARCHAR}, + usersPhone = #{usersphone,jdbcType=VARCHAR}, + usersEmail = #{usersemail,jdbcType=VARCHAR}, + usersAdress = #{usersadress,jdbcType=VARCHAR}, + usersLevel = #{userslevel,jdbcType=TINYINT}, + usersCorp = #{userscorp,jdbcType=INTEGER}, + corpNo = #{corpno,jdbcType=VARCHAR}, + corpName = #{corpname,jdbcType=VARCHAR}, + usersTime = #{userstime,jdbcType=TIMESTAMP}, + tenant_id = #{tenantId,jdbcType=VARCHAR}, + del_flag = #{delFlag,jdbcType=INTEGER} + where usersID = #{usersid,jdbcType=INTEGER} + + \ No newline at end of file