Browse Source

api模块新增/api/work/event/item/handleCategory接口(获取当前部门可做操作)

dev
尹作梅 6 years ago
parent
commit
b5aaf6afcf
  1. 18
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java
  2. 15
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java
  3. 9
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkItemFeignClientFallback.java
  4. 14
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java
  5. 7
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java
  6. 12
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java
  7. 8
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
  8. 61
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

18
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkItemController.java

@ -1,9 +1,6 @@
package com.elink.esua.epdc.controller;
import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.SysDeptDTO;
import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO;
import com.elink.esua.epdc.dto.item.form.*;
import com.elink.esua.epdc.dto.item.result.*;
@ -111,8 +108,9 @@ public class ApiWorkItemController {
/**
* 项目消息列表
*
* @Params: [ formDto]
* @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemResultDTO>>
* @Return: com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.item.result.ItemResultDTO>>
* @Author: lipengfei
* @Date: 2019/11/19 16:34
*/
@ -120,4 +118,16 @@ public class ApiWorkItemController {
public Result<List<ItemInformationResultDTO>> notice(ItemInformationFormDTO formDto) {
return workItemService.notice(formDto);
}
/**
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.item.result.ItemHandleResultDTO>>
* @Author yinzuomei
* @Description 获取当前部门可做操作
* @Date 2020/1/13 16:48
**/
@GetMapping("handleCategory")
public Result<List<ItemHandleResultDTO>> queryHandleCategories() {
return workItemService.queryHandleCategories();
}
}

15
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkItemFeignClient.java

@ -20,7 +20,7 @@ import java.util.List;
* @Author LPF
* @Date 2019/11/18 16:39
*/
@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = WorkItemFeignClientFallback.class, configuration = FeignRequestInterceptor.class)
@FeignClient(name = ServiceConstant.EPDC_EVENTS_SERVER, fallback = WorkItemFeignClientFallback.class, configuration = FeignRequestInterceptor.class, url = "http://localhost:9066")
public interface WorkItemFeignClient {
@ -99,14 +99,25 @@ public interface WorkItemFeignClient {
*/
@GetMapping(value = "events/work/item/processList", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<List<ItemHandleProgressResultDTO>> processList(ItemProcessFormDTO dto) ;
/**
* 项目消息列表
*
* @Params: [ItemProcessFormDTO]
* @Return: com.elink.esua.epdc.commons.tools.utils.Result
* @Author: lipengfei
* @Date: 2019/11/19 16:34
*/
@GetMapping(value = "events/work/item/notice", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<List<ItemInformationResultDTO>> notice(ItemInformationFormDTO formDto) ;
Result<List<ItemInformationResultDTO>> notice(ItemInformationFormDTO formDto);
/**
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.item.result.ItemHandleResultDTO>>
* @Author yinzuomei
* @Description 获取当前部门可做操作
* @Date 2020/1/13 16:53
**/
@GetMapping(value = "events/work/item/handleCategory")
Result<List<ItemHandleResultDTO>> queryHandleCategories();
}

9
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkItemFeignClientFallback.java

@ -3,11 +3,9 @@ package com.elink.esua.epdc.feign.fallback;
import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.SysDeptDTO;
import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO;
import com.elink.esua.epdc.dto.item.form.*;
import com.elink.esua.epdc.dto.item.result.*;
import com.elink.esua.epdc.feign.ItemFeignClient;
import com.elink.esua.epdc.feign.WorkItemFeignClient;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.PathVariable;
@ -52,13 +50,20 @@ public class WorkItemFeignClientFallback implements WorkItemFeignClient {
public Result<List<ItemEvaluateDeptDTO>> evaluationDept(EvaluationFormDTO evaluationFormDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "evaluationDept", evaluationFormDTO);
}
@Override
public Result<List<ItemHandleProgressResultDTO>> processList(ItemProcessFormDTO dto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "processList", dto);
}
@Override
public Result<List<ItemInformationResultDTO>> notice(ItemInformationFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "notice", formDto);
}
@Override
public Result<List<ItemHandleResultDTO>> queryHandleCategories() {
return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "queryHandleCategories");
}
}

14
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkItemService.java

@ -1,12 +1,9 @@
package com.elink.esua.epdc.service;
import com.elink.esua.epdc.common.token.dto.TokenDto;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.SysDeptDTO;
import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO;
import com.elink.esua.epdc.dto.item.form.*;
import com.elink.esua.epdc.dto.item.result.*;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
@ -80,8 +77,10 @@ public interface WorkItemService {
* @Date: 2019/11/19 16:34
*/
Result<List<ItemHandleProgressResultDTO>> processList(ItemProcessFormDTO dto);
/**
* 项目消息列表
*
* @Params: [formDto]
* @Return: com.elink.esua.epdc.commons.tools.utils.Result
* @Author: lipengfei
@ -89,5 +88,12 @@ public interface WorkItemService {
*/
Result<List<ItemInformationResultDTO>> notice(ItemInformationFormDTO formDto);
/**
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.item.result.ItemHandleResultDTO>>
* @Author yinzuomei
* @Description 获取当前部门可做操作
* @Date 2020/1/13 16:49
**/
Result<List<ItemHandleResultDTO>> queryHandleCategories();
}

7
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkItemServiceImpl.java

@ -64,13 +64,20 @@ public class WorkItemServiceImpl implements WorkItemService {
public Result<List<ItemEvaluateDeptDTO>> evaluationDept(EvaluationFormDTO evaluationFormDTO) {
return workItemFeignClient.evaluationDept(evaluationFormDTO);
}
@Override
public Result<List<ItemHandleProgressResultDTO>> processList(ItemProcessFormDTO dto) {
return workItemFeignClient.processList(dto);
}
@Override
public Result<List<ItemInformationResultDTO>> notice(ItemInformationFormDTO formDto) {
return workItemFeignClient.notice(formDto);
}
@Override
public Result<List<ItemHandleResultDTO>> queryHandleCategories() {
return workItemFeignClient.queryHandleCategories();
}
}

12
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/WorkItemController.java

@ -148,4 +148,16 @@ public class WorkItemController {
List<ItemHandleProgressResultDTO> data = itemService.listOfItemHandleProgressByWork(formDTO.getItemId());
return new Result<List<ItemHandleProgressResultDTO>>().ok(data);
}
/**
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.item.result.ItemHandleResultDTO>>
* @Author yinzuomei
* @Description 获取当前部门可做操作
* @Date 2020/1/13 16:55
**/
@GetMapping(value = "handleCategory")
public Result<List<ItemHandleResultDTO>> queryHandleCategories() {
return itemService.queryHandleCategories();
}
}

8
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java

@ -313,4 +313,12 @@ public interface ItemService extends BaseService<ItemEntity> {
*/
Result reportCallback(ItemPlatformProcessFormDTO formDto);
/**
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.item.result.ItemHandleResultDTO>>
* @Author yinzuomei
* @Description 获取当前部门可做操作
* @Date 2020/1/13 16:55
**/
Result<List<ItemHandleResultDTO>> queryHandleCategories();
}

61
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@ -1174,4 +1174,65 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
return new Result();
}
/**
* @param
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.item.result.ItemHandleResultDTO>>
* @Author yinzuomei
* @Description 获取当前部门可做操作
* @Date 2020/1/13 16:55
**/
@Override
public Result<List<ItemHandleResultDTO>> queryHandleCategories() {
List<ItemHandleResultDTO> itemHandleResultDTOList = new ArrayList<>();
UserDetail userDetail = SecurityUser.getUser();
// 获取可操作处理和可流转部门
switch (userDetail.getTypeKey()) {
case OrganizationTypeConstant.ORG_TYPE_GRID_PARTY:
itemHandleResultDTOList = ItemHandleCategoryEnum.getHandleCategoriesForGird(false);
break;
case OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY:
case OrganizationTypeConstant.ORG_TYPE_STREET_DEPT:
case OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT:
ItemHandleResultDTO itemHanle = new ItemHandleResultDTO();
itemHanle.setProcessResult(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue());
itemHanle.setProcessName(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getName());
itemHanle.setSelect(false);
itemHandleResultDTOList.add(itemHanle);
break;
case OrganizationTypeConstant.ORG_TYPE_STREET_PARTY:
itemHandleResultDTOList = getStreetPartyHandleCategory();
}
return new Result<List<ItemHandleResultDTO>>().ok(itemHandleResultDTOList);
}
/**
* @param
* @return java.util.List<com.elink.esua.epdc.dto.item.result.ItemHandleResultDTO>
* @Author yinzuomei
* @Description 街道党工委目前具有的操作权限吹哨回应上报网格化平台
* @Date 2020/1/13 17:21
**/
private List<ItemHandleResultDTO> getStreetPartyHandleCategory() {
List<ItemHandleResultDTO> itemHandleResultDTOS = new ArrayList<>();
ItemHandleResultDTO itemHandleResultDTO = new ItemHandleResultDTO();
itemHandleResultDTO.setProcessResult(ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue());
itemHandleResultDTO.setProcessName(ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getName());
itemHandleResultDTO.setSelect(false);
itemHandleResultDTOS.add(itemHandleResultDTO);
ItemHandleResultDTO itemHandleResultDTO1 = new ItemHandleResultDTO();
itemHandleResultDTO1.setProcessResult(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue());
itemHandleResultDTO1.setProcessName(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getName());
itemHandleResultDTO1.setSelect(false);
itemHandleResultDTOS.add(itemHandleResultDTO1);
ItemHandleResultDTO itemHandleResultDTO2 = new ItemHandleResultDTO();
itemHandleResultDTO2.setProcessResult(ItemHandleCategoryEnum.HANDLE_REPORT.getValue());
itemHandleResultDTO2.setProcessName(ItemHandleCategoryEnum.HANDLE_REPORT.getName());
itemHandleResultDTO2.setSelect(false);
itemHandleResultDTOS.add(itemHandleResultDTO2);
return itemHandleResultDTOS;
}
}

Loading…
Cancel
Save