修复bug

273548560@qq.com
1 parent 42fad2dd
Showing 8 changed files with 103 additions and 115 deletions
trash-quartz/src/main/java/com/trash/quartz/task/DriverTask.java
trash-ui/src/api/dict.js
trash-ui/src/views/activiti/task/index.vue
trash-ui/src/views/casefile/violationCaseFile/index.vue
trash-ui/src/views/casefile/violationWarningInformation/index.vue
trash-workFlow/src/main/java/com/trash/casefile/controller/RemoteServerController.java
trash-workFlow/src/main/java/com/trash/casefile/kafka/Consumer.java
trash-workFlow/src/main/java/com/trash/workflow/listener/SupervisionListener.java
@@ -17,6 +17,7 @@ import javax.servlet.http.HttpServletResponse;
 import com.trash.casefile.domain.KafkaCompensation;
 import com.trash.casefile.kafka.Consumer;
 import com.trash.casefile.mapper.KafkaCompensationMapper;
+import com.trash.common.core.redis.RedisCache;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -56,6 +57,9 @@ public class DriverTask
     @Autowired
     private trashConfig trashConfig;
+	@Autowired
+	private RedisCache redisCache;
+
     public void checkCredit(){
     	if(RemoteServerUtils.remote == null){
@@ -257,6 +261,10 @@ public class DriverTask
     }
+	/**
+	 * kafka补偿机制，每半小时一次
+	 * @throws InterruptedException
+	 */
 	public void kafkaCompensation() throws InterruptedException {
 		KafkaCompensation kafkaCompensation = new KafkaCompensation();
 		kafkaCompensation.setStatus(0);
@@ -265,5 +273,60 @@ public class DriverTask
 			SpringUtils.getBean(Consumer.class).autoViolationWarning(k.getData(),k.getId().toString());
 		}
 	}
-    
+
+	/**
+	 * 每分钟更新一次公司列表
+	 */
+	public void getCompanyList(){
+		if(RemoteServerUtils.remote == null){
+			RemoteServerUtils.remote = trashConfig.getRemotePath();
+		}
+		Map<String, Object> map = new HashMap<>();
+		map.put("size",9999);
+		map.put("page",1);
+		JSONArray jsonArray = RemoteServerUtils.getCompanyList(map, trashConfig.getToken());
+		redisCache.setCacheObject("companyList",jsonArray);
+	}
+
+	/**
+	 * 每分钟更新一次工地列表
+	 */
+	public void getConstructionList(){
+		if(RemoteServerUtils.remote == null){
+			RemoteServerUtils.remote = trashConfig.getRemotePath();
+		}
+		Map<String, Object> map = new HashMap<>();
+		map.put("size",999);
+		map.put("page",1);
+		JSONArray jsonArray = RemoteServerUtils.getConstructionList(map,trashConfig.getToken());
+		redisCache.setCacheObject("constructionList",jsonArray);
+	}
+
+	/**
+	 * 每分钟更新一次消纳场列表
+	 */
+	public void getEarthSitesList(){
+		if(RemoteServerUtils.remote == null){
+			RemoteServerUtils.remote = trashConfig.getRemotePath();
+		}
+		Map<String, Object> map = new HashMap<>();
+		map.put("size",999);
+		map.put("page",1);
+		JSONArray jsonArray = RemoteServerUtils.getEarthSitesList(map,trashConfig.getToken());
+		redisCache.setCacheObject("earthSitesList",jsonArray);
+	}
+
+	/**
+	 * 每分钟更新一次区域列表
+	 */
+	public void getAreaList(){
+		if(RemoteServerUtils.remote == null){
+			RemoteServerUtils.remote = trashConfig.getRemotePath();
+		}
+		Map<String, Object> map = new HashMap<>();
+		map.put("size",999);
+		map.put("page",1);
+		JSONArray jsonArray = RemoteServerUtils.getAreas(trashConfig.getToken());
+		redisCache.setCacheObject("areaList",jsonArray);
+	}
 }
@@ -148,10 +148,10 @@ export function getDict(params) {
   });
 }
-export function getSupervision(data) {
+export function getSupervision(params) {
   return requestRemote({
-    url: '/api/gpsservice/cs/supervision/ledger/list',
-    method: 'post',
-    data: data
+    url: '/api/gpsservice/cs/supervision/detail',
+    method: 'get',
+    params: params
   });
 }
@@ -681,14 +681,15 @@ export default {
         if(this.definitionKey.indexOf("supervision")>-1){
           console.log(row)
           const params = {
-            id: "1fee149a03a3482ba45367745fea6669",
-            type:1,
-            page:1,
-            size:1
+            id: row.businessKey.split(":")[1],
           }
           getSupervision(params).then(res=>{
             console.log(res)
-            this.supervisionData = res.result.list[0];
+            if(res.result==null){
+              this.$message.error("获取纪检督察详情失败！请重试")
+              return;
+            }
+            this.supervisionData = res.result;
             this.supervisionOpen = true;
           })
           return;
 <template>
   <div class="app-container">
-    <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="105px">
       <el-form-item label="所属区域" prop="owningRegion">
         <el-select v-model="queryParams.owningRegion" placeholder="请选择违规类型"  size="small">
@@ -54,7 +54,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['casefile:violationCaseFile:add']"
-        >新增</el-button>
+        >违规案卷录入</el-button>
       </el-col>
 <!--      <el-col :span="1.5">-->
 <!--        <el-button-->
@@ -140,7 +140,7 @@
           </el-col>
           <el-col :span="11">
             <el-form-item label="违规对象类型" prop="violationObjectType">
-              <el-select v-model="form.violationObjectType" placeholder="请选择违规对象类型"  size="small">
+              <el-select v-model="form.violationObjectType" placeholder="请选择违规对象类型"  size="small" style="width: 100%">
                 <el-option label="工地" value="0" />
                 <el-option label="消纳场" value="1" />
                 <el-option label="企业" value="2" />
@@ -186,8 +186,8 @@
         <el-row :gutter="2">
           <el-col :span="11">
             <el-form-item label="公司" prop="violationGrade">
-              <el-select v-model="form.companyName" placeholder="请选择公司" style="width: 100%;">
-                  <el-option  v-for="item in companyList" :label="item.name" :value="item.name" />
+              <el-select v-model="form.companyName" :filterable="true" :remote-method="companyLoadOptions" :loading="isLoadingCompany" placeholder="请输入项目名称" style="width: 100%;">
+                <el-option v-for="item in companyList" :key="item.name" :label="item.name" :value="item.name"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -46,7 +46,7 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['casefile:violationWarningInformation:add']"
-        >新增</el-button>
+        >预警信息录入</el-button>
       </el-col>
 <!--      <el-col :span="1.5">-->
 <!--        <el-button-->
@@ -29,27 +29,8 @@ public class RemoteServerController {
     @PostMapping("/getConstructionList")
     public AjaxResult getConstructionList(){
         JSONArray jsonArray = redisCache.getCacheObject("constructionList");
-        int i = 0;
-        if(jsonArray==null||jsonArray.size()==0){
-            Map<String, Object> map = new HashMap<>();
-            map.put("size",999);
-            map.put("page",1);
-            while (true){
-                i++;
-                jsonArray = RemoteServerUtils.getConstructionList(map,trashConfig.getToken());
-                if(jsonArray!=null&&jsonArray.size()>0) {
-                    break;
-                }
-                if(i==3){
-                    return AjaxResult.error("获取工地列表失败!!!");
-                }
-                sleep(500);
-            }
-
-            if(jsonArray!=null&&jsonArray.size()>0){
-                redisCache.setCacheObject("constructionList",jsonArray,1, TimeUnit.HOURS);
-            }
-
+        if(jsonArray==null){
+            return AjaxResult.error("获取工地列表失败!请稍后重试或联系管理员");
         }
         return AjaxResult.success(jsonArray);
     }
@@ -57,27 +38,8 @@ public class RemoteServerController {
     @PostMapping("/getEarthSitesList")
     public AjaxResult getEarthSitesList(){
         JSONArray jsonArray = redisCache.getCacheObject("earthSitesList");
-        int i = 0;
-        if(jsonArray==null||jsonArray.size()==0){
-            Map<String, Object> map = new HashMap<>();
-            map.put("size",999);
-            map.put("page",1);
-            while (true){
-                i++;
-                jsonArray = RemoteServerUtils.getEarthSitesList(map,trashConfig.getToken());
-                if(jsonArray!=null&&jsonArray.size()>0) {
-                    break;
-                }
-                if(i==3){
-                    return AjaxResult.error("获取消纳场列表失败!!!");
-                }
-                sleep(500);
-            }
-
-            if(jsonArray!=null&&jsonArray.size()>0) {
-                redisCache.setCacheObject("earthSitesList",jsonArray,1, TimeUnit.HOURS);
-            }
-
+        if(jsonArray==null){
+            return AjaxResult.error("获取消纳场列表失败!请稍后重试或联系管理员");
         }
         return AjaxResult.success(jsonArray);
     }
@@ -85,23 +47,8 @@ public class RemoteServerController {
     @PostMapping("/getAreaList")
     public AjaxResult getAreaList(){
         JSONArray jsonArray = redisCache.getCacheObject("areaList");
-        int i = 1;
-        if(jsonArray==null||jsonArray.size()==0){
-            while (true){
-                i++;
-                jsonArray = RemoteServerUtils.getAreas(trashConfig.getToken());
-                if(jsonArray!=null&&jsonArray.size()>0) {
-                    break;
-                }
-                if(i==3){
-                    return AjaxResult.error("获取区域列表失败!!!");
-                }
-                sleep(500);
-            }
-
-            if(jsonArray!=null&&jsonArray.size()>0) {
-                redisCache.setCacheObject("areaList", jsonArray, 1, TimeUnit.HOURS);
-            }
+        if(jsonArray==null){
+            return AjaxResult.error("获取区域列表失败!请稍后重试或联系管理员");
         }
         return AjaxResult.success(jsonArray);
     }
@@ -109,25 +56,8 @@ public class RemoteServerController {
     @PostMapping("/getCompanyList")
     public AjaxResult getCompanyList(){
         JSONArray jsonArray = redisCache.getCacheObject("companyList");
-        int i = 1;
-        if(jsonArray==null||jsonArray.size()==0){
-            Map<String, Object> map = new HashMap<>();
-            map.put("size",999);
-            map.put("page",1);
-            while (true){
-                i++;
-                jsonArray = RemoteServerUtils.getCompanyList(map,trashConfig.getToken());
-                if(jsonArray!=null&&jsonArray.size()>0) {
-                    break;
-                }
-                if(i==3){
-                    return AjaxResult.error("获取公司列表失败!!!");
-                }
-                sleep(500);
-            }
-            if(jsonArray!=null&&jsonArray.size()>0) {
-                redisCache.setCacheObject("companyList", jsonArray, 1, TimeUnit.HOURS);
-            }
+        if(jsonArray==null){
+            return AjaxResult.error("获取公司列表失败!请稍后重试或联系管理员");
         }
         return AjaxResult.success(jsonArray);
     }
@@ -83,23 +83,7 @@ public class Consumer {
         JSONArray company1 = redisCache.getCacheObject("companyList");
         JSONObject basevehicleInfo = RemoteServerUtils.getBasevehicleInfo(jsonObject.getString("vehicleId"),trashConfig.getToken());
         if(company1==null){
-            int i = 0;
-            Map map = new HashMap<>();
-            map.put("size",9999);
-            map.put("page",1);
-            while (true){
-                company1 = RemoteServerUtils.getCompanyList(map, trashConfig.getToken());
-                if(company1!=null){
-                    break;
-                }
-                i++;
-                if(i==5){
-                    throw new RuntimeException("获取公司列表失败5次！！！");
-                }
-                Thread.sleep(500);
-            }
-
-            redisCache.setCacheObject("companyList",company1,1, TimeUnit.HOURS);
+            throw new RuntimeException("获取公司列表失败！！！");
         }
         //这两种类型无需累加
@@ -23,13 +23,23 @@ public class SupervisionListener implements ExecutionListener {
     @Override
     public void notify(DelegateExecution delegateExecution) {
-    	
+
     	List<Map> maps = new ArrayList<Map>();
-    	
-    	Map map = new HashMap();
+
+    	Map<String,Object> map = new HashMap<>();
     	map.put("id", delegateExecution.getProcessInstanceBusinessKey().split(":")[1]);
-    	map.put("supervisionResult", state.getValue(delegateExecution).toString());
+    	map.put("supervisionResult", 2);
+		if(delegateExecution.getProcessDefinitionId().contains("gongdi")){
+			map.put("type",0);
+		}else if(delegateExecution.getProcessInstanceBusinessKey().contains("xnc")){
+			map.put("type",1);
+		}else if (delegateExecution.getProcessInstanceBusinessKey().contains("anjuan")){//案卷暂时不用
+			map.put("type",3);
+		}else{
+			map.put("type",2);
+		}
+
     	maps.add(map);
     	RemoteServerUtils.UpdateSupervisionStatus(maps);