m

youxiw2000
1 parent 26dfe208
Showing 24 changed files with 496 additions and 391 deletions
trash-activiti/src/main/java/com/trash/activiti/domain/dto/ActTaskDTO.java
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
trash-ui/src/api/caseOfflineInfo.js
trash-ui/src/api/caseoffline.js
trash-ui/src/api/vio_casefile.js
trash-ui/src/api/vio_casefile_info.js
trash-ui/src/api/vio_warning_info.js
trash-ui/src/views/activiti/task/taskCard.vue
trash-ui/src/views/caseOffline/caseOffline/index.vue
trash-ui/src/views/casefile/violationCaseFile/index.vue
trash-ui/src/views/casefile/violationCaseFile/violationCaseFileInfo.vue
trash-ui/src/views/casefile/violationWarningInformation/index.vue
trash-ui/src/views/casefile/violationWarningInformation/violationWarningInformationInfo.vue
trash-ui/src/views/h5/task/taskCard.vue
trash-ui/src/views/h5/task/violationCaseFileInfo.vue
trash-ui/src/views/h5/task/violationWarningInformationInfo.vue
trash-workFlow/src/main/java/com/trash/caseOffline/domain/CaseOffline.java
trash-workFlow/src/main/java/com/trash/casefile/domain/ViolationCaseFile.java
trash-workFlow/src/main/java/com/trash/casefile/domain/ViolationWarningInformation.java
trash-workFlow/src/main/java/com/trash/casefile/kafka/Consumer.java
@@ -70,8 +70,9 @@ public class ActTaskDTO
     public ActTaskDTO() {
 	}
-    public ActTaskDTO(ProcessInstance processInstance, Map<String, Object> map,ActWorkflowFormData from) {
+    public ActTaskDTO(ProcessInstance processInstance, Map<String, Object> map,ActWorkflowFormData from,org.activiti.engine.task.Task task) {
     	this.id = processInstance.getId();
+    	this.name = task.getName();
     	this.instanceName = processInstance.getName();
         this.definitionKey= processInstance.getProcessDefinitionKey();
         this.businessKey= processInstance.getBusinessKey();
@@ -86,6 +87,9 @@ public class ActTaskDTO
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
+		
+
+        getPrevNext(task);
 	}
     public ActTaskDTO(HistoricProcessInstance processInstance, Map<String, Object> map) {
@@ -129,6 +133,84 @@ public class ActTaskDTO
     }
+	private void getPrevNext(org.activiti.engine.task.Task et) {
+
+
+        long date = new Date().getTime();
+		RedisCache cache = SpringUtils.getBean(RedisCache.class);
+
+		String exeId = et.getExecutionId();
+
+		
+        Map<String, Object> params= cache.getCacheMap(exeId);
+        
+        if(params == null || params.size() == 0){
+        	params= SpringUtils.getBean(RuntimeService.class).getVariables(exeId);
+        	cache.setCacheMap(exeId, params);
+        }
+        
+		String route = null;
+		String index = null;
+      
+		String key = this.businessKey.split(":")[0];
+				
+		
+      if(params.get("route")!=null){
+          route = params.get("route").toString();
+          key += "route"+route;
+      }
+      if(params.get("index") != null){
+          index = params.get("index").toString();
+          key += "index"+index;
+      }
+      
+      List<String> list = cache.getCacheList(key);
+      if(list.size() > 0){
+    	  
+    	  if(list.indexOf(et.getName())>0){
+    		  this.prev = list.get(list.indexOf(et.getName())-1);
+    	  }
+    	  if(list.size() > (list.indexOf(et.getName())+1)){
+    		  this.next = list.get(list.indexOf(et.getName())+1);
+    	  }
+    	  return;
+      }
+
+
+      BpmnModel model = SpringUtils.getBean(RepositoryService.class).getBpmnModel(et.getProcessDefinitionId());
+		List<org.activiti.bpmn.model.Process> processes = model.getProcesses();
+      
+		List<String> modelList = null;
+		
+		for(org.activiti.bpmn.model.Process p:processes){
+			Collection<FlowElement> flows = p.getFlowElements();
+			
+			for(FlowElement f:flows){
+				if(f instanceof StartEvent){
+					
+					
+					modelList = getRouteList((StartEvent)f,route,index);
+					
+					
+					break;
+					
+				}
+				
+			}
+		}
+		
+		
+		cache.setCacheList(key, modelList);
+		
+		  if(modelList.indexOf(et.getName())>0){
+    		  this.prev = modelList.get(modelList.indexOf(et.getName())-1);
+    	  }
+    	  if(modelList.size() > (modelList.indexOf(et.getName())+1)){
+    		  this.next = modelList.get(modelList.indexOf(et.getName())+1);
+    	  }
+
+	}
+
 	private void getPrevNext(Task task) {
@@ -298,6 +298,7 @@ public class ActTaskServiceImpl implements IActTaskService {
 		ProcessInstanceQuery query = runtimeService.createProcessInstanceQuery().involvedUser(username);
+		
 		if(name != null)
 			query.processInstanceNameLike("%"+name+"%");
@@ -311,11 +312,18 @@ public class ActTaskServiceImpl implements IActTaskService {
 		List<ProcessInstance> processInstanceList = query.list();
+
+		
 		list.setTotal(query.count());
 		processInstanceList = query.listPage((pageNum-1) * pageSize,pageSize);
 		if (processInstanceList.size() > 0) {
+			
+			List<String> pids = processInstanceList.parallelStream().map(p->p.getId()).collect(Collectors.toList());
+			
+			List<org.activiti.engine.task.Task> tasks = taskService.createTaskQuery().processInstanceIdIn(pids).list();
+			
 			Set<String> idString = new HashSet<String>();
 			for (ProcessInstance pi : processInstanceList) {
@@ -329,12 +337,13 @@ public class ActTaskServiceImpl implements IActTaskService {
 				for (ProcessInstance p : processInstanceList) {
 					try {
 						ActTaskDTO dto = new ActTaskDTO(p, maps.parallelStream().filter(pi -> p.getProcessInstanceId().equals(pi.get("instance_id"))).findAny().get(),
-								dataList.parallelStream().filter(pi ->  p.getBusinessKey().equals(pi.getBusinessKey())).findAny().get());
+								dataList.parallelStream().filter(pi ->  p.getBusinessKey().equals(pi.getBusinessKey())).findAny().get(),
+								tasks.parallelStream().filter(t ->  p.getId().equals(t.getProcessInstanceId())).findAny().get());
 						list.add(dto);
 					} catch (Exception e) {
-						// TODO: handle exception
+						e.printStackTrace();
 					}
 				}
@@ -5,6 +5,7 @@ import {getArea,} from &quot;@/api/dict&quot;;
 import {getToken} from "@/utils/auth";
 import {listReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
+import {historyFromData} from '@/api/activiti/historyFormdata'
 export default {
   name: "CaseOffline",
   props: {
@@ -148,7 +149,7 @@ export default {
       if (id.length == 2) {
         id = id[1];
-      } 
+      }
       getCaseOffline(id).then(response => {
         this.form = response.data;
         if (this.form.attach && this.form.attach != "")
@@ -191,7 +192,18 @@ export default {
           }
         });
-
+          if(response.data.status == 0){
+            historyFromData(this.workflow + ":" + id).then(response => {
+
+                 let obj = response.data[response.data.length-1];
+                let data  = {
+                  reply:obj.controlValue,
+                  replyPeople:obj.createBy,
+                };
+
+                this.replyApprovalProcessList.push(data);
+            });
+          }
         this.open2 = true;
       });
@@ -173,8 +173,16 @@ export default {
     },
     /** 查询线下交办案卷列表 */
     getList() {
-      this.loading = true;
-      listCaseOffline(this.queryParams).then(response => {
+      this.loading = true;
+      let query = {};
+      
+      for(var i in this.queryParams){
+        query[i] = this.queryParams[i];
+      }
+      
+      query.createTime = null;
+      
+      listCaseOffline(this.query).then(response => {
         this.caseOfflineList = response.rows;
         for(let i in this.caseOfflineList){
@@ -229,8 +229,21 @@ export default {
     },
     /** 查询平台违规案卷列表 */
     getList() {
-      this.loading = true;
-      listViolationCaseFile(this.queryParams).then(response => {
+      this.loading = true;
+      if(this.queryParams.createTime){
+        this.queryParams.startTime = this.queryParams.createTime[0];
+        this.queryParams.endTime = this.queryParams.createTime[1];
+      }
+
+      let query = {};
+
+      for(var i in this.queryParams){
+        query[i] = this.queryParams[i];
+      }
+
+      query.createTime = null;
+
+      listViolationCaseFile(query).then(response => {
         this.violationCaseFileList = response.rows;
         this.total = response.total;
         this.loading = false;
+import {getViolationCaseFile} from "@/api/casefile/violationCaseFile";
+import {listReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
+
+import {historyFromData} from '@/api/activiti/historyFormdata'
+export default {
+  name: "violationWarningInformationInfo",
+  props: {
+    businessKey: {
+      type: String
+    },
+    idInfo: {
+      type: String
+    },
+    entryType: {
+      type: Number
+    },
+  },
+  data() {
+    return {
+      form: {},
+      fileEntityList: [],
+      open: false,
+      replyApprovalProcessList: [],
+      openImg: false,
+      img: [],
+      showPic: null,
+      picImage: null,
+      slide1: [],
+      videoSrc: [],
+    }
+  },
+  created() {
+    let id = this.idInfo.split(":");
+
+    if (id.length == 2) {
+      this.idInfo = id[1];
+    } else {
+      this.idInfo = id;
+    }
+
+
+    this.init();
+  },
+  methods: {
+    init() {
+      getViolationCaseFile(this.idInfo).then(response => {
+        this.form = response.data.violationCaseFile;
+        let files = JSON.stringify(response.data.uploadFiles);
+        this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"));
+        this.fileEntityList.map(item => {
+          if (item.url.indexOf(".jpg") > -1 || item.url.indexOf(".png") > -1 || item.url.indexOf(".jpeg") > -1 || item.url.indexOf(".jpg") > -1) {
+            this.slide1.push(process.env.VUE_APP_BASE_API + item.url);
+          }
+          if (item.url.indexOf(".mp4") > -1 || item.url.indexOf(".avi") > -1) {
+            this.videoSrc.push(process.env.VUE_APP_BASE_API + item.url);
+          }
+        })
+
+      });
+ listReplyApprovalProcess({tableName: "workflow_casefile" + ":" + this.idInfo}).then(response => {
+          this.replyApprovalProcessList = response.rows;
+          if(this.form.status == 0){
+            historyFromData("workflow_casefile" + ":" + this.idInfo).then(response => {
+
+                 let obj = response.data[response.data.length-1];
+                let data  = {
+                  reply:obj.controlValue,
+                  replyPeople:obj.createBy,
+                };
+
+                this.replyApprovalProcessList.push(data);
+            });
+          }
+        });
+
+
+    },
+    /** 文件下载 */
+    downloadFA(row) {
+      let name = row.name;
+      let url = row.url;
+      const a = document.createElement('a')
+      a.setAttribute('download', name)
+      a.setAttribute('target', '_blank')
+      a.setAttribute('href', process.env.VUE_APP_BASE_API + url);
+      a.click()
+    },
+    openImage(path) {
+      this.img = [];
+      this.openImg = true;
+      let files = path.split(",");
+      for(let i=0;i<files.length;i++){
+        this.img.push(files[i]);
+      }
+    },
+    downloadFile(path) {
+      window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path);
+    },
+    showFile(path) {
+      return process.env.VUE_APP_BASE_API + path;
+    },
+  }
+}
 \ No newline at end of file
+import {getViolationWarningInformation} from "@/api/casefile/violationWarningInformation";
+import {listReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
+
+import {historyFromData} from '@/api/activiti/historyFormdata'
+
+export default {
+  name: "violationWarningInformationInfo",
+  props: {
+    businessKey: {
+      type: String
+    },
+    idInfo: {
+      type: String
+    },
+    entryType: {
+      type: Number
+    },
+  },
+  data() {
+    return {
+      form: {},
+      fileEntityList: [],
+      open: false,
+      replyApprovalProcessList: [],
+      openImg: false,
+      img: [],
+      showPic: null,
+      picImage: null,
+      slide1: [],
+      videoSrc: [],
+    }
+  },
+  created() {
+    let id = this.idInfo.split(":");
+
+    if (id.length == 2) {
+      this.idInfo = id[1];
+    } else {
+      this.idInfo = id;
+    }
+    this.init();
+  },
+  methods: {
+    init() {
+      getViolationWarningInformation(this.idInfo).then(response => {
+        this.form = response.data.violationWarningInformation;
+        let files = JSON.stringify(response.data.uploadFiles);
+        this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"));
+        this.fileEntityList.map(item => {
+          if (item.url.indexOf(".jpg") > -1 || item.url.indexOf(".png") > -1 || item.url.indexOf(".jpeg") > -1 || item.url.indexOf(".jpg") > -1) {
+            this.slide1.push(process.env.VUE_APP_BASE_API + item.url);
+          }
+          if (item.url.indexOf(".mp4") > -1 || item.url.indexOf(".avi") > -1) {
+            this.videoSrc.push(process.env.VUE_APP_BASE_API + item.url);
+          }
+        })
+
+
+      });
+
+        listReplyApprovalProcess({tableName: "violation_warning" + ":" + this.idInfo}).then(response => {
+          this.replyApprovalProcessList = response.rows;
+          if(this.form.status == 0){
+            historyFromData("violation_warning" + ":" + this.idInfo).then(response => {
+
+                 let obj = response.data[response.data.length-1];
+                let data  = {
+                  reply:obj.controlValue,
+                  replyPeople:obj.createBy,
+                };
+
+                this.replyApprovalProcessList.push(data);
+            });
+          }
+        });
+
+    },
+    /** 文件下载 */
+    downloadFA(row) {
+      let name = row.name;
+      let url = row.url;
+      const a = document.createElement('a')
+      a.setAttribute('download', name)
+      a.setAttribute('target', '_blank')
+      a.setAttribute('href', process.env.VUE_APP_BASE_API + url);
+      a.click()
+    },
+    openImage(path) {
+      this.img = [];
+      this.openImg = true;
+      let files = path.split(",");
+      for(let i=0;i<files.length;i++){
+        this.img.push(files[i]);
+      }
+    },
+    downloadFile(path) {
+      window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path);
+    },
+    showFile(path) {
+      return process.env.VUE_APP_BASE_API + path;
+    },
+  }
+}
 \ No newline at end of file
@@ -12,14 +12,14 @@
       </el-col>
     </el-row>
-    <el-row class="card_row" v-if="!task.checkStatus">
-      <el-col :span="8" >
+    <el-row class="card_row" >
+      <el-col :span="8" v-if="task.prev">
         <div >上一节点: {{task.prev}}</div>
       </el-col>
       <el-col :span="8"  v-if="task.name">
         <div >当前节点: {{task.name}}</div>
       </el-col>
-      <el-col :span="8" >
+      <el-col :span="8" v-if="task.next">
         <div >下一节点: {{task.next}}</div>
       </el-col>
     </el-row>
@@ -12,11 +12,10 @@
         </el-select>
       </el-form-item>
       <el-form-item label="时间" prop="createTime">
-        <el-date-picker size="small" style="width: 200px"
-                        v-model="queryParams.createTime"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="选择时间">
+        <el-date-picker  size="small" v-model="queryParams.createTime" type="datetimerange"
+          start-placeholder="开始日期"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -97,9 +96,9 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="form.siteType==0?'工地名称':'处理场所名称'" prop="siteName">
-          <el-select 
+          <el-select
             :popper-append-to-body="false" class="product-style"
-            v-model="form.siteName" placeholder="请选择类型" 
+            v-model="form.siteName" placeholder="请选择类型"
             allow-create  filterable @change="getSite">
             <el-option v-for="item in data[form.siteType]" :label="item.name" :value="item.name" :title="item.name"/>
           </el-select>
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="105px">
-
+      <el-row>
       <el-form-item label="所属区域" prop="owningRegion">
         <el-select v-model="queryParams.owningRegion" placeholder="请选择所属区域"  size="small">
           <el-option  v-for="item in areas" :label="item.name" :value="item.name" />
@@ -22,28 +22,29 @@
           <el-option label="企业" value="2" />
         </el-select>
       </el-form-item>
-
-
-
+</el-row>
+      <el-row>
       <el-form-item label="违规对象" prop="projectName">
         <el-input
           v-model="queryParams.projectName"
           placeholder="请输入违规对象"
-
           size="small"
-
         />
       </el-form-item>
       <el-form-item label="日期" prop="createTime">
-        <el-date-picker  size="small" style="width: 200px" v-model="queryParams.createTime" type="date"
-          value-format="yyyy-MM-dd" placeholder="开始时间">
+        <el-date-picker  size="small"  v-model="queryParams.createTime" type="datetimerange"
+          start-placeholder="开始日期"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
+      </el-form-item>
+
+      </el-row>
     </el-form>
     <el-row :gutter="10" class="mb8">
@@ -168,96 +168,7 @@
   </el-form>
 </template>
-<script>
-import {getViolationCaseFile} from "@/api/casefile/violationCaseFile";
-import {listReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
-
-export default {
-  name: "violationWarningInformationInfo",
-  props: {
-    businessKey: {
-      type: String
-    },
-    idInfo: {
-      type: String
-    },
-    entryType: {
-      type: Number
-    },
-  },
-  data() {
-    return {
-      form: {},
-      fileEntityList: [],
-      open: false,
-      replyApprovalProcessList: [],
-      openImg: false,
-      img: [],
-      showPic: null,
-      picImage: null,
-      slide1: [],
-      videoSrc: [],
-    }
-  },
-  created() {
-    let id = this.idInfo.split(":");
-
-    if (id.length == 2) {
-      this.idInfo = id[1];
-    } else {
-      this.idInfo = id;
-    }
-
-
-    this.init();
-  },
-  methods: {
-    init() {
-      getViolationCaseFile(this.idInfo).then(response => {
-        this.form = response.data.violationCaseFile;
-        let files = JSON.stringify(response.data.uploadFiles);
-        this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"));
-        this.fileEntityList.map(item => {
-          if (item.url.indexOf(".jpg") > -1 || item.url.indexOf(".png") > -1 || item.url.indexOf(".jpeg") > -1 || item.url.indexOf(".jpg") > -1) {
-            this.slide1.push(process.env.VUE_APP_BASE_API + item.url);
-          }
-          if (item.url.indexOf(".mp4") > -1 || item.url.indexOf(".avi") > -1) {
-            this.videoSrc.push(process.env.VUE_APP_BASE_API + item.url);
-          }
-        })
-      });
-
-
-      listReplyApprovalProcess({tableName: "workflow_casefile" + ":" + this.idInfo}).then(response => {
-        this.replyApprovalProcessList = response.rows;
-      });
-    },
-    /** 文件下载 */
-    downloadFA(row) {
-      let name = row.name;
-      let url = row.url;
-      const a = document.createElement('a')
-      a.setAttribute('download', name)
-      a.setAttribute('target', '_blank')
-      a.setAttribute('href', process.env.VUE_APP_BASE_API + url);
-      a.click()
-    },
-    openImage(path) {
-      this.img = [];
-      this.openImg = true;
-      let files = path.split(",");
-      for(let i=0;i<files.length;i++){
-        this.img.push(files[i]);
-      }
-    },
-    downloadFile(path) {
-      window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path);
-    },
-    showFile(path) {
-      return process.env.VUE_APP_BASE_API + path;
-    },
-  }
-}
+<script src="@/api/vio_casefile_info">
 </script>
 <style scoped>
@@ -28,8 +28,10 @@
         />
       </el-form-item>
       <el-form-item label="日期" prop="createTime">
-        <el-date-picker clearable size="small" style="width: 200px" v-model="queryParams.createTime" type="date"
-                        value-format="yyyy-MM-dd" placeholder="开始时间">
+        <el-date-picker  size="small" v-model="queryParams.createTime" type="datetimerange"
+          start-placeholder="开始日期"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -167,93 +167,9 @@
   </el-form>
 </template>
-<script>
-import {getViolationWarningInformation} from "@/api/casefile/violationWarningInformation";
-import {listReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
+<script src="@/api/vio_warning_info">
+</script>
-export default {
-  name: "violationWarningInformationInfo",
-  props: {
-    businessKey: {
-      type: String
-    },
-    idInfo: {
-      type: String
-    },
-    entryType: {
-      type: Number
-    },
-  },
-  data() {
-    return {
-      form: {},
-      fileEntityList: [],
-      open: false,
-      replyApprovalProcessList: [],
-      openImg: false,
-      img: [],
-      showPic: null,
-      picImage: null,
-      slide1: [],
-      videoSrc: [],
-    }
-  },
-  created() {
-    let id = this.idInfo.split(":");
-
-    if (id.length == 2) {
-      this.idInfo = id[1];
-    } else {
-      this.idInfo = id;
-    }
-    this.init();
-  },
-  methods: {
-    init() {
-      getViolationWarningInformation(this.idInfo).then(response => {
-        this.form = response.data.violationWarningInformation;
-        let files = JSON.stringify(response.data.uploadFiles);
-        this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"));
-        this.fileEntityList.map(item => {
-          if (item.url.indexOf(".jpg") > -1 || item.url.indexOf(".png") > -1 || item.url.indexOf(".jpeg") > -1 || item.url.indexOf(".jpg") > -1) {
-            this.slide1.push(process.env.VUE_APP_BASE_API + item.url);
-          }
-          if (item.url.indexOf(".mp4") > -1 || item.url.indexOf(".avi") > -1) {
-            this.videoSrc.push(process.env.VUE_APP_BASE_API + item.url);
-          }
-        })
-      });
-      listReplyApprovalProcess({tableName: "violation_warning" + ":" + this.idInfo}).then(response => {
-        this.replyApprovalProcessList = response.rows;
-      });
-    },
-    /** 文件下载 */
-    downloadFA(row) {
-      let name = row.name;
-      let url = row.url;
-      const a = document.createElement('a')
-      a.setAttribute('download', name)
-      a.setAttribute('target', '_blank')
-      a.setAttribute('href', process.env.VUE_APP_BASE_API + url);
-      a.click()
-    },
-    openImage(path) {
-      this.img = [];
-      this.openImg = true;
-      let files = path.split(",");
-      for(let i=0;i<files.length;i++){
-        this.img.push(files[i]);
-      }
-    },
-    downloadFile(path) {
-      window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path);
-    },
-    showFile(path) {
-      return process.env.VUE_APP_BASE_API + path;
-    },
-  }
-}
-</script>
 <style scoped>
@@ -6,14 +6,14 @@
     <el-row class="card_row">
       <div class="card_title">{{task.instanceName}}</div>
     </el-row>
-    <el-row class="card_row" v-if="!task.checkStatus">
-      <el-col :span="24" class="card_grid">
+    <el-row class="card_row" >
+      <el-col :span="24" class="card_grid" v-if="task.prev">
         <div >上一节点: {{task.prev}}</div>
       </el-col>
       <el-col :span="24" class="card_grid" v-if="task.name">
         <div >当前节点: {{task.name}}</div>
       </el-col>
-      <el-col :span="24" class="card_grid">
+      <el-col :span="24" class="card_grid" v-if="task.next">
         <div >下一节点: {{task.next}}</div>
       </el-col>
           </el-row>
@@ -144,97 +144,7 @@
   </el-form>
 </template>
-<script>
-import {getViolationCaseFile} from "@/api/casefile/violationCaseFile";
-import {listReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
-
-export default {
-  name: "violationWarningInformationInfo",
-  props: {
-    businessKey: {
-      type: String
-    },
-    idInfo: {
-      type: String
-    },
-    entryType: {
-      type: Number
-    },
-  },
-  data() {
-    return {
-      form: {},
-      fileEntityList: [],
-      open: false,
-      replyApprovalProcessList: [],
-      openImg: false,
-      img: [],
-      showPic: null,
-      picImage: null,
-      slide1: [],
-      videoSrc: [],
-    }
-  },
-  created() {
-    let id = this.idInfo.split(":");
-
-    if (id.length == 2) {
-      this.idInfo = id[1];
-    } else {
-      this.idInfo = id;
-    }
-
-
-    this.init();
-  },
-  methods: {
-    init() {
-      getViolationCaseFile(this.idInfo).then(response => {
-        this.form = response.data.violationCaseFile;
-        let files = JSON.stringify(response.data.uploadFiles);
-        this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"));
-        this.fileEntityList.map(item => {
-          if (item.url.indexOf(".jpg") > -1 || item.url.indexOf(".png") > -1 || item.url.indexOf(".jpeg") > -1 || item.url.indexOf(".jpg") > -1) {
-            this.slide1.push(process.env.VUE_APP_BASE_API + item.url);
-          }
-          if (item.url.indexOf(".mp4") > -1 || item.url.indexOf(".avi") > -1) {
-            this.videoSrc.push(process.env.VUE_APP_BASE_API + item.url);
-          }
-        })
-      });
-
-
-      listReplyApprovalProcess({tableName: "workflow_casefile" + ":" + this.idInfo}).then(response => {
-        this.replyApprovalProcessList = response.rows;
-      });
-    },
-    /** 文件下载 */
-    downloadFA(row) {
-      let name = row.name;
-      let url = row.url;
-      const a = document.createElement('a')
-      a.setAttribute('download', name)
-      a.setAttribute('target', '_blank')
-      a.setAttribute('href', process.env.VUE_APP_BASE_API + url);
-      a.click()
-    },
-    openImage(path) {
-      debugger;
-      this.img = [];
-      this.openImg = true;
-      let files = path.split(",");
-      for(let i=0;i<files.length;i++){
-        this.img.push(files[i]);
-      }
-    },
-    downloadFile(path) {
-      window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path);
-    },
-    showFile(path) {
-      return process.env.VUE_APP_BASE_API + path;
-    },
-  }
-}
+<script src="@/api/vio_casefile_info">
 </script>
 <style scoped>
@@ -122,7 +122,7 @@
     </el-dialog>
     <el-dialog title="预览" :visible.sync="openImg" append-to-body width="300px">
       <div v-for="item in img" style="border: 1px black solid;text-align: center;">
-      
+
         <el-image style="width: 250px; height: 250px; margin: 5px;"
                   v-if="item.indexOf('.jpg')>-1||item.indexOf('.png')>-1||item.indexOf('.jpeg')>-1||item.indexOf('.gif')>-1"
                   :src="showFile(item)"
@@ -138,93 +138,9 @@
   </el-form>
 </template>
-<script>
-import {getViolationWarningInformation} from "@/api/casefile/violationWarningInformation";
-import {listReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
-
-export default {
-  name: "violationWarningInformationInfo",
-  props: {
-    businessKey: {
-      type: String
-    },
-    idInfo: {
-      type: String
-    },
-    entryType: {
-      type: Number
-    },
-  },
-  data() {
-    return {
-      form: {},
-      fileEntityList: [],
-      open: false,
-      replyApprovalProcessList: [],
-      openImg: false,
-      img: [],
-      showPic: null,
-      picImage: null,
-      slide1: [],
-      videoSrc: [],
-    }
-  },
-  created() {
-    let id = this.idInfo.split(":");
-
-    if (id.length == 2) {
-      this.idInfo = id[1];
-    } else {
-      this.idInfo = id;
-    }
-    this.init();
-  },
-  methods: {
-    init() {
-      getViolationWarningInformation(this.idInfo).then(response => {
-        this.form = response.data.violationWarningInformation;
-        let files = JSON.stringify(response.data.uploadFiles);
-        this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"));
-        this.fileEntityList.map(item => {
-          if (item.url.indexOf(".jpg") > -1 || item.url.indexOf(".png") > -1 || item.url.indexOf(".jpeg") > -1 || item.url.indexOf(".jpg") > -1) {
-            this.slide1.push(process.env.VUE_APP_BASE_API + item.url);
-          }
-          if (item.url.indexOf(".mp4") > -1 || item.url.indexOf(".avi") > -1) {
-            this.videoSrc.push(process.env.VUE_APP_BASE_API + item.url);
-          }
-        })
-      });
-      listReplyApprovalProcess({tableName: "violation_warning" + ":" + this.idInfo}).then(response => {
-        this.replyApprovalProcessList = response.rows;
-      });
-    },
-    /** 文件下载 */
-    downloadFA(row) {
-      let name = row.name;
-      let url = row.url;
-      const a = document.createElement('a')
-      a.setAttribute('download', name)
-      a.setAttribute('target', '_blank')
-      a.setAttribute('href', process.env.VUE_APP_BASE_API + url);
-      a.click()
-    },
-    openImage(path) {
-      this.img = [];
-      this.openImg = true;
-      let files = path.split(",");
-      for(let i=0;i<files.length;i++){
-        this.img.push(files[i]);
-      }
-    },
-    downloadFile(path) {
-      window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path);
-    },
-    showFile(path) {
-      return process.env.VUE_APP_BASE_API + path;
-    },
-  }
-}
-</script>
+<script src="@/api/vio_warning_info">
+</script>
+
 <style scoped>
 </style>
@@ -33,14 +33,18 @@ public class CaseOffline extends BaseEntity
     		+ "7=无许可消纳（工）,8=无许可消纳（消）,9=使用非专用车辆")
     private String type;
+    
     /** 名称 */
+    @Excel(name = "场站名称")
     private String siteName;
     /** 位置描述 */
+    @Excel(name = "位置描述")
     private String locationDec;
     /** 问题描述 */
+    @Excel(name = "问题描述")
     private String caseDec;
     /** 审批状态 */
@@ -51,6 +55,7 @@ public class CaseOffline extends BaseEntity
     private String place;
     /** 类型 */
+    @Excel(name = "场站类型编号" ,readConverterExp = "0=工地,1=处理场所")
     private Long siteType;
     /** 基础数据ID */
@@ -85,6 +90,27 @@ public class CaseOffline extends BaseEntity
     @Excel(name = "日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
+    private String startTime;
+    
+    private String endTime;
+    
+    public String getStartTime() {
+		return startTime;
+	}
+
+	public void setStartTime(String startTime) {
+		this.startTime = startTime;
+	}
+
+    @Override
+	public String getEndTime() {
+		return endTime;
+	}	
+
+    @Override
+	public void setEndTime(String endTime) {
+		this.endTime = endTime;
+	}
     public Date getCreateTime() {
@@ -78,6 +78,31 @@ public class ViolationCaseFile extends BaseEntity
     private String abbreviation;
+    private String startTime;
+    
+
+    private String endTime;
+
+    
+    
+    public String getStartTime() {
+		return startTime;
+	}
+
+	public void setStartTime(String startTime) {
+		this.startTime = startTime;
+	}
+
+    @Override
+	public String getEndTime() {
+		return endTime;
+	}	
+
+    @Override
+	public void setEndTime(String endTime) {
+		this.endTime = endTime;
+	}
+    
     @Override
     public Date getCreateTime() {
         return createTime;
@@ -55,6 +55,7 @@ public class ViolationWarningInformation extends BaseEntity {
     /**
      * 违规等级
      */
+    @Excel(name = "违规等级")
     private String violationGrade;
@@ -62,6 +63,7 @@ public class ViolationWarningInformation extends BaseEntity {
     /**
      * 企业名称
      */
+    @Excel(name = "企业名称")
     private String companyName;
     @Excel(name = "日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@@ -71,6 +73,7 @@ public class ViolationWarningInformation extends BaseEntity {
     /**
      * 违规描述
      */
+    @Excel(name = "违规描述")
     private String describe;
     /**
@@ -87,6 +90,7 @@ public class ViolationWarningInformation extends BaseEntity {
     /**
      * 接收人
      */
+    @Excel(name = "接收人")
     private String receive;
     /**
@@ -98,16 +102,46 @@ public class ViolationWarningInformation extends BaseEntity {
      * 阅览人
      */
     private String readBy;
-
+    
+    
+    @Excel(name = "发送人")
+    private String createBy;
     /**
      * 阅览时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "阅读时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date readTime;
     private String abbreviation;
+    private String startTime;
+    
+
+    private String endTime;
+
+    
+    
+    public String getStartTime() {
+		return startTime;
+	}
+
+	public void setStartTime(String startTime) {
+		this.startTime = startTime;
+	}    
+	
+	@Override
+	public String getEndTime() {
+		return endTime;
+	}	
+
     @Override
+	public void setEndTime(String endTime) {
+		this.endTime = endTime;
+	}
+    
+
+	@Override
     public Date getCreateTime() {
         return createTime;
     }
@@ -330,8 +330,25 @@ public class Consumer {
                     violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
                     break;
                 case "44030033"://闯禁行驶
+                    violationWarningInformation.setViolationObjectType("0");
+                    violationWarningInformation.setSendObject("区管理部门");
+                    describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+                            + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "出现" + violationWarningInformation.getViolationType();
+                    //设置公司简称
+                    for(Object o:company1){
+                        JSONObject jo = (JSONObject) o;
+                        if(basevehicleInfo.getString("companyID").equals(jo.getString("id"))){
+                            violationWarningInformation.setAbbreviation(jo.getString("abbreviation"));
+                        }
+                    }
+                    violationWarningInformation.setCreateTime(alarmTime);
+                    violationWarningInformation.setDescribe(describe);
+                    // 业务逻辑
+                    violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
+                    break;
+
                 case "44030034"://失信车辆作业
-                    violationWarningInformation.setViolationObjectType("2");
+                	violationWarningInformation.setViolationObjectType("2");
                     violationWarningInformation.setSendObject("运输企业");
                     describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
                             + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "出现" + violationWarningInformation.getViolationType();
@@ -94,9 +94,25 @@ public class ViolationWarningInformationServiceImpl implements IViolationWarning
      * @param violationWarningInformation 违规预警信息
      * @return 结果
      */
+    
+    String innerArea = "湘江新区,芙蓉区,天心区,开福区,雨花区";
+    String warnString = "处理场所预警-未报开工作业、处理场所预警-视频设备离线超时报警、处理场所预警-三无车辆进入处理场所、处理场所预警-未到指定的处理场所作业";
+    
     @Override
     @Transactional
     public int insertViolationWarningInformation(MultipartFile[] files,ViolationWarningInformation violationWarningInformation) throws IOException {
+    	
+    	
+    	if(!innerArea.contains(violationWarningInformation.getOwningRegion()) && warnString.contains(violationWarningInformation.getViolationType()) 
+    			&& violationWarningInformation.getViolationObjectType() == "1") {
+    		
+    		log.info("不记录预警信息"  + violationWarningInformation.getOwningRegion() + " " + violationWarningInformation.getViolationType());
+    		
+    		return 1;
+    		
+    	}
+    	
+    	
         if(violationWarningInformation.getCreateTime()==null){
             violationWarningInformation.setCreateTime(DateUtils.getNowDate());
         }
@@ -36,7 +36,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <where>  
             <if test="type != null  and type != ''"> and type = #{type}</if>
             <if test="place != null  and place != ''"> and place = #{place}</if>
-            <if test="createTime != null "> and DATE_FORMAT(create_time,("%y%m%d")) =DATE_FORMAT(#{createTime},("%y%m%d"))</if>
+            <if test="startTime != null "> and create_time between #{startTime} and #{endTime}</if>
         </where>
     </select>
@@ -49,6 +49,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="readBy != null  and readBy != ''"> and read_by = #{readBy}</if>
             <if test="readTime != null "> and read_time = #{readTime}</if>
             <if test="createTime != null "> and DATE_FORMAT(create_time,("%y%m%d")) = DATE_FORMAT(#{createTime},("%y%m%d"))</if>
+            <if test="startTime != null "> and create_time between #{startTime} and #{endTime}</if>
         </where>
         order by create_time desc
     </select>
@@ -41,6 +41,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="projectName != null  and projectName != ''"> and project_name like concat('%', #{projectName}, '%')</if>
             <if test="companyName != null  and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
             <if test="createTime != null"> and DATE_FORMAT(create_time,("%y%m%d")) = DATE_FORMAT(#{createTime},("%y%m%d"))</if>
+            <if test="startTime != null "> and create_time between #{startTime} and #{endTime}</if>
         </where>
         order by create_time desc
     </select>