rongchao
/
epmet-cloud-rizhao
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

找回@LoginUser

dev
yinzuomei 5 years ago
parent
6ecf864936
commit
02ab6e9e62
19 changed files with 83 additions and 60 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      epmet-auth/src/main/java/com/epmet/controller/LoginController.java
  2. 2
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/GovTokenDto.java
  3. 2
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/CpUserDetailRedis.java
  4. 13
      epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java
  5. 5
      epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java
  6. 5
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/controller/ResiCommentController.java
  7. 21
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
  8. 7
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/GroupInvitationController.java
  9. 20
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java
  10. 22
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
  11. 3
      epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java
  12. 3
      epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/UserGuideController.java
  13. 3
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java
  14. 5
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/controller/UserMessageController.java
  15. 9
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/partymember/controller/PartyMemberController.java
  16. 7
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java
  17. 5
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedController.java
  18. 5
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/OperUserController.java
  19. 3
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java

3
epmet-auth/src/main/java/com/epmet/controller/LoginController.java
View File

@ -1,5 +1,6 @@
package com.epmet.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.exception.ErrorCode;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
@ -92,7 +93,7 @@ public class LoginController {
* @Date 2020/3/18 22:43
**/
@PostMapping(value = "logout")
public Result logout(TokenDto tokenDto, HttpServletRequest request) {
public Result logout(@LoginUser TokenDto tokenDto, HttpServletRequest request) {
//String token = request.getParameter(Constant.TOKEN_HEADER);
return loginService.logoutByToken(tokenDto);
}

2
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/dto/GovTokenDto.java
View File

@ -25,7 +25,7 @@ public class GovTokenDto implements Serializable {
/**
* 用户ID
*/
private String staffId;
private String userId;
/**
* sessionKey

2
epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/CpUserDetailRedis.java
View File

@ -105,7 +105,7 @@ public class CpUserDetailRedis {
if (user == null) {
return;
}
String key = RedisKeys.getCpUserKey(user.getApp(), user.getClient(), user.getStaffId());
String key = RedisKeys.getCpUserKey(user.getApp(), user.getClient(), user.getUserId());
//bean to map
Map<String, Object> map = BeanUtil.beanToMap(user, false, true);
redisUtils.hMSet(key, map, expire);

13
epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java
View File

@ -1,5 +1,6 @@
package com.epmet.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.exception.ErrorCode;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
@ -57,7 +58,7 @@ public class OperMenuController {
}
@PostMapping
public Result save(@RequestBody OperMenuDTO dto, TokenDto tokenDto){
public Result save(@RequestBody OperMenuDTO dto, @LoginUser TokenDto tokenDto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
operMenuService.save(dto,tokenDto);
@ -65,7 +66,7 @@ public class OperMenuController {
}
@PutMapping
public Result update(@RequestBody OperMenuDTO dto, TokenDto tokenDto){
public Result update(@RequestBody OperMenuDTO dto, @LoginUser TokenDto tokenDto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
operMenuService.update(dto,tokenDto);
@ -81,7 +82,7 @@ public class OperMenuController {
}
@DeleteMapping("{id}")
public Result delete(@PathVariable("id") String id, TokenDto tokenDto){
public Result delete(@PathVariable("id") String id, @LoginUser TokenDto tokenDto){
//效验数据
AssertUtils.isNull(id, "id");
@ -120,7 +121,7 @@ public class OperMenuController {
* @return List<OperMenuDTO>
*/
@GetMapping("nav")
public Result<List<OperMenuDTO>> nav(TokenDto tokenDto){
public Result<List<OperMenuDTO>> nav(@LoginUser TokenDto tokenDto){
List<OperMenuDTO> list = operMenuService.getUserMenuNavList(tokenDto);
return new Result<List<OperMenuDTO>>().ok(list);
}
@ -131,7 +132,7 @@ public class OperMenuController {
* @return Set<String>
*/
@GetMapping("permissions")
public Result<Set<String>> permissions(TokenDto tokenDto){
public Result<Set<String>> permissions(@LoginUser TokenDto tokenDto){
Set<String> set = operMenuService.getUserPermissions(tokenDto);
return new Result<Set<String>>().ok(set);
}
@ -142,7 +143,7 @@ public class OperMenuController {
* @return
*/
@GetMapping("select")
public Result<List<OperMenuDTO>> select(TokenDto tokenDto){
public Result<List<OperMenuDTO>> select(@LoginUser TokenDto tokenDto){
List<OperMenuDTO> list = operMenuService.getUserMenuList(tokenDto, null);
return new Result<List<OperMenuDTO>>().ok(list);

5
epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java
View File

@ -18,6 +18,7 @@
package com.epmet.controller;
import com.alibaba.fastjson.JSON;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ExcelUtils;
@ -25,8 +26,8 @@ import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.CustomerDTO;
import com.epmet.dto.result.ValidCustomerResultDTO;
import com.epmet.excel.CustomerExcel;
@ -132,7 +133,7 @@ public class CustomerController {
* @Date 2020/3/11 21:58
**/
@GetMapping("getvalidcustomerlist")
public Result<List<ValidCustomerResultDTO>> getValidCustomerList(TokenDto tokenDTO) {
public Result<List<ValidCustomerResultDTO>> getValidCustomerList(@LoginUser TokenDto tokenDTO) {
logger.info("getvalidcustomerlist:"+ JSON.toJSONString(tokenDTO));
return customerService.getValidCustomerList();
}

5
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/controller/ResiCommentController.java
View File

@ -1,5 +1,6 @@
package com.epmet.modules.comment.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
@ -37,7 +38,7 @@ public class ResiCommentController {
* @Date 2020.04.01 18:06
**/
@PostMapping("commenttopic")
public Result commentTopic(TokenDto tokenDto, @RequestBody ResiPublishCommentFormDTO publishCommentFormDTO){
public Result commentTopic(@LoginUser TokenDto tokenDto, @RequestBody ResiPublishCommentFormDTO publishCommentFormDTO){
ValidatorUtils.validateEntity(publishCommentFormDTO);
return commentService.commentTopic(tokenDto,publishCommentFormDTO);
}
@ -51,7 +52,7 @@ public class ResiCommentController {
* @Date 2020.04.01 23:49
**/
@PostMapping("getcommentlistoftopic")
public Result<List<ResiCommentResultDTO>> getCommentListOfTopic(TokenDto tokenDto, @RequestBody ResiQueryCommentFormDTO queryCommentFormDTO){
public Result<List<ResiCommentResultDTO>> getCommentListOfTopic(@LoginUser TokenDto tokenDto, @RequestBody ResiQueryCommentFormDTO queryCommentFormDTO){
ValidatorUtils.validateEntity(queryCommentFormDTO);
return commentService.getCommentList(tokenDto,queryCommentFormDTO);
}

21
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
View File

@ -17,6 +17,7 @@
package com.epmet.modules.group.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.exception.RenException;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
@ -63,7 +64,7 @@ public class ResiGroupController {
* @Date 2020/3/28 20:36
**/
@PostMapping("getmygroup")
public Result<List<MyGroupResultDTO>> getMyGroup(TokenDto tokenDto, @RequestBody MyGroupFormDTO myGroupFormDTO) {
public Result<List<MyGroupResultDTO>> getMyGroup(@LoginUser TokenDto tokenDto, @RequestBody MyGroupFormDTO myGroupFormDTO) {
myGroupFormDTO.setUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(myGroupFormDTO);
return resiGroupService.getMyGroup(myGroupFormDTO);
@ -78,7 +79,7 @@ public class ResiGroupController {
* @Date 2020/3/28 19:52
**/
@PostMapping("getrecommendgroup")
public Result<List<RecommendGroupResultDTO>> getRecommendGroup(TokenDto tokenDto,
public Result<List<RecommendGroupResultDTO>> getRecommendGroup(@LoginUser TokenDto tokenDto,
@RequestBody RecommendGroupFormDTO recommendGroupFormDTO) {
recommendGroupFormDTO.setUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(recommendGroupFormDTO);
@ -94,7 +95,7 @@ public class ResiGroupController {
* @Date 2020/3/28 21:59
**/
@PostMapping("getcreated")
public Result<List<CreatedResultDTO>> getCreated(TokenDto tokenDto,
public Result<List<CreatedResultDTO>> getCreated(@LoginUser TokenDto tokenDto,
@RequestBody CreatedFormDTO createdFormDTO) {
createdFormDTO.setUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(createdFormDTO);
@ -110,7 +111,7 @@ public class ResiGroupController {
* @Date 2020/3/28 22:20
**/
@PostMapping("modifygroup")
public Result modifyGroup(TokenDto tokenDto, @RequestBody ModifyGroupFormDTO modifyGroupFormDTO) {
public Result modifyGroup(@LoginUser TokenDto tokenDto, @RequestBody ModifyGroupFormDTO modifyGroupFormDTO) {
modifyGroupFormDTO.setUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(modifyGroupFormDTO);
return resiGroupService.modifyGroup(modifyGroupFormDTO);
@ -125,7 +126,7 @@ public class ResiGroupController {
* @Date 2020/3/29 17:32
**/
@PostMapping("getgroupsummarize")
public Result<GroupSummarizeResultDTO> getGroupSummarize(TokenDto tokenDto,
public Result<GroupSummarizeResultDTO> getGroupSummarize(@LoginUser TokenDto tokenDto,
@RequestBody GroupSummarizeFormDTO groupSummarizeFormDTO) {
groupSummarizeFormDTO.setUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(groupSummarizeFormDTO);
@ -141,7 +142,7 @@ public class ResiGroupController {
* @Date 2020/3/29 19:26
**/
@PostMapping("applycreategroup")
public Result applyCreateGroup(TokenDto tokenDto,
public Result applyCreateGroup(@LoginUser TokenDto tokenDto,
@RequestBody ApplyCreateGroupFormDTO applyCreateGroupFormDTO) {
applyCreateGroupFormDTO.setUserId(tokenDto.getUserId());
applyCreateGroupFormDTO.setApp(tokenDto.getApp());
@ -158,7 +159,7 @@ public class ResiGroupController {
* @Date 2020/3/30 10:11
**/
@PostMapping("initapplygroup")
public Result initApplyGroup(TokenDto tokenDto,
public Result initApplyGroup(@LoginUser TokenDto tokenDto,
@RequestBody InitApplyGroupFormDTO initApplyGroupFormDTO) {
if (null == tokenDto) {
logger.error(ModuleConstant.USER_NOT_NULL);
@ -178,7 +179,7 @@ public class ResiGroupController {
* @Date 2020/3/30 15:44
**/
@PostMapping("initapplycreategroup")
public Result initApplyCreatedGroup(TokenDto tokenDto,
public Result initApplyCreatedGroup(@LoginUser TokenDto tokenDto,
@RequestBody InitApplyCreatedGroupFormDTO initApplyCreatedGroupFormDTO) {
if (null == tokenDto) {
logger.error(ModuleConstant.USER_NOT_NULL);
@ -198,7 +199,7 @@ public class ResiGroupController {
* @Date 2020/3/31 12:31
**/
@PostMapping("agreeapplygroup")
public Result agreeApplyGroup(TokenDto tokenDto, @RequestBody AgreeApplyGroupFormDTO agreeApplyGroupFormDTO) {
public Result agreeApplyGroup(@LoginUser TokenDto tokenDto, @RequestBody AgreeApplyGroupFormDTO agreeApplyGroupFormDTO) {
agreeApplyGroupFormDTO.setUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(agreeApplyGroupFormDTO);
return resiGroupService.agreeApplyGroup(agreeApplyGroupFormDTO);
@ -213,7 +214,7 @@ public class ResiGroupController {
* @Date 2020/3/31 13:23
**/
@PostMapping("disagreeapplygroup")
public Result disagreeApplyGroup(TokenDto tokenDto, @RequestBody DisAgreeApplyGroupFormDTO disAgreeApplyGroupFormDTO) {
public Result disagreeApplyGroup(@LoginUser TokenDto tokenDto, @RequestBody DisAgreeApplyGroupFormDTO disAgreeApplyGroupFormDTO) {
disAgreeApplyGroupFormDTO.setUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(disAgreeApplyGroupFormDTO);
return resiGroupService.disagreeApplyGroup(disAgreeApplyGroupFormDTO);

7
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/GroupInvitationController.java
View File

@ -17,6 +17,7 @@
package com.epmet.modules.invitation.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
@ -55,7 +56,7 @@ public class GroupInvitationController {
* @Date 2020/3/31 22:50
**/
@PostMapping("creategroupinvitation")
public Result<CreateGroupInvitationResultDTO> createGroupInvitation(TokenDto tokenDto,
public Result<CreateGroupInvitationResultDTO> createGroupInvitation(@LoginUser TokenDto tokenDto,
@RequestBody CreateGroupInvitationFormDTO formDTO) {
formDTO.setUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(formDTO);
@ -70,7 +71,7 @@ public class GroupInvitationController {
* @Date 2020/3/31 23:11
**/
@PostMapping("getlinkgroupinfo")
public Result<LinkGroupInfoResultDTO> getLinkGroupInfo(TokenDto tokenDto,
public Result<LinkGroupInfoResultDTO> getLinkGroupInfo(@LoginUser TokenDto tokenDto,
@RequestBody LinkGroupInfoFormDTO formDTO) {
formDTO.setUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(formDTO);
@ -86,7 +87,7 @@ public class GroupInvitationController {
* @Date 2020/3/31 23:47
**/
@PostMapping("acceptinvitation")
public Result accetInvitation(TokenDto tokenDto,
public Result accetInvitation(@LoginUser TokenDto tokenDto,
@RequestBody AccetInvitationFormDTO formDTO) {
formDTO.setUserId(tokenDto.getUserId());
formDTO.setApp(tokenDto.getApp());

20
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java
View File

@ -17,6 +17,7 @@
package com.epmet.modules.member.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
@ -25,7 +26,10 @@ import com.epmet.resi.group.dto.member.form.*;
import com.epmet.resi.group.dto.member.result.ApplyingMemberResultDTO;
import com.epmet.resi.group.dto.member.result.GroupMemberListResultDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@ -51,7 +55,7 @@ public class ResiGroupMemberController {
* @Date 2020/3/29 20:01
**/
@PostMapping("applyjoingroup")
public Result applyJoinGroup(TokenDto tokenDto,
public Result applyJoinGroup(@LoginUser TokenDto tokenDto,
@RequestBody ApplyJoinGroupFormDTO applyJoinGroupFormDTO) {
applyJoinGroupFormDTO.setUserId(tokenDto.getUserId());
applyJoinGroupFormDTO.setApp(tokenDto.getApp());
@ -68,7 +72,7 @@ public class ResiGroupMemberController {
* @Date 2020/3/30 21:14
**/
@PostMapping("getgroupmember")
public Result<List<GroupMemberListResultDTO>> getGroupMemberList(TokenDto tokenDto,
public Result<List<GroupMemberListResultDTO>> getGroupMemberList(@LoginUser TokenDto tokenDto,
@RequestBody GroupMemberListFormDTO groupMemberListFormDTO) {
ValidatorUtils.validateEntity(groupMemberListFormDTO);
return resiGroupMemberService.getGroupMemberList(groupMemberListFormDTO);
@ -83,7 +87,7 @@ public class ResiGroupMemberController {
* @Date 2020/3/30 21:37
**/
@PostMapping("getapplyingmember")
public Result<List<ApplyingMemberResultDTO>> getApplyingMember(TokenDto tokenDto,
public Result<List<ApplyingMemberResultDTO>> getApplyingMember(@LoginUser TokenDto tokenDto,
@RequestBody ApplyingMemberFormDTO applyingMemberFormDTO) {
ValidatorUtils.validateEntity(applyingMemberFormDTO);
return resiGroupMemberService.getApplyingMember(applyingMemberFormDTO);
@ -98,7 +102,7 @@ public class ResiGroupMemberController {
* @Date 2020/3/30 22:07
**/
@PostMapping("agreeapply")
public Result agreeApply(TokenDto tokenDto,
public Result agreeApply(@LoginUser TokenDto tokenDto,
@RequestBody AgreeApplyFormDTO agreeApplyFormDTO) {
agreeApplyFormDTO.setUserId(tokenDto.getUserId());
agreeApplyFormDTO.setApp(tokenDto.getApp());
@ -115,7 +119,7 @@ public class ResiGroupMemberController {
* @Date 2020/3/30 22:07
**/
@PostMapping("disagreeapply")
public Result disAgreeApply(TokenDto tokenDto,
public Result disAgreeApply(@LoginUser TokenDto tokenDto,
@RequestBody DisagreeApplyFormDTO disagreeApplyFormDTO) {
disagreeApplyFormDTO.setUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(disagreeApplyFormDTO);
@ -127,7 +131,7 @@ public class ResiGroupMemberController {
* @Description 楼院小组--删除组成员
**/
@PostMapping("removemember")
public Result removeMember(TokenDto tokenDto, @RequestBody RemoveMemberFormDTO removeMemberFormDTO) {
public Result removeMember(@LoginUser TokenDto tokenDto, @RequestBody RemoveMemberFormDTO removeMemberFormDTO) {
removeMemberFormDTO.setUserId(tokenDto.getUserId());
removeMemberFormDTO.setApp(tokenDto.getApp());
ValidatorUtils.validateEntity(removeMemberFormDTO);
@ -142,7 +146,7 @@ public class ResiGroupMemberController {
* @Description 楼院小组--禁言组员
**/
@PostMapping("slientmember")
public Result slientMember(TokenDto tokenDto, @RequestBody SlientMemberFormDTO slientMemberFormDTO) {
public Result slientMember(@LoginUser TokenDto tokenDto, @RequestBody SlientMemberFormDTO slientMemberFormDTO) {
slientMemberFormDTO.setUserId(tokenDto.getUserId());
slientMemberFormDTO.setApp(tokenDto.getApp());
ValidatorUtils.validateEntity(slientMemberFormDTO);

22
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
View File

@ -1,5 +1,6 @@
package com.epmet.modules.topic.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
@ -8,7 +9,10 @@ import com.epmet.resi.group.dto.topic.form.*;
import com.epmet.resi.group.dto.topic.result.ResiTopicDetailResultDTO;
import com.epmet.resi.group.dto.topic.result.ResiTopicInfoResultDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@ -35,7 +39,7 @@ public class ResiTopicController {
* @Date 2020.03.31 13:15
**/
@PostMapping("createtopic")
public Result createTopic(TokenDto tokenDto, @RequestBody ResiTopicPublishFormDTO topicPublishFormDTO){
public Result createTopic(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicPublishFormDTO topicPublishFormDTO){
ValidatorUtils.validateEntity(topicPublishFormDTO);
return topicService.createTopic(tokenDto,topicPublishFormDTO);
@ -50,7 +54,7 @@ public class ResiTopicController {
* @Date 2020.04.01 23:48
**/
@PostMapping("gettopicdetail")
public Result<ResiTopicDetailResultDTO> getTopicDetail(TokenDto tokenDto, @RequestBody ResiTopicDetailFormDTO topicDetailFormDTO ){
public Result<ResiTopicDetailResultDTO> getTopicDetail(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicDetailFormDTO topicDetailFormDTO ){
ValidatorUtils.validateEntity(topicDetailFormDTO);
return topicService.getTopicDetail(tokenDto,topicDetailFormDTO.getTopicId());
}
@ -64,7 +68,7 @@ public class ResiTopicController {
* @Date 2020.04.01 10:36
**/
@PostMapping("getpasttopiclist")
public Result<List<ResiTopicInfoResultDTO>> getPastTopicList(TokenDto tokenDto, @RequestBody ResiTopicPageFormDTO topicPageFormDTO){
public Result<List<ResiTopicInfoResultDTO>> getPastTopicList(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicPageFormDTO topicPageFormDTO){
ValidatorUtils.validateEntity(topicPageFormDTO);
return topicService.getPastTopicList(tokenDto,topicPageFormDTO);
}
@ -78,7 +82,7 @@ public class ResiTopicController {
* @Date 2020.04.02 00:01
**/
@PostMapping("getlatesttopics")
Result<List<ResiTopicInfoResultDTO>> getLatestTopics(TokenDto tokenDto, @RequestBody ResiTopicDefaultPageFormDTO topicDefaultPageFormDTO){
Result<List<ResiTopicInfoResultDTO>> getLatestTopics(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicDefaultPageFormDTO topicDefaultPageFormDTO){
ValidatorUtils.validateEntity(topicDefaultPageFormDTO);
return topicService.getLatestTopics(tokenDto,topicDefaultPageFormDTO.getGroupId());
}
@ -92,7 +96,7 @@ public class ResiTopicController {
* @Date 2020.04.01 12:38
**/
@RequestMapping("hidetopic")
Result hideTopic(TokenDto tokenDto, @RequestBody ResiTopicOperationFormDTO hiddenFormDTO){
Result hideTopic(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicOperationFormDTO hiddenFormDTO){
ValidatorUtils.validateEntity(hiddenFormDTO);
return topicService.hideTopic(tokenDto,hiddenFormDTO);
}
@ -106,7 +110,7 @@ public class ResiTopicController {
* @Date 2020.04.01 16:45
**/
@PostMapping("gethiddentopic")
Result<List<ResiTopicInfoResultDTO>> getHiddenTopic(TokenDto tokenDto, @RequestBody ResiTopicPageFormDTO topicPageFormDTO){
Result<List<ResiTopicInfoResultDTO>> getHiddenTopic(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicPageFormDTO topicPageFormDTO){
ValidatorUtils.validateEntity(topicPageFormDTO);
return topicService.getHiddenTopics(tokenDto,topicPageFormDTO);
}
@ -120,7 +124,7 @@ public class ResiTopicController {
* @Date 2020.04.01 14:17
**/
@PostMapping("cancelhiddentopics")
Result cancelHiddenTopics(TokenDto tokenDto, @RequestBody ResiTopicCancelHiddenFormDTO cancelHiddenFormDTO){
Result cancelHiddenTopics(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicCancelHiddenFormDTO cancelHiddenFormDTO){
return topicService.cancelHiddenTopics(tokenDto,cancelHiddenFormDTO.getTopicIds());
}
@ -133,7 +137,7 @@ public class ResiTopicController {
* @Date 2020.04.01 15:37
**/
@PostMapping("closetopic")
Result closeTopic(TokenDto tokenDto, @RequestBody ResiTopicOperationFormDTO closeFormDTO){
Result closeTopic(@LoginUser TokenDto tokenDto, @RequestBody ResiTopicOperationFormDTO closeFormDTO){
ValidatorUtils.validateEntity(closeFormDTO);
return topicService.closeTopic(tokenDto,closeFormDTO);
}

3
epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/StrangerResiGuideController.java
View File

@ -17,6 +17,7 @@
package com.epmet.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
@ -53,7 +54,7 @@ public class StrangerResiGuideController {
* @Date 2020/3/16
**/
@PostMapping("getgridhome")
public Result<HomeDesignByCustomerResultDTO> getGridHome( TokenDto tokenDTO, @RequestBody StrangerFormDTO strangerFormDTO) throws Exception {
public Result<HomeDesignByCustomerResultDTO> getGridHome(@LoginUser TokenDto tokenDTO, @RequestBody StrangerFormDTO strangerFormDTO) throws Exception {
return strangerAccessRecordService.getGridHome(tokenDTO, strangerFormDTO);
}

3
epmet-module/resi-guide/resi-guide-server/src/main/java/com/epmet/controller/UserGuideController.java
View File

@ -1,5 +1,6 @@
package com.epmet.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
@ -26,7 +27,7 @@ public class UserGuideController {
private UserAccessService userAccessService;
@PostMapping("entergrid")
Result<UserInfoOnEnterGridResultDTO> enterGrid(TokenDto token, @RequestBody UserEnterGridFormDTO userEnterGridFormDTO){
Result<UserInfoOnEnterGridResultDTO> enterGrid(@LoginUser TokenDto token, @RequestBody UserEnterGridFormDTO userEnterGridFormDTO){
ValidatorUtils.validateEntity(userEnterGridFormDTO);

3
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java
View File

@ -1,5 +1,6 @@
package com.epmet.modules.grid.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.result.LatestGridInfoResultDTO;
@ -28,7 +29,7 @@ public class ResiMineGridController {
* @Date 2020/3/24 11:10
**/
@GetMapping("getlatestgridinfo")
public Result<LatestGridInfoResultDTO> getLatestGridInfo(TokenDto tokenDto){
public Result<LatestGridInfoResultDTO> getLatestGridInfo(@LoginUser TokenDto tokenDto){
return resiMineGridService.getLatestGridInfo(tokenDto);
}
}

5
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/message/controller/UserMessageController.java
View File

@ -1,5 +1,6 @@
package com.epmet.modules.message.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
@ -34,7 +35,7 @@ public class UserMessageController {
* @Date 2020/3/29 20:53
**/
@PostMapping("getmymessage")
public Result<List<UserMessageDTO>> getMyMessage(TokenDto tokenDto,
public Result<List<UserMessageDTO>> getMyMessage(@LoginUser TokenDto tokenDto,
@RequestBody MymessageFormDTO mymessageFormDTO) {
mymessageFormDTO.setUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(mymessageFormDTO);
@ -63,7 +64,7 @@ public class UserMessageController {
* @Date 2020/3/29 21:06
**/
@PostMapping("readallmsg")
public Result readAllMessage(TokenDto tokenDto, @RequestBody UserMessageDTO userMessageDTO) {
public Result readAllMessage(@LoginUser TokenDto tokenDto, @RequestBody UserMessageDTO userMessageDTO) {
//逻辑待实现
return userMessageService.readAllMessage(tokenDto, userMessageDTO);
}

9
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/partymember/controller/PartyMemberController.java
View File

@ -1,5 +1,6 @@
package com.epmet.modules.partymember.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.modules.partymember.service.PartyMemberService;
@ -33,7 +34,7 @@ public class PartyMemberController {
* @return Result<PartyMemberInitResultDto>
*/
@PostMapping("init")
public Result<PartyMemberInitResultDTO> init(TokenDto tokenDto, @RequestBody PartyMemberInitFromDTO fromDto) {
public Result<PartyMemberInitResultDTO> init(@LoginUser TokenDto tokenDto, @RequestBody PartyMemberInitFromDTO fromDto) {
fromDto.setUserId(tokenDto.getUserId());
return partyMemberService.init(fromDto);
}
@ -46,7 +47,7 @@ public class PartyMemberController {
* @date 2020/3/30 13:50
*/
@PostMapping("getverificationcode")
public Result getVerificationCode(TokenDto tokenDto, @RequestBody VerificationCodeFromDTO fromDto) {
public Result getVerificationCode(@LoginUser TokenDto tokenDto, @RequestBody VerificationCodeFromDTO fromDto) {
return partyMemberService.getVerificationCode(tokenDto, fromDto);
}
@ -58,7 +59,7 @@ public class PartyMemberController {
* @date 2020/3/30 13:50
*/
@PostMapping("submit")
public Result submit(TokenDto tokenDto, @RequestBody PartyMemberSubmitFromDTO fromDto) {
public Result submit(@LoginUser TokenDto tokenDto, @RequestBody PartyMemberSubmitFromDTO fromDto) {
return partyMemberService.submit(tokenDto, fromDto);
}
@ -70,7 +71,7 @@ public class PartyMemberController {
* @date 2020/3/30 13:50
*/
@PostMapping("extra")
public Result partyMemberInfoExtra(TokenDto tokenDto, @RequestBody PartyMemberSubmitFromDTO fromDto) {
public Result partyMemberInfoExtra(@LoginUser TokenDto tokenDto, @RequestBody PartyMemberSubmitFromDTO fromDto) {
return partyMemberService.partyMemberInfoExtra(tokenDto, fromDto);
}
}

7
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java
View File

@ -1,5 +1,6 @@
package com.epmet.modules.resiregister.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
@ -33,7 +34,7 @@ public class ResiRegisterController {
* @Date 2020/3/30
**/
@PostMapping("init")
public Result<ResiRegisterResultDTO> init(TokenDto tokenDTO, @RequestBody ResiRegisterFormDTO resiRegisterFormDTO) {
public Result<ResiRegisterResultDTO> init(@LoginUser TokenDto tokenDTO, @RequestBody ResiRegisterFormDTO resiRegisterFormDTO) {
ValidatorUtils.validateEntity(resiRegisterFormDTO);
return resiRegisterService.init(tokenDTO, resiRegisterFormDTO);
}
@ -44,7 +45,7 @@ public class ResiRegisterController {
* @Description 居民端-居民注册信息提交
**/
@PostMapping("submit")
public Result submit(TokenDto tokenDTO, @RequestBody ResiInfoSubmitFormDTO resiInfoSubmitFormDTO) {
public Result submit(@LoginUser TokenDto tokenDTO, @RequestBody ResiInfoSubmitFormDTO resiInfoSubmitFormDTO) {
ValidatorUtils.validateEntity(resiInfoSubmitFormDTO);
return resiRegisterService.submit(tokenDTO, resiInfoSubmitFormDTO);
}
@ -55,7 +56,7 @@ public class ResiRegisterController {
* @Description 居民端-居民注册根据手机号获取验证码
**/
@PostMapping("getverificationcode")
public Result getVerificationCode(TokenDto tokenDTO, @RequestBody VerificationCodeFormDTO formDTO) {
public Result getVerificationCode(@LoginUser TokenDto tokenDTO, @RequestBody VerificationCodeFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO);
return resiRegisterService.getVerificationCode(tokenDTO, formDTO);
}

5
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedController.java
View File

@ -1,5 +1,6 @@
package com.epmet.modules.warmhearted.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
@ -30,7 +31,7 @@ public class ResiWarmheartedController {
* @Description 居民端-热心居民申请页面初始化-查询有无申请、新增访问行为记录数据
**/
@PostMapping("init")
public Result<ResiWarmheartedResultDTO> init(TokenDto tokenDTO, @RequestBody ResiWarmheartedFormDTO resiWarmheartedFormDTO) {
public Result<ResiWarmheartedResultDTO> init(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmheartedFormDTO resiWarmheartedFormDTO) {
ValidatorUtils.validateEntity(resiWarmheartedFormDTO);
return resiWarmheartedService.init(tokenDTO, resiWarmheartedFormDTO);
}
@ -41,7 +42,7 @@ public class ResiWarmheartedController {
* @Description 居民端-热心居民申请-提交申请数据
**/
@PostMapping("submit")
public Result submit(TokenDto tokenDTO, @RequestBody ResiWarmheartedSubmitFormDTO formDTO) {
public Result submit(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmheartedSubmitFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO);
return resiWarmheartedService.submit(tokenDTO, formDTO);
}

5
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/OperUserController.java
View File

@ -17,6 +17,7 @@
package com.epmet.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ConvertUtils;
@ -25,8 +26,8 @@ import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.OperUserDTO;
import com.epmet.dto.result.QueryOperUserResultDto;
import com.epmet.excel.OperUserExcel;
@ -108,7 +109,7 @@ public class OperUserController {
* @author zhaoqifeng
*/
@GetMapping("queryOperUserDto")
public Result<QueryOperUserResultDto> queryOperUserDto(TokenDto tokenDto) {
public Result<QueryOperUserResultDto> queryOperUserDto(@LoginUser TokenDto tokenDto) {
OperUserDTO data = operUserService.getOperUserInfoById(tokenDto.getUserId());
QueryOperUserResultDto dto = ConvertUtils.sourceToTarget(data, QueryOperUserResultDto.class);
return new Result<QueryOperUserResultDto>().ok(dto);

3
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java
View File

@ -1,5 +1,6 @@
package com.epmet.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
@ -79,7 +80,7 @@ public class UserController {
* @Description 居民端个人信息-同步用户微信信息
**/
@PostMapping("updatewxuserinfo")
public Result updateWxUserInfo(TokenDto tokenDTO, @RequestBody WxUserInfoFormDTO wxUserInfoFormDTO) {
public Result updateWxUserInfo(@LoginUser TokenDto tokenDTO, @RequestBody WxUserInfoFormDTO wxUserInfoFormDTO) {
wxUserInfoFormDTO.setUserId(tokenDTO.getUserId());
ValidatorUtils.validateEntity(wxUserInfoFormDTO);
return userService.updateWxUserInfo(wxUserInfoFormDTO);

Write Preview
Loading…
Cancel
Save