m

youxiw2000
1 parent 3da21a93
Showing 21 changed files with 283 additions and 87 deletions
sql/act_ru_event_subscr.sql
trash-admin/src/main/resources/application-dev.yml
trash-common/pom.xml
trash-common/src/main/java/com/trash/common/utils/LoginUtils.java
trash-common/src/main/java/com/trash/common/utils/SecurityUtils.java
trash-common/src/main/java/com/trash/common/utils/file/MimeTypeUtils.java
trash-framework/src/main/java/com/trash/framework/web/service/SysLoginService.java
trash-quartz/src/main/java/com/trash/quartz/task/DriverTask.java
trash-ui/src/layout/index5.vue → trash-ui/src/layout/index4.vue
trash-ui/src/views/activiti/task/index.vue
trash-ui/src/views/business/TruckCredit/index.vue
trash-ui/src/views/business/dayWorkReport/index.vue
trash-ui/src/views/business/threestep/index.vue
trash-ui/src/views/caseOffline/caseOffline/index.vue
trash-ui/src/views/daily/information_sharing/index.vue
trash-ui/src/views/daily/report/index.vue
trash-ui/src/views/h5/task/index.vue
trash-ui/src/views/otherData/otherData/index.vue
trash-workFlow/pom.xml
trash-workFlow/src/main/java/com/trash/casefile/kafka/Consumer.java
+/*
+ Navicat MySQL Data Transfer
+
+ Source Server         : mari
+ Source Server Type    : MariaDB
+ Source Server Version : 100508
+ Source Host           : localhost:3306
+ Source Schema         : trash
+
+ Target Server Type    : MariaDB
+ Target Server Version : 100508
+ File Encoding         : 65001
+
+ Date: 19/05/2023 12:29:12
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for act_ru_event_subscr
+-- ----------------------------
+DROP TABLE IF EXISTS `act_ru_event_subscr`;
+CREATE TABLE `act_ru_event_subscr`  (
+  `ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+  `REV_` int(11) NULL DEFAULT NULL,
+  `EVENT_TYPE_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
+  `EVENT_NAME_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+  `EXECUTION_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+  `PROC_INST_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+  `ACTIVITY_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+  `CONFIGURATION_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+  `CREATED_` timestamp(3) NOT NULL DEFAULT current_timestamp,
+  `PROC_DEF_ID_` varchar(64) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL,
+  `TENANT_ID_` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '',
+  PRIMARY KEY (`ID_`) USING BTREE,
+  INDEX `ACT_IDX_EVENT_SUBSCR_CONFIG_`(`CONFIGURATION_`) USING BTREE,
+  INDEX `ACT_FK_EVENT_EXEC`(`EXECUTION_ID_`) USING BTREE,
+  CONSTRAINT `ACT_FK_EVENT_EXEC` FOREIGN KEY (`EXECUTION_ID_`) REFERENCES `act_ru_execution` (`ID_`) ON DELETE RESTRICT ON UPDATE RESTRICT
+) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
@@ -16,10 +16,12 @@ trash:
     # 验证码类型 math 数组计算 char 字符验证
     captchaType: math
     # 远程服务器地址
-    remotePath: http://183.66.242.6:6001
-    #remotePath: http://183.66.242.6:14601
+    remotePath: http://183.66.242.6:6001 
     token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0MzI3NzQ1ODkyfQ.4BrpgD9i_1TwjLRGqa3wo4Ikx8t8Gcl3FzHfjL_uolPnNMm2rd7fCvrUoBBN4Qp4cMGzg9h2Nt4NNx8PYThTaQ
-
+    #remotePath: http://183.66.242.6:14601
+    #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
+    
+   
 # 数据源配置
 spring:
     datasource:
@@ -125,13 +125,6 @@
             <version>[3.20.6.1,)</version>
         </dependency>
  
-        <!--    kafka    -->
-        <dependency>
-            <groupId>org.springframework.kafka</groupId>
-            <artifactId>spring-kafka</artifactId>
-            <version>1.1.1.RELEASE</version>
-        </dependency>
-
     </dependencies>
  
 </project>
 \ No newline at end of file
+package com.trash.common.utils;
+
+public class LoginUtils {
+
+}
 package com.trash.common.utils;
  
+import java.util.Collection;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
  
 import com.trash.common.constant.HttpStatus;
@@ -15,6 +26,14 @@ import com.trash.common.exception.CustomException;
  */
 public class SecurityUtils
 {
+	
+	@Autowired
+	UserDetailsService userDetailsService;
+	
+    @Resource
+    private AuthenticationManager authenticationManager;
+	
+	
     /**
      * 获取用户账户
      **/
@@ -102,4 +121,10 @@ public class SecurityUtils
     {
         return userId != null && "1".equals(userId);
     }
+    
+    
+    
+    
+    
+    
 }
@@ -26,7 +26,7 @@ public class MimeTypeUtils
  
     public static final String[] DEFAULT_ALLOWED_EXTENSION = {
             // 图片
-            "bmp", "gif", "jpg", "jpeg", "png",
+            "bmp", "gif", "jpg", "jpeg", "png","pdf",
             // word excel powerpoint
             "doc", "docx", "xls", "xlsx", "ppt", "pptx", "html", "htm", "txt",
             // 压缩文件
@@ -33,6 +33,7 @@ import com.trash.common.exception.user.CaptchaExpireException;
 import com.trash.common.exception.user.UserPasswordNotMatchException;
 import com.trash.common.utils.MessageUtils;
 import com.trash.common.utils.RemoteServerUtils;
+import com.trash.common.utils.SecurityUtils;
 import com.trash.framework.manager.AsyncManager;
 import com.trash.framework.manager.factory.AsyncFactory;
  
@@ -29,6 +29,7 @@ import com.trash.business.service.ICompanyCreditService;
 import com.trash.business.service.ISupervisionThreestepService;
 import com.trash.business.service.ITruckActivateService;
 import com.trash.business.service.ITruckCreditService;
+import com.trash.casefile.domain.ViolationWarningInformation;
 import com.trash.common.annotation.Log;
 import com.trash.common.config.trashConfig;
 import com.trash.common.utils.LogUtils;
@@ -52,45 +53,49 @@ public class DriverTask
     @Autowired
     private trashConfig trashConfig;
  
-    public void checkCredit()
-    {	
+    public void checkCredit(){
+    	ViolationWarningInformation violationWarningInformation = new ViolationWarningInformation();
+    	violationWarningInformation.setSendObject("区管理部门(治)");
+    	violationWarningInformation.setNumber("123123");
+    	violationWarningInformation.setId(44444L);
+    	SpringUtils.getBean(IWorkflowService.class).createCaseFile1(violationWarningInformation,1,1);
  
-    	if(RemoteServerUtils.remote == null){
-    		RemoteServerUtils.remote = trashConfig.getRemotePath();
-    	}
-    	if(TOKEN == null){
-    		TOKEN = trashConfig.getToken();
-    	}
-
-        LogUtils.getBlock("=================== checkCredit 定时器执行 当前时间:      " + simpleDateFormat.format(new Date()));
-        
-        
-    	try {
-        	checkTruckCredit();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-    	try {
-        	checkCompanyCredit();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-    	try {
-        	
-        	checkTruckByCompany();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-    	try {
-        	checkDriverCredit(); //检查驾驶员信用
-		} catch (Exception e) {
-			e.printStackTrace();
-		}	
-    	try {
-        	checkTruckActive();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
+//    	if(RemoteServerUtils.remote == null){
+//    		RemoteServerUtils.remote = trashConfig.getRemotePath();
+//    	}
+//    	if(TOKEN == null){
+//    		TOKEN = trashConfig.getToken();
+//    	}
+//
+//        LogUtils.getBlock("=================== checkCredit 定时器执行 当前时间:      " + simpleDateFormat.format(new Date()));
+//        
+//        
+//    	try {
+//        	checkTruckCredit();
+//		} catch (Exception e) {
+//			e.printStackTrace();
+//		}
+//    	try {
+//        	checkCompanyCredit();
+//		} catch (Exception e) {
+//			e.printStackTrace();
+//		}
+//    	try {
+//        	
+//        	checkTruckByCompany();
+//		} catch (Exception e) {
+//			e.printStackTrace();
+//		}
+//    	try {
+//        	checkDriverCredit(); //检查驾驶员信用
+//		} catch (Exception e) {
+//			e.printStackTrace();
+//		}	
+//    	try {
+//        	checkTruckActive();
+//		} catch (Exception e) {
+//			e.printStackTrace();
+//		}
  
     }
  
@@ -512,6 +512,10 @@ export default {
       this.form[target].splice(this.form[target].indexOf(img), 1);
     },
     uploadSuccess(res, file, fileList) {
+		if(res.code){
+			this.$message(res.message);
+			return;
+		}
       let target = "sub_img" + this.picIndex;
       if (!this.form[target]) {
         this.form[target] = [];
@@ -100,7 +100,7 @@
         </el-form-item>
         <el-form-item label="车牌号码" prop="licensePlate">
           <el-select v-model="form.licensePlate" filterable reserve-keyword placeholder="车牌号码">
-            <el-option @click.native="getObjId(item)"  v-for="item in truckList" :key="item.id" :label="item.licenseplateNo" :value="item.licenseplateNo" v-if="form.companyId==item.companyName">
+            <el-option @click.native="getObjId(item)"  v-for="item in truckList" :key="item.id" :label="item.licenseplateNo" :value="item.licenseplateNo" v-if="!form.companyId || form.companyId==item.companyName">
             </el-option>
           </el-select>
         </el-form-item>
@@ -309,6 +309,7 @@
         }
       },
       getObjId(a) {
+        this.form.companyId = a.companyName;
         this.form.objectId = a.id;
       },
       getList() {
@@ -11,8 +11,7 @@
       </el-col>
     </el-row>
  
-
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="工地名称" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入项目名称"  size="small"
            />
@@ -49,6 +48,10 @@
       </el-form-item>
     </el-form>
  
+
+    <p> {{dayWorkCount}}</p>
+
+
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button size="mini" @click="handleExport" v-hasPermi="['business:threestep:export']">导出</el-button>
@@ -160,7 +163,7 @@
         bindname:null,
         projectTypes:null,
         earthsitesTypes:null,
-
+        dayWorkCount:null,
         outside:["长沙县","望城区","浏阳市","宁乡市","株洲市","湘潭市","汩罗市","湘阴县"],
       };
     },
@@ -239,7 +242,18 @@
  
             constructionsitesList(this.remoteQueryData).then(res => {
               this.constructionsitesList = res.result.list;
+
+              let count = 0;
+              let count1 = 0;
+
               for(let i =0;i< this.threestepList.length;i++){
+
+                if(this.threestepList[i].status == "开工"){
+                  count += 1;
+                }
+                if(this.threestepList[i].estatus == "开工"){
+                  count1 += 1;
+                }
                 for(let j =0;j<this.constructionsitesList.length;j++){
                   if(this.threestepList[i].objectId == this.constructionsitesList[j].id){
                     for(let x in this.projectTypes){
@@ -250,6 +264,14 @@
                   }
                 }
               }
+
+
+               let str = "今日";
+              if(this.queryParams.his){
+                str = "";
+              }
+
+                this.dayWorkCount = str + "长沙市工地开工数量:" + count + "  " + str  +"长沙市消纳场开工数量:" + count1;
                 this.loading = false;
             });
  
@@ -125,7 +125,7 @@
             <el-form-item :label="labelName" prop="name">
               <el-select v-model="form.name" filterable  reserve-keyword>
                 <el-option @click.native="getObjId(item)" v-for="item in remoteData" :label="item.name"
-                  :value="item.name" :key="item.id" v-if="areaCode == null || item.areaCode == areaCode">
+                  :value="item.name" :key="item.id" v-if="!form.place || item.areaCode == form.place">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -501,7 +501,7 @@
           ]
         },
         SiteWorkAreaCodeType: [],
-        remoteData: [{name:"a",id:"id"}],
+        remoteData: [],
         remoteQueryData: {
           "page": 1,
           "size": 9999,
@@ -510,7 +510,7 @@
         },
         areas: [],
         areaCode: null,
-        bindData: [{name:"a",id:"id"}],
+        bindData: [],
         bindname:null,
         transportCompanyId:null,
       };
@@ -697,7 +697,10 @@
       },
  
       uploadSuccess(res, file, fileList) {
-
+		if(res.code){
+			this.$message(res.message);
+			return;
+		}
         if(this.picIndex > 90){
            let target = "attchItem" + (this.picIndex-90);
           if (!this.form[target]) {
@@ -741,6 +744,7 @@
       handleClose() {
         this.uploadImageDialog = false;
         this.fileList = [];
+        this.reset();
       },
       selectType(value) {
         if (value == "0") {
@@ -442,6 +442,10 @@ export default {
       this.$forceUpdate();
     },
     uploadSuccess(res, file, fileList) {
+		if(res.code){
+			this.$message(res.message);
+			return;
+		}
       if(!this.form.attach){
         this.form.attach = [];
       }
@@ -244,6 +244,10 @@ export default {
       this.resetForm("form");
     },
     uploadSuccess(res, file, fileList) {
+		if(res.code){
+			this.$message(res.message);
+			return;
+		}
       this.fileList = [];
  
       this.fileList.push(file);
@@ -253,6 +253,11 @@ export default {
       });
     },
     uploadSuccess(res, file, fileList) {
+		
+		if(res.code){
+			this.$message(res.message);
+			return;
+		}
       this.fileList = [];
  
       this.fileList.push(file);
@@ -375,6 +375,10 @@ import {  getSignByObjId, addSign, updateSign } from &quot;@/api/sign/sign&quot;;
         this.form[target].splice(this.form[target].indexOf(img), 1);
       },
       uploadSuccess(res, file, fileList) {
+		  if(res.code){
+		  	this.$message(res.message);
+		  	return;
+		  }
         let target = "sub_img" + this.picIndex;
         if (!this.form[target]) {
           this.form[target] = [];
@@ -367,6 +367,10 @@ export default {
       this.$forceUpdate();
     },
     uploadSuccess(res, file, fileList) {
+		if(res.code){
+			this.$message(res.message);
+			return;
+		}
       if(!this.form.attach){
         this.form.attach = [];
       }
@@ -26,5 +26,14 @@
      <artifactId>gson</artifactId>
      <version>2.3.1</version>
   </dependency>
+  
+        <!--    kafka    -->
+        <dependency>
+            <groupId>org.springframework.kafka</groupId>
+            <artifactId>spring-kafka</artifactId>
+            <version>1.1.1.RELEASE</version>
+        </dependency>
+  
+  
     </dependencies>
 </project>
 \ No newline at end of file
@@ -29,20 +29,20 @@ import java.util.Map;
 public class Consumer {
     private static final Logger log = LoggerFactory.getLogger(Consumer.class);
  
-    @Autowired
-    private IViolationWarningInformationService violationWarningInformationService;
-
-    @KafkaListener(topics="record_process_alarm")
-    public void consume(@Payload String data) {
-        log.info("kafka消费数据成功,data:" + data);
-        autoViolationWarning(data);
-    }
-
-    @Autowired
-    trashConfig trashConfig;
-
-    @Autowired
-    SysLoginService loginService;
+//    @Autowired
+//    private IViolationWarningInformationService violationWarningInformationService;
+//
+//    @KafkaListener(topics="record_process_alarm")
+//    public void consume(@Payload String data) {
+//        log.info("kafka消费数据成功,data:" + data);
+//        autoViolationWarning(data);
+//    }
+//
+//    @Autowired
+//    trashConfig trashConfig;
+//
+//    @Autowired
+//    SysLoginService loginService;
  
     public void autoViolationWarning(String data) {
 //        String[] code = {"44030020=工地预警-未报开工作业","44030021=工地预警-视频设备离线超时报警","44030022=工地预警-三无车辆进入工地","44030023=工地预警未按时间作业",
@@ -5,11 +5,15 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
  
+import javax.annotation.Resource;
+
 import com.trash.casefile.domain.ViolationWarningInformation;
 import com.trash.common.config.trashConfig;
+import com.trash.common.core.domain.model.LoginUser;
 import com.trash.framework.web.service.SysLoginService;
 import org.activiti.api.process.model.ProcessInstance;
 import org.activiti.api.process.model.builders.ProcessPayloadBuilder;
+import org.activiti.api.process.model.payloads.StartProcessPayload;
 import org.activiti.api.process.runtime.ProcessRuntime;
 import org.activiti.api.task.runtime.TaskRuntime;
 import org.activiti.engine.RuntimeService;
@@ -19,6 +23,9 @@ import org.activiti.engine.task.IdentityLinkType;
 import org.activiti.engine.task.Task;
 import org.apache.commons.collections4.map.HashedMap;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
  
@@ -259,7 +266,13 @@ public class WorkflowServiceImpl implements IWorkflowService {
 		return 0;
  
     }
-
+    
+    @Resource
+    private AuthenticationManager authenticationManager;
+    
+    @Autowired
+	RuntimeService runtimeService;
+    
 	@Override
 	@Transactional
 	public int createCaseFile1(ViolationWarningInformation caseFile, int index,int isAuto){ //违规预警案卷
@@ -267,30 +280,34 @@ public class WorkflowServiceImpl implements IWorkflowService {
 			if(StringUtils.isEmpty(RemoteServerUtils.remote)){
 				RemoteServerUtils.remote = trashConfig.getRemotePath();
 			}
-			loginService.loginByRemote(trashConfig.getToken());
+			LoginUser user = loginService.loginByRemote(trashConfig.getToken());
+			org.activiti.engine.impl.identity.Authentication.setAuthenticatedUserId(user.getUsername());
 		}
-		ProcessInstance processInstance = null;
+		
+        
+		org.activiti.engine.runtime.ProcessInstance  instance = null;
 		String title = "案卷号:" + caseFile.getNumber();
 		String flowType = "violation_warning";
 		try {
-
-			processInstance = processRuntime.start(ProcessPayloadBuilder
-					.start()
-					.withProcessDefinitionKey(flowType)
-					.withName(title)
-					.withBusinessKey(flowType + ":" + caseFile.getId())
-					.withVariable("route", index)
-					.build());
-
+					
+			instance = runtimeService.createProcessInstanceBuilder().businessKey(flowType + ":" + caseFile.getId()).variable("route", index).processDefinitionKey(flowType).start();
+			
+			
+			Map map = new HashedMap<>();
+			
+			map.put("route", index);
+			
+			runtimeService.startProcessInstanceById(instance.getProcessDefinitionId(),map);
+			
  
 			if(index == 0){
-				Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+				Task task = taskService.createTaskQuery().processInstanceId(instance.getId()).singleResult();
  
 				task.setAssignee(caseFile.getCompanyName());
  
 				taskService.saveTask(task);
 			}else{
-				updateProcess(processInstance,caseFile.getOwningRegion());
+				updateProcess(instance,caseFile.getOwningRegion());
 			}
  
  
@@ -302,12 +319,12 @@ public class WorkflowServiceImpl implements IWorkflowService {
 			workflow.setStartTime(sdf.format(caseFile.getCreateTime()));
 			workflow.setEndTime(sdf.format(caseFile.getCreateTime()));
 			workflow.setType("违规预警信息案卷");
-			workflow.setInstanceId(processInstance.getId());
+			workflow.setInstanceId(instance.getId());
 			workflow.setState("0");
  
 			return workflowMapper.insertWorkflow(workflow);
 		} catch (Exception e) {
-			processRuntime.delete(ProcessPayloadBuilder.delete(processInstance));
+			runtimeService.deleteProcessInstance(instance.getId(), "创建失败");
 			throw new RuntimeException(e);
 		}
  
@@ -376,6 +393,51 @@ public class WorkflowServiceImpl implements IWorkflowService {
  
 	}
  
+	void updateProcess(org.activiti.engine.runtime.ProcessInstance processInstance,String placeName){
+    	Map map = new HashedMap<>();
+
+    	map.put("type", "CSUserDepartmentType");
+
+    	JSONArray array2 = RemoteServerUtils.getDict(map);
+		
+		String placeCode = null;
+		String code = null;
+
+		for(Object obj:array2){
+			if(((JSONObject)obj).getString("name").equals("渣土办")){
+				code = ((JSONObject)(obj)).getString("code");
+			}
+    		if(((JSONObject)obj).getString("name").replace("渣土办", "").equals(placeName)){
+    			placeCode = ((JSONObject)(obj)).getString("code");
+
+    			if(code != null){
+    				break;
+    			}
+    		}
+
+    	}
+
+		if(placeCode != null){
+			Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+
+
+			List<IdentityLink> list = taskService.getIdentityLinksForTask(task.getId());
+
+			for(IdentityLink identityLink:list){
+//				if(identityLink.getGroupId() != null)
+//					taskService.deleteGroupIdentityLink(task.getId(), identityLink.getGroupId(), identityLink.getType());
+				if(identityLink.getUserId() != null)
+    				taskService.deleteUserIdentityLink(task.getId(), identityLink.getUserId(), identityLink.getType());
+			}
+
+			taskService.addCandidateUser(task.getId(), placeCode);
+			
+			task.setDescription(placeCode);
+			
+    		taskService.saveTask(task);
+		}
+	}
+	
 	void updateProcess(ProcessInstance processInstance,String placeName){
     	Map map = new HashedMap<>();