Merge remote-tracking branch 'origin/master'

skyeye-promote/src/main/java/com/skyeye/activiti/controller/ActivitiModelController.java

@@ -127,4 +127,20 @@ public class ActivitiModelController {
 		activitiModelService.queryReleasedActivitiModelList(inputObject, outputObject);
 	}
 	
+	/**
+	 * 
+	     * @Title: deleteReleasedActivitiModelById
+	     * @Description: 取消发布
+	     * @param @param inputObject
+	     * @param @param outputObject
+	     * @param @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@RequestMapping("/post/ActivitiModelController/deleteReleasedActivitiModelById")
+	@ResponseBody
+	public void deleteReleasedActivitiModelById(InputObject inputObject, OutputObject outputObject) throws Exception{
+		activitiModelService.deleteReleasedActivitiModelById(inputObject, outputObject);
+	}
+	
 }

skyeye-promote/src/main/java/com/skyeye/activiti/service/ActivitiModelService.java

@@ -19,4 +19,6 @@ public interface ActivitiModelService {
 
 	public void queryReleasedActivitiModelList(InputObject inputObject, OutputObject outputObject) throws Exception;
 
+	public void deleteReleasedActivitiModelById(InputObject inputObject, OutputObject outputObject) throws Exception;
+
 }

skyeye-promote/src/main/java/com/skyeye/activiti/service/impl/ActivitiModelServiceImpl.java

@@ -233,6 +233,23 @@ public class ActivitiModelServiceImpl implements ActivitiModelService{
 		outputObject.setBeans(rows);
 		outputObject.settotal(count);
 	}
+
+	/**
+	 * 
+	     * @Title: deleteReleasedActivitiModelById
+	     * @Description: 取消发布
+	     * @param @param inputObject
+	     * @param @param outputObject
+	     * @param @throws Exception    参数
+	     * @return void    返回类型
+	     * @throws
+	 */
+	@Override
+	public void deleteReleasedActivitiModelById(InputObject inputObject, OutputObject outputObject) throws Exception {
+		Map<String, Object> map = inputObject.getParams();
+		String deploymentId = map.get("deploymentId").toString();
+		repositoryService.deleteDeployment(deploymentId);
+	}
     
 	
 }

skyeye-promote/src/main/resources/mapping/reqmapping.xml

@@ -911,6 +911,9 @@
 		<property id="limit" name="limit" ref="required,num" var="分页参数,每页多少条数据" />
 	    <property id="page" name="page" ref="required,num" var="分页参数,第几页"/>
 	</url>
+	<url id="activitimode008" path="/post/ActivitiModelController/deleteReleasedActivitiModelById" val="取消发布" allUse="1">
+		<property id="deploymentId" name="deploymentId" ref="required" var="部署流程id"/>
+	</url>
 	<!-- 工作流结束 -->
 	
 </controller>
\ No newline at end of file

skyeye-promote/src/main/resources/template/js/activitimodel/releasedactivitimodellist.js

@@ -62,7 +62,7 @@ layui.config({
 		layer.confirm(msg, { icon: 3, title: '取消发布' }, function (index) {
 			layer.close(index);
             //向服务端发送删除指令
-            AjaxPostUtil.request({url:reqBasePath + "activitimode006", params:{rowId: data.id}, type:'json', callback:function(json){
+            AjaxPostUtil.request({url:reqBasePath + "activitimode008", params:{deploymentId: data.id}, type:'json', callback:function(json){
     			if(json.returnCode == 0){
     				top.winui.window.msg("取消发布成功", {icon: 1,time: 2000});
     				loadTable();