m

youxiw2000
1 parent f8cea7e4
Showing 10 changed files with 160 additions and 26 deletions
trash-ui/dist.7z
trash-ui/src/views/h5/threestep/index.vue
trash-unit/pom.xml
trash-unit/src/main/java/com/trash/dropPointInfo/service/impl/DropPointInfoServiceImpl.java
trash-workFlow/pom.xml
trash-workFlow/src/main/java/com/trash/business/mapper/GarMapper.java
trash-workFlow/src/main/java/com/trash/workflow/listener/DropPointListener.java
trash-workFlow/src/main/java/com/trash/workflow/service/IWorkflowService.java
trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
trash-workFlow/src/main/resources/mapper/GarMapper.xml
@@ -30,17 +30,18 @@
           format="yyyy-MM-dd HH:mm:ss"
           value-format="yyyy-MM-dd HH:mm:ss" placeholder="结束时间">
         </el-date-picker>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
+      
       <el-form-item label="抽查状态" prop="checkStatus" v-if="this.queryParams.his==1">
          <el-select v-model="queryParams.checkStatus" placeholder="请选择抽查状态"  size="small">
           <el-option label="未抽查" value="0" />
           <el-option label="已抽查" value="1" />
          </el-select>
       </el-form-item>
+      <el-form-item>
+        <el-button type="primary" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
     </el-form>
     <el-row :gutter="10" class="mb8">
@@ -20,5 +20,10 @@
       <groupId>com.trash</groupId>
       <artifactId>trash-common</artifactId>
     </dependency>
+    
+    <dependency>
+      <groupId>com.trash</groupId>
+      <artifactId>trash-workflow</artifactId>
+    </dependency>
   </dependencies>
 </project>
 \ No newline at end of file
 package com.trash.dropPointInfo.service.impl;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+
 import com.trash.common.utils.DateUtils;
 import com.trash.common.utils.SecurityUtils;
+import com.trash.common.utils.spring.SpringUtils;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.stereotype.Service;
 import com.trash.dropPointInfo.mapper.DropPointInfoMapper;
 import com.trash.dropPointInfo.domain.DropPointInfo;
 import com.trash.dropPointInfo.service.IDropPointInfoService;
+import com.trash.office.mapper.UploadFileMapper;
+import com.trash.workflow.service.IWorkflowService;
 /**
  * 投放点信息管理Service业务层处理
@@ -60,12 +68,31 @@ public class DropPointInfoServiceImpl implements IDropPointInfoService
      * @param dropPointInfo 投放点信息管理
      * @return 结果
      */
+    @Autowired
+    IWorkflowService workflow;
+    
     @Override
     public int insertDropPointInfo(DropPointInfo dropPointInfo)
     {
         dropPointInfo.setCreateTime(DateUtils.getNowDate());
         dropPointInfo.setCreateBy(SecurityUtils.getUsername());
-        return dropPointInfoMapper.insertDropPointInfo(dropPointInfo);
+        
+        int i = dropPointInfoMapper.insertDropPointInfo(dropPointInfo);
+        
+        if(i == 0){
+        	return i;
+        }
+        Map<String, String> map = new HashMap<String, String>();
+        map.put("name", dropPointInfo.getDropPointName());
+        map.put("area", dropPointInfo.getDistrict());
+        map.put("id", dropPointInfo.getId()+"");
+        
+        i = workflow.createDropPointWorkFlow(map);
+        if (i == 0) {
+        	dropPointInfoMapper.deleteDropPointInfoById(dropPointInfo.getId());
+		}
+        
+        return i;
     }
     /**
@@ -21,7 +21,6 @@
             <groupId>com.trash</groupId>
             <artifactId>trash-common</artifactId>
         </dependency>
-
         <!--    kafka    -->
         <dependency>
             <groupId>org.springframework.kafka</groupId>
+package com.trash.business.mapper;
+
+import org.apache.ibatis.annotations.Param;
+
+import com.trash.activiti.domain.vo.ActReDeploymentVO;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+public interface GarMapper {
+
+		public int updateDropPointById(@Param("id")String  id ,@Param("status") String status);
+
+}
+package com.trash.workflow.listener;
+
+import com.trash.business.domain.SupervisionTrack;
+import com.trash.business.mapper.GarMapper;
+import com.trash.business.mapper.SupervisionTrackMapper;
+import com.trash.casefile.service.IViolationCaseFileService;
+import com.trash.common.utils.RemoteServerUtils;
+import com.trash.common.utils.spring.SpringUtils;
+import com.trash.workflow.service.IWorkflowService;
+import org.activiti.engine.delegate.DelegateExecution;
+import org.activiti.engine.delegate.ExecutionListener;
+import org.activiti.engine.delegate.Expression;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+public class DropPointListener implements ExecutionListener {
+
+	private Expression state;
+	
+	
+	@Autowired
+	GarMapper mapper;
+	
+
+    @Override
+    public void notify(DelegateExecution delegateExecution) {
+
+    	List<Map> maps = new ArrayList<Map>();
+    	
+    	SupervisionTrack supervisionTrack = new SupervisionTrack();
+    	
+    	String idString = (delegateExecution.getProcessInstanceBusinessKey().split(":")[1]);
+    	String status = (state.getValue(delegateExecution).toString());
+    	
+    	mapper.updateDropPointById(idString, status);
+
+        workflowUtils.sendDataToHisTory(delegateExecution, state,null);
+    	
+    	System.out.println("纪检督察流程状态更新 更新ID:" + delegateExecution.getProcessInstanceBusinessKey()  + "状态:" + state.getValue(delegateExecution).toString());
+    }
+
+
+
+}
@@ -3,17 +3,12 @@ package com.trash.workflow.service;
 import java.util.List;
 import java.util.Map;
-import com.trash.casefile.domain.ViolationWarningInformation;
-import org.activiti.api.process.model.ProcessInstance;
-
-import com.trash.activiti.domain.dto.HistoryDataDTO;
 import com.trash.business.domain.SupervisionThreestep;
 import com.trash.caseOffline.domain.CaseOffline;
 import com.trash.casefile.domain.ViolationCaseFile;
+import com.trash.casefile.domain.ViolationWarningInformation;
 import com.trash.workflow.domain.Workflow;
-import net.sf.jsqlparser.statement.create.table.Index;
-
 /**
  * 请假Service接口
  * 
@@ -79,6 +74,7 @@ public interface IWorkflowService
      */
     int deleteWorkflowById(String id);
+    int createDropPointWorkFlow(Map<String,String> droppoint);
 	int createLeaveWorkFlow(Workflow workflow,int index);
@@ -4,33 +4,20 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
-import com.trash.casefile.domain.ViolationWarningInformation;
-import com.trash.common.config.trashConfig;
-import com.trash.common.core.redis.RedisCache;
-import com.trash.common.core.domain.entity.SysUser;
-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;
 import org.activiti.engine.TaskService;
 import org.activiti.engine.task.IdentityLink;
-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.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.context.SecurityContextImpl;
-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;
@@ -44,11 +31,14 @@ import com.trash.business.service.IConstructionSignService;
 import com.trash.business.service.ISupervisionThreestepService;
 import com.trash.caseOffline.domain.CaseOffline;
 import com.trash.casefile.domain.ViolationCaseFile;
+import com.trash.casefile.domain.ViolationWarningInformation;
+import com.trash.common.core.domain.entity.SysUser;
+import com.trash.common.core.redis.RedisCache;
 import com.trash.common.utils.DateUtils;
 import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.SecurityUtils;
 import com.trash.common.utils.StringUtils;
-import com.trash.common.utils.uuid.UUID;
+import com.trash.framework.web.service.SysLoginService;
 import com.trash.system.service.ISysUserService;
 import com.trash.workflow.domain.Workflow;
 import com.trash.workflow.mapper.WorkflowMapper;
@@ -280,6 +270,46 @@ public class WorkflowServiceImpl implements IWorkflowService {
 		return 0;
 	}
+	
+	@Override
+	@Transactional
+	public int createDropPointWorkFlow(Map<String,String> droppoint) { // 三查
+		ProcessInstance processInstance = null;
+		ActWorkflowFormData awf = null;
+		try {
+			String name = "投放点审批:" + droppoint.get("name");
+			
+			processInstance = processRuntime.start(ProcessPayloadBuilder.start()
+					.withProcessDefinitionKey("workflow_drop_point").withName(name)
+					.withBusinessKey("workflow_drop_point:" + droppoint.get("id")).build());
+			
+			PorcThreeStepTask(processInstance, droppoint.get("area"));
+
+			Workflow workflow = new Workflow();
+			workflow.setId("workflow_drop_point:" + droppoint.get("id"));
+			workflow.setTitle(name);
+			workflow.setReason(droppoint.get("name") + "审批流程");
+			workflow.setStartTime(sdf.format(new Date()));
+			workflow.setEndTime(sdf.format(new Date()));
+			workflow.setType("投放点审批");
+			workflow.setInstanceId(processInstance.getId());
+			workflow.setState("0");
+			workflow.setCreateTime(new Date());
+			
+
+			SysUser user = SecurityUtils.getLoginUser().getUser();
+			awf = insertAwf(user,workflow);
+
+			return workflowMapper.insertWorkflow(workflow);
+		} catch (Exception e) {
+			e.printStackTrace();
+			if(awf.getId() != null)
+				awfServer.deleteActWorkflowFormDataById(awf.getId());
+			processRuntime.delete(ProcessPayloadBuilder.delete(processInstance));
+		}
+
+		return 0;
+	}
 	@Override
 	@Transactional
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.trash.activiti.mapper.GarMapper">
+	
+	<update id="updateDropPointInfo" parameterType="DropPointInfo">
+		update drop_point_info Set update_time = NOW(),status = #{status}
+		where id = #{id}
+	</update>
+</mapper> 
 \ No newline at end of file