运维管理

operation_manager/src/main/java/com/huaxu/process/activiti/Service/ProgressSevice.java

@@ -33,7 +33,7 @@ public class ProgressSevice  implements JavaDelegate{
         System.out.println("serviceTask已经执行已经执行！");
         Map<String, Object> variables = delegateExecution.getVariables();
         Message message=new Message();
-        message.setChannel(0);
+
         message.setStatus(1);
         LoginUser currentUser = UserUtil.getCurrentUser();
         message.setCreateBy(currentUser.getUsername());
@@ -44,6 +44,7 @@ public class ProgressSevice  implements JavaDelegate{
         message.setMessageTemplateId((Integer) variables.get("templateId"));
         String value = (String) expression.getValue(delegateExecution);
         TaskUserDTO taskUserDTO = JSONObject.parseObject(value, TaskUserDTO.class);
+        message.setChannel(taskUserDTO.getChannel());
         Set<Integer> taskUsers = userFormService.getTaskUsers(taskUserDTO);
 
         if(taskUsers!=null){

operation_manager/src/main/java/com/huaxu/process/controller/UserFormController.java

@@ -24,9 +24,8 @@ public class UserFormController {
 
     @GetMapping("/getTaskForm")
     @ApiOperation(value = "获取任务表单")
-    public AjaxMessage<UserForm> getTaskForm(@ApiParam(value = "任务ID", required = true) @RequestParam(required = true) String taskId,
-                                             @ApiParam(value = "客户端类型", required = true) @RequestParam(required = true) String clientType) {
-        UserForm taskForm = userFormService.getTaskUserForm(taskId, clientType);
+    public AjaxMessage<UserForm> getTaskForm(@ApiParam(value = "任务ID", required = true) @RequestParam(required = true) String taskId) {
+        UserForm taskForm = userFormService.getTaskUserForm(taskId);
         return new AjaxMessage<>(ResultStatus.OK, taskForm);
     }
 
@@ -52,4 +51,5 @@ public class UserFormController {
         UserForm result = userFormService.getUserFormDetail(formKey, channelId);
         return new AjaxMessage<>(ResultStatus.OK, result);
     }
+
 }

operation_manager/src/main/java/com/huaxu/process/controller/WorkFlowController.java

@@ -21,8 +21,13 @@ import io.swagger.annotations.ApiParam;
 import org.activiti.engine.task.Task;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.FileCopyUtils;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -119,14 +124,38 @@ public class WorkFlowController {
         workFlowService.saveBPMNContent(id, content, svg);
         return new AjaxMessage(ResultStatus.OK);
     }
-
+    @GetMapping("/image")
+    @ApiOperation(value = "工单流程图片")
+    public void image(
+            @ApiParam(value = "流程实例id", required = true) @RequestParam(required = true) String processId,
+         HttpServletResponse response
+    ) throws Exception {
+        InputStream inputStream =workFlowService.queryProHighLighted(processId);
+        OutputStream out = response.getOutputStream();
+
+        //设置响应头通知浏览器以图片的形式打开
+        response.setContentType("image/png");
+        //设置响应头控制浏览器不要缓存
+        response.setDateHeader("expries", -1);
+        response.setHeader("Cache-Control", "no-cache");
+        response.setHeader("Pragma", "no-cache");
+        //ImageIO.write(imageCode.getImage(), "PNG", out);
+        out.write(FileCopyUtils.copyToByteArray(inputStream));
+        out.close();
+    }
+    @PostMapping("/deleteProcess")
+    @ApiOperation(value = "终止流程")
+    public AjaxMessage saveBpmnContent(
+            @ApiParam(value = "流程实例id", required = true) @RequestParam(required = true) Integer processId) {
+        workFlowService.deleteProcessDefinition(processId);
+        return new AjaxMessage(ResultStatus.OK);
+    }
     @GetMapping("/testStartProgress")
     @ApiOperation(value = "开启流程")
     public AjaxMessage testStartProgress() {
         ProcessDefinition processDefinition=new ProcessDefinition();
         processDefinition.setTenantId("test1");
         processDefinition.setProcessKey("workFlow");
-        String businessKey="43";
         Map<String, Object> vars=new HashMap<>();
         vars.put("assineeFormUserId","55,66");
         //巡检发送系统消息所需参数
@@ -136,10 +165,10 @@ public class WorkFlowController {
         vars.put("msgType",4);
         //工单发送发送系统消息所需参数
         vars.put("工单类型","ttt");
-        vars.put("文档名称","12345678");
+        vars.put("工单编号","12345678");
         vars.put("templateId",7);
         vars.put("msgType",7);
-        String startProcess = workFlowService.startProcess(processDefinition, businessKey, vars);
+        String startProcess = workFlowService.startProcess(processDefinition, vars);
         Task task = workFlowService.getProcessRuntimeTask(startProcess).get(0);
         Set<String> taskParticipator = workFlowService.getTaskParticipator(task.getId(), false, null);
         return new AjaxMessage(ResultStatus.OK,taskParticipator);

operation_manager/src/main/java/com/huaxu/process/dto/TaskUserDTO.java

@@ -12,5 +12,7 @@ public class TaskUserDTO   {
     private List<Integer>userIds;
     @ApiModelProperty(value = "表单用户标识")
     private Integer userFormFlag=0;
+    @ApiModelProperty(value = "渠道标识")
+    private Integer channel=0;
 
 }

operation_manager/src/main/java/com/huaxu/process/service/UserFormService.java

@@ -27,7 +27,7 @@ public interface UserFormService {
      */
     UserForm getUserFormDetail(String formKey, Integer channelId);
 
-    UserForm getTaskUserForm(String taskId, String clientType);
+    UserForm getTaskUserForm(String taskId);
 
     Set<Integer> getTaskUsers(TaskUserDTO taskUserDTO);
 }

operation_manager/src/main/java/com/huaxu/process/service/WorkFlowService.java

@@ -71,11 +71,11 @@ public interface WorkFlowService {
      * <p>启动工作流,返回启动后实例ID</p>
      *
      * @param def
-     * @param businessKey
+     * @param
      * @param vars
      * @return
      */
-    public String startProcess(ProcessDefinition def, String businessKey, Map<String, Object> vars);
+    public String startProcess(ProcessDefinition def, Map<String, Object> vars);
 
     /**
      * <p>处理任务</p>

operation_manager/src/main/java/com/huaxu/process/service/impl/UserFormServiceImpl.java

@@ -65,7 +65,7 @@ public class UserFormServiceImpl implements UserFormService {
     }
 
     @Override
-    public UserForm getTaskUserForm(String taskId, String clientType) {
+    public UserForm getTaskUserForm(String taskId) {
         UserForm form = null;
         String taskFormkey = workFlowService.getTaskFormkey(taskId);
         if (taskFormkey != null) {

operation_manager/src/main/java/com/huaxu/process/service/impl/WorkFlowServiceImpl.java

@@ -340,11 +340,11 @@ public class WorkFlowServiceImpl implements WorkFlowService {
     }
 
     @Override
-    public String startProcess(ProcessDefinition def, String businessKey, Map<String, Object> vars) {
-        log.info("begin startProcess,def ={} , businessKey= {} , vars = {} ", def.getProcessKey(), businessKey, vars);
+    public String startProcess(ProcessDefinition def, Map<String, Object> vars) {
+        log.info("begin startProcess,def ={} , businessKey= {} , vars = {} ", def.getProcessKey(), def.getId(), vars);
         // 1,启动流程，并设置全局变量
         String tenantId = def.getTenantId();
-
+        String businessKey=def.getId()+"";
         ProcessInstance pi = runtimeService.startProcessInstanceByKeyAndTenantId(def.getProcessKey(),
                 businessKey, vars, tenantId);
         // 2,返回流程实例ID