From 38da05d8d1198501c9c9d2f37e6710cb82d1ce4f Mon Sep 17 00:00:00 2001 From: ck <851316342@qq.com> Date: Tue, 1 Dec 2020 10:19:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=87=AA=E5=A2=9Eid=E6=94=B9?= =?UTF-8?q?=E6=88=90uuid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/AwardRecordController.java | 13 +++++++------ .../template/mapper/UsersMapper.java | 19 ------------------- .../jingcheng/template/model/AwardRecord.java | 2 +- .../com/jingcheng/template/model/Users.java | 2 ++ .../template/service/AwardRecordService.java | 6 +++--- .../service/impl/AwardRecordServiceImpl.java | 16 +++++++++++----- .../service/impl/UsersServiceImpl.java | 10 ++++++---- 7 files changed, 30 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/jingcheng/template/controller/AwardRecordController.java b/src/main/java/com/jingcheng/template/controller/AwardRecordController.java index 3beaf60..d41a783 100644 --- a/src/main/java/com/jingcheng/template/controller/AwardRecordController.java +++ b/src/main/java/com/jingcheng/template/controller/AwardRecordController.java @@ -5,6 +5,7 @@ import com.jingcheng.template.model.AwardRecord; import com.jingcheng.template.service.AwardRecordService; import com.jingcheng.template.util.AjaxRequest; import com.jingcheng.template.util.AjaxResult; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.RequestBody; @@ -25,8 +26,8 @@ public class AwardRecordController extends BaseController { - List getUsersByConditions(@Param(value = "isCertificate")Integer isCertificate - ,@Param(value = "roleId")Integer roleId - ,@Param(value = "groupsId")Integer groupsId - ,@Param(value = "trainingId")Integer trainingId - ,@Param(value = "joinStartTime")String joinStartTime - ,@Param(value = "joinEndTime")String joinEndTime - ,@Param(value = "param")String param); - - List getExportUsersByConditions(@Param(value = "isCertificate")Integer isCertificate - , @Param(value = "roleId")Integer roleId - , @Param(value = "groupsId")Integer groupsId - , @Param(value = "trainingId")Integer trainingId - , @Param(value = "joinStartTime")String joinStartTime - , @Param(value = "joinEndTime")String joinEndTime - , @Param(value = "param")String param); - List superAdminGetUsersList(@Param(value = "groupsId")Long groupsId - , @Param(value = "name")String name); - - List getbanUsers(@Param(value = "groupsId")Long groupsId); } diff --git a/src/main/java/com/jingcheng/template/model/AwardRecord.java b/src/main/java/com/jingcheng/template/model/AwardRecord.java index bda5bd8..ef1cf22 100644 --- a/src/main/java/com/jingcheng/template/model/AwardRecord.java +++ b/src/main/java/com/jingcheng/template/model/AwardRecord.java @@ -13,7 +13,7 @@ public class AwardRecord extends BaseEntity{ */ private Integer awardType; - private Long userId; + private String userId; private String source; diff --git a/src/main/java/com/jingcheng/template/model/Users.java b/src/main/java/com/jingcheng/template/model/Users.java index 5e53463..8ffb056 100644 --- a/src/main/java/com/jingcheng/template/model/Users.java +++ b/src/main/java/com/jingcheng/template/model/Users.java @@ -21,6 +21,8 @@ public class Users extends BaseEntity { private Integer sex; + private String userId; + private String userNo;//工号 private String password;//密码 diff --git a/src/main/java/com/jingcheng/template/service/AwardRecordService.java b/src/main/java/com/jingcheng/template/service/AwardRecordService.java index 09e998c..31b8669 100644 --- a/src/main/java/com/jingcheng/template/service/AwardRecordService.java +++ b/src/main/java/com/jingcheng/template/service/AwardRecordService.java @@ -12,7 +12,7 @@ public interface AwardRecordService extends BaseService extends BaseService extends BaseService awardRecordVoList = new ArrayList<>(); for (AwardRecord awardRecord:awardRecordList){ - Long userId = awardRecord.getUserId(); - Users users = usersMapper.selectByPrimaryKey(userId); + String userId = awardRecord.getUserId(); + Users findUsers = new Users(); + findUsers.setUserId(userId); + findUsers.setState(Constants.STATE_VALID); + Users users = usersMapper.selectOne(findUsers); + if (null == users){ + continue; + } AwardRecordVo awardRecordVo = new AwardRecordVo(); awardRecordVo.setOpenId(users.getOpenId()); if ( 0 == awardRecord.getAwardType()){ @@ -254,7 +260,7 @@ public class AwardRecordServiceImpl extends BaseServiceImpl implem findUsers.setOpenId(openId); findUsers.setState(Constants.STATE_VALID); Users users = usersMapper.selectOne(findUsers); - Long usersId ; + String usersId ; if (null == users){ Users newUsers = new Users(); newUsers.setOpenId(openId); newUsers.setNickName(nickName); newUsers.setHeadImgUrl(headimgurl); + newUsers.setUserId(UUID.randomUUID().toString()); newUsers.setSex(sex); newUsers.setState(Constants.STATE_VALID); newUsers.setCreateDateTime(new Date()); newUsers.setUpdateDateTime(new Date()); usersMapper.insert(newUsers); - usersId = newUsers.getId(); + usersId = newUsers.getUserId(); }else { users.setNickName(nickName); users.setUpdateDateTime(new Date()); users.setSex(sex); users.setHeadImgUrl(headimgurl); usersMapper.updateByPrimaryKeySelective(users); - usersId = users.getId(); + usersId = users.getUserId(); } JSONObject userJson = new JSONObject(); - userJson.put("id",usersId); + userJson.put("usersId",usersId); userJson.put("openId",openId); userJson.put("subscribe",subscribe); userJson.put("nickname",nickName);