Merge branch 'dev' of 192.168.168.245:youxiw20000/trash into dev

youxiw2000
2 parents 7e7dcdfc 2a8e1fbe
Showing 16 changed files with 183 additions and 21 deletions
trash-common/src/main/java/com/trash/common/utils/RemoteServerUtils.java
trash-ui/src/views/business/threestep/threestepInfo.vue
trash-ui/src/views/casefile/violationCaseFile/index.vue
trash-ui/src/views/casefile/violationWarningInformation/index.vue
trash-ui/src/views/casefile/violationWarningInformation/violationWarningInformationInfo.vue
trash-ui/src/views/h5/leaveApplication/index.vue
trash-ui/src/views/h5/violationCaseFile/index.vue
trash-ui/src/views/h5/violationWarningInformation/index.vue
trash-ui/src/views/office/handle/index.vue
trash-ui/src/views/office/handleAffairsCommon/index.vue
trash-ui/src/views/office/handleAffairsXF/index.vue
trash-ui/src/views/office/leaveApplication/index.vue
trash-ui/src/views/office/management/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
@@ -47,6 +47,8 @@ public class RemoteServerUtils {
 	public static String UpdateConstruction= "/api/siteservice/cs/constructionsites/status";
+	public static String UpdateSupervision= "/api/gpsservice/cs/supervision/status/update";
+
 	public static String CompanyListRequestPath = "/api/gpsservice/cs/companies/ledger/list";
@@ -70,6 +72,18 @@ public class RemoteServerUtils {
 		return list;
 	}
+	public static JSONArray getEarthSitesList(Map map,String token){
+		JSONArray list=null;
+		Object object = post(EarthSitesList,map,token);
+
+		if(object != null){
+			JSONObject jsonObject = JSON.parseObject(object.toString());
+			list = jsonObject.getJSONArray("list");
+		}
+
+		return list;
+	}
+
 	public static JSONArray getConstructionList(Map map){
 		JSONArray list=null;
 		Object object = post(ConstructionList,map);
@@ -82,6 +96,18 @@ public class RemoteServerUtils {
 		return list;
 	}
+	public static JSONArray getConstructionList(Map map,String token){
+		JSONArray list=null;
+		Object object = post(ConstructionList,map,token);
+
+		if(object != null){
+			JSONObject jsonObject = JSON.parseObject(object.toString());
+			list = jsonObject.getJSONArray("list");
+		}
+
+		return list;
+	}
+
 	public static JSONArray getTruckOnline(Map map){
 		JSONArray turckList=null;
 		Object object = post(TruckStatusListRequestPath,map);
@@ -100,6 +126,12 @@ public class RemoteServerUtils {
 		return object;
 	}
+
+	public static Object UpdateSupervisionStatus(List<Map> map){
+		Object object = post(UpdateSupervision,map);
+
+		return object;
+	}
 	public static Object updateEarthSitesCreditAndStatus(List<Map> map){
 		JSONArray turckList=null;
@@ -64,7 +64,6 @@
         <el-col :span="12">
           <el-form-item label="联系电话">
             <el-input v-model="infoData.phone" :maxlength="11" show-word-limit  disabled />
-            </el-select>
           </el-form-item>
         </el-col>
       </el-row>
@@ -662,6 +662,7 @@ export default {
             message: '上传文件大小不得超过20M！',
             type: 'warning'
           });
+          fileList = fileList.splice(fileList.length - 1, 1);
         } else {
           //符合条件后进行添加
           this.fileEntityList = fileList
@@ -624,6 +624,7 @@ export default {
             message: '上传文件大小不得超过20M！',
             type: 'warning'
           });
+          fileList = fileList.splice(fileList.length - 1, 1);
         } else {
           //符合条件后进行添加
           this.fileEntityList = fileList
@@ -83,7 +83,7 @@
     <el-row>
       <el-col :span="22">
         <el-form-item label="违规描述" prop="describe">
-          <el-input v-model="form.describe" type="textarea" placeholder="请输入内容" :rows="5" :disabled="true"/>
+          <el-input v-model="form.describe" type="textarea" placeholder="请输入内容" :rows="5" :disabled="true"style="white-space: pre-line"/>
         </el-form-item>
       </el-col>
     </el-row>
@@ -509,6 +509,7 @@ export default {
             message: '上传文件大小不得超过5M！',
             type: 'warning'
           });
+          fileList = fileList.splice(fileList.length - 1, 1);
         } else {
           //符合条件后进行添加
           this.fileEntityList = fileList
@@ -627,6 +627,7 @@ export default {
             message: '上传文件大小不得超过20M！',
             type: 'warning'
           });
+          fileList = fileList.splice(fileList.length - 1, 1);
         } else {
           //符合条件后进行添加
           this.fileEntityList = fileList
@@ -565,6 +565,7 @@ export default {
             message: '上传文件大小不得超过20M！',
             type: 'warning'
           });
+          fileList = fileList.splice(fileList.length - 1, 1);
         } else {
           //符合条件后进行添加
           this.fileEntityList = fileList
@@ -110,18 +110,18 @@
         </template>
       </el-table-column>
       <el-table-column label="公文类" align="center">
-        <el-table-column label="来文单位" align="center" prop="company" show-overflow-tooltip="true"/>
+        <el-table-column label="来文单位" align="center" prop="company" :show-overflow-tooltip="true"/>
         <el-table-column label="收文时间" align="center" prop="receiveTime" width="180">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.receiveTime, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="文件标题" align="center" prop="title" show-overflow-tooltip="true"/>
+        <el-table-column label="文件标题" align="center" prop="title" :show-overflow-tooltip="true"/>
       </el-table-column>
       <el-table-column label="信访类" align="center">
-        <el-table-column label="信访单位(人)" align="center" prop="sendPerson" show-overflow-tooltip="true"/>
+        <el-table-column label="信访单位(人)" align="center" prop="sendPerson" :show-overflow-tooltip="true"/>
         <el-table-column label="信访日期" align="center" prop="sendDate" />
-        <el-table-column label="诉求" align="center" prop="appeal" show-overflow-tooltip="true"/>
+        <el-table-column label="诉求" align="center" prop="appeal" :show-overflow-tooltip="true"/>
       </el-table-column>
       <el-table-column label="审批状态" align="center" prop="status">
         <template slot-scope="scope">
@@ -406,8 +406,6 @@ export default {
       this.idInfo = row.id+"";
       this.openInfo = true;
       this.title = "办文办事详情";
-
-      console.log(row.type);
       if(row.type==0){
         this.businessKey = 'yuelanxuexi1';
       }else if(row.type==1){
@@ -501,6 +499,7 @@ export default {
      * 大小不超过5M
      * */
     fileChange(file, fileList) {
+      console.log(fileList)
       let count = 0;
       for (let i = 0; i < fileList.length; i++) {
         // console.log(fileList.length)
@@ -532,6 +531,7 @@ export default {
             message: '上传文件大小不得超过5M！',
             type: 'warning'
           });
+          fileList = fileList.splice(fileList.length - 1, 1);
         } else {
           //符合条件后进行添加
           this.fileEntityList = fileList
@@ -5,9 +5,9 @@
         <el-input
           v-model="queryParams.company"
           placeholder="请输入来文单位"
-          
+
           size="small"
-          
+
         />
       </el-form-item>
       <el-form-item label="收文时间" prop="receiveTime">
@@ -445,6 +445,7 @@ export default {
             message: '上传文件大小不得超过5M！',
             type: 'warning'
           });
+          fileList = fileList.splice(fileList.length - 1, 1);
         } else {
           //符合条件后进行添加
           this.fileEntityList = fileList
@@ -5,9 +5,9 @@
         <el-input
           v-model="queryParams.company"
           placeholder="请输入信访单位(人)"
-          
+
           size="small"
-          
+
         />
       </el-form-item>
       <el-form-item label="信访日期" prop="receiveDate">
@@ -439,6 +439,7 @@ export default {
             message: '上传文件大小不得超过5M！',
             type: 'warning'
           });
+          fileList = fileList.splice(fileList.length - 1, 1);
         } else {
           //符合条件后进行添加
           this.fileEntityList = fileList
@@ -518,6 +518,7 @@ export default {
             message: '上传文件大小不得超过5M！',
             type: 'warning'
           });
+          fileList = fileList.splice(fileList.length - 1, 1);
         } else {
           //符合条件后进行添加
           this.fileEntityList = fileList
@@ -559,6 +559,7 @@ export default {
             message: '上传文件大小不得超过5M！',
             type: 'warning'
           });
+          fileList = fileList.splice(fileList.length - 1, 1);
         } else {
           //符合条件后进行添加
           this.fileEntityList = fileList
 package com.trash.casefile.controller;
 import com.alibaba.fastjson.JSONArray;
+import com.trash.common.config.trashConfig;
 import com.trash.common.core.domain.AjaxResult;
 import com.trash.common.core.redis.RedisCache;
 import com.trash.common.utils.RemoteServerUtils;
@@ -13,6 +14,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
+import static com.trash.common.utils.Threads.sleep;
+
 @RestController
 @RequestMapping("/remoteServer")
 public class RemoteServerController {
@@ -20,14 +23,29 @@ public class RemoteServerController {
     @Autowired
     RedisCache redisCache;
+    @Autowired
+    trashConfig trashConfig;
+
     @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);
-            jsonArray = RemoteServerUtils.getConstructionList(map);
+            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);
             }
@@ -39,11 +57,23 @@ 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);
-            jsonArray = RemoteServerUtils.getEarthSitesList(map);
+            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);
             }
@@ -55,8 +85,20 @@ public class RemoteServerController {
     @PostMapping("/getAreaList")
     public AjaxResult getAreaList(){
         JSONArray jsonArray = redisCache.getCacheObject("areaList");
+        int i = 1;
         if(jsonArray==null||jsonArray.size()==0){
-            jsonArray = RemoteServerUtils.getAreas();
+            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);
             }
@@ -67,11 +109,22 @@ 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);
-            jsonArray = RemoteServerUtils.getCompanyList(map);
+            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);
             }
@@ -34,7 +34,7 @@ public class Consumer {
     private IViolationWarningInformationService violationWarningInformationService;
     @KafkaListener(topics = "record_process_alarm")
-    public void consume(@Payload String data) {
+    public void consume(@Payload String data) throws InterruptedException {
         log.info("kafka消费数据成功,data:" + data);
         autoViolationWarning(data);
     }
@@ -48,14 +48,26 @@ public class Consumer {
     @Autowired
     RedisCache redisCache;
-    public void autoViolationWarning(String data) {
+    public void autoViolationWarning(String data) throws InterruptedException {
         String[] code = {"44030020=工地预警-未报开工作业", "44030021=工地预警-视频设备离线超时报警", "44030022=工地预警-三无车辆进入工地", "44030023=工地预警未按时间作业",
                 "44030024=消纳场预警-未报开工作业", "44030025=消纳场预警-视频设备离线超时报警", "44030026=消纳场预警-三无车辆进入消纳场", "44030027=消纳场预警-未到指定的消纳场作业",
                 "44030028=离线运输报警(工)", "44030029=离线运输报警(消)", "44030030=未激活车辆作业", "44030031=未核准作业车辆作业", "44030032=未按线路行驶",
                 "44030033=闯禁行驶", "44030034=失信车辆作业"};
         JSONObject jsonObject = JSONObject.parseObject(data);
-        String nowDate = DateFormatUtils.format(new Date(), "yyyy-MM-dd");
-        String tomorrowDate = DateFormatUtils.format(DateUtils.addDays(new Date(), 1), "yyyy-MM-dd");
+        //q:获取当前时间
+        String nowHour = DateFormatUtils.format(new Date(), "HH");
+        String nowDate = null;
+        String tomorrowDate = null;
+        if(Integer.valueOf(nowHour)<8){
+            nowDate = DateFormatUtils.format(DateUtils.addDays(new Date(), -1), "yyyy-MM-dd");
+            tomorrowDate = DateFormatUtils.format(new Date(), "yyyy-MM-dd");
+        }else{
+            nowDate = DateFormatUtils.format(new Date(), "yyyy-MM-dd");
+            tomorrowDate = DateFormatUtils.format(DateUtils.addDays(new Date(), 1), "yyyy-MM-dd");
+        }
+
+
+
         String violationType = jsonObject.getString("alarmName");
         if(RemoteServerUtils.remote==null){
             //登录
@@ -66,10 +78,22 @@ 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);
-            company1 = RemoteServerUtils.getCompanyList(map, trashConfig.getToken());
+            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);
         }
+package com.trash.workflow.listener;
+
+import com.trash.common.utils.RemoteServerUtils;
+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.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+public class SupervisionListener implements ExecutionListener {
+
+	private Expression state;
+	
+	@Autowired
+	IWorkflowService workflowService;
+	
+
+    @Override
+    public void notify(DelegateExecution delegateExecution) {
+    	
+    	List<Map> maps = new ArrayList<Map>();
+    	
+    	Map map = new HashMap();
+    	
+    	map.put("id", delegateExecution.getProcessInstanceBusinessKey().split(":")[1]);
+    	map.put("supervisionResult", state.getValue(delegateExecution).toString());
+    	maps.add(map);
+    	
+    	RemoteServerUtils.UpdateSupervisionStatus(maps);
+
+        workflowUtils.sendDataToHisTory(delegateExecution, state);
+    	
+    	
+    	System.out.println("纪检督察流程状态更新 更新ID:" + delegateExecution.getProcessInstanceBusinessKey()  + "状态:" + state.getValue(delegateExecution).toString());
+    }
+
+
+
+}