elink-star
/
epdc-cloud-events-yushan
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

工作端接口补全

feature/zhy_category v2.0.0.200529.Release
yujt 5 years ago
parent
24bb3e94c4
commit
734c6dbaa9
3 changed files with 138 additions and 38 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. 58
      epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/item/controller/v2/EpdcAppWorkEventItemV2Controller.java
  2. 29
      epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
  3. 87
      epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

58
epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/item/controller/v2/EpdcAppWorkEventItemV2Controller.java
View File

@ -0,0 +1,58 @@
package com.elink.esua.epdc.modules.item.controller.v2;
import com.elink.esua.epdc.commons.api.version.ApiVersion;
import com.elink.esua.epdc.commons.tools.constant.Constant;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.item.result.ItemCirculationDeptResultDTO;
import com.elink.esua.epdc.dto.item.result.ItemHandleResultDTO;
import com.elink.esua.epdc.modules.item.service.ItemService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* 工作端事件 迭代接口 v2
*
* @author zy
* @date 2020/05/06
*/
@ApiVersion(2)
@RestController("EpdcAppWorkEventItemV2Controller")
@RequestMapping(Constant.EPDC_APP + "work/event/item" + Constant.VERSION_CONTROL)
public class EpdcAppWorkEventItemV2Controller {
@Autowired
private ItemService itemService;
/**
* 获取可吹哨部门V2
*
* @param:
* @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemCirculationDeptResultDTO>>
* @Author: zy
* @Date: 2020-05-06
*/
@GetMapping("whistlingDept")
public Result<List<ItemCirculationDeptResultDTO>> whistlingDept() {
List<ItemCirculationDeptResultDTO> list = this.itemService.listWhistlingDept();
return new Result<List<ItemCirculationDeptResultDTO>>().ok(list);
}
/**
* 获取当前部门可做操作V2
*
* @param:
* @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemHandleResultDTO>>
* @Author: zy
* @Date: 2020-05-06
*/
@GetMapping("handleCategory")
public Result<List<ItemHandleResultDTO>> handleCategory() {
List<ItemHandleResultDTO> list = this.itemService.listHandleCategory();
return new Result<List<ItemHandleResultDTO>>().ok(list);
}
}

29
epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
View File

@ -373,35 +373,52 @@ public interface ItemService extends BaseService<ItemEntity> {
List<KpiEvaluationAmountResultDTO> statGridEvaluationMetaData(KpiMetaDataOfEventsFormDTO metaDataFormDto);
/**
*
* 项目修改组织机构信息
*
* @params [dto]
* @return void
* @params [dto]
* @author liuchuang
* @since 2020/3/7 1:23
*/
void modifyOrganizationInfo(OrganizationModifyDTO dto);
/**
*
* 更新项目表党员群名称
*
* @params [groups]
* @return void
* @params [groups]
* @author liuchuang
* @since 2020/3/7 12:50
*/
void modifyPartyGroupName(List<GroupFormDTO> groups);
/**
*
* 修改分类信息
*
* @params []
* @return void
* @params []
* @author liuchuang
* @since 2020/3/7 16:33
*/
void modifyCategoryInfo(CategoryModifyDTO dto);
/**
* 获取可吹哨部门V2
*
* @param:
* @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.item.result.ItemCirculationDeptResultDTO>>
* @Author: zy
* @Date: 2020-05-06
*/
List<ItemCirculationDeptResultDTO> listWhistlingDept();
/**
* 获取当前部门可做操作V2
*
* @param:
* @return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.item.result.ItemHandleResultDTO>>
* @Author: zy
* @Date: 2020-05-06
*/
List<ItemHandleResultDTO> listHandleCategory();
}

87
epdc-cloud-events/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
View File

@ -795,10 +795,10 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
}
//居民端项目关闭、结案-短信通知
if (ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() ||
ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()){
ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) {
List<String> list = new ArrayList<>();
list.add(entity.getMobile());
this.projectSmsNotification(dto,list);
this.projectSmsNotification(dto, list);
}
//工作端 根据不同的处理方式，进行短信通知
this.workProjectHandle(dto);
@ -1305,30 +1305,30 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
* @Author: zy
* @Date: 2020-01-09
*/
private void workProjectHandle(ItemHandleSubmitFormDTO dto){
private void workProjectHandle(ItemHandleSubmitFormDTO dto) {
UserDetail user = SecurityUser.getUser(); //获取当前登录人信息
List<Long> deptId = new ArrayList<>();
if(ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue() == dto.getHandleCategory()){
if (ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue() == dto.getHandleCategory()) {
List<ItemCirculationDeptResultDTO> deptList = dto.getDeptResultDTOS();
for (int i =0; i < deptList.size(); i++) {
ItemCirculationDeptResultDTO indexDto = (ItemCirculationDeptResultDTO)deptList.get(i);
for (int i = 0; i < deptList.size(); i++) {
ItemCirculationDeptResultDTO indexDto = (ItemCirculationDeptResultDTO) deptList.get(i);
deptId.add(indexDto.getDeptId());
}
issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId,user.getTypeKey());//吹哨处理 a吹b 向b部门下的，所有人员发送短信
if (user.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_PARTY)){ //如果是街道做吹哨处理, 做回应处理
issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId, user.getTypeKey());//吹哨处理 a吹b 向b部门下的，所有人员发送短信
if (user.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_PARTY)) { //如果是街道做吹哨处理, 做回应处理
this.superiorDeptSmsHandle(dto);
}
} else if(ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() ||
ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()){
deptId = baseDao.queryDeptIdList(dto.getId(),user.getDeptId());
if (deptId != null && deptId.size() > 0){
issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId,user.getTypeKey());//关闭/结案 当前项目的所有部门ID，下的人员发送短信，且不等于当前部门ID
} else if (ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() ||
ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) {
deptId = baseDao.queryDeptIdList(dto.getId(), user.getDeptId());
if (deptId != null && deptId.size() > 0) {
issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId, user.getTypeKey());//关闭/结案 当前项目的所有部门ID，下的人员发送短信，且不等于当前部门ID
}
} else if(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue() == dto.getHandleCategory()){
if (!user.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)){//回应
} else if (ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue() == dto.getHandleCategory()) {
if (!user.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) {//回应
this.superiorDeptSmsHandle(dto);
}
}else if(ItemHandleCategoryEnum.HANDLE_REPORT.getValue() == dto.getHandleCategory()){ //上报网格化平台
} else if (ItemHandleCategoryEnum.HANDLE_REPORT.getValue() == dto.getHandleCategory()) { //上报网格化平台
this.superiorDeptSmsHandle(dto);
}
}
@ -1341,25 +1341,26 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
* @Author: zy
* @Date: 2020-01-14
*/
private void superiorDeptSmsHandle(ItemHandleSubmitFormDTO dto){
private void superiorDeptSmsHandle(ItemHandleSubmitFormDTO dto) {
UserDetail user = SecurityUser.getUser(); //获取当前登录人信息
List<Long> deptId = new ArrayList<>();
Long queryDePtId = user.getDeptId();
while (true){
List<Long> createdDeptId = baseDao.queryParentDeptId(dto.getId(),queryDePtId);
if (createdDeptId != null && createdDeptId.size() > 0){
for(Long ll : createdDeptId){
while (true) {
List<Long> createdDeptId = baseDao.queryParentDeptId(dto.getId(), queryDePtId);
if (createdDeptId != null && createdDeptId.size() > 0) {
for (Long ll : createdDeptId) {
deptId.add(ll);
queryDePtId = ll;
}
}else{
} else {
break;
}
}
if (deptId != null && deptId.size() > 0) {
issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId,user.getTypeKey());//做回应处理，向部门下的所有人员发送短信
issueOverseeResultsTask.getUserPhoneByListDeptId(dto, deptId, user.getTypeKey());//做回应处理，向部门下的所有人员发送短信
}
}
/**
* @Description: 居民端：项目处理，发送短信
* @Param: [dto]
@ -1368,17 +1369,18 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
* @Author: zy
* @Date: 2020-01-08
*/
public void projectSmsNotification(ItemHandleSubmitFormDTO dto, List<String> userMobiles){
public void projectSmsNotification(ItemHandleSubmitFormDTO dto, List<String> userMobiles) {
// 审核操作发送短信
SmsNoticeFormDTO sms = new SmsNoticeFormDTO();
sms.setMobiles(userMobiles);
if (ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory()) { // 关闭
sms.setSmsTemplateType(SysSmsTemplateConstant.SMS_TEMPLATE_RESIDENTS_ITEM_CLOSED);
}else if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()){ //结案
} else if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) { //结案
sms.setSmsTemplateType(SysSmsTemplateConstant.SMS_TEMPLATE_RESIDENTS_ITEM_SETTLE);
}
issueOverseeResultsTask.sendSmsNotice(sms);
}
/**
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.item.result.ItemHandleResultDTO>>
@ -1457,17 +1459,16 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
}
/**
*
* 组织机构信息处理
*
* @params [dto, eventsList]
* @return java.util.List<com.elink.esua.epdc.modules.events.entity.EpdcEventsEntity>
* @params [dto, eventsList]
* @author liuchuang
* @since 2020/3/7 1:17
*/
private List<ItemEntity> handleOrganizationInfo(OrganizationModifyDTO dto, List<ItemDTO> itemList) {
List<ItemEntity> entities = new ArrayList<>();
for (ItemDTO item: itemList) {
for (ItemDTO item : itemList) {
ItemEntity entity = new ItemEntity();
if (StringUtils.isNotEmpty(item.getParentDeptIds()) && StringUtils.isNotEmpty(item.getParentDeptNames())) {
List<String> parentDeptIds = Arrays.asList(item.getParentDeptIds().split(","));
@ -1517,18 +1518,42 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
}
}
@Override
public List<ItemCirculationDeptResultDTO> listWhistlingDept() {
UserDetail user = SecurityUser.getUser();
Result<List<Long>> roleIdList = adminFeignClient.getRoleIdList(user.getId());
if (!roleIdList.success() || roleIdList.getData().isEmpty()) {
throw new RenException("获取角色Id列表失败");
}
//可流转部门
List<ItemCirculationDeptResultDTO> deptResultDTOS = handleRoleCategoryService.listItemCirculationDeptResultDTO(roleIdList.getData());
return deptResultDTOS;
}
@Override
public List<ItemHandleResultDTO> listHandleCategory() {
UserDetail user = SecurityUser.getUser();
Result<List<Long>> roleIdList = adminFeignClient.getRoleIdList(user.getId());
if (!roleIdList.success() || roleIdList.getData().isEmpty()) {
throw new RenException("获取角色Id列表失败");
}
//可处理操作
List<ItemHandleResultDTO> handleResultDTOS = handleRoleCategoryService.listItemHandleResultDTO(roleIdList.getData());
return handleResultDTOS;
}
/**
*
* 分类信息处理
*
* @params [dto, eventsList]
* @return java.util.List<com.elink.esua.epdc.modules.events.entity.ItemEntity>
* @params [dto, eventsList]
* @author liuchuang
* @since 2020/3/7 17:00
*/
private List<ItemEntity> handleCategoryInfo(CategoryModifyDTO dto, List<ItemDTO> itemList) {
List<ItemEntity> entities = new ArrayList<>();
for (ItemDTO item: itemList) {
for (ItemDTO item : itemList) {
if (StringUtils.isNotEmpty(item.getCategoryFullName())) {
List<String> categoryFullName = Arrays.asList(item.getCategoryFullName().split("-"));
int index = categoryFullName.indexOf(dto.getOldCategoryName());

Write Preview
Loading…
Cancel
Save