优化代码

java110-bean/src/main/java/com/java110/dto/oaWorkflow/OaWorkflowDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.oaWorkflow;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -14,14 +15,18 @@ import java.util.Date;
  **/
 public class OaWorkflowDto extends PageDto implements Serializable {
 
+    public static final String STATE_WAIT = "W";//待部署
+    public static final String STATE_COMPLAINT = "C";//部署完成
+
     private String describle;
-private String modelId;
-private String flowKey;
-private String storeId;
-private String flowId;
-private String flowName;
-private String flowType;
-private String processDefinitionKey;
+    private String modelId;
+    private String flowKey;
+    private String storeId;
+    private String flowId;
+    private String flowName;
+    private String flowType;
+    private String processDefinitionKey;
+    private String state;
 
 
     private Date createTime;
@@ -32,49 +37,64 @@ private String processDefinitionKey;
     public String getDescrible() {
         return describle;
     }
-public void setDescrible(String describle) {
+
+    public void setDescrible(String describle) {
         this.describle = describle;
     }
-public String getModelId() {
+
+    public String getModelId() {
         return modelId;
     }
-public void setModelId(String modelId) {
+
+    public void setModelId(String modelId) {
         this.modelId = modelId;
     }
-public String getFlowKey() {
+
+    public String getFlowKey() {
         return flowKey;
     }
-public void setFlowKey(String flowKey) {
+
+    public void setFlowKey(String flowKey) {
         this.flowKey = flowKey;
     }
-public String getStoreId() {
+
+    public String getStoreId() {
         return storeId;
     }
-public void setStoreId(String storeId) {
+
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
-public String getFlowId() {
+
+    public String getFlowId() {
         return flowId;
     }
-public void setFlowId(String flowId) {
+
+    public void setFlowId(String flowId) {
         this.flowId = flowId;
     }
-public String getFlowName() {
+
+    public String getFlowName() {
         return flowName;
     }
-public void setFlowName(String flowName) {
+
+    public void setFlowName(String flowName) {
         this.flowName = flowName;
     }
-public String getFlowType() {
+
+    public String getFlowType() {
         return flowType;
     }
-public void setFlowType(String flowType) {
+
+    public void setFlowType(String flowType) {
         this.flowType = flowType;
     }
-public String getProcessDefinitionKey() {
+
+    public String getProcessDefinitionKey() {
         return processDefinitionKey;
     }
-public void setProcessDefinitionKey(String processDefinitionKey) {
+
+    public void setProcessDefinitionKey(String processDefinitionKey) {
         this.processDefinitionKey = processDefinitionKey;
     }
 
@@ -94,4 +114,12 @@ public void setProcessDefinitionKey(String processDefinitionKey) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
 }

java110-bean/src/main/java/com/java110/po/oaWorkflow/OaWorkflowPo.java

@@ -1,74 +1,97 @@
 package com.java110.po.oaWorkflow;
 
 import java.io.Serializable;
-import java.util.Date;
 
 public class OaWorkflowPo implements Serializable {
 
     private String describle;
-private String modelId;
-private String statusCd = "0";
-private String flowKey;
-private String storeId;
-private String flowId;
-private String flowName;
-private String flowType;
-private String processDefinitionKey;
-public String getDescrible() {
+    private String modelId;
+    private String statusCd = "0";
+    private String flowKey;
+    private String storeId;
+    private String flowId;
+    private String flowName;
+    private String flowType;
+    private String state;
+    private String processDefinitionKey;
+
+    public String getDescrible() {
         return describle;
     }
-public void setDescrible(String describle) {
+
+    public void setDescrible(String describle) {
         this.describle = describle;
     }
-public String getModelId() {
+
+    public String getModelId() {
         return modelId;
     }
-public void setModelId(String modelId) {
+
+    public void setModelId(String modelId) {
         this.modelId = modelId;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getFlowKey() {
+
+    public String getFlowKey() {
         return flowKey;
     }
-public void setFlowKey(String flowKey) {
+
+    public void setFlowKey(String flowKey) {
         this.flowKey = flowKey;
     }
-public String getStoreId() {
+
+    public String getStoreId() {
         return storeId;
     }
-public void setStoreId(String storeId) {
+
+    public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
-public String getFlowId() {
+
+    public String getFlowId() {
         return flowId;
     }
-public void setFlowId(String flowId) {
+
+    public void setFlowId(String flowId) {
         this.flowId = flowId;
     }
-public String getFlowName() {
+
+    public String getFlowName() {
         return flowName;
     }
-public void setFlowName(String flowName) {
+
+    public void setFlowName(String flowName) {
         this.flowName = flowName;
     }
-public String getFlowType() {
+
+    public String getFlowType() {
         return flowType;
     }
-public void setFlowType(String flowType) {
+
+    public void setFlowType(String flowType) {
         this.flowType = flowType;
     }
-public String getProcessDefinitionKey() {
+
+    public String getProcessDefinitionKey() {
         return processDefinitionKey;
     }
-public void setProcessDefinitionKey(String processDefinitionKey) {
+
+    public void setProcessDefinitionKey(String processDefinitionKey) {
         this.processDefinitionKey = processDefinitionKey;
     }
 
+    public String getState() {
+        return state;
+    }
 
-
+    public void setState(String state) {
+        this.state = state;
+    }
 }

java110-db/src/main/resources/mapper/oa/OaWorkflowServiceDaoImplMapper.xml

@@ -8,9 +8,9 @@
     <!-- 保存OA工作流信息 add by wuxw 2018-07-03 -->
     <insert id="saveOaWorkflowInfo" parameterType="Map">
         insert into oa_workflow(
-        describle,model_id,flow_key,store_id,flow_id,flow_name,flow_type,process_definition_key
+        describle,model_id,flow_key,store_id,flow_id,flow_name,flow_type,process_definition_key,state
         ) values (
-        #{describle},#{modelId},#{flowKey},#{storeId},#{flowId},#{flowName},#{flowType},#{processDefinitionKey}
+        #{describle},#{modelId},#{flowKey},#{storeId},#{flowId},#{flowName},#{flowType},#{processDefinitionKey},#{state}
         )
     </insert>
 
@@ -20,7 +20,7 @@
         select t.describle,t.model_id,t.model_id modelId,t.status_cd,t.status_cd statusCd,t.flow_key,t.flow_key
         flowKey,t.store_id,t.store_id storeId,t.flow_id,t.flow_id flowId,t.flow_name,t.flow_name
         flowName,t.flow_type,t.flow_type flowType,t.process_definition_key,t.process_definition_key processDefinitionKey,
-        t.create_time createTime
+        t.create_time createTime,t.state
         from oa_workflow t
         where 1 =1
         <if test="describle !=null and describle != ''">
@@ -44,6 +44,9 @@
         <if test="flowName !=null and flowName != ''">
             and t.flow_name= #{flowName}
         </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
         <if test="flowType !=null and flowType != ''">
             and t.flow_type= #{flowType}
         </if>
@@ -73,6 +76,9 @@
         <if test="flowKey !=null and flowKey != ''">
             , t.flow_key= #{flowKey}
         </if>
+        <if test="state !=null and state != ''">
+            , t.state= #{state}
+        </if>
 
         <if test="flowName !=null and flowName != ''">
             , t.flow_name= #{flowName}
@@ -116,6 +122,9 @@
         <if test="flowId !=null and flowId != ''">
             and t.flow_id= #{flowId}
         </if>
+        <if test="state !=null and state != ''">
+            and t.state= #{state}
+        </if>
         <if test="flowName !=null and flowName != ''">
             and t.flow_name= #{flowName}
         </if>

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

@@ -90,6 +90,24 @@ public class WorkflowApi {
 
     }
 
+    /**
+     * 部署流程
+     *
+     * @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);
+
+    }
+
 
     /**
      * 获取model的节点信息，编辑器根据返回的json进行绘图

service-common/src/main/java/com/java110/common/bmo/workflow/impl/QueryWorkFlowFirstStaffBMOImpl.java

@@ -180,6 +180,7 @@ public class QueryWorkFlowFirstStaffBMOImpl implements IQueryWorkFlowFirstStaffB
         oaWorkflowPo.setFlowId(oaWorkflowDtos.get(0).getFlowId());
         oaWorkflowPo.setStoreId(oaWorkflowDtos.get(0).getStoreId());
         oaWorkflowPo.setProcessDefinitionKey(deploymentid);
+        oaWorkflowPo.setState(OaWorkflowDto.STATE_COMPLAINT);
         oaWorkflowInnerServiceSMOImpl.updateOaWorkflow(oaWorkflowPo);
 //        //部署历史表
 //        List<DeployHistoryEntity> deployHistoryEntities = deployHistoryRepository.getDeployHistoryByDeptWithProcessKeyId(deptWithProcessKeyId);
@@ -214,6 +215,7 @@ public class QueryWorkFlowFirstStaffBMOImpl implements IQueryWorkFlowFirstStaffB
         OaWorkflowXmlDto oaWorkflowXmlDto = new OaWorkflowXmlDto();
         oaWorkflowXmlDto.setFlowId(oaWorkflowDtos.get(0).getFlowId());
         oaWorkflowXmlDto.setStoreId(oaWorkflowDtos.get(0).getStoreId());
+
         List<OaWorkflowXmlDto> oaWorkflowXmlDtos = oaWorkflowXmlInnerServiceSMOImpl.queryOaWorkflowXmls(oaWorkflowXmlDto);
         int flag = 0;
         if(oaWorkflowXmlDtos == null || oaWorkflowXmlDtos.size() < 1){
@@ -257,7 +259,7 @@ public class QueryWorkFlowFirstStaffBMOImpl implements IQueryWorkFlowFirstStaffB
             throw new ActivitiException("Error saving model", e);
         }
 
-        return deployModel(workflowModelDto);
+        return ResultVo.success();
     }
 
 }

service-oa/src/main/java/com/java110/oa/api/OaWorkflowApi.java

@@ -113,7 +113,7 @@ public class OaWorkflowApi {
      */
     @RequestMapping(value = "/queryOaWorkflow", method = RequestMethod.GET)
     public ResponseEntity<String> queryOaWorkflow(@RequestHeader(value = "store-id") String storeId,
-                                                  @RequestParam(value="flowId") String flowId,
+                                                  @RequestParam(value="flowId",required = false) String flowId,
                                                   @RequestParam(value = "page") int page,
                                                   @RequestParam(value = "row") int row) {
         OaWorkflowDto oaWorkflowDto = new OaWorkflowDto();

service-oa/src/main/java/com/java110/oa/bmo/oaWorkflow/impl/SaveOaWorkflowBMOImpl.java

@@ -2,6 +2,7 @@ package com.java110.oa.bmo.oaWorkflow.impl;
 
 import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.oaWorkflow.OaWorkflowDto;
 import com.java110.dto.workflow.WorkflowModelDto;
 import com.java110.intf.common.IWorkflowInnerServiceSMO;
 import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
@@ -39,6 +40,7 @@ public class SaveOaWorkflowBMOImpl implements ISaveOaWorkflowBMO {
 
         oaWorkflowPo.setModelId(workflowModelDto.getModelId());
         oaWorkflowPo.setFlowKey(workflowModelDto.getKey());
+        oaWorkflowPo.setState(OaWorkflowDto.STATE_WAIT);
         int flag = oaWorkflowInnerServiceSMOImpl.saveOaWorkflow(oaWorkflowPo);
 
         if (flag > 0) {

service-oa/src/main/java/com/java110/oa/bmo/oaWorkflow/impl/UpdateOaWorkflowBMOImpl.java

@@ -1,6 +1,7 @@
 package com.java110.oa.bmo.oaWorkflow.impl;
 
 import com.java110.core.annotation.Java110Transactional;
+import com.java110.dto.oaWorkflow.OaWorkflowDto;
 import com.java110.intf.oa.IOaWorkflowInnerServiceSMO;
 import com.java110.oa.bmo.oaWorkflow.IUpdateOaWorkflowBMO;
 import com.java110.po.oaWorkflow.OaWorkflowPo;
@@ -21,7 +22,8 @@ public class UpdateOaWorkflowBMOImpl implements IUpdateOaWorkflowBMO {
      */
     @Java110Transactional
     public ResponseEntity<String> update(OaWorkflowPo oaWorkflowPo) {
-
+        //只要已修改 就 状态刷为待部署
+        oaWorkflowPo.setState(OaWorkflowDto.STATE_WAIT);
         int flag = oaWorkflowInnerServiceSMOImpl.updateOaWorkflow(oaWorkflowPo);
 
         if (flag > 0) {