m

youxiw2000
2 parents dd252249 1cda9357
Showing 25 changed files with 376 additions and 144 deletions
trash-common/pom.xml
trash-common/src/main/java/com/trash/common/utils/RemoteServerUtils.java
trash-quartz/pom.xml
trash-ui/src/views/business/ConstructionCredit/index.vue
trash-ui/src/views/business/EarthSitesCredit/index.vue
trash-ui/src/views/h5/office/conference/index.vue
trash-ui/src/views/h5/office/handle/handleInfo.vue
trash-ui/src/views/h5/office/handle/index.vue
trash-ui/src/views/h5/office/leaveApplication/index.vue
trash-ui/src/views/h5/office/logistics/index.vue
trash-ui/src/views/h5/office/logistics/logisticsInfo.vue
trash-ui/src/views/h5/office/management/index.vue
trash-ui/src/views/office/conference/index.vue
trash-ui/src/views/office/handle/handleInfo.vue
trash-ui/src/views/office/handle/index.vue
trash-ui/src/views/office/leaveApplication/index.vue
trash-ui/src/views/office/logistics/index.vue
trash-ui/src/views/office/logistics/logisticsInfo.vue
trash-ui/src/views/office/management/index.vue
trash-workFlow/src/main/java/com/trash/business/domain/CompanyCredit.java
@@ -125,6 +125,13 @@
             <version>[3.20.6.1,)</version>
         </dependency>
+        <!--    kafka    -->
+        <dependency>
+            <groupId>org.springframework.kafka</groupId>
+            <artifactId>spring-kafka</artifactId>
+            <version>1.1.1.RELEASE</version>
+        </dependency>
+
     </dependencies>
 </project>
 \ No newline at end of file
@@ -186,8 +186,7 @@ public class RemoteServerUtils {
 		return array;
 	}
-	
-	
+
 	public static JSONArray getTruckList(Map params){
 		JSONArray turckList=null;
 		Object object = post(TruckListRequestPath,params);
@@ -532,10 +531,9 @@ public class RemoteServerUtils {
         	e.printStackTrace();
         	return null;
 		}
-        
-        return null;
-	}
+		return null;
+	}
@@ -43,12 +43,7 @@
             <groupId>com.trash</groupId>
             <artifactId>trash-workflow</artifactId>
         </dependency>
-        
-        <dependency>
-			<groupId>org.apache.kafka</groupId>
-			<artifactId>kafka-clients</artifactId>
-			<version>2.4.1</version>
-		</dependency>
+
     </dependencies>
 </project>
 \ No newline at end of file
@@ -25,7 +25,7 @@
         <el-col>
           <el-form-item label="所属区域" prop="place">
-            <el-select v-model="queryParams.place" filterable  reserve-keyword placeholder="所属场地" size="small"
+            <el-select v-model="queryParams.place" filterable  reserve-keyword placeholder="所属区域" size="small"
               :loading="loading">
               <el-option v-for="item in dictPlaces" :label="item" :value="item" :key="item">
               </el-option>
@@ -24,8 +24,8 @@
         </el-col>
         <el-col>
-          <el-form-item label="所属场地" prop="place">
-            <el-select v-model="queryParams.place" filterable  reserve-keyword placeholder="所属场地" size="small" >
+          <el-form-item label="所属区域" prop="place">
+            <el-select v-model="queryParams.place" filterable  reserve-keyword placeholder="所属区域" size="small" >
               <el-option v-for="item in dictPlaces" :label="item" :value="item" :key="item">
               </el-option>
             </el-select>
@@ -34,8 +34,8 @@
       </el-row>
       <el-row type="flex" justify="center">
         <el-col>
-          <el-form-item label="垃圾类型" prop="type" style="float:right;">
-            <el-select v-model="queryParams.type" filterable  reserve-keyword placeholder="建筑垃圾类型" size="small"
+          <el-form-item label="消纳场类型" prop="type" style="float:right;">
+            <el-select v-model="queryParams.type" filterable  reserve-keyword placeholder="消纳场类型" size="small"
               :loading="loading">
               <el-option v-for="item in dictTypes" :label="item" :value="item" :key="item">
               </el-option>
@@ -9,12 +9,12 @@
                         placeholder="选择会议时间">
         </el-date-picker>
       </el-form-item>
-<!--      <el-form-item label="发起部门" prop="deptId">-->
-<!--        <el-select v-model="queryParams.deptId" placeholder="请输入发起部门" style="width: 100%">-->
-<!--          <el-option label="全部" value=""/>-->
-<!--          <el-option v-for="item in depts" :label="item.name" :value="item.code" :key="item.code"/>-->
-<!--        </el-select>-->
-<!--      </el-form-item>-->
+      <el-form-item label="发起部门" prop="deptName">
+        <el-select v-model="queryParams.deptName" placeholder="请输入发起部门" style="width: 100%">
+          <el-option label="全部" value=""/>
+          <el-option v-for="item in depts" :label="item.name" :value="item.name" :key="item.code"/>
+        </el-select>
+      </el-form-item>
       <el-form-item label="会议地点" prop="conferenceSite">
         <el-input v-model="queryParams.conferenceSite" placeholder="请输入会议地点"/>
       </el-form-item>
@@ -75,11 +75,7 @@
       <el-table-column label="会议时间" align="center" prop="conferenceTime"/>
       <el-table-column label="会议地点" align="center" prop="conferenceSite"/>
       <el-table-column label="参会人员" align="center" prop="staff"/>
-<!--      <el-table-column label="发起部门" align="center" prop="deptId">-->
-<!--        <template slot-scope="scope">-->
-<!--          <span>{{ parseDept(scope.row.deptId) }}</span>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <el-table-column label="发起部门" align="center" prop="deptName"/>
       <el-table-column label="审批状态" align="center">
         <template slot-scope="scope">
           <span>{{parseStatus(scope.row.status)}}</span>
@@ -263,7 +259,7 @@ export default {
         pageSize: 10,
         conferenceTime: null,
         conferenceSite: null,
-        deptId: null,
+        deptName: null,
         staff: null,
         subject: null,
         content: null,
@@ -325,7 +321,7 @@ export default {
         id: null,
         conferenceTime: null,
         conferenceSite: null,
-        deptId: null,
+        deptName: null,
         staff: null,
         subject: null,
         content: null,
@@ -355,7 +351,7 @@ export default {
     /** 查看按钮操作 */
     handleInfo(row){
       this.reset();
-      this.idInfo = row.id;
+      this.idInfo = row.id+"";
       this.title = "会议管理详情";
       this.openInfo = true;
     },
@@ -509,14 +505,6 @@ export default {
       a.setAttribute('target', '_blank')
       a.setAttribute('href', process.env.VUE_APP_BASE_API + url);
       a.click()
-    },
-    parseDept(deptId){
-      let dept = this.depts.filter(item=>{
-        if(item.code == deptId){
-          return item;
-        }
-      });
-      return dept[0].name
     }
   }
 };
@@ -2,16 +2,16 @@
   <el-form ref="form" :model="form" label-width="110px">
     <el-form-item label="办文办事类型" prop="type">
       <el-select v-model="form.type" placeholder="请选择办文办事类型" style="width: 100%" :disabled="true">
-        <el-option label="传阅学习类" value="0" />
-        <el-option label="公文批办类" value="1" />
-        <el-option label="热线举报类" value="2" />
-        <el-option label="上级信访类" value="3" />
-        <el-option label="现场信访类" value="4" />
+        <el-option label="传阅学习类" value="0"/>
+        <el-option label="公文批办类" value="1"/>
+        <el-option label="热线举报类" value="2"/>
+        <el-option label="上级信访类" value="3"/>
+        <el-option label="现场信访类" value="4"/>
       </el-select>
     </el-form-item>
     <!--    公文类    -->
     <el-form-item label="来文单位" prop="company" v-if="form.type==0 || form.type==1">
-      <el-input v-model="form.company" placeholder="请输入来文单位" :disabled="true" />
+      <el-input v-model="form.company" placeholder="请输入来文单位" :disabled="true"/>
     </el-form-item>
     <el-form-item label="收文时间" prop="receiveTime" v-if="form.type==0 || form.type==1">
       <el-date-picker  size="small" style="width: 100%"
@@ -23,11 +23,11 @@
       </el-date-picker>
     </el-form-item>
     <el-form-item label="文件标题" prop="title" v-if="form.type==0 || form.type==1">
-      <el-input v-model="form.title" placeholder="请输入文件标题" :disabled="true" />
+      <el-input v-model="form.title" placeholder="请输入文件标题" :disabled="true"/>
     </el-form-item>
     <!--    信访类    -->
     <el-form-item label="信访单位(人)" prop="sendPerson" v-if="form.type==2 || form.type==3|| form.type==4">
-      <el-input v-model="form.sendPerson" placeholder="请输入信访单位(人)" :disabled="true" />
+      <el-input v-model="form.sendPerson" placeholder="请输入信访单位(人)" :disabled="true"/>
     </el-form-item>
     <el-form-item label="信访日期" prop="sendDate" v-if="form.type==2 || form.type==3|| form.type==4">
       <el-date-picker  size="small" style="width: 100%"
@@ -41,13 +41,54 @@
     <el-form-item label="诉求" prop="appeal" v-if="form.type==2 || form.type==3|| form.type==4">
       <el-input v-model="form.appeal" type="textarea" placeholder="请输入内容" :rows="6" :disabled="true"/>
     </el-form-item>
-    <!--    意见处    -->
-    <!--        <el-form-item label="办理意见" prop="opinion">-->
-    <!--          <el-input v-model="form.opinion" placeholder="请输入办理意见" />-->
-    <!--        </el-form-item>-->
-    <!--        <el-form-item label="相关部门意见" prop="deptOpinion">-->
-    <!--          <el-input v-model="form.deptOpinion" placeholder="请输入相关部门意见" />-->
-    <!--        </el-form-item>-->
+    <el-form-item label="信访部门" prop="deptName"
+                  v-if="((form.type==4 || form.type==2) && controlId=='FormProperty_214hj4h') ||
+                  (form.type==3 && controlId=='FormProperty_2vu2250') ||
+                  (form.deptName!=null && form.type!=1)">
+      <el-select ref="formDeptNameRef" v-model="form.deptId" placeholder="请选择信访部门" style="width: 100%"
+                 :disabled="controlId!='FormProperty_2vu2250' && controlId!='FormProperty_214hj4h'">
+        <el-option v-for="item in depts" :label="item.name" :value="item.code" :key="item.code"/>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="意见" prop="appeal"
+                  v-if="((form.type==4 || form.type==2) && controlId=='FormProperty_0orjdou') || (form.type==3 && controlId=='FormProperty_05v7lct') || form.opinion!=null">
+      <el-input type="textarea" v-model="form.opinion" :rows="4"
+                :disabled="controlId!='FormProperty_0orjdou' && controlId!='FormProperty_05v7lct'"/>
+    </el-form-item>
+    <el-form-item label="推送对象" v-if="controlId=='FormProperty_0aq22i0'">
+      <el-radio-group v-model="form.sendObject" :disabled="controlId!='FormProperty_0aq22i0'">
+        <el-radio :label="0">中心负责人</el-radio>
+        <el-radio :label="1">分管领导</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item label="处理部门" prop="deptName" v-if="controlId=='FormProperty_11p96vq' || (businessKey=='gongwenchuli'&&form.type==1)">
+      <el-select ref="formDeptNameRef" v-model="form.deptId" placeholder="请选择处理部门" style="width: 100%"
+                 :disabled="controlId!='FormProperty_11p96vq'">
+        <el-option v-for="item in depts" :label="item.name" :value="item.code" :key="item.code"/>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="办理意见" prop="opinion" v-if="controlId=='FormProperty_11p96vq'">
+      <el-input type="textarea" v-model="opinion" :rows="4" :disabled="controlId!='FormProperty_11p96vq'"/>
+    </el-form-item>
+    <el-form-item label="办理意见" prop="opinion"
+                  v-if="form.type==1 && controlId!='FormProperty_11p96vq' && businessKey=='gongwenchuli'">
+      <el-input type="textarea" v-model="opinion1" :rows="4" :disabled="true"/>
+    </el-form-item>
+    <el-form-item label="回复意见" prop="opinion" v-if="controlId=='FormProperty_2jvcgq8'">
+      <el-input type="textarea" v-model="opinion" :rows="4" :disabled="controlId!='FormProperty_2jvcgq8'"/>
+    </el-form-item>
+    <el-form-item label="回复意见" prop="opinion"
+                  v-if="form.type==1 && controlId!='FormProperty_2jvcgq8' && businessKey=='gongwenchuli' && controlId!='FormProperty_11p96vq'">
+      <el-input type="textarea" v-model="opinion2" :rows="4" :disabled="true"/>
+    </el-form-item>
+    <el-form-item label="阅览人" prop="userNames"
+                  v-if="form.type==0 && businessKey=='yuelanxuexi1'">
+      <el-input v-model="form.userNames" :disabled="true"/>
+    </el-form-item>
+    <el-form-item label="已阅览人" prop="userNamesDone"
+                  v-if="form.type==0 && businessKey=='yuelanxuexi1'">
+      <el-input v-model="form.userNamesDone" :disabled="true"/>
+    </el-form-item>
     <el-row>
       <el-table :data="fileEntityList">
         <el-table-column property="name" label="附件名称" header-align="center" align="center"></el-table-column>
@@ -70,32 +111,51 @@
 <script>
 import {getHandle} from "@/api/office/handle";
+import {listReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
+
 export default {
-  name: "contractInfo",
+  name: "handleInfo",
   props: {
     businessKey: {
       type: String
     },
     idInfo: {
-      type: Number
+      type: String
+    },
+    depts: {
+      type: Array
+    },
+    controlId: {
+      type: String
     }
+
   },
   data() {
     return {
       form: {},
-      fileEntityList:[]
+      fileEntityList: [],
+      opinion: null,
+      opinion1: null,
+      opinion2: null,
     }
   },
   created() {
     this.init();
   },
-  methods:{
-    init(){
+  methods: {
+    init() {
       getHandle(this.idInfo).then(response => {
         this.form = response.data.handleAffairs;
         let files = JSON.stringify(response.data.uploadFiles);
-        this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"))
+        this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"));
       });
+      listReplyApprovalProcess({tableName: 'handle_affairs', tableId: this.idInfo}).then(response => {
+        if(response.rows.length>0){
+          this.opinion1 = response.rows[0].reply;
+          this.opinion2 = response.rows[1].reply;
+        }
+      });
+
     },
     /** 文件下载 */
     downloadFA(row) {
@@ -3,6 +3,7 @@
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="108px">
       <el-form-item label="办文办事类型" prop="type">
         <el-select v-model="queryParams.type" placeholder="请选择办文办事类型"  size="small">
+          <el-option label="全部" value=""/>
           <el-option label="传阅学习类" value="0" />
           <el-option label="公文批办类" value="1" />
           <el-option label="热线举报类" value="2" />
@@ -14,9 +15,9 @@
         <el-input
           v-model="queryParams.company"
           placeholder="请输入来文单位"
-          
+
           size="small"
-          
+
         />
       </el-form-item>
       <el-form-item label="收文时间" prop="receiveTime">
@@ -31,18 +32,18 @@
         <el-input
           v-model="queryParams.title"
           placeholder="请输入文件标题"
-          
+          clearable
           size="small"
-          
+
         />
       </el-form-item>
       <el-form-item label="信访单位(人)" prop="sendPerson">
         <el-input
           v-model="queryParams.sendPerson"
           placeholder="请输入信访单位(人)"
-          
+
           size="small"
-          
+
         />
       </el-form-item>
       <el-form-item label="信访日期" prop="sendDate">
@@ -124,7 +125,7 @@
       </el-table-column>
       <el-table-column label="审批状态" align="center" prop="status">
         <template slot-scope="scope">
-          <span>{{parseStatus(scope.row.status)}}</span>
+          <span>{{parseStatusz(scope.row.status)}}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -132,7 +133,7 @@
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-view"
             @click="handleInfo(scope.row)"
             v-hasPermi="['office:handle:edit']"
           >详情</el-button>
@@ -260,7 +261,7 @@
       </div>
     </el-dialog>
     <el-dialog :title="title" :visible.sync="openInfo" width="600px" append-to-body>
-      <handleInfo :idInfo="idInfo" v-if="openInfo"/>
+      <handleInfo :idInfo="idInfo" v-if="openInfo" :businessKey="businessKey" :depts="depts"/>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">取 消</el-button>
       </div>
@@ -271,6 +272,7 @@
 <script>
 import { listHandle, getHandle, delHandle, addHandle, updateHandle, exportHandle } from "@/api/office/handle";
 import handleInfo from "./handleInfo";
+import {getDict} from "@/api/dict";
 export default {
   name: "Handle",
   components: { handleInfo },
@@ -331,9 +333,15 @@ export default {
       fileEntityList: [],
       idInfo: null,
       openInfo: false,
+      businessKey:null,
+      depts:[],
     };
   },
   created() {
+    let dep =  {type:"CSUserDepartmentType"};
+    getDict(dep).then(res=>{
+      this.depts = res.result;
+    });
     this.getList();
   },
   methods: {
@@ -350,6 +358,7 @@ export default {
     cancel() {
       this.open = false;
       this.openInfo = false;
+      this.businessKey = null;
       this.reset();
     },
     // 表单重置
@@ -394,9 +403,16 @@ export default {
     },
     /** 查看详情 */
     handleInfo(row){
-      this.idInfo = row.id;
+      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){
+        this.businessKey = 'gongwenchuli';
+      }
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -576,6 +592,17 @@ export default {
         this.rules.sendDate[0].required = true;
         this.rules.appeal[0].required = true;
       }
+    },
+    parseStatusz(status) {
+      if(status==1){
+        return "审批通过";
+      }else if(status==2){
+        return "审批驳回";
+      }else if(status==3){
+        return "收文完成";
+      }else{
+        return "审批中";
+      }
     }
   }
 };
@@ -5,9 +5,9 @@
         <el-input
           v-model="queryParams.applicant"
           placeholder="请输入申请人"
-          
+
           size="small"
-          
+
         />
       </el-form-item>
       <el-form-item label="申请部门" prop="deptId">
@@ -115,6 +115,7 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
+            v-if="scope.row.status==2"
             v-hasPermi="['office:leaveApplication:edit']"
           >修改
           </el-button>
@@ -139,7 +140,7 @@
     />
     <!-- 添加或修改请假申请对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="open" width="300px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="联系方式" prop="phone">
@@ -244,6 +245,7 @@ import {
 } from "@/api/office/leaveApplication";
 import Editor from '@/components/ZcEditor';
 import leaveApplicationInfo from './leaveApplicationInfo';
+import {getDict} from "@/api/dict";
 export default {
   name: "LeaveApplication",
@@ -273,7 +275,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         applicant: null,
-        deptId: null,
+        deptName: null,
         positionId: null,
         birthdate: null,
         phone: null,
@@ -318,9 +320,14 @@ export default {
       openInfo: false,
       idInfo: null,
       fileEntityList:[],
+      depts:[]
     };
   },
   created() {
+    let dep =  {type:"CSUserDepartmentType"};
+    getDict(dep).then(res=>{
+      this.depts = res.result;
+    });
     this.getList();
   },
   methods: {
@@ -345,7 +352,7 @@ export default {
       this.form = {
         id: null,
         applicant: null,
-        deptId: null,
+        deptName: null,
         positionId: null,
         workDate: null,
         birthdate: null,
@@ -382,7 +389,7 @@ export default {
     /** 查看按钮操作 */
     handleInfo(row) {
       this.reset();
-      this.idInfo = row.id;
+      this.idInfo = row.id+"";
       this.title = "请假申请详情";
       this.openInfo = true;
     },
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="105px">
-      <el-form-item label="申请部门" prop="deptId">
-        <el-select v-model="queryParams.deptId" placeholder="请输入申请部门" style="width: 100%">
+      <el-form-item label="申请部门" prop="deptName">
+        <el-select v-model="queryParams.deptName" placeholder="请输入申请部门" style="width: 100%">
           <el-option label="全部" value=""/>
-          <el-option v-for="item in depts" :label="item.name" :value="item.code" :key="item.code"/>
+          <el-option v-for="item in depts" :label="item.name" :value="item.name" :key="item.code"/>
         </el-select>
       </el-form-item>
       <el-form-item label="用章类型" prop="sealType" v-if="type==0">
@@ -18,9 +18,9 @@
         <el-input
           v-model="queryParams.staff"
           placeholder="请输入申请人"
-          
+
           size="small"
-          
+
         />
       </el-form-item>
       <el-form-item label="物品申请日期" prop="useDate" v-if="type!=0">
@@ -35,9 +35,9 @@
         <el-input
           v-model="queryParams.goodsName"
           placeholder="请输入物品名称"
-          
+
           size="small"
-          
+
         />
       </el-form-item>
       <el-form-item>
@@ -93,11 +93,7 @@
     <el-table v-loading="loading" :data="logisticsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="申请部门" align="center" prop="deptId">
-        <template slot-scope="scope">
-          <span>{{ parseDept(scope.row.deptId) }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="申请部门" align="center" prop="deptName"/>
       <!--   用章申请   -->
       <el-table-column label="用章类型" align="center" prop="sealType" v-if="type==0"/>
       <el-table-column label="更新时间" align="center" prop="sealUpdateTime" width="180" v-if="type==0">
@@ -167,9 +163,9 @@
     <!-- 添加或修改后勤管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body  :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="申请部门" prop="deptId">
-          <el-select v-model="form.deptId" placeholder="请输入申请部门" style="width: 100%">
-            <el-option v-for="item in depts" :label="item.name" :value="item.code" :key="item.code"/>
+        <el-form-item label="申请部门" prop="deptName">
+          <el-select v-model="form.deptName" placeholder="请输入申请部门" style="width: 100%">
+            <el-option v-for="item in depts" :label="item.name" :value="item.name" :key="item.code"/>
           </el-select>
         </el-form-item>
         <el-form-item label="用章类型" prop="sealType" v-if="type==0">
@@ -279,7 +275,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         type: this.type,
-        deptId: null,
+        deptName: null,
         sealType: null,
         staff: null,
         useDate: null,
@@ -289,7 +285,7 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        deptId: [
+        deptName: [
           {required: true, message: "必填", trigger: "blur"}
         ],
         sealType: [
@@ -348,7 +344,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
-        deptId: null,
+        deptName: null,
         sealType: null,
         sealUpdateTime: null,
         sealEndTime: null,
@@ -390,7 +386,7 @@ export default {
     },
     /** 查看按钮操作 */
     handleInfo(row) {
-      this.idInfo = row.id;
+      this.idInfo = row.id+"";
       this.openInfo = true;
       this.title = "查看后勤管理";
     },
@@ -480,14 +476,6 @@ export default {
         this.rules.goodsName[0].required = true;
         this.rules.quantity[0].required = true;
       }
-    },
-    parseDept(deptId){
-      let dept = this.depts.filter(item=>{
-        if(item.code == deptId){
-          return item;
-        }
-      });
-      return dept[0].name
     }
   }
 };
@@ -2,7 +2,7 @@
   <el-form ref="form" :model="form" label-width="80px">
     <el-form-item label="申请部门" prop="deptId">
       <el-select v-model="form.deptId" placeholder="请输入申请部门" style="width: 100%" :disabled="true">
-        <el-option v-for="item in depts" :label="item.name" :value="item.code" :key="item.code"/>
+        <el-option v-for="item in depts" :label="item.name" :value="item.name" :key="item.code"/>
       </el-select>
     </el-form-item>
     <el-form-item label="用章类型" prop="sealType" v-if="type==0">
@@ -67,7 +67,7 @@ export default {
       type: String
     },
     idInfo: {
-      type: Number
+      type: String
     }
   },
   data() {
@@ -5,9 +5,9 @@
         <el-input
           v-model="queryParams.contractName"
           placeholder="请输入合同名称"
-          
+
           size="small"
-          
+
         />
       </el-form-item>
       <el-form-item label="合同状态" prop="contractState">
@@ -420,7 +420,7 @@ export default {
     /** 查看按钮操作 */
     handleInfo(row){
       this.reset();
-      this.idInfo = row.id;
+      this.idInfo = row.id+"";
       this.title = "请假申请详情";
       this.openInfo = true;
     },
@@ -351,7 +351,7 @@ export default {
     /** 查看按钮操作 */
     handleInfo(row){
       this.reset();
-      this.idInfo = row.id;
+      this.idInfo = row.id+"";
       this.title = "会议管理详情";
       this.openInfo = true;
     },
@@ -120,6 +120,7 @@ export default {
       type: String
     },
     idInfo: {
+      type: String
     },
     depts: {
       type: Array
@@ -15,9 +15,9 @@
         <el-input
           v-model="queryParams.company"
           placeholder="请输入来文单位"
-          
+
           size="small"
-          
+
         />
       </el-form-item>
       <el-form-item label="收文时间" prop="receiveTime">
@@ -32,18 +32,18 @@
         <el-input
           v-model="queryParams.title"
           placeholder="请输入文件标题"
-          
+
           size="small"
-          
+
         />
       </el-form-item>
       <el-form-item label="信访单位(人)" prop="sendPerson">
         <el-input
           v-model="queryParams.sendPerson"
           placeholder="请输入信访单位(人)"
-          
+
           size="small"
-          
+
         />
       </el-form-item>
       <el-form-item label="信访日期" prop="sendDate">
@@ -403,7 +403,7 @@ export default {
     },
     /** 查看详情 */
     handleInfo(row){
-      this.idInfo = row.id;
+      this.idInfo = row.id+"";
       this.openInfo = true;
       this.title = "办文办事详情";
@@ -5,9 +5,9 @@
         <el-input
           v-model="queryParams.applicant"
           placeholder="请输入申请人"
-          
+
           size="small"
-          
+
         />
       </el-form-item>
 <!--      <el-form-item label="申请部门" prop="deptName">-->
@@ -390,7 +390,7 @@ export default {
     /** 查看按钮操作 */
     handleInfo(row) {
       this.reset();
-      this.idInfo = row.id;
+      this.idInfo = row.id+"";
       this.title = "请假申请详情";
       this.openInfo = true;
     },
@@ -18,9 +18,9 @@
         <el-input
           v-model="queryParams.staff"
           placeholder="请输入申请人"
-          
+
           size="small"
-          
+
         />
       </el-form-item>
       <el-form-item label="物品申请日期" prop="useDate" v-if="type!=0">
@@ -35,9 +35,9 @@
         <el-input
           v-model="queryParams.goodsName"
           placeholder="请输入物品名称"
-          
+
           size="small"
-          
+
         />
       </el-form-item>
       <el-form-item>
@@ -386,7 +386,7 @@ export default {
     },
     /** 查看按钮操作 */
     handleInfo(row) {
-      this.idInfo = row.id;
+      this.idInfo = row.id+"";
       this.openInfo = true;
       this.title = "查看后勤管理";
     },
@@ -67,7 +67,7 @@ export default {
       type: String
     },
     idInfo: {
-      type: Number
+      type: String
     }
   },
   data() {
@@ -5,9 +5,9 @@
         <el-input
           v-model="queryParams.contractName"
           placeholder="请输入合同名称"
-          
+
           size="small"
-          
+
         />
       </el-form-item>
       <el-form-item label="合同状态" prop="contractState">
@@ -420,7 +420,7 @@ export default {
     /** 查看按钮操作 */
     handleInfo(row){
       this.reset();
-      this.idInfo = row.id;
+      this.idInfo = row.id+"";
       this.title = "请假申请详情";
       this.openInfo = true;
     },
@@ -24,15 +24,16 @@ public class CompanyCredit extends BaseEntity
     @Excel(name = "运输企业")
     private String name;
-    /** 失信时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "失信时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date time;
     /** 所属区域 */
     @Excel(name = "所属区域")
     private String place;
+    /** 失信时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "失信时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date time;
+
     /** 失信原因 */
     @Excel(name = "失信原因")
     private String reason;
@@ -30,7 +30,6 @@ public class TruckCredit extends BaseEntity
     @Excel(name = "车牌号码")
     private String licensePlate;
-
     /** 0当前 1历史 */
     private Long status;
+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.service.IViolationWarningInformationService;
+import com.trash.common.config.trashConfig;
+import com.trash.common.utils.DateUtils;
+import com.trash.common.utils.RemoteServerUtils;
+import com.trash.common.utils.StringUtils;
+import com.trash.framework.web.service.SysLoginService;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.kafka.annotation.KafkaListener;
+import org.springframework.kafka.support.KafkaHeaders;
+import org.springframework.messaging.handler.annotation.Header;
+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;
+
+@Component
+public class Consumer {
+    private static final Logger log = LoggerFactory.getLogger(Consumer.class);
+
+    @Autowired
+    private IViolationWarningInformationService violationWarningInformationService;
+
+    @KafkaListener(topics="record_process_alarm")
+    public void consume(@Payload String data) {
+        log.info("kafka消费数据成功,data:" + data);
+        autoViolationWarning(data);
+    }
+
+    @Autowired
+    trashConfig trashConfig;
+
+    @Autowired
+    SysLoginService loginService;
+
+    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();
+//        }
+
+
+    }
+}
@@ -8,6 +8,7 @@ import com.trash.casefile.domain.ViolationCaseFile;
 import com.trash.casefile.domain.vo.ViolationWarningInformationVo;
 import com.trash.common.utils.DateUtils;
 import com.trash.common.utils.SecurityUtils;
+import com.trash.common.utils.StringUtils;
 import com.trash.common.utils.file.FileUploadUtils;
 import com.trash.office.domain.LeaveApplication;
 import com.trash.office.domain.UploadFile;
@@ -78,18 +79,22 @@ public class ViolationWarningInformationServiceImpl implements IViolationWarning
     @Override
     @Transactional
     public int insertViolationWarningInformation(MultipartFile[] files,ViolationWarningInformation violationWarningInformation) throws IOException {
-        violationWarningInformation.setCreateBy(SecurityUtils.getUsername());
+        if(StringUtils.isEmpty(violationWarningInformation.getCreateBy())){
+            violationWarningInformation.setCreateBy(SecurityUtils.getUsername());
+        }
         violationWarningInformation.setCreateTime(DateUtils.getNowDate());
         violationWarningInformation.setStatus(0);
         Integer result = violationWarningInformationMapper.insertViolationWarningInformation(violationWarningInformation);
-        //文件上传
-        for (MultipartFile file : files) {
-            UploadFile uploadFile = new UploadFile();
-            uploadFile.setTableName("violation_warning_information");
-            uploadFile.setTableNumber(violationWarningInformation.getId().toString());
-            uploadFile.setFileName(file.getOriginalFilename());
-            uploadFile.setFilePath(FileUploadUtils.uploadFile(file));
-            uploadFileMapper.insertUploadFile(uploadFile);
+        if(StringUtils.isNotEmpty(files)){
+            //文件上传
+            for (MultipartFile file : files) {
+                UploadFile uploadFile = new UploadFile();
+                uploadFile.setTableName("violation_warning_information");
+                uploadFile.setTableNumber(violationWarningInformation.getId().toString());
+                uploadFile.setFileName(file.getOriginalFilename());
+                uploadFile.setFilePath(FileUploadUtils.uploadFile(file));
+                uploadFileMapper.insertUploadFile(uploadFile);
+            }
         }
         int i = 0;
@@ -105,7 +110,12 @@ public class ViolationWarningInformationServiceImpl implements IViolationWarning
         }
-        WorkflowService.createCaseFile1(violationWarningInformation,i);
+        if(violationWarningInformation.getCreateBy().equals("长沙市建筑垃圾智慧监管平台")){
+            WorkflowService.createCaseFile1(violationWarningInformation,i,1);
+        }else{
+            WorkflowService.createCaseFile1(violationWarningInformation,i,0);
+        }
+
         return result;
     }
@@ -94,5 +94,5 @@ public interface IWorkflowService
 	int createCaseFile(ViolationCaseFile violationCaseFile,int index);
-    int createCaseFile1(ViolationWarningInformation violationCaseFile, int index);
+    int createCaseFile1(ViolationWarningInformation violationCaseFile, int index,int isAuto);
 }
@@ -6,6 +6,8 @@ import java.util.Map;
 import java.util.stream.Collectors;
 import com.trash.casefile.domain.ViolationWarningInformation;
+import com.trash.common.config.trashConfig;
+import com.trash.framework.web.service.SysLoginService;
 import org.activiti.api.process.model.ProcessInstance;
 import org.activiti.api.process.model.builders.ProcessPayloadBuilder;
 import org.activiti.api.process.runtime.ProcessRuntime;
@@ -57,6 +59,13 @@ public class WorkflowServiceImpl implements IWorkflowService {
 	@Autowired
 	private TaskRuntime taskRuntime;
+
+	@Autowired
+	com.trash.common.config.trashConfig trashConfig;
+
+	@Autowired
+	SysLoginService loginService;
+
 	String siteType[] = { "消纳场", "建筑垃圾资源化处置场", "盾构土环保处置场", "盾构土应急消纳场", "回填场" };
 	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -253,7 +262,13 @@ public class WorkflowServiceImpl implements IWorkflowService {
 	@Override
 	@Transactional
-	public int createCaseFile1(ViolationWarningInformation caseFile, int index){ //违规预警案卷
+	public int createCaseFile1(ViolationWarningInformation caseFile, int index,int isAuto){ //违规预警案卷
+		if(isAuto==1){
+			if(StringUtils.isEmpty(RemoteServerUtils.remote)){
+				RemoteServerUtils.remote = trashConfig.getRemotePath();
+			}
+			loginService.loginByRemote(trashConfig.getToken());
+		}
 		ProcessInstance processInstance = null;
 		String title = "案卷号:" + caseFile.getNumber();
 		String flowType = "violation_warning";