修复bug

273548560@qq.com
1 parent 1cda9357
Showing 10 changed files with 278 additions and 170 deletions
trash-common/src/main/java/com/trash/common/utils/RemoteServerUtils.java
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-workFlow/src/main/java/com/trash/casefile/domain/ViolationWarningInformation.java
trash-workFlow/src/main/java/com/trash/casefile/kafka/Consumer.java
trash-workFlow/src/main/java/com/trash/casefile/mapper/ViolationWarningInformationMapper.java
trash-workFlow/src/main/java/com/trash/casefile/service/IViolationWarningInformationService.java
trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
trash-workFlow/src/main/resources/mapper/casefile/ViolationWarningInformationMapper.xml
@@ -53,8 +53,9 @@ public class RemoteServerUtils {
 	public static String UpdateEarthSiteRequestPath = "/api/siteservice/cs/earthsites/status";
  
 	public static String UpdateConractRequestPath = "/api/siteservice/cs/sitecontract/audit/status";
-	
-	
+
+	public static String BasevehicleInfo = "/api/gpsservice/cs/basevehicle/";
+
 	public static JSONArray getEarthSitesList(Map map){
 		JSONArray list=null;
 		Object object = post(EarthSitesList,map);
@@ -534,7 +535,18 @@ public class RemoteServerUtils {
  
 		return null;
 	}
+	public static JSONObject getBasevehicleInfo(String id,String token) {
+		JSONObject turckList=null;
+		Object object = get(BasevehicleInfo + id,null,token);
  
+		if(object != null){
+			turckList = JSON.parseObject(object.toString());
+			return turckList;
+		}
+
+		return turckList;
+
+	}
  
  
 }
@@ -29,7 +29,7 @@
         <el-input
           v-model="queryParams.projectName"
           placeholder="请输入项目名称"
-          
+
           size="small"
  
         />
@@ -385,16 +385,10 @@ export default {
       {code:29,name:"其他5"}],
  
       projectNameList:[
-        {name:"项目1"},
-        {name:"项目2"},
-        {name:"项目3"},
       ],
       isLoading: false,
       fileEntityList:[],
       companyList:[
-        {name:"公司1"},
-        {name:"公司2"},
-        {name:"公司3"},
       ],
       remoteQueryData: {
         "page": 1,
@@ -415,10 +409,10 @@ export default {
  
  
     constructionsitesList(this.remoteQueryData).then(res => {
-      this.data = res.result.list;
+      this.projectNameList = res.result.list;
       earthsitesList(this.remoteQueryData).then(res => {
          for(var i in res.result.list){
-           this.data.push(res.result.list[i]);
+           this.projectNameList.push(res.result.list[i]);
          }
       });
     });
@@ -91,6 +91,7 @@
       <el-table-column label="违规类型" align="center" prop="violationType" />
       <el-table-column label="项目名称" align="center" prop="projectName" />
       <el-table-column label="企业名称" align="center" prop="companyName" />
+      <el-table-column label="日期" align="center" prop="createTime"/>
       <el-table-column label="审批状态" align="center" prop="status">
         <template slot-scope="scope">
           <span>{{parseStatus(scope.row.status) }}</span>
@@ -198,7 +199,7 @@
         <el-row>
           <el-col :span="22">
             <el-form-item label="违规描述" prop="describe">
-              <el-input v-model="form.describe" type="textarea" placeholder="请输入内容" :row="4"/>
+              <el-input v-model="form.describe" type="textarea" placeholder="请输入内容" :rows="4"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -332,47 +333,26 @@ export default {
           { required: true, message: "必填", trigger: "blur" }
         ],
       },
-      caseType:[{code:0,name:"进入非专用车辆"},
-        {code:1,name:"无许可手续（工）"},
-        {code:2,name:"无许可手续（消）"},
-        {code:3,name:"黄土覆盖情况"},
-        {code:4,name:"出入口路面污染"},
-        {code:5,name:"出入口道路硬化"},
-        {code:6,name:"车辆冲洗是否到位"},
-        {code:7,name:"雾炮机是否正常开启"},
-        {code:8,name:"使用费专用车运输"},
-        {code:9,name:"监控点位未对准"},
-        {code:10,name:"未报开工作业"},
-        {code:11,name:"视频设备离线超时报警"},
-        {code:12,name:"三无车辆进入工地"},
-        {code:13,name:"未按时间作业"},
-        {code:14,name:"未报开工作业"},
-        {code:15,name:"视频设备离线超时报警"},
-        {code:16,name:"三无车辆进入消纳场"},
-        {code:17,name:"未到指定的消纳场作业"},
-        {code:18,name:"离线运输报警（工）"},
-        {code:19,name:"离线运输报警（消）"},
-        {code:20,name:"未激活车辆作业"},
-        {code:21,name:"未核准作业车辆作业"},
-        {code:22,name:"未按线路行驶"},
-        {code:23,name:"闯禁行驶"},
-        {code:24,name:"失信车辆作业"},
-        {code:25,name:"其他1"},
-        {code:26,name:"其他2"},
-        {code:27,name:"其他3"},
-        {code:28,name:"其他4"},
-        {code:29,name:"其他5"}],
+      caseType:[{code:0,name:"工地预警-未报开工作业"},
+        {code:1,name:"工地预警-视频设备离线超时报警"},
+        {code:2,name:"工地预警-三无车辆进入工地"},
+        {code:3,name:"工地预警未按时间作业"},
+        {code:4,name:"消纳场预警-未报开工作业"},
+        {code:5,name:"消纳场预警-视频设备离线超时报警"},
+        {code:6,name:"消纳场预警-三无车辆进入消纳场"},
+        {code:7,name:"消纳场预警-未到指定的消纳场作业"},
+        {code:8,name:"离线运输报警(工)"},
+        {code:9,name:"离线运输报警(消)"},
+        {code:10,name:"未激活车辆作业"},
+        {code:11,name:"未核准作业车辆作业"},
+        {code:12,name:"未按线路行驶"},
+        {code:13,name:"闯禁行驶"},
+        {code:14,name:"失信车辆作业"}],
       projectNameList:[
-        {name:"项目1"},
-        {name:"项目2"},
-        {name:"项目3"},
       ],
       isLoading: false,
       fileEntityList:[],
       companyList:[
-        {name:"公司1"},
-        {name:"公司2"},
-        {name:"公司3"},
       ],
       remoteQueryData: {
         "page": 1,
@@ -393,14 +373,15 @@ export default {
  
  
     constructionsitesList(this.remoteQueryData).then(res => {
-      this.data = res.result.list;
+      this.projectNameList = res.result.list;
       earthsitesList(this.remoteQueryData).then(res => {
         for(var i in res.result.list){
-          this.data.push(res.result.list[i]);
+          this.projectNameList.push(res.result.list[i]);
         }
       });
     });
  
+    console.log(this.data);
  
     companyList(this.remoteQueryData).then(res => {
       this.companyList = res.result.list;
@@ -68,18 +68,13 @@
       </el-col>
       <el-col :span="11">
         <el-form-item label="接收人" prop="receive">
-          <el-input :value="form.receive!=null?form.receive:'' + form.receiveStatus!=null?form.receiveStatus:''"
+          <el-input :value="form.readBy!=null?form.readBy:''"
                     :disabled="true"/>
         </el-form-item>
       </el-col>
     </el-row>
     <el-row :gutter="2">
       <el-col :span="11">
-        <el-form-item label="阅读人" prop="createBy">
-          <el-input :value="form.readBy" :disabled="true"/>
-        </el-form-item>
-      </el-col>
-      <el-col :span="11">
         <el-form-item label="阅读时间" prop="createBy">
           <el-input :value="form.readTime" :disabled="true"/>
         </el-form-item>
@@ -88,7 +83,7 @@
     <el-row>
       <el-col :span="22">
         <el-form-item label="违规描述" prop="describe">
-          <el-input v-model="form.describe" type="textarea" placeholder="请输入内容" :row="4" :disabled="true"/>
+          <el-input v-model="form.describe" type="textarea" placeholder="请输入内容" :rows="5" :disabled="true"/>
         </el-form-item>
       </el-col>
     </el-row>
@@ -189,7 +184,7 @@ export default {
         let files = JSON.stringify(response.data.uploadFiles);
         this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"));
       });
-      listReplyApprovalProcess({tableName:"workflow_casefile" + ":" +  this.idInfo}).then(response => {
+      listReplyApprovalProcess({tableName:"violation_warning" + ":" +  this.idInfo}).then(response => {
         this.replyApprovalProcessList = response.rows;
       });
     },
@@ -106,6 +106,15 @@ public class ViolationWarningInformation extends BaseEntity {
     @Excel(name = "阅览时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date readTime;
  
+    private String abbreviation;
+
+    public String getAbbreviation() {
+        return abbreviation;
+    }
+
+    public void setAbbreviation(String abbreviation) {
+        this.abbreviation = abbreviation;
+    }
  
     public void setId(Long id) {
         this.id = id;
@@ -3,11 +3,14 @@ package com.trash.casefile.kafka;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.trash.casefile.domain.ViolationWarningInformation;
+import com.trash.casefile.mapper.ViolationWarningInformationMapper;
 import com.trash.casefile.service.IViolationWarningInformationService;
 import com.trash.common.config.trashConfig;
+import com.trash.common.core.redis.RedisCache;
 import com.trash.common.utils.DateUtils;
 import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.StringUtils;
+import com.trash.common.utils.spring.SpringUtils;
 import com.trash.framework.web.service.SysLoginService;
 import org.apache.commons.lang3.time.DateFormatUtils;
 import org.slf4j.Logger;
@@ -20,10 +23,8 @@ import org.springframework.messaging.handler.annotation.Payload;
 import org.springframework.stereotype.Component;
  
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
  
 @Component
 public class Consumer {
@@ -32,7 +33,7 @@ public class Consumer {
     @Autowired
     private IViolationWarningInformationService violationWarningInformationService;
  
-    @KafkaListener(topics="record_process_alarm")
+    @KafkaListener(topics = "record_process_alarm")
     public void consume(@Payload String data) {
         log.info("kafka消费数据成功,data:" + data);
         autoViolationWarning(data);
@@ -44,92 +45,120 @@ public class Consumer {
     @Autowired
     SysLoginService loginService;
  
+    @Autowired
+    RedisCache redisCache;
+
     public void autoViolationWarning(String data) {
-//        String[] code = {"44030020=工地预警-未报开工作业","44030021=工地预警-视频设备离线超时报警","44030022=工地预警-三无车辆进入工地","44030023=工地预警未按时间作业",
-//                "44030024=消纳场预警-未报开工作业","44030025=消纳场预警-视频设备离线超时报警","44030026=消纳场预警-三无车辆进入消纳场","44030027=消纳场预警-未到指定的消纳场作业",
-//                "44030028=离线运输报警(工)","44030029=离线运输报警(消)","44030030=未激活车辆作业","44030031=未核准作业车辆作业","44030032=未按线路行驶",
-//                "44030033=闯禁行驶","44030034=失信车辆作业"};
-//        JSONObject jsonObject = JSONObject.parseObject(data);
-//        ViolationWarningInformation violationWarningInformation = new ViolationWarningInformation();
-//        String siteType = jsonObject.getString("siteType");
-//
-//
-//        if(StringUtils.isEmpty(RemoteServerUtils.remote)){
-//            RemoteServerUtils.remote = trashConfig.getRemotePath();
-//        }
-//        loginService.loginByRemote(trashConfig.getToken());
-//        JSONArray jsonArray = RemoteServerUtils.getAreas(trashConfig.getToken());
-//        if("1".equals(siteType)){//工地
-//            violationWarningInformation.setViolationObjectType("0");
-//            JSONObject object = RemoteServerUtils.getConstructionInfo(jsonObject.getString("siteId"),trashConfig.getToken());
-//            String areaCode = object.get("areaCode").toString();
-//            for(Object areasObject:jsonArray){
-//                JSONObject areas = (JSONObject) areasObject;
-//                if(areaCode.equals(areas.getString("code"))){
-//                    violationWarningInformation.setOwningRegion(areas.getString("name"));
-//                    break;
-//                }
-//            }
-//        }else if("2".equals(siteType)){//消纳场
-//            violationWarningInformation.setViolationObjectType("1");
-//            JSONObject object = RemoteServerUtils.getEarthSitesInfo(jsonObject.getString("siteId"),trashConfig.getToken());
-//            String areaCode = object.get("areaCode").toString();
-//            for(Object areasObject:jsonArray){
-//                JSONObject areas = (JSONObject) areasObject;
-//                if(areaCode.equals(areas.getString("code"))){
-//                    violationWarningInformation.setOwningRegion(areas.getString("name"));
-//                    break;
-//                }
-//            }
-//        }
-//        String number = DateFormatUtils.format(new Date(), "yyyyMMddHHmmssSSS");
-//        violationWarningInformation.setNumber(number.substring(2, number.length()));
-//        violationWarningInformation.setCompanyName(jsonObject.getString("enterpriseName"));
-//        String violationTypeCode = jsonObject.getString("alarmType");
-//        for (int i = 0; i < code.length; i++) {
-//            if (violationTypeCode.equals(code[i].split("=")[0])) {
-//                violationWarningInformation.setViolationType(code[i].split("=")[1]);
-//                break;
-//            }
-//        }
-//        //发送人
-//        violationWarningInformation.setCreateBy("长沙市建筑垃圾智慧监管平台");
-//        //推送对象
-//        violationWarningInformation.setViolationGrade("一般类");
-//        switch (violationWarningInformation.getViolationType()){
-//            case "工地预警-未报开工作业":
-//            case "消纳场预警-未到指定的消纳场作业":
-//            case "消纳场预警-三无车辆进入消纳场":
-//            case "消纳场预警-未报开工作业":
-//            case "工地预警未按时间作业":
-//            case "工地预警-三无车辆进入工地":
-//            case "工地预警-视频设备离线超时报警":
-//            case "离线运输报警(消)":
-//            case "离线运输报警(工)":
-//            case "未激活车辆作业":
-//            case "未核准作业车辆作业":
-//                violationWarningInformation.setSendObject("区管理部门(治)");
-//                break;
-//            case "消纳场预警-视频设备离线超时报警":
-//                violationWarningInformation.setSendObject("区管理部门(消)");
-//                break;
-//            case "未按线路行驶":
-//                violationWarningInformation.setViolationGrade("重点类");
-//                violationWarningInformation.setSendObject("区管理部门(治)");
-//                break;
-//            case "闯禁行驶":
-//            case "失信车辆作业":
-//                violationWarningInformation.setSendObject("运输企业");
-//                violationWarningInformation.setCompanyName(jsonObject.getString("enterpriseName"));
-//                break;
-//        }
-//
-//        // 业务逻辑
-//        try {
-//            violationWarningInformationService.insertViolationWarningInformation(null,violationWarningInformation);
-//        } catch (IOException e) {
-//            e.printStackTrace();
-//        }
+        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");
+        String violationType = jsonObject.getString("alarmName");
+        if(RemoteServerUtils.remote==null){
+            //登录
+            RemoteServerUtils.remote = trashConfig.getRemotePath();
+            loginService.loginByRemote(trashConfig.getToken());
+        }
+        ViolationWarningInformation violationWarningInformation1 = null;
+        JSONArray company1 = redisCache.getCacheObject("company");
+        JSONObject basevehicleInfo = RemoteServerUtils.getBasevehicleInfo(jsonObject.getString("vehicleId"),trashConfig.getToken());
+        if(company1==null){
+            Map map = new HashMap<>();
+            map.put("size",9999);
+            map.put("page",1);
+            company1 = RemoteServerUtils.getCompanyList(map, trashConfig.getToken());
+            redisCache.setCacheObject("company",company1,1, TimeUnit.HOURS);
+        }
+
+        //这两种类型无需累加
+        if(violationType.equals("工地预警-视频设备离线超时报警") || violationType.equals("消纳场预警-视频设备离线超时报警")){
+            violationWarningInformation1 = null;
+        }else if(violationType.equals("闯禁行驶")||violationType.equals("失信车辆作业")){//这两种类型根据公司累加
+            String company = jsonObject.getString("enterpriseName");
+            violationWarningInformation1 = SpringUtils.getBean(ViolationWarningInformationMapper.class).selectViolationWarningInformation(company,null, violationType, nowDate, tomorrowDate);
+        }else{//其他都是根据工地/消纳站累加
+            String project = jsonObject.getString("siteName");
+            violationWarningInformation1 = SpringUtils.getBean(ViolationWarningInformationMapper.class).selectViolationWarningInformation(null,project, violationType, nowDate, tomorrowDate);
+        }
+        //判断该类型，该工地，该时间段是否已经存在报警信息，如果存在则不再新增，如果不存在则新增
+        if (violationWarningInformation1 == null) {
+            ViolationWarningInformation violationWarningInformation = new ViolationWarningInformation();
+            String siteType = jsonObject.getString("siteType");
+            if ("1".equals(siteType)) {//工地
+                violationWarningInformation.setViolationObjectType("0");
+            } else if ("2".equals(siteType)) {//消纳场
+                violationWarningInformation.setViolationObjectType("1");
+            }
+            //所属区域
+            violationWarningInformation.setOwningRegion(jsonObject.getString("areaName"));
+            //案卷编码
+            String number = DateFormatUtils.format(new Date(), "yyyyMMddHHmmssSSS");
+            violationWarningInformation.setNumber(number.substring(2));
+            //公司名称
+            violationWarningInformation.setCompanyName(jsonObject.getString("enterpriseName"));
+            //违规类型
+            violationWarningInformation.setViolationType(jsonObject.getString("alarmName"));
+            //发送人
+            violationWarningInformation.setCreateBy("长沙市建筑垃圾智慧监管平台");
+            //推送对象
+            violationWarningInformation.setViolationGrade("一般类");
+            //项目名称（工地名称，消纳场名称）
+            violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
+            violationWarningInformation.setSendObject("区管理部门(治)");
+            switch (violationWarningInformation.getViolationType()) {
+                case "工地预警-未报开工作业":
+                case "消纳场预警-未到指定的消纳场作业":
+                case "消纳场预警-三无车辆进入消纳场":
+                case "消纳场预警-未报开工作业":
+                case "工地预警-未按时间作业":
+                case "工地预警-三无车辆进入工地":
+                case "工地预警-视频设备离线超时报警":
+                case "离线运输报警(消)":
+                case "离线运输报警(工)":
+                case "未激活车辆作业":
+                case "未核准作业车辆作业":
+                    violationWarningInformation.setSendObject("区管理部门(治)");
+                    break;
+                case "消纳场预警-视频设备离线超时报警":
+                    violationWarningInformation.setSendObject("区管理部门(消)");
+                    break;
+                case "未按线路行驶":
+                    violationWarningInformation.setViolationGrade("重点类");
+                    violationWarningInformation.setSendObject("区管理部门(治)");
+                    break;
+                case "闯禁行驶":
+                case "失信车辆作业":
+                    violationWarningInformation.setSendObject("运输企业");
+                    break;
+            }
+
+            String describe = DateFormatUtils.format(new Date(), "yyyy/MM/dd HH:mm:ss") + " "
+                    + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
+                    jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
+            //设置公司简称
+            for(Object o:company1){
+                JSONObject jo = (JSONObject) o;
+                if(basevehicleInfo.getString("companyID").equals(jo.getString("id"))){
+                    violationWarningInformation.setAbbreviation(jo.getString("abbreviation"));
+                }
+            }
+            violationWarningInformation.setDescribe(describe);
+            // 业务逻辑
+            try {
+                violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        } else {
+            String describe = violationWarningInformation1.getDescribe() + ";" + DateFormatUtils.format(new Date(), "yyyy/MM/dd HH:mm:ss") + " "
+                    + jsonObject.getString("enterpriseName") + " " + jsonObject.get("licenseplateNo") + "在" +
+                    jsonObject.get("siteName") + "出现" + jsonObject.getString("alarmName");
+            violationWarningInformation1.setDescribe(describe);
+            SpringUtils.getBean(ViolationWarningInformationMapper.class).updateViolationWarningInformation(violationWarningInformation1);
+        }
  
  
     }
@@ -2,6 +2,8 @@ package com.trash.casefile.mapper;
  
 import java.util.List;
 import com.trash.casefile.domain.ViolationWarningInformation;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.security.core.parameters.P;
  
 /**
  * 违规预警信息Mapper接口
@@ -20,6 +22,15 @@ public interface ViolationWarningInformationMapper
         ViolationWarningInformation selectViolationWarningInformationById(Long id);
  
     /**
+     * 根据项目名称、类型、创建时间查询违规预警信息
+     * @param projectName
+     * @param type
+     * @param createDate
+     * @return
+     */
+    ViolationWarningInformation selectViolationWarningInformation(@Param("companyName") String companyName, @Param("projectName")String projectName, @Param("type")String type, @Param("nowDate") String nowDate, @Param("tomorrowDate")String tomorrowDate);
+
+    /**
      * 查询违规预警信息列表
      * 
      * @param violationWarningInformation 违规预警信息
@@ -23,6 +23,7 @@ public interface IViolationWarningInformationService {
      */
     ViolationWarningInformationVo selectViolationWarningInformationById(Long id);
  
+
     /**
      * 查询违规预警信息列表
      *
@@ -3,10 +3,12 @@ package com.trash.workflow.service.impl;
 import java.text.SimpleDateFormat;
 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.framework.web.service.SysLoginService;
 import org.activiti.api.process.model.ProcessInstance;
 import org.activiti.api.process.model.builders.ProcessPayloadBuilder;
@@ -19,6 +21,9 @@ 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.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
  
@@ -71,11 +76,14 @@ public class WorkflowServiceImpl implements IWorkflowService {
 	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
  
 	@Autowired
-	RuntimeService runTImeService;
+	RuntimeService runtimeService;
  
 	@Autowired
 	ISupervisionThreestepService server;
  
+	@Autowired
+	RedisCache redisCache;
+
 	@Override
 	@Transactional
 	public int createWorkFlow(Map<String, Object> data) { //第三方通用接收接口
@@ -269,32 +277,39 @@ public class WorkflowServiceImpl implements IWorkflowService {
 			}
 			loginService.loginByRemote(trashConfig.getToken());
 		}
-		ProcessInstance processInstance = null;
+		SecurityContextImpl securityContextImpl = new SecurityContextImpl();
+
+		securityContextImpl.setAuthentication(SecurityContextHolder.getContext().getAuthentication());
+		org.activiti.engine.runtime.ProcessInstance  instance = null;
 		String title = "案卷号:" + caseFile.getNumber();
 		String flowType = "violation_warning";
 		try {
+			Map map = new HashedMap<>();
+
+			map.put("route", index);
+			instance = runtimeService.createProcessInstanceBuilder()
+					.businessKey(flowType + ":" + caseFile.getId())
+					.variable("route", index)
+					.processDefinitionKey(flowType)
+					.variables(map)
+					.start();
+
  
-			processInstance = processRuntime.start(ProcessPayloadBuilder
-					.start()
-					.withProcessDefinitionKey(flowType)
-					.withName(title)
-					.withBusinessKey(flowType + ":" + caseFile.getId())
-					.withVariable("route", index)
-					.build());
+
+
+			//runtimeService.startProcessInstanceById(instance.getProcessDefinitionId(),map);
  
  
 			if(index == 0){
-				Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+				Task task = taskService.createTaskQuery().processInstanceId(instance.getId()).singleResult();
  
-				task.setAssignee(caseFile.getCompanyName());
+				task.setAssignee(caseFile.getAbbreviation());
  
 				taskService.saveTask(task);
 			}else{
-				updateProcess(processInstance,caseFile.getOwningRegion());
+				updateProcessKafka(instance,caseFile.getOwningRegion(), trashConfig.getToken());
 			}
  
-
-
 			Workflow workflow = new Workflow();
 			workflow.setId(flowType + ":" + caseFile.getId());
 			workflow.setTitle(title);
@@ -302,12 +317,12 @@ public class WorkflowServiceImpl implements IWorkflowService {
 			workflow.setStartTime(sdf.format(caseFile.getCreateTime()));
 			workflow.setEndTime(sdf.format(caseFile.getCreateTime()));
 			workflow.setType("违规预警信息案卷");
-			workflow.setInstanceId(processInstance.getId());
+			workflow.setInstanceId(instance.getId());
 			workflow.setState("0");
  
 			return workflowMapper.insertWorkflow(workflow);
 		} catch (Exception e) {
-			processRuntime.delete(ProcessPayloadBuilder.delete(processInstance));
+			runtimeService.deleteProcessInstance(instance.getId(), "创建失败");
 			throw new RuntimeException(e);
 		}
  
@@ -375,15 +390,64 @@ public class WorkflowServiceImpl implements IWorkflowService {
     	}
  
 	}
-	
+
 	void updateProcess(ProcessInstance processInstance,String placeName){
+		Map map = new HashedMap<>();
+
+		map.put("type", "CSUserDepartmentType");
+
+		JSONArray array2 = RemoteServerUtils.getDict(map);
+
+
+		String placeCode = null;
+		String code = null;
+
+		for(Object obj:array2){
+			if(((JSONObject)obj).getString("name").equals("渣土办")){
+				code = ((JSONObject)(obj)).getString("code");
+			}
+			if(((JSONObject)obj).getString("name").replace("渣土办", "").equals(placeName)){
+				placeCode = ((JSONObject)(obj)).getString("code");
+
+				if(code != null){
+					break;
+				}
+			}
+
+		}
+
+		if(placeCode != null){
+			Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
+
+
+			List<IdentityLink> list = taskService.getIdentityLinksForTask(task.getId());
+
+			for(IdentityLink identityLink:list){
+//				if(identityLink.getGroupId() != null)
+//					taskService.deleteGroupIdentityLink(task.getId(), identityLink.getGroupId(), identityLink.getType());
+				if(identityLink.getUserId() != null)
+					taskService.deleteUserIdentityLink(task.getId(), identityLink.getUserId(), identityLink.getType());
+			}
+
+			taskService.addCandidateUser(task.getId(), placeCode);
+
+			task.setDescription(placeCode);
+
+			taskService.saveTask(task);
+		}
+	};
+
+	void updateProcessKafka(org.activiti.engine.runtime.ProcessInstance processInstance,String placeName,String token){
     	Map map = new HashedMap<>();
  
     	map.put("type", "CSUserDepartmentType");
  
-    	JSONArray array2 = RemoteServerUtils.getDict(map);
-		
-		
+
+		JSONArray array2 = redisCache.getCacheObject("dict");
+		if(array2==null||array2.size()==0){
+			array2 = RemoteServerUtils.getDict(map,token);
+			redisCache.setCacheObject("dict",array2,24, TimeUnit.HOURS);
+		}
 		String placeCode = null;
 		String code = null;
  
@@ -27,7 +27,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
     </resultMap>
  
     <sql id="selectViolationWarningInformationVo">
-        select id, `number`, violation_object_type, owning_region, violation_type, violation_grade, project_name, company_name, `describe`, send_object, create_time, create_by, update_time, update_by, status, receive, receive_status, read_by, read_time from casefile_violation_warning_information
+        select id, `number`, violation_object_type, owning_region, violation_type, violation_grade, project_name, company_name, `describe`, send_object, create_time, create_by, update_time, update_by, status, receive, receive_status, read_by, read_time,abbreviation from casefile_violation_warning_information
     </sql>
  
     <select id="selectViolationWarningInformationList" parameterType="ViolationWarningInformation" resultMap="ViolationWarningInformationResult">
@@ -47,7 +47,16 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <include refid="selectViolationWarningInformationVo"/>
         where id = #{id}
     </select>
-        
+    <select id="selectViolationWarningInformation"
+            resultType="com.trash.casefile.domain.ViolationWarningInformation">
+        <include refid="selectViolationWarningInformationVo"/>
+        <where>
+            <if test="projectName!=null">project_name = #{projectName}</if>
+            <if test="companyName!=null">company_name = #{companyName}</if>
+            and violation_type = #{type} and create_time between CONCAT(#{nowDate},' 08:00:00') and CONCAT(#{tomorrowDate},' 07:59:59')
+        </where>
+    </select>
+
     <insert id="insertViolationWarningInformation" parameterType="ViolationWarningInformation" useGeneratedKeys="true" keyProperty="id">
         insert into casefile_violation_warning_information
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -63,6 +72,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="sendObject != null">send_object,</if>
             <if test="createBy != null">create_by,</if>
             <if test="status != null">status,</if>
+            <if test="abbreviation!=null">abbreviation,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             now(),
@@ -77,6 +87,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="sendObject != null">#{sendObject},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="status != null">#{status},</if>
+            <if test="abbreviation!=null">#{abbreviation},</if>
          </trim>
     </insert>
  
@@ -99,6 +110,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="receiveStatus != null">receive_status = #{receiveStatus},</if>
             <if test="readBy != null">read_by = #{readBy},</if>
             <if test="readTime != null">read_time = #{readTime},</if>
+            <if test="abbreviation!=null">abbreviation=#{abbreviation},</if>
         </trim>
         where id = #{id}
     </update>