优化databus bug

java110

2022-06-28 22e8a676ee42c0d78b3526bcd9a635abbe8dca03

 service-common/src/main/java/com/java110/common/api/WorkflowApi.java

@@ -7,21 +7,12 @@
import com.java110.dto.workflow.WorkflowDto;
import com.java110.dto.workflow.WorkflowModelDto;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.vo.ResultVo;
import org.activiti.editor.constants.ModelDataJsonConstants;
import org.activiti.engine.ActivitiException;
import org.activiti.engine.ProcessEngine;
import org.activiti.engine.ProcessEngines;
import org.activiti.engine.RepositoryService;
import org.activiti.engine.RuntimeService;
import org.activiti.engine.repository.Deployment;
import org.activiti.engine.repository.Model;
import org.apache.batik.transcoder.TranscoderInput;
import org.apache.batik.transcoder.TranscoderOutput;
import org.apache.batik.transcoder.image.PNGTranscoder;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -33,13 +24,10 @@
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestController;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;

@RestController
@RequestMapping("/workflow")
public class WorkflowApi {

    private static final Logger logger = LoggerFactory.getLogger(WorkflowApi.class);

    @Autowired
@@ -48,14 +36,10 @@
    @Autowired
    private ObjectMapper objectMapper;



    String MODEL_ID = "modelId";
    String MODEL_NAME = "name";
    String MODEL_REVISION = "revision";
    String MODEL_DESCRIPTION = "description";



    @Autowired
    private IQueryWorkFlowFirstStaffBMO queryWorkFlowFirstStaffBMOImpl;
@@ -71,20 +55,34 @@
        return queryWorkFlowFirstStaffBMOImpl.query(workflowDto);
    }


    /**
     * 更新流程
     *
     * @param reqJson 模型ID
     * @param reqString 模型ID
     * @ServiceCode /workflow/saveModel
     */
    @RequestMapping(value = "/saveModel", method = RequestMethod.POST)
    @ResponseStatus(value = HttpStatus.OK)
    public ResponseEntity<String> saveModel(@RequestBody JSONObject reqJson) {
    public ResponseEntity<String> saveModel(@RequestBody String reqString) {
        JSONObject reqJson = JSONObject.parseObject(reqString);
        WorkflowModelDto workflowModelDto = BeanConvertUtil.covertBean(reqJson, WorkflowModelDto.class);
        //部署model
        return queryWorkFlowFirstStaffBMOImpl.saveModel(workflowModelDto);
    }

    /**
     * 部署流程
     *
     * @param reqString 模型ID
     * @ServiceCode /workflow/deployModel
     */
    @RequestMapping(value = "/deployModel", method = RequestMethod.POST)
    @ResponseStatus(value = HttpStatus.OK)
    public ResponseEntity<String> deployModel(@RequestBody String reqString) {
        JSONObject reqJson = JSONObject.parseObject(reqString);
        WorkflowModelDto workflowModelDto = BeanConvertUtil.covertBean(reqJson, WorkflowModelDto.class);
        //部署model
        return queryWorkFlowFirstStaffBMOImpl.deployModel(workflowModelDto);
    }


@@ -119,6 +117,4 @@
        }
        return new ResponseEntity(modelNode.toString(), HttpStatus.OK);
    }


}