elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

冲突解决

dev_shibei_match
yinzuomei 4 years ago
parent
23d69798d4
commit
abdaf5aa90
2 changed files with 37 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 69
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
  2. 2
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java

69
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ResiEventController.java
View File

@ -43,34 +43,35 @@ import java.util.List;
@RestController @RestController
@RequestMapping("resievent") @RequestMapping("resievent")
public class ResiEventController { public class ResiEventController {
@Autowired @Autowired
private ResiEventService resiEventService; private ResiEventService resiEventService;
/** /**
* @Description 报事详情-两端通用 * @Description 报事详情-两端通用
* @Param formDTO * @Param formDTO
* @author zxc * @author zxc
* @date 2021/8/3 1:47 下午 * @date 2021/8/3 1:47 下午
*/ */
@PostMapping("eventdetail") @PostMapping("eventdetail")
public Result<EventDetailResultDTO> eventDetail(@LoginUser TokenDto tokenDto ,@RequestBody EventDetailFormDTO formDTO){ public Result<EventDetailResultDTO> eventDetail(@LoginUser TokenDto tokenDto, @RequestBody EventDetailFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO); ValidatorUtils.validateEntity(formDTO);
return new Result<EventDetailResultDTO>().ok(resiEventService.eventDetail(formDTO,tokenDto)); return new Result<EventDetailResultDTO>().ok(resiEventService.eventDetail(formDTO, tokenDto));
} }
/** /**
* 我要报事-提交（尹） * 我要报事-提交（尹）
* *
* @param formDTO * @param formDTO
* @return com.epmet.commons.tools.utils.Result * @return com.epmet.commons.tools.utils.Result
* @author yinzuomei * @author yinzuomei
* @date 2021/8/3 10:46 * @date 2021/8/3 10:46
*/ */
@PostMapping("report") @PostMapping("report")
public Result<ResiEventIdDTO> report(@LoginUser TokenDto tokenDto, @RequestBody ResiEventFormDTO formDTO){ public Result<ResiEventIdDTO> report(@LoginUser TokenDto tokenDto, @RequestBody ResiEventFormDTO formDTO) {
formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setCustomerId(tokenDto.getCustomerId());
formDTO.setUserId(tokenDto.getUserId()); formDTO.setUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(formDTO,ResiEventFormDTO.AddUserShowGroup.class,ResiEventFormDTO.AddUserInternalGroup.class); ValidatorUtils.validateEntity(formDTO, ResiEventFormDTO.AddUserShowGroup.class, ResiEventFormDTO.AddUserInternalGroup.class);
return new Result<ResiEventIdDTO>().ok(resiEventService.report(formDTO)); return new Result<ResiEventIdDTO>().ok(resiEventService.report(formDTO));
} }
@ -78,15 +79,15 @@ public class ResiEventController {
* 我要报事-撤回（尹） * 我要报事-撤回（尹）
* *
* @param formDTO * @param formDTO
* @return com.epmet.commons.tools.utils.Result * @return com.epmet.commons.tools.utils.Result
* @author yinzuomei * @author yinzuomei
* @date 2021/8/3 10:54 * @date 2021/8/3 10:54
*/ */
@PostMapping("recall") @PostMapping("recall")
public Result recall(@LoginUser TokenDto tokenDto,@RequestBody ReCallEventFormDTO formDTO){ public Result recall(@LoginUser TokenDto tokenDto, @RequestBody ReCallEventFormDTO formDTO) {
formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setCustomerId(tokenDto.getCustomerId());
formDTO.setUserId(tokenDto.getUserId()); formDTO.setUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(formDTO,ResiEventIdDTO.ResiEventIdGroup.class,ReCallEventFormDTO.AddUserInternalGroup.class); ValidatorUtils.validateEntity(formDTO, ResiEventIdDTO.ResiEventIdGroup.class, ReCallEventFormDTO.AddUserInternalGroup.class);
resiEventService.reCall(formDTO); resiEventService.reCall(formDTO);
return new Result(); return new Result();
} }
@ -96,15 +97,15 @@ public class ResiEventController {
* *
* @param tokenDto * @param tokenDto
* @param formDTO * @param formDTO
* @return com.epmet.commons.tools.utils.Result * @return com.epmet.commons.tools.utils.Result
* @author yinzuomei * @author yinzuomei
* @date 2021/8/3 13:57 * @date 2021/8/3 13:57
*/ */
@PostMapping("chooseresolve") @PostMapping("chooseresolve")
public Result chooseResolve(@LoginUser TokenDto tokenDto,@RequestBody ChooseResolveFormDTO formDTO){ public Result chooseResolve(@LoginUser TokenDto tokenDto, @RequestBody ChooseResolveFormDTO formDTO) {
formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setCustomerId(tokenDto.getCustomerId());
formDTO.setUserId(tokenDto.getUserId()); formDTO.setUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(formDTO,ResiEventIdDTO.ResiEventIdGroup.class,ChooseResolveFormDTO.AddUserInternalGroup.class); ValidatorUtils.validateEntity(formDTO, ResiEventIdDTO.ResiEventIdGroup.class, ChooseResolveFormDTO.AddUserInternalGroup.class);
resiEventService.chooseResolve(formDTO); resiEventService.chooseResolve(formDTO);
return new Result(); return new Result();
} }
@ -115,43 +116,43 @@ public class ResiEventController {
* *
* @param tokenDto * @param tokenDto
* @param formDTO * @param formDTO
* @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.MyReportedResultDTO>> * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.MyReportedResultDTO>>
* @author yinzuomei * @author yinzuomei
* @date 2021/8/3 14:27 * @date 2021/8/3 14:27
*/ */
@PostMapping("myreported") @PostMapping("myreported")
public Result<List<MyReportedResultDTO>> queryMyReported(@LoginUser TokenDto tokenDto, @RequestBody MyReportedFormDTO formDTO){ public Result<List<MyReportedResultDTO>> queryMyReported(@LoginUser TokenDto tokenDto, @RequestBody MyReportedFormDTO formDTO) {
formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setCustomerId(tokenDto.getCustomerId());
formDTO.setUserId(tokenDto.getUserId()); formDTO.setUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(formDTO,MyReportedFormDTO.AddUserInternalGroup.class); ValidatorUtils.validateEntity(formDTO, MyReportedFormDTO.AddUserInternalGroup.class);
return new Result<List<MyReportedResultDTO>>().ok(resiEventService.queryMyReported(formDTO)); return new Result<List<MyReportedResultDTO>>().ok(resiEventService.queryMyReported(formDTO));
} }
/** /**
* @Description 群众直报（待处理、处理中、已办结）列表 * @Description 群众直报（待处理、处理中、已办结）列表
* @Param formDTO * @Param formDTO
* @author zxc * @author zxc
* @date 2021/8/3 10:53 上午 * @date 2021/8/3 10:53 上午
*/ */
@PostMapping("eventlist") @PostMapping("eventlist")
public Result<List<EventListResultDTO>> eventList(@RequestBody EventListFormDTO formDTO){ public Result<List<EventListResultDTO>> eventList(@RequestBody EventListFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO, EventListFormDTO.EventListForm.class); ValidatorUtils.validateEntity(formDTO, EventListFormDTO.EventListForm.class);
return new Result<List<EventListResultDTO>>().ok(resiEventService.eventList(formDTO)); return new Result<List<EventListResultDTO>>().ok(resiEventService.eventList(formDTO));
} }
/** /**
* @Description 报事-首次查看事件-两端通用 * @Description 报事-首次查看事件-两端通用
* @Param formDTO * @Param formDTO
* @author zxc * @author zxc
* @date 2021/8/3 11:01 上午 * @date 2021/8/3 11:01 上午
*/ */
@PostMapping("updateviewtime") @PostMapping("updateviewtime")
public Result updateViewTime(@LoginUser TokenDto tokenDto,@RequestBody UpdateViewTimeFormDTO formDTO){ public Result updateViewTime(@LoginUser TokenDto tokenDto, @RequestBody UpdateViewTimeFormDTO formDTO) {
formDTO.setUserId(tokenDto.getUserId()); formDTO.setUserId(tokenDto.getUserId());
formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setCustomerId(tokenDto.getCustomerId());
ValidatorUtils.validateEntity(formDTO,UpdateViewTimeFormDTO.AddUserInternalGroup.class); ValidatorUtils.validateEntity(formDTO, UpdateViewTimeFormDTO.AddUserInternalGroup.class);
if(EventConstant.STAFF.equals(formDTO.getViewType())){ if (EventConstant.STAFF.equals(formDTO.getViewType())) {
ValidatorUtils.validateEntity(formDTO,UpdateViewTimeFormDTO.GovInternalGroup.class); ValidatorUtils.validateEntity(formDTO, UpdateViewTimeFormDTO.GovInternalGroup.class);
} }
resiEventService.updateViewTime(formDTO); resiEventService.updateViewTime(formDTO);
return new Result(); return new Result();
@ -162,25 +163,26 @@ public class ResiEventController {
* *
* @param tokenDto * @param tokenDto
* @param formDTO * @param formDTO
* @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.MyReportedResultDTO>> * @return com.epmet.commons.tools.utils.Result<java.util.List < com.epmet.dto.result.MyReportedResultDTO>>
* @author yinzuomei * @author yinzuomei
* @date 2021/8/4 9:40 * @date 2021/8/4 9:40
*/ */
@PostMapping("mentionlist") @PostMapping("mentionlist")
public Result<List<UserMentionResultDTO>> mentionList(@LoginUser TokenDto tokenDto, @RequestBody UserMentionFormDTO formDTO){ public Result<List<UserMentionResultDTO>> mentionList(@LoginUser TokenDto tokenDto, @RequestBody UserMentionFormDTO formDTO) {
formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setCustomerId(tokenDto.getCustomerId());
formDTO.setUserId(tokenDto.getUserId()); formDTO.setUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(formDTO,UserMentionFormDTO.AddUserInternalGroup.class); ValidatorUtils.validateEntity(formDTO, UserMentionFormDTO.AddUserInternalGroup.class);
return new Result<List<UserMentionResultDTO>>().ok(resiEventService.mentionList(formDTO)); return new Result<List<UserMentionResultDTO>>().ok(resiEventService.mentionList(formDTO));
}} }
/** /**
* @Description 最新直报 * @Description 最新直报
* @Param userId * @Param userId
* @author zxc * @author zxc
* @date 2021/8/5 9:55 上午 * @date 2021/8/5 9:55 上午
*/ */
@PostMapping("newevents") @PostMapping("newevents")
public Result<List<NewEventsResultDTO>> newEvents(@LoginUser TokenDto tokenDto){ public Result<List<NewEventsResultDTO>> newEvents(@LoginUser TokenDto tokenDto) {
return new Result<List<NewEventsResultDTO>>().ok(resiEventService.newEvents(tokenDto.getUserId())); return new Result<List<NewEventsResultDTO>>().ok(resiEventService.newEvents(tokenDto.getUserId()));
} }
@ -189,14 +191,15 @@ public class ResiEventController {
* *
* @param tokenDto * @param tokenDto
* @param formDTO * @param formDTO
* @return com.epmet.commons.tools.utils.Result * @return com.epmet.commons.tools.utils.Result
* @author yinzuomei * @author yinzuomei
* @date 2021/8/5 10:47 * @date 2021/8/5 10:47
*/ */
@PostMapping("close") @PostMapping("close")
public Result closeResiEvent(@LoginUser TokenDto tokenDto,@RequestBody CloseResiEventFormDTO formDTO){ public Result closeResiEvent(@LoginUser TokenDto tokenDto, @RequestBody CloseResiEventFormDTO formDTO) {
formDTO.setUserId(tokenDto.getUserId()); formDTO.setUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(formDTO,CloseResiEventFormDTO.AddUserInternalGroup.class); ValidatorUtils.validateEntity(formDTO, CloseResiEventFormDTO.AddUserInternalGroup.class);
resiEventService.closeResiEvent(formDTO); resiEventService.closeResiEvent(formDTO);
return new Result(); return new Result();
} }
}

2
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
View File

@ -89,7 +89,7 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
private ProjectDao projectDao; private ProjectDao projectDao;
@Autowired @Autowired
private ResiEventReplyDao resiEventReplyDao; private ResiEventReplyDao resiEventReplyDao;
y
/** /**
* @Description 群众直报（待处理、处理中、已办结）列表 * @Description 群众直报（待处理、处理中、已办结）列表
* 未处理：按照创建时间正序； * 未处理：按照创建时间正序；

Write Preview
Loading…
Cancel
Save