springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventDealDTO.java
@@ -63,4 +63,6 @@ private Integer operateType; @ApiModelProperty(value = "(当前操作)用户社区ID", hidden = true, example = "1") private Long communityId; @ApiModelProperty(value = "(当前操作)用户社区名称", hidden = true, example = "学园社区") private String communityName; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/grid/CommonEventReportDTO.java
@@ -41,5 +41,8 @@ @ApiModelProperty(value = "(当前操作)用户姓名", hidden = true, example = "张三") private String userName; @ApiModelProperty(value = "(当前操作)用户社区ID", hidden = true, example = "1") private Long communityId; } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/ComMapGridEventVO.java
@@ -20,9 +20,12 @@ @ApiModelProperty("事件标题") private String eventTitle; @ApiModelProperty("发生地点") @ApiModelProperty("发生地点备注") private String happentAddress; @ApiModelProperty("发生地点位置") private String happenAddress; @ApiModelProperty("发生的精度纬度信息（逗号隔开）") private String happentLatLng;
@@ -74,7 +74,7 @@ } LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo(); commonEventAddDTO.setUserId(loginUserInfoVO.getUserId()); commonEventAddDTO.setUserName(loginUserInfoVO.getName()); commonEventAddDTO.setUserName(loginUserInfoVO.getNickName()); commonEventAddDTO.setPhone(loginUserInfoVO.getPhone()); return gridService.addCommon(commonEventAddDTO); } @@ -94,7 +94,7 @@ } LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo(); commonEventEditDTO.setUserId(loginUserInfoVO.getUserId()); commonEventEditDTO.setUserName(loginUserInfoVO.getName()); commonEventEditDTO.setUserName(loginUserInfoVO.getNickName()); commonEventEditDTO.setPhone(loginUserInfoVO.getPhone()); return gridService.saveDraft(commonEventEditDTO); } @@ -110,7 +110,8 @@ LoginUserInfoVO loginUserInfoVO = getLoginUserInfo(); ClazzUtils.setIfStringIsEmpty(commonEventReportDTO); commonEventReportDTO.setUserId(loginUserInfoVO.getUserId()); commonEventReportDTO.setUserName(loginUserInfoVO.getName()); commonEventReportDTO.setUserName(loginUserInfoVO.getNickName()); commonEventReportDTO.setCommunityId(loginUserInfoVO.getCommunityId()); return gridService.report(commonEventReportDTO); } @@ -125,8 +126,10 @@ ClazzUtils.setIfStringIsEmpty(commonEventDealDTO); LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo(); commonEventDealDTO.setUserId(loginUserInfoVO.getUserId()); commonEventDealDTO.setUserName(loginUserInfoVO.getName()); commonEventDealDTO.setUserName(loginUserInfoVO.getNickName()); commonEventDealDTO.setOperateType(0); commonEventDealDTO.setCommunityId(loginUserInfoVO.getCommunityId()); commonEventDealDTO.setCommunityName(loginUserInfoVO.getCommunityName()); return gridService.dealEvent(commonEventDealDTO); } @@ -141,7 +144,7 @@ ClazzUtils.setIfStringIsEmpty(commonEventVerifyDTO); LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo(); commonEventVerifyDTO.setUserId(loginUserInfoVO.getUserId()); commonEventVerifyDTO.setUserName(loginUserInfoVO.getName()); commonEventVerifyDTO.setUserName(loginUserInfoVO.getNickName()); return gridService.verifyEvent(commonEventVerifyDTO); }
@@ -45,7 +45,7 @@ ClazzUtils.setIfStringIsEmpty(eventRevokeDTO); LoginUserInfoVO loginUserInfoVO = getLoginUserInfo(); eventRevokeDTO.setUserId(loginUserInfoVO.getUserId()); eventRevokeDTO.setUserName(loginUserInfoVO.getName()); eventRevokeDTO.setUserName(loginUserInfoVO.getNickName()); return gridService.emergenciesRevoke(eventRevokeDTO); } @@ -82,7 +82,7 @@ ClazzUtils.setIfStringIsEmpty(commonEventRepublishDTO); LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo(); commonEventRepublishDTO.setUserId(loginUserInfoVO.getUserId()); commonEventRepublishDTO.setUserName(loginUserInfoVO.getName()); commonEventRepublishDTO.setUserName(loginUserInfoVO.getNickName()); return gridService.republishEvent(commonEventRepublishDTO); } @@ -98,7 +98,7 @@ ClazzUtils.setIfStringIsEmpty(commonEventPublicDTO); LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo(); commonEventPublicDTO.setUserId(loginUserInfoVO.getUserId()); commonEventPublicDTO.setUserName(loginUserInfoVO.getName()); commonEventPublicDTO.setUserName(loginUserInfoVO.getNickName()); return gridService.draftRelease(commonEventPublicDTO); }
@@ -60,7 +60,7 @@ ClazzUtils.setIfStringIsEmpty(publicityEventAddDTO); LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo(); publicityEventAddDTO.setUserId(loginUserInfoVO.getUserId()); publicityEventAddDTO.setUserName(loginUserInfoVO.getName()); publicityEventAddDTO.setUserName(loginUserInfoVO.getNickName()); publicityEventAddDTO.setPhone(loginUserInfoVO.getPhone()); return gridService.addPublicity(publicityEventAddDTO); } @@ -76,7 +76,7 @@ ClazzUtils.setIfStringIsEmpty(publicityEventEditDTO); LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo(); publicityEventEditDTO.setUserId(loginUserInfoVO.getUserId()); publicityEventEditDTO.setUserName(loginUserInfoVO.getName()); publicityEventEditDTO.setUserName(loginUserInfoVO.getNickName()); publicityEventEditDTO.setPhone(loginUserInfoVO.getPhone()); return gridService.savePublicityDraft(publicityEventEditDTO); } springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/SpecialPopulationEventApi.java
@@ -61,7 +61,7 @@ ClazzUtils.setIfStringIsEmpty(specialEventEditDTO); LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo(); specialEventEditDTO.setUserId(loginUserInfoVO.getUserId()); specialEventEditDTO.setUserName(loginUserInfoVO.getName()); specialEventEditDTO.setUserName(loginUserInfoVO.getNickName()); specialEventEditDTO.setPhone(loginUserInfoVO.getPhone()); return gridService.saveSpecialDraft(specialEventEditDTO); } @@ -91,7 +91,8 @@ LoginUserInfoVO loginUserInfoVO = getLoginUserInfo(); ClazzUtils.setIfStringIsEmpty(commonEventReportDTO); commonEventReportDTO.setUserId(loginUserInfoVO.getUserId()); commonEventReportDTO.setUserName(loginUserInfoVO.getName()); commonEventReportDTO.setUserName(loginUserInfoVO.getNickName()); commonEventReportDTO.setCommunityId(loginUserInfoVO.getCommunityId()); return gridService.report(commonEventReportDTO); } @@ -106,7 +107,9 @@ ClazzUtils.setIfStringIsEmpty(commonEventDealDTO); LoginUserInfoVO loginUserInfoVO = new LoginUserInfoVO(); commonEventDealDTO.setUserId(loginUserInfoVO.getUserId()); commonEventDealDTO.setUserName(loginUserInfoVO.getName()); commonEventDealDTO.setUserName(loginUserInfoVO.getNickName()); commonEventDealDTO.setCommunityId(loginUserInfoVO.getCommunityId()); commonEventDealDTO.setCommunityName(loginUserInfoVO.getCommunityName()); return gridService.dealEvent(commonEventDealDTO); } @@ -121,7 +124,7 @@ ClazzUtils.setIfStringIsEmpty(commonEventVerifyDTO); LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo(); commonEventVerifyDTO.setUserId(loginUserInfoVO.getUserId()); commonEventVerifyDTO.setUserName(loginUserInfoVO.getName()); commonEventVerifyDTO.setUserName(loginUserInfoVO.getNickName()); return gridService.verifyEvent(commonEventVerifyDTO); }
@@ -75,7 +75,7 @@ ClazzUtils.setIfStringIsEmpty(eventRevokeDTO); LoginUserInfoVO loginUserInfoVO = getLoginUserInfo(); eventRevokeDTO.setUserId(loginUserInfoVO.getUserId()); eventRevokeDTO.setUserName(loginUserInfoVO.getName()); eventRevokeDTO.setUserName(loginUserInfoVO.getNickName()); eventRevokeDTO.setCommunityName(loginUserInfoVO.getCommunityName()); eventRevokeDTO.setCommunityId(loginUserInfoVO.getCommunityId()); return gridService.markEventInvalid(eventRevokeDTO); @@ -94,7 +94,7 @@ } LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo(); commonEventCommunityAddDTO.setUserId(loginUserInfoVO.getUserId()); commonEventCommunityAddDTO.setUserName(loginUserInfoVO.getName()); commonEventCommunityAddDTO.setUserName(loginUserInfoVO.getNickName()); commonEventCommunityAddDTO.setPhone(loginUserInfoVO.getPhone()); return gridService.addCommon(commonEventCommunityAddDTO); } @@ -133,7 +133,7 @@ ClazzUtils.setIfStringIsEmpty(commonEventRepublishDTO); LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo(); commonEventRepublishDTO.setUserId(loginUserInfoVO.getUserId()); commonEventRepublishDTO.setUserName(loginUserInfoVO.getName()); commonEventRepublishDTO.setUserName(loginUserInfoVO.getNickName()); return gridService.republishInvalidEvent(commonEventRepublishDTO); } @@ -162,9 +162,10 @@ } LoginUserInfoVO loginUserInfoVO = this.getLoginUserInfo(); commonEventDealDTO.setUserId(loginUserInfoVO.getUserId()); commonEventDealDTO.setUserName(loginUserInfoVO.getName()); commonEventDealDTO.setUserName(loginUserInfoVO.getNickName()); commonEventDealDTO.setOperateType(1); commonEventDealDTO.setCommunityId(loginUserInfoVO.getCommunityId()); commonEventDealDTO.setCommunityName(loginUserInfoVO.getCommunityName()); return gridService.dealEvent(commonEventDealDTO); }
@@ -232,14 +232,14 @@ } if(StringUtils.isNotEmpty(comMngPopulationVO.getAgeStart())){ String ageStartTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(new Date(),-(Integer.parseInt(comMngPopulationVO.getAgeStart()))),"yyyy-MM-dd"); String ageStartTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(new Date(),-(Integer.parseInt(comMngPopulationVO.getAgeStart()) + 1)),"yyyy-MM-dd"); if(StringUtils.isNotEmpty(ageStartTime)){ comMngPopulationVO.setAgeStartTime(ageStartTime); } } if(StringUtils.isNotEmpty(comMngPopulationVO.getAgeEnd())){ String ageEndTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(new Date(),-(Integer.parseInt(comMngPopulationVO.getAgeEnd()))),"yyyy-MM-dd"); String ageEndTime = DateUtils.getDateFormatString(DateUtils.yearAddNum(new Date(),-(Integer.parseInt(comMngPopulationVO.getAgeEnd()) + 1)),"yyyy-MM-dd"); if(StringUtils.isNotEmpty(ageEndTime)){ comMngPopulationVO.setAgeEndTime(ageEndTime); } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -487,7 +487,8 @@ if(updated!=1){ throw new ServiceException("更新突发事件状态更新失败"); } addTransferRecord(eventDO.getId(), commonEventReportDTO.getToId(), comActVO.getName(), 2, commonEventReportDTO.getProcessResult(),2); addTransferRecord(eventDO.getId(), commonEventReportDTO.getToId(), comActVO.getName(), 2, commonEventReportDTO.getProcessResult(), commonEventReportDTO.getUserId(), commonEventReportDTO.getUserName(), 2); return R.ok(); } @@ -558,7 +559,7 @@ processType = 1; } EventTransferRecordDO transferRecordDO = addTransferRecord(eventDO.getId(), commonEventDealDTO.getUserId(), commonEventDealDTO.getUserName(),1, "网格员自处理完成", processType); addTransferRecord(eventDO.getId(), commonEventDealDTO.getUserId(), commonEventDealDTO.getUserName(),1, "网格员自处理完成", commonEventDealDTO.getUserId(), commonEventDealDTO.getUserName(), processType); if(transferRecordDO!=null && transferRecordDO.getId()!=null){ //添加音频 if(StringUtils.isNotEmpty(commonEventDealDTO.getAudio())){ @@ -646,9 +647,9 @@ @Override public R republishEvent(CommonEventRepublishDTO commonEventRepublishDTO) { EventDO eventDO = this.getBaseMapper().selectById(commonEventRepublishDTO.getId()); boolean canRepublishByUser = eventDO.getEventStatus()==4; boolean canRepublishByUser = eventDO.getEventStatus()==4||eventDO.getEventStatus()==1; if(!canRepublishByUser){ return R.fail("当前不是撤销状态"); return R.fail("当前不是撤销/草稿状态"); } eventDO.setEventStatus(2);//2 发布 @@ -659,7 +660,8 @@ if(updated!=1){ return R.fail("更新事件状态失败"); } addTransferRecord(eventDO.getId(), commonEventRepublishDTO.getUserId(), commonEventRepublishDTO.getUserName(), 1, "重新发布已撤销事件", 8); addTransferRecord(eventDO.getId(), commonEventRepublishDTO.getUserId(), commonEventRepublishDTO.getUserName(), 1, "重新发布已撤销事件", commonEventRepublishDTO.getUserId(), commonEventRepublishDTO.getUserName(), 8); return R.ok(); } @@ -1284,7 +1286,8 @@ eventDO.setInvalid(true); int updated = this.getBaseMapper().updateById(eventDO); if(updated == 1){ addTransferRecord(eventDO.getId(), commonEventRepublishDTO.getUserId(), commonEventRepublishDTO.getUserName(), 1,"重新发布事件成功", 9 ); addTransferRecord(eventDO.getId(), commonEventRepublishDTO.getUserId(), commonEventRepublishDTO.getUserName(), 1,"重新发布事件成功", commonEventRepublishDTO.getUserId(), commonEventRepublishDTO.getUserName(), 9 ); return R.ok(); } return R.fail(); @@ -1301,6 +1304,24 @@ return R.fail("事件当前不是上报状态"); } List<EventTransferRecordDO> list = eventTransferRecordService.getBaseMapper().selectList(new LambdaQueryWrapper<EventTransferRecordDO>() .eq(EventTransferRecordDO::getEventId, eventDO.getId()) .orderByDesc(EventTransferRecordDO::getCreateAt) ); Long reportToInDB = -1L; for (int i = 0; i < list.size(); i++) { EventTransferRecordDO eventTransferRecordDO = list.get(i); if(eventTransferRecordDO.getProcessType()!=null && eventTransferRecordDO.getProcessType()==2){ reportToInDB = eventTransferRecordDO.getToId(); } } if(commonEventDealDTO.getCommunityId()==null){ return R.fail("当前用户社区获取失败"); } if(reportToInDB.longValue() != commonEventDealDTO.getCommunityId().longValue()){ return R.fail("用户上报的社区不是当前社区"); } if(commonEventDealDTO.getNeedVerify()){ eventDO.setEventProcessStatus(3);//待验证状态 eventDO.setProcessType(1);//交给网格员处理-验证 @@ -1320,7 +1341,8 @@ return R.fail("更新事件状态失败"); } EventTransferRecordDO transferRecordDO = addTransferRecord(eventDO.getId(), commonEventDealDTO.getUserId(), commonEventDealDTO.getUserName(),1, "社区处理完成", 3); addTransferRecord(eventDO.getId(), commonEventDealDTO.getUserId(), commonEventDealDTO.getUserName(),1, "社区处理完成", commonEventDealDTO.getCommunityId(), commonEventDealDTO.getCommunityName(), 3); if(transferRecordDO!=null && transferRecordDO.getId()!=null){ //添加音频 if(StringUtils.isNotEmpty(commonEventDealDTO.getAudio())){ @@ -1506,9 +1528,9 @@ * @param msg 流转消息 * @return */ private EventTransferRecordDO addTransferRecord(Long eventId, Long toId, String toName, Integer toType, String msg,Integer processType){ /* private EventTransferRecordDO addTransferRecord(Long eventId, Long toId, String toName, Integer toType, String msg,Integer processType){ return addTransferRecord(eventId, toId, toName, toType, msg, null, null, processType); } }*/ /** * 根据子状态 查询用户事件处理状态 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/mapper/EventMapper.xml
@@ -395,8 +395,9 @@ SELECT id, event_type AS type, event_title AS eventTitle, event_des AS eventTitle, happent_address AS happentAddress, happen_address AS happenAddress, happent_lat_lng AS happentLatLng FROM `event` @@ -409,8 +410,9 @@ SELECT id, IFNULL( NULL, 7 ) AS type, event_title AS eventTitle, event_des AS eventTitle, happent_address AS happentAddress, happen_address AS happenAddress, happent_lat_lng AS happentLatLng FROM event_visiting_tasks springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -1913,6 +1913,9 @@ String encode = new BCryptPasswordEncoder().encode(eventGridMemberAddDTO.getPassword()); eventGridMemberAddDTO.setPassword(encode); BeanUtils.copyProperties(eventGridMemberAddDTO, sysUserDO); if(!StringUtils.isEmpty(sysUserDO.getNickName())){ sysUserDO.setName(sysUserDO.getNickName()); } sysUserDO.setType(6); int insert = 0; try {
