m

youxiw2000
1 parent 20a4cfa9
Showing 5 changed files with 83 additions and 39 deletions
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
trash-ui/dist.rar
trash-ui/src/api/vio_casefile.js
trash-ui/src/views/casefile/violationCaseFile/index.vue
trash-workFlow/src/main/java/com/trash/casefile/service/impl/ViolationWarningInformationServiceImpl.java
@@ -186,15 +186,6 @@ public class ActTaskServiceImpl implements IActTaskService {
 				list.setTotal(list.size());
 			}
  
-
-			list.sort(new Comparator<ActTaskDTO>() {
-
-				@Override
-				public int compare(ActTaskDTO o1, ActTaskDTO o2) {
-					// TODO Auto-generated method stub
-					return (int) (o2.getCreatedDate().getTime() - o1.getCreatedDate().getTime());
-				}
-			});
  
 		return list;
 	}
@@ -278,17 +269,6 @@ public class ActTaskServiceImpl implements IActTaskService {
  
 		}
  
-//		list.sort(new Comparator<ActTaskDTO>() {
-//
-//			@Override
-//			public int compare(ActTaskDTO o1, ActTaskDTO o2) {
-//				// TODO Auto-generated method stub
-//				return (int) (o2.getCreatedDate().getTime() - o1.getCreatedDate().getTime());
-//			}
-//		});
-//
-//		list.setPageNum(pageDomain.getPageNum());
-//		list.setPageSize(pageDomain.getPageSize());
  
  
 		return list;
@@ -364,6 +344,15 @@ public class ActTaskServiceImpl implements IActTaskService {
 			}
 		}
  
+		list.sort(new Comparator<ActTaskDTO>() {
+
+			@Override
+			public int compare(ActTaskDTO o1, ActTaskDTO o2) {
+				// TODO Auto-generated method stub
+				return (int) (o2.getCreatedDate().getTime() - o1.getCreatedDate().getTime());
+			}
+		});
+		
 		return list;
 	}
  
@@ -210,10 +210,14 @@ export default {
     getRemoteDate(value){
       this.remoteQueryData.name =value;
        constructionsitesList(this.remoteQueryData).then(res => {
-         this.projectNameList["0"] = res.result.list;
+          this.projectNameList["0"] = res.result.list;
+          
+          this.$forceUpdate();
        });
        earthsitesList(this.remoteQueryData).then(res => {
-           this.projectNameList["1"] = res.result.list;
+          this.projectNameList["1"] = res.result.list;
+          
+          this.$forceUpdate();
        });
     },
     selectArea(item) {
@@ -403,20 +407,6 @@ export default {
       const code = `${year}${month}${day}${hour}${minute}${second}${millisecond}`;
       return code;
     },
-    projectNameLoadOptions(query) {
-      // 根据输入的关键字query异步加载选项数据
-      this.isLoading = true
-      setTimeout(() => {
-        // 模拟异步加载数据
-        const data = [
-          {name: '项目1'},
-          {name: '项目2'},
-          {name: '项目3'}
-        ].filter(item => item.name.includes(query))
-        this.projectNameList = data
-        this.isLoading = false
-      }, 200)
-    },
     getCompanys(value){
  
       let query  = {
@@ -177,7 +177,6 @@
                 <el-select
                 v-model="form.projectName"
                 :filterable="true"
-                :remote-method="projectNameLoadOptions"
                 :loading="isLoading" placeholder="请输入项目名称" style="width: 100%;"
                  :filter-method="getRemoteDate">
                   <el-option v-for="item in projectNameList[form.violationObjectType]" :key="item.name" :label="item.name" :value="item.name" :title="item.name"></el-option>
 package com.trash.casefile.service.impl;
  
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
  
 import com.alibaba.fastjson.JSONArray;
@@ -131,8 +138,26 @@ public class ViolationWarningInformationServiceImpl implements IViolationWarning
                 i = 2;
             }
         }
-
-
+        
+        Map map = null;
+        try {
+        	map = redisCache.getCacheMap("warningParam");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+        
+        
+        if(map == null || map.size() == 0){
+        	map = getTypeToRedis();
+        }
+        
+        if(map!= null && map.get(violationWarningInformation.getViolationType()) != null &&
+        		map.get(violationWarningInformation.getViolationType()).equals("0")){
+        	System.out.println(violationWarningInformation.getViolationType() + " " + map.get(violationWarningInformation.getViolationType()));
+        	return result;
+        }
+//        
+        
         if(violationWarningInformation.getCreateBy().equals("长沙市建筑垃圾智慧监管平台")){
             WorkflowService.createCaseFile1(violationWarningInformation,i,1);
         }else{
@@ -141,6 +166,47 @@ public class ViolationWarningInformationServiceImpl implements IViolationWarning
  
         return result;
     }
+    
+    
+    public Map getTypeToRedis(){
+    	
+    	
+    	File file = new File("d:/warningParam.txt");
+    	
+    	Map map = null;
+    	
+    	try {
+			BufferedReader fReader = new BufferedReader(new FileReader(file));
+			
+			String result = null;
+			map = new HashMap<>();
+			while(true){
+				try {
+					result = fReader.readLine();
+					
+					if(result == null){
+						break;
+					}
+					
+					map.put(result.split(" ")[0], result.split(" ")[1]);
+					
+					System.out.println(result.split(" ")[0] +"," +  result.split(" ")[1]);
+					
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+				
+			}
+			
+			redisCache.setCacheObject("warningParam", map,15,TimeUnit.MINUTES);
+			
+			return map;
+		} catch (FileNotFoundException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+    	return null;
+    }
  
     /**
      * 修改违规预警信息