Browse Source

北尚诉办-接受网格化平台推送项目处理进程

feature/dangjian
Jackwang 3 years ago
parent
commit
a9d2b3a796
  1. 13
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java
  2. 10
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java
  3. 5
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java
  4. 9
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java
  5. 5
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java
  6. 44
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/AcceptPlantformProcessDTO.java
  7. 3
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java
  8. 14
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java
  9. 9
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
  10. 40
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
  11. 3
      esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java

13
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java

@ -119,4 +119,17 @@ public class ApiItemController {
formDto.setUserId(userDetail.getUserId());
return itemService.getItemListByUserId(formDto);
}
/**
* @describe: 接受网格化平台项目处理结果结案/驳回
* @author wangtong
* @date 2022/9/6 17:03
* @params [formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
@PostMapping("pushItemProcess")
public Result pushItemProcess(@RequestBody AcceptPlantformProcessDTO formDto) {
return itemService.pushItemProcess(formDto);
}
}

10
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java

@ -121,4 +121,14 @@ public interface ItemFeignClient {
*/
@GetMapping(value = "events/epdc-app/item/getItemListByUserId", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<List<ItemResultDTO>> getItemListByUserId(PeopleItemFormDTO formDto);
/**
* @describe: 接受网格化平台项目处理结果结案/驳回
* @author wangtong
* @date 2022/9/6 17:03
* @params [formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
@PostMapping(value = "events/item/pushItemProcess", consumes = MediaType.APPLICATION_JSON_VALUE)
Result pushItemProcess(AcceptPlantformProcessDTO formDto);
}

5
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java

@ -70,4 +70,9 @@ public class ItemFeignClientFallback implements ItemFeignClient {
public Result<List<ItemResultDTO>> getItemListByUserId(PeopleItemFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "getItemListByUserId", formDto);
}
@Override
public Result pushItemProcess(AcceptPlantformProcessDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "pushItemProcess", formDto);
}
}

9
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java

@ -104,4 +104,13 @@ public interface ItemService {
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemResultDTO>>
*/
Result<List<ItemResultDTO>> getItemListByUserId(PeopleItemFormDTO formDto);
/**
* @describe: 接受网格化平台项目处理结果结案/驳回
* @author wangtong
* @date 2022/9/6 17:03
* @params [formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
Result pushItemProcess(AcceptPlantformProcessDTO formDto);
}

5
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java

@ -206,4 +206,9 @@ public class ItemServiceImpl implements ItemService {
);
return listResult;
}
@Override
public Result pushItemProcess(AcceptPlantformProcessDTO formDto) {
return itemFeignClient.pushItemProcess(formDto);
}
}

44
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/AcceptPlantformProcessDTO.java

@ -0,0 +1,44 @@
package com.elink.esua.epdc.dto.item.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.List;
/**
* @program: esua-epdc
* @description:
* @author: wangtong
* @create: 2022-09-06 16:26
**/
@Data
public class AcceptPlantformProcessDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 记录唯一标识
*/
@NotBlank(message = "唯一标识不可为空")
private String p_recId;
/**
*状态0通过 1驳回
*/
@NotBlank(message = "审批不可为空")
private String state;
/**
*处理意见
*/
@NotNull(message = "处理意见不可为空")
private String handleAdvice;
/**
*
*/
private List<String> images;
}

3
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java

@ -26,7 +26,8 @@ public enum ItemGridPlatformHandleStatusEnum {
HANDLE_CL(45, "处置完成"),
HANDLE_PZ(70, "批转"),
HANDLE_TD(75, "退单"),
HANDLE_BJ(80, "办结");
HANDLE_BJ(80, "办结"),
HANDLE_BH(1065, "驳回");

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

@ -30,6 +30,7 @@ import com.elink.esua.epdc.dto.events.form.EventDeleteCommentsFormDTO;
import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO;
import com.elink.esua.epdc.dto.item.ItemDTO;
import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO;
import com.elink.esua.epdc.dto.item.form.AcceptPlantformProcessDTO;
import com.elink.esua.epdc.dto.item.form.ExamineCaseFormDTO;
import com.elink.esua.epdc.dto.item.form.HandleResultDTOSFormDTO;
import com.elink.esua.epdc.dto.item.form.ItemHandleSubmitFormDTO;
@ -346,5 +347,18 @@ public class ItemController {
ValidatorUtils.validateEntity(formDto);
return itemService.examineCase(formDto);
}
/**
* @describe: 接受网格化平台项目处理结果结案/驳回
* @author wangtong
* @date 2022/9/6 17:03
* @params [formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
@PostMapping("pushItemProcess")
public Result pushItemProcess(@RequestBody AcceptPlantformProcessDTO formDto) {
ValidatorUtils.validateEntity(formDto);
return itemService.pushItemProcess(formDto);
}
}

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

@ -526,4 +526,13 @@ public interface ItemService extends BaseService<ItemEntity> {
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
Result examineCase(ExamineCaseFormDTO formDto);
/**
* @describe: 接受网格化平台项目处理结果结案/驳回
* @author wangtong
* @date 2022/9/6 17:03
* @params [formDto]
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
Result pushItemProcess(AcceptPlantformProcessDTO formDto);
}

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

@ -2521,4 +2521,44 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
return serialNum + numStr;
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result pushItemProcess(AcceptPlantformProcessDTO formDto) {
String successFlag = YesOrNoEnum.NO.value();
String returnMsgBody = "";
ItemGridPlatformDTO itemPlat = itemGridPlatformService.getInfoByTaskId(formDto.getP_recId());
if(null == itemPlat){
// 保存接口调用日志
this.saveInterfaceLog(itemPlat.getReferenceId(), InterfaceLogBusinessTypeEnum.ACCEPT_ITEM_PROCESS.getValue(),
ApiConstants.acceptItemProcess, successFlag, formDto.getP_recId(), returnMsgBody);
return new Result().error("未查到相关事件信息");
}
// 插入项目处理进度表
ItemHandleProcessDTO itemHandleProcessDto = new ItemHandleProcessDTO();
itemHandleProcessDto.setId(UUID.randomUUID().toString().replaceAll("-", ""));
itemHandleProcessDto.setItemId(itemPlat.getReferenceId());
if("0".equals(formDto.getState())){
itemHandleProcessDto.setState(ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue());
}else if("1".equals(formDto.getState())){
itemHandleProcessDto.setState(ItemGridPlatformHandleStatusEnum.HANDLE_BH.getValue());
}else{
// 保存接口调用日志
this.saveInterfaceLog(itemPlat.getReferenceId(), InterfaceLogBusinessTypeEnum.ACCEPT_ITEM_PROCESS.getValue(),
ApiConstants.acceptItemProcess, successFlag, formDto.getP_recId(), returnMsgBody);
return new Result().error("状态信息有误");
}
itemHandleProcessDto.setHandleAdvice(formDto.getHandleAdvice());
itemHandleProcessDto.setOutHandleAdvice(formDto.getHandleAdvice());
itemHandleProcessDto.setHandlerDept("网格化平台");
itemHandleProcessDto.setCreatedTime(new Date());
itemHandleProcessDto.setUpdatedTime(new Date());
itemHandleProcessService.saveItemHandleProcess(itemHandleProcessDto);
successFlag = YesOrNoEnum.YES.value();
// 保存接口调用日志
this.saveInterfaceLog(itemPlat.getReferenceId(), InterfaceLogBusinessTypeEnum.ACCEPT_ITEM_PROCESS.getValue(),
ApiConstants.acceptItemProcess, successFlag, formDto.getP_recId(), returnMsgBody);
return new Result().ok("操作成功");
}
}

3
esua-epdc/epdc-module/epdc-webservice/src/main/java/com/elink/esua/epdc/enums/ItemGridPlatformHandleStatusEnum.java

@ -25,7 +25,8 @@ public enum ItemGridPlatformHandleStatusEnum {
HANDLE_CL(45, "处置完成"),
HANDLE_PZ(70, "批转"),
HANDLE_TD(75, "退单"),
HANDLE_BJ(80, "办结");
HANDLE_BH(1065, "驳回");

Loading…
Cancel
Save