diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ResiUserBadgeDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ResiUserBadgeDTO.java index 45aebb9263..09417f15f4 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ResiUserBadgeDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/ResiUserBadgeDTO.java @@ -101,5 +101,7 @@ public class ResiUserBadgeDTO implements Serializable { public ResiUserBadgeDTO() { this.delFlag = "0"; this.revision = 0; + this.createdBy = "APP_USER"; + this.updatedBy = "APP_USER"; } } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBadgeController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBadgeController.java index 3cfab36c41..6346deb0e4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBadgeController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBadgeController.java @@ -116,8 +116,8 @@ public class UserBadgeController { * @date 2020/11/18 下午3:03 */ @PostMapping("initbadge") - public Result initPartyMemberBadge(@RequestParam(required = false) String userId) { - userBadgeService.initPartyMemberBadge(userId); + public Result initPartyMemberBadge(@RequestParam(required = false) String userId,@LoginUser TokenDto tokenDto) { + userBadgeService.initPartyMemberBadge(userId,tokenDto); return new Result(); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBadgeService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBadgeService.java index 08147de433..a8c7e7b0f9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBadgeService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBadgeService.java @@ -105,5 +105,5 @@ public interface UserBadgeService { * @author zxc * @date 2020/11/18 下午3:03 */ - void initPartyMemberBadge(String userId); + void initPartyMemberBadge(String userId,TokenDto tokenDto); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java index ce39a81ebc..a3e956ff5c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java @@ -134,7 +134,7 @@ public class UserBadgeServiceImpl implements UserBadgeService { * @date 2020/11/18 下午3:04 */ @Override - public void initPartyMemberBadge(String userId){ + public void initPartyMemberBadge(String userId,TokenDto tokenDto){ List userIds = resiUserBadgeDao.selectUserIds(); List badges = new ArrayList<>(); String partyBadgeId = badgeDao.getPartyBadgeId(null); @@ -159,6 +159,7 @@ public class UserBadgeServiceImpl implements UserBadgeService { dto.setCustomerId(u.getCustomerId()); dto.setGridId(u.getRegisteredGridId()); dto.setIsOpened(NumConstant.ZERO); + dto.setUserId(u.getUserId()); badges.add(dto); }); resiUserBadgeDao.insertResiUserBadge(badges); @@ -183,6 +184,9 @@ public class UserBadgeServiceImpl implements UserBadgeService { dto.setCustomerId(u.getCustomerId()); dto.setGridId(u.getRegisteredGridId()); dto.setIsOpened(NumConstant.ZERO); + dto.setUserId(u.getUserId()); + dto.setCreatedBy(tokenDto.getUserId()); + dto.setUpdatedBy(tokenDto.getUserId()); badges.add(dto); }); } @@ -194,6 +198,9 @@ public class UserBadgeServiceImpl implements UserBadgeService { dto.setCustomerId(u.getCustomerId()); dto.setGridId(u.getRegisteredGridId()); dto.setIsOpened(NumConstant.ZERO); + dto.setUserId(u.getUserId()); + dto.setCreatedBy(tokenDto.getUserId()); + dto.setUpdatedBy(tokenDto.getUserId()); badges.add(dto); }); } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/ResiUserBadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/ResiUserBadgeDao.xml index 5aee896f18..d67b6d08d0 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/ResiUserBadgeDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/ResiUserBadgeDao.xml @@ -17,7 +17,9 @@ DEL_FLAG, REVISION, CREATED_TIME, - UPDATED_TIME + CREATED_BY, + UPDATED_TIME, + UPDATED_BY ) VALUES @@ -32,7 +34,9 @@ #{b.delFlag}, #{b.revision}, NOW(), - NOW() + #{b.createdBy}, + NOW(), + #{b.updatedBy} )