设备工单

blade-service-api/work-order-api/src/main/java/org/springblade/workorder/deviceorder/dto/DeviceOrderDTO.java

@@ -38,4 +38,7 @@ public class DeviceOrderDTO extends DeviceOrder {
 	@ApiModelProperty("要查询的设备类型集合")
 	private List<Integer> deviceTypeList = new ArrayList<>();
 
+	private String taskId;
+
+	private String comment;
 }

blade-service/work-order/src/main/java/org/springblade/workorder/deviceorder/controller/DeviceOrderController.java

@@ -43,6 +43,8 @@ import org.springblade.workorder.deviceorder.service.IDeviceOrderService;
 import org.springblade.workorder.deviceorder.vo.DeviceOrderStatisticsVO;
 import org.springblade.workorder.deviceorder.vo.DeviceOrderVO;
 import org.springblade.workorder.deviceorder.wrapper.DeviceOrderWrapper;
+import org.springblade.workorder.publicevent.dto.PublicEventDTO;
+import org.springblade.workorder.publicevent.entity.PublicEvent;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -221,4 +223,19 @@ public class DeviceOrderController extends BladeController {
 		return R.data(deviceJobStaticVO);
 	}
 
+	/**
+	 * 	开启流程
+	 * */
+	@PostMapping("start-process")
+	public R startProcess(@RequestBody DeviceOrder deviceOrder) {
+		return R.status(this.deviceOrderService.startProcess(deviceOrder));
+	}
+
+	/**
+	 * 	完成流程
+	 * */
+	@PostMapping("complete-process")
+	public R completeProcess(@RequestBody DeviceOrderDTO deviceOrderDTO) {
+		return R.status(this.deviceOrderService.completeProcess(deviceOrderDTO));
+	}
 }

blade-service/work-order/src/main/java/org/springblade/workorder/deviceorder/service/IDeviceOrderService.java

@@ -18,6 +18,7 @@ package org.springblade.workorder.deviceorder.service;
 
 import org.springblade.core.mp.base.BaseService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.workorder.deviceorder.dto.DeviceOrderDTO;
 import org.springblade.workorder.deviceorder.entity.DeviceOrder;
 import org.springblade.workorder.deviceorder.vo.DeviceOrderVO;
 
@@ -39,4 +40,8 @@ public interface IDeviceOrderService extends BaseService<DeviceOrder> {
 	IPage<DeviceOrderVO> selectDeviceOrderPage(IPage<DeviceOrderVO> page, DeviceOrderVO deviceOrder);
 
 	Integer getUntreatedCount();
+
+	boolean startProcess(DeviceOrder deviceOrder);
+
+	boolean completeProcess(DeviceOrderDTO deviceOrderDTO);
 }

blade-service/work-order/src/main/java/org/springblade/workorder/deviceorder/service/impl/DeviceOrderServiceImpl.java

@@ -16,13 +16,36 @@
  */
 package org.springblade.workorder.deviceorder.service.impl;
 
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.support.Kv;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.flow.core.constant.ProcessConstant;
+import org.springblade.flow.core.entity.BladeFlow;
+import org.springblade.flow.core.feign.IFlowClient;
+import org.springblade.flow.core.utils.FlowUtil;
+import org.springblade.flow.core.utils.TaskUtil;
+import org.springblade.workorder.common.FlowStepConst;
+import org.springblade.workorder.deviceorder.dto.DeviceOrderDTO;
 import org.springblade.workorder.deviceorder.entity.DeviceOrder;
 import org.springblade.workorder.deviceorder.mapper.DeviceOrderMapper;
 import org.springblade.workorder.deviceorder.service.IDeviceOrderService;
 import org.springblade.workorder.deviceorder.vo.DeviceOrderVO;
+import org.springblade.workorder.publicevent.entity.PublicEvent;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Map;
+import java.util.Objects;
+
+import static org.springblade.workorder.common.FlowStepConst.STEP_1;
+import static org.springblade.workorder.common.FlowStepConst.flowStep;
 
 /**
  * 设备工单 服务实现类
@@ -31,7 +54,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
  * @since 2021-04-21
  */
 @Service
+@Slf4j
+@AllArgsConstructor
 public class DeviceOrderServiceImpl extends BaseServiceImpl<DeviceOrderMapper, DeviceOrder> implements IDeviceOrderService {
+	private final IFlowClient flowClient;
 
 	@Override
 	public IPage<DeviceOrderVO> selectDeviceOrderPage(IPage<DeviceOrderVO> page, DeviceOrderVO deviceOrder) {
@@ -42,4 +68,64 @@ public class DeviceOrderServiceImpl extends BaseServiceImpl<DeviceOrderMapper, D
 		return baseMapper.getUntreatedCount();
 	}
 
+	@Override
+	@Transactional
+	public boolean startProcess(DeviceOrder deviceOrder) {
+		String businessTable = FlowUtil.getBusinessTable(ProcessConstant.DEVICE_ORDER);
+		if (Func.isEmpty(deviceOrder.getId())){
+			deviceOrder.setFlag(STEP_1.step);
+			deviceOrder.setJobStatus(1);
+			this.save(deviceOrder);
+			// 启动流程
+			Kv variables = Kv.create()
+				.set("handlePerson", TaskUtil.getTaskUser(deviceOrder.getHandlePerson()))
+				.set(ProcessConstant.TASK_VARIABLE_CREATE_USER, AuthUtil.getUserName());
+			R<BladeFlow> result = flowClient
+				.startProcessInstanceById(deviceOrder.getProcessDefinitionId(), FlowUtil.getBusinessKey(businessTable, String.valueOf(deviceOrder.getId())), variables);
+			if (result.isSuccess()) {
+				deviceOrder.setProcessInstanceId(result.getData().getProcessInstanceId());
+				updateById(deviceOrder);
+			} else {
+				throw new ServiceException("开启流程失败");
+			}
+		}else {
+			this.updateById(deviceOrder);
+		}
+		return true;
+	}
+
+	@Override
+	@Transactional
+	public boolean completeProcess(DeviceOrderDTO deviceOrderDTO) {
+		try {
+			DeviceOrder deviceOrder = Objects.requireNonNull(BeanUtil.copy(deviceOrderDTO, DeviceOrder.class));
+			R<Map<String, Object>> variablesRes = flowClient.taskVariables(deviceOrderDTO.getTaskId());
+			if (variablesRes.isSuccess()){
+				Map<String, Object> variables = variablesRes.getData();
+				if (variables == null) {
+					variables = Kv.create();
+				}
+				switch ((FlowStepConst)flowStep.get(deviceOrder.getFlag())){
+					case STEP_1:
+						break;
+					case STEP_2:
+						break;
+					case STEP_3:
+						break;
+					default:
+						log.error("查找当前步骤表单失败！");
+						return false;
+				}
+				this.updateById(deviceOrder);
+				R res = flowClient.completeTask(deviceOrderDTO.getTaskId(), deviceOrderDTO.getProcessInstanceId(),
+					Func.isEmpty(deviceOrderDTO.getComment()) ? "同意" : deviceOrderDTO.getComment(), variables);
+				return res.isSuccess();
+			}
+			return false;
+		}catch (Exception e){
+			log.error("公共事件流程处理异常：" + e.getMessage());
+			throw e;
+		}
+	}
+
 }