diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java index 4677442fef..1e647cad6d 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java @@ -13,11 +13,30 @@ public class PartyActSignFormDTO implements Serializable { /** * 活动Id */ - @NotBlank(message = "活动Id不能为空",groups = {AddGroup.class}) + @NotBlank(message = "活动Id不能为空",groups = {UpdateGroup.class}) private String icPartyActId; + /** + * 签到地点 + */ + @NotBlank(message = "签到地点不能为空",groups = {AddGroup.class}) + private String address; + /** + * 签到地点纬度 + */ + @NotBlank(message = "签到地点纬度不能为空",groups = {AddGroup.class}) + private String latitude; + /** + * 签到地点经度 + */ + @NotBlank(message = "签到地点经度不能为空",groups = {AddGroup.class}) + private String longitude; private Integer pageNo = 1; private Integer pageSize = 20; private Boolean isPage = false; + //token中信息 + private String customerId; + private String userId; + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java index de93f1d2c3..9a4b16fda7 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java @@ -36,7 +36,7 @@ public class IcPartyActSignInRecordController { @RequestMapping("list") public Result> list(@RequestBody PartyActSignFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO, AddGroup.class); + ValidatorUtils.validateEntity(formDTO, UpdateGroup.class); return new Result>().ok(icPartyActSignInRecordService.list(formDTO)); } @@ -71,5 +71,14 @@ public class IcPartyActSignInRecordController { icPartyActSignInRecordService.delete(ids); return new Result(); } + + @PostMapping("sign") + public Result sign(@LoginUser TokenDto tokenDto, @RequestBody PartyActSignFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, AddGroup.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + icPartyActSignInRecordService.sign(formDTO); + return new Result(); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java index 413be5fd54..bb1f91a727 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java @@ -72,4 +72,6 @@ public interface IcPartyActSignInRecordService extends BaseService implements IcPartyActSignInRecordService { + @Autowired + private EpmetUserOpenFeignClient epmetUserOpenFeignClient; @Override @@ -96,4 +105,22 @@ public class IcPartyActSignInRecordServiceImpl extends BaseServiceImpl result = epmetUserOpenFeignClient.customerUserDetail(user); + if (!result.success() && null == result.getData()) { + throw new RenException("获取当前登录人居民信息失败"); + } + //保存签到记录数据 + IcPartyActSignInRecordEntity entity = ConvertUtils.sourceToTarget(formDTO, IcPartyActSignInRecordEntity.class); + entity.setEpmetUserId(formDTO.getUserId()); + entity.setIdCard(result.getData().getIdNum()); + entity.setUserRealName(result.getData().getName()); + insert(entity); + } + } \ No newline at end of file