Merge remote-tracking branch 'origin/dev' into dev

# Conflicts: # trash-workFlow/src/main/java/com/trash/casefile/kafka/Consumer.java

Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # trash-workFlow/src/main/java/com/trash/casefile/kafka/Consumer.java
273548560@qq.com
2 parents cbf64206 d05520da
Showing 37 changed files with 371 additions and 224 deletions
sql/threestep_history.sql
trash-ui/dist.rar
trash-ui/src/api/caseOfflineInfo.js
trash-ui/src/api/truck_active.js
trash-ui/src/api/truck_credit.js
trash-ui/src/api/vio_casefile.js
trash-ui/src/api/warningInfo.js
trash-ui/src/layout/index.vue
trash-ui/src/layout/index5.vue → trash-ui/src/layout/index44.vue
trash-ui/src/main.js
trash-ui/src/views/business/CompanyCredit/index.vue
trash-ui/src/views/business/dayWorkReport/index.vue
trash-ui/src/views/business/threestep/index.vue
trash-ui/src/views/daily/situation/index.vue
trash-ui/src/views/h5/threestep/index.vue
trash-workFlow/src/main/java/com/trash/business/controller/EarthsitesCreditController.java
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionThreestepController.java
trash-workFlow/src/main/java/com/trash/business/controller/TruckActivateController.java
trash-workFlow/src/main/java/com/trash/business/domain/EarthsitesCredit.java
trash-workFlow/src/main/java/com/trash/business/domain/SupervisionSpecial.java
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : rrr
+ Source Server Type    : MySQL
+ Source Server Version : 100508 (10.5.8-MariaDB)
+ Source Host           : localhost:3306
+ Source Schema         : trash
+
+ Target Server Type    : MySQL
+ Target Server Version : 100508 (10.5.8-MariaDB)
+ File Encoding         : 65001
+
+ Date: 18/08/2023 16:39:46
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for threestep_history
+-- ----------------------------
+DROP TABLE IF EXISTS `threestep_history`;
+CREATE TABLE `threestep_history`  (
+  `id` int NOT NULL AUTO_INCREMENT COMMENT '序号',
+  `name` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '名称',
+  `type` int NULL DEFAULT NULL COMMENT '类型',
+  `project_type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '作业类型',
+  `place` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '所属区域',
+  `reason` longtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '开停工原因',
+  `status` int NULL DEFAULT 0 COMMENT '1开工 3停工',
+  `object_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '基础数据ID',
+  `create_by` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
+  `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
+  `person` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '执法部门负责人',
+  `person_number` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系方式',
+  `person1` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '管理部门负责人',
+  `person1_number` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系方式',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 115 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
+
+SET FOREIGN_KEY_CHECKS = 1;
@@ -92,15 +92,14 @@ export default {
     let id = this.businessKey.split(":");
     if (id.length == 2) {
-      this.businessKey = id[1];
-    } else {
-      this.businessKey = id;
+      id = id[1];
     }
+
     getArea().then(res => {
       this.areas = res.result;
       this.handleUpdate();
     });
-    listReplyApprovalProcess({tableName: "workflow_caseoffline:"+this.businessKey}).then(response => {
+    listReplyApprovalProcess({tableName: "workflow_caseoffline:"+id}).then(response => {
       this.replyApprovalProcessList = response.rows;
     });
   },
@@ -148,11 +147,9 @@ export default {
       let id = this.businessKey.split(":");
       if (id.length == 2) {
-        this.businessKey = id[1];
-      } else {
-        this.businessKey = id;
-      }
-      getCaseOffline(this.businessKey).then(response => {
+        id = id[1];
+      } 
+      getCaseOffline(id).then(response => {
         this.form = response.data;
         if (this.form.attach && this.form.attach != "")
           this.form.attach = this.form.attach.split(",");
@@ -161,7 +158,7 @@ export default {
         this.form.type = this.getCaseType(this.form.type);
         this.form.place = this.getAreaName(this.form.place);
-        getAdviceList(this.workflow + ":" + this.businessKey).then(res => {
+        getAdviceList(this.workflow + ":" + id).then(res => {
           if (res.data) {
             if (res.data.advice1) {
               this.adviceList.push({
@@ -112,6 +112,21 @@ export default {
   },
   created() {
+
+    if(window.location.search){
+      let params = window.location.search.replace("?","");
+      let arr = params.split("&");
+      for(let j in arr){
+        if(arr[j].split("=")[0] == "objType"){
+            this.queryParams.activateStatus = arr[j].split("=")[1];
+        }
+        if(arr[j].split("=")[0] == "objValue"){
+            this.queryParams.construction = arr[j].split("=")[1];
+        }
+      }
+    }
+
+
     let dep = {type: "CSUserDepartmentType"};
     getDict(dep).then(res => {
@@ -346,6 +361,9 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.resetForm("queryForm");
+      this.queryParams.activateStatus = null;
+      this.queryParams.construction = null;
+
       this.handleQuery();
     },
     // 多选框选中数据
@@ -201,6 +201,7 @@ import h5Page from &#39;@/views/h5/Pagination&#39;;
           status: null,
           lostCredit: null
         };
+        this.queryParams.licensePlate = null;
         this.resetForm("form");
       },
       /** 搜索按钮操作 */
@@ -211,7 +212,6 @@ import h5Page from &#39;@/views/h5/Pagination&#39;;
       /** 重置按钮操作 */
       resetQuery() {
         this.resetForm("queryForm");
-        console.log(this.queryParams);
         this.handleQuery();
       },
       // 多选框选中数据
@@ -153,7 +153,6 @@ export default {
   },
   created() {
     getArea().then(res => {
-
       this.areas = res.result;
     });
@@ -171,6 +170,39 @@ export default {
       this.companyList = res.result.list;
     });
+    if(window.location.search){
+      let params = window.location.search.replace("?","");
+      let arr = params.split("&");
+      let type = -1;
+      let name = null;
+      for(let j in arr){
+        if(arr[j].split("=")[0] == "objType"){
+            if(arr[j].split("=")[1] == "company"){
+                type = 1;
+                this.queryParams.violationObjectType = "2";
+            }else if(arr[j].split("=")[1] == "construction"){
+                type = 0;
+                this.queryParams.violationObjectType = "0";
+            }else if(arr[j].split("=")[1] == "earthSite"){
+                type = 0;
+                this.queryParams.violationObjectType = "1";
+            }
+        }
+        if(arr[j].split("=")[0] == "objValue"){
+            name = arr[j].split("=")[1];
+        }
+      }
+
+      if(type == 0){
+        this.queryParams.projectName = decodeURIComponent(name);
+      }
+      if(type == 1){
+        this.queryParams.companyName = decodeURIComponent(name);
+      }
+
+
+    }
+
     this.getList();
   },
@@ -241,7 +273,11 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+
       this.resetForm("queryForm");
+      this.queryParams.violationObjectType =null;
+      this.queryParams.projectName = null;
+      this.queryParams.companyName = null;
       this.handleQuery();
     },
     // 多选框选中数据
@@ -486,10 +522,10 @@ export default {
           const minute = now.getMinutes() < 10 ? `0${now.getMinutes()}` : now.getMinutes();
           const second = now.getSeconds() < 10 ? `0${now.getSeconds()}` : now.getSeconds();
           const code = `${year}/${month}/${day} ${hour}:${minute}:${second}`;
-          
+
           let companyName = formData.companyName ? formData.companyName : "";
           let projectName = formData.projectName ? formData.projectName : "";
-          
+
           this.form.describe = code + companyName + "在" + projectName + "出现" + formData.violationType;
           this.rules.companyName = null;
           this.rules.projectName = null;
@@ -227,6 +227,39 @@ export default {
     getCompanyList(this.remoteQueryData).then(res => {
       this.companyList = res.data;
     });
+    debugger;
+    if(window.location.search){
+      let params = window.location.search.replace("?","");
+      let arr = params.split("&");
+      let type = -1;
+      let name = null;
+      for(let j in arr){
+        if(arr[j].split("=")[0] == "objType"){
+            if(arr[j].split("=")[1] == "company"){
+                type = 1;
+                this.queryParams.violationObjectType = "2";
+            }else if(arr[j].split("=")[1] == "construction"){
+                type = 0;
+                this.queryParams.violationObjectType = "0";
+            }else if(arr[j].split("=")[1] == "earthSite"){
+                type = 0;
+                this.queryParams.violationObjectType = "1";
+            }
+        }
+        if(arr[j].split("=")[0] == "objValue"){
+            name = arr[j].split("=")[1];
+        }
+      }
+      if(type == 0){
+        this.queryParams.projectName = decodeURIComponent(name);
+      }
+      if(type == 1){
+        this.queryParams.companyName = decodeURIComponent(name);
+      }
+      
+      }
+
+
     this.getList();
   },
   methods: {
@@ -556,9 +589,9 @@ export default {
             let companyName = formData.companyName ? formData.companyName : "";
             let projectName = formData.projectName ? formData.projectName : "";
-            
+
             this.form.describe = code + companyName + "在" + projectName + "出现" + formData.violationType;
-            
+
           this.rules.companyName = null;
           this.rules.projectName = null;
         }
 <template>
-  <div :class="classObj" class="app-wrapper">
-    <sidebar class="sidebar-container"/>
-    <div :class="{hasTagsView:needTagsView}" class="main-container">
-      <tags-view v-if="needTagsView"/>
-      <app-main/>
-
-    </div>
-  </div>
+      <app-main />
 </template>
 <script>
 import RightPanel from '@/components/RightPanel'
-import {AppMain, Navbar, Settings, Sidebar, TagsView} from './components'
+import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
 import ResizeMixin from './mixin/ResizeHandler'
-import {mapState} from 'vuex'
+import { mapState } from 'vuex'
 export default {
   name: 'Layout',
@@ -45,63 +38,52 @@ export default {
   },
   methods: {
     handleClickOutside() {
-      this.$store.dispatch('app/closeSideBar', {withoutAnimation: false})
+      this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
     }
   }
 }
 </script>
 <style lang="scss" scoped>
-@import "~@/assets/styles/mixin.scss";
-@import "~@/assets/styles/variables.scss";
+  @import "~@/assets/styles/mixin.scss";
+  @import "~@/assets/styles/variables.scss";
-.app-wrapper {
-  @include clearfix;
-  position: relative;
-  height: 100%;
-  width: 100%;
+  .app-wrapper {
+    @include clearfix;
+    position: relative;
+    height: 100%;
+    width: 100%;
-  &.mobile.openSidebar {
-    position: fixed;
-    top: 0;
+    &.mobile.openSidebar {
+      position: fixed;
+      top: 0;
+    }
   }
-}
-.drawer-bg {
-  background: #000;
-  opacity: 0.3;
-  width: 100%;
-  top: 0;
-  height: 100%;
-  position: absolute;
-  z-index: 999;
-}
-
-.fixed-header {
-  position: fixed;
-  top: 0;
-  right: 0;
-  z-index: 9;
-  width: calc(100% - #{$sideBarWidth});
-  transition: width 0.28s;
-}
-
-.hideSidebar .fixed-header {
-  width: calc(100% - 54px)
-}
+  .drawer-bg {
+    background: #000;
+    opacity: 0.3;
+    width: 100%;
+    top: 0;
+    height: 100%;
+    position: absolute;
+    z-index: 999;
+  }
-.mobile .fixed-header {
-  width: 100%;
-}
+  .fixed-header {
+    position: fixed;
+    top: 0;
+    right: 0;
+    z-index: 9;
+    width: calc(100% - #{$sideBarWidth});
+    transition: width 0.28s;
+  }
-.preview figure {
-  float: left;
-  width: 30%;
-  height:calc(30vw - 0px);
-  margin: 1.5%;
-}
+  .hideSidebar .fixed-header {
+    width: calc(100% - 54px)
+  }
-.preview figure img {
-  width: 400px;
-}
+  .mobile .fixed-header {
+    width: 100%;
+  }
 </style>
 <template>
-      <app-main />
+  <div :class="classObj" class="app-wrapper">
+    <sidebar class="sidebar-container"/>
+    <div :class="{hasTagsView:needTagsView}" class="main-container">
+      <tags-view v-if="needTagsView"/>
+      <app-main/>
+
+    </div>
+  </div>
 </template>
 <script>
 import RightPanel from '@/components/RightPanel'
-import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
+import {AppMain, Navbar, Settings, Sidebar, TagsView} from './components'
 import ResizeMixin from './mixin/ResizeHandler'
-import { mapState } from 'vuex'
+import {mapState} from 'vuex'
 export default {
   name: 'Layout',
@@ -38,52 +45,63 @@ export default {
   },
   methods: {
     handleClickOutside() {
-      this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
+      this.$store.dispatch('app/closeSideBar', {withoutAnimation: false})
     }
   }
 }
 </script>
 <style lang="scss" scoped>
-  @import "~@/assets/styles/mixin.scss";
-  @import "~@/assets/styles/variables.scss";
-
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-
-    &.mobile.openSidebar {
-      position: fixed;
-      top: 0;
-    }
-  }
+@import "~@/assets/styles/mixin.scss";
+@import "~@/assets/styles/variables.scss";
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
+.app-wrapper {
+  @include clearfix;
+  position: relative;
+  height: 100%;
+  width: 100%;
-  .fixed-header {
+  &.mobile.openSidebar {
     position: fixed;
     top: 0;
-    right: 0;
-    z-index: 9;
-    width: calc(100% - #{$sideBarWidth});
-    transition: width 0.28s;
   }
+}
-  .hideSidebar .fixed-header {
-    width: calc(100% - 54px)
-  }
+.drawer-bg {
+  background: #000;
+  opacity: 0.3;
+  width: 100%;
+  top: 0;
+  height: 100%;
+  position: absolute;
+  z-index: 999;
+}
-  .mobile .fixed-header {
-    width: 100%;
-  }
+.fixed-header {
+  position: fixed;
+  top: 0;
+  right: 0;
+  z-index: 9;
+  width: calc(100% - #{$sideBarWidth});
+  transition: width 0.28s;
+}
+
+.hideSidebar .fixed-header {
+  width: calc(100% - 54px)
+}
+
+.mobile .fixed-header {
+  width: 100%;
+}
+
+.preview figure {
+  float: left;
+  width: 30%;
+  height:calc(30vw - 0px);
+  margin: 1.5%;
+}
+
+.preview figure img {
+  width: 400px;
+}
 </style>
@@ -37,8 +37,8 @@ Vue.prototype.handleTree = handleTree
 Vue.prototype.parseStatus = parseStatus
 Vue.prototype.checkPer = checkPermi
-Vue.prototype.remoteFrame = "http://183.66.242.6:14601"
-// Vue.prototype.remoteFrame = "http://175.6.47.84:8008"
+// Vue.prototype.remoteFrame = "http://183.66.242.6:14601"
+Vue.prototype.remoteFrame = "http://175.6.47.84:8008"
 Vue.prototype.msgSuccess = function (msg) {
   this.$message({ showClose: true, message: msg, type: "success" });
@@ -61,7 +61,8 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary"  size="mini" @click="handleAdd"  v-if="queryParams.status==0 && checkPer(['businessmanage.credit.CompanyCredit.add'])">新增</el-button>
+        <el-button type="primary"  size="mini" @click="handleAdd"  
+        v-if="queryParams.status==0 && checkPer(['businessmanage.credit.CompanyCredit.add'])">新增</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button  size="mini" @click="handleExport" v-hasPermi="['Company:credit:export']">导出</el-button>
@@ -16,10 +16,14 @@
       </el-col>
       <el-col :span="1.5">
-        <el-button :class="{'el-button':true, 'el-button--primary':this.queryParams.pageStatus==4}" size="mini" @click="getList(4);">工地开停工</el-button>
+        <el-button :class="{'el-button':true, 'el-button--primary':this.queryParams.pageStatus==4}" size="mini" @click="getList(4);"
+          v-if="checkPer(['business.supervision.dayWorkReport.csopen'])"
+          >工地开停工</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button :class="{'el-button':true,'el-button--primary':this.queryParams.pageStatus==5}" size="mini" @click="getList(5);">处理场所开停工</el-button>
+        <el-button :class="{'el-button':true,'el-button--primary':this.queryParams.pageStatus==5}" size="mini" @click="getList(5);"
+        v-if="checkPer(['business.supervision.dayWorkReport.esopen'])"
+        >处理场所开停工</el-button>
       </el-col>
     </el-row>
@@ -88,7 +88,7 @@
       </el-table-column>
       <el-table-column label="报工状态" align="center" prop="status" width="180">
         <template slot-scope="scope">
-          <span>{{ scope.row.status==0 ? "待巡查" : scope.row.status==1 ? "巡查通过" : "巡查驳回"}}</span>
+          <span>{{ scope.row.status==0 ? "待巡查" : scope.row.status==1 ? "巡查通过" : scope.row.status==2 ? "巡查驳回" : "已停工"}}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -134,19 +134,19 @@
           <editor v-model="form.numberOfVehicles" :min-height="192"/>
         </el-form-item>
-        <el-form-item label="平台各类预警值信息(案卷情况)" prop="numberOfVehicles">
+        <el-form-item label="平台各类预警信息（案卷）情况" prop="numberOfVehicles">
           <editor v-model="form.caseFileInfo" :min-height="192"/>
         </el-form-item>
-        <el-form-item label="平台推送各类预警信息(案卷情况)" prop="numberOfVehicles">
+        <el-form-item label="平台推送各类预警（信息）案卷情况" prop="numberOfVehicles">
           <editor v-model="form.warningCaseFileInfo" :min-height="192"/>
         </el-form-item>
-        <el-form-item label="抽查预警信息(案卷情况)回复情况" prop="desc1">
+        <el-form-item label="抽查预警案卷回复情况" prop="desc1">
           <editor v-model="form.desc1" :min-height="192"/>
         </el-form-item>
-        <el-form-item label="'三无'违规情况" prop="desc2">
+        <el-form-item label="“三无”违规情况" prop="desc2">
           <editor v-model="form.desc2" :min-height="192"/>
         </el-form-item>
@@ -184,22 +184,22 @@
            </el-row>
            <el-row type="flex" justify="center" class="bd_left bd_right bd_bottom ">
                  <el-col :span="4"> <p >3</p></el-col>
-                 <el-col :span="6" class="bd_left bd_right"> <p >平台各类预警值信息(案卷情况)</p></el-col>
+                 <el-col :span="6" class="bd_left bd_right"> <p >平台各类预警信息（案卷）情况</p></el-col>
                  <el-col :span="14"> <editor v-model="form.caseFileInfo" disabled/></el-col>
            </el-row>
            <el-row type="flex" justify="center" class="bd_left bd_right bd_bottom ">
                  <el-col :span="4"> <p >4</p></el-col>
-                 <el-col :span="6" class="bd_left bd_right"> <p >平台推送各类预警信息(案卷情况)</p></el-col>
+                 <el-col :span="6" class="bd_left bd_right"> <p >平台推送各类预警（信息）案卷情况</p></el-col>
                  <el-col :span="14"> <editor v-model="form.warningCaseFileInfo" disabled/></el-col>
            </el-row>
            <el-row type="flex" justify="center" class="bd_left bd_right bd_bottom ">
                  <el-col :span="4"> <p >5</p></el-col>
-                 <el-col :span="6" class="bd_left bd_right"> <p >抽查预警信息(案卷情况)回复情况</p></el-col>
+                 <el-col :span="6" class="bd_left bd_right"> <p >抽查预警案卷回复情况</p></el-col>
                  <el-col :span="14"> <editor v-model="form.desc1" disabled/></el-col>
            </el-row>
            <el-row type="flex" justify="center" class="bd_left bd_right bd_bottom ">
                  <el-col :span="4"> <p >6</p></el-col>
-                 <el-col :span="6" class="bd_left bd_right"> <p >三无'违规情况</p></el-col>
+                 <el-col :span="6" class="bd_left bd_right"> <p >“三无”违规情况</p></el-col>
                  <el-col :span="14"> <editor v-model="form.desc2" disabled/></el-col>
            </el-row>
@@ -51,7 +51,7 @@
            <span >{{item.place}}</span>
          </el-col>
        </el-row>
-
+        
        <el-row class="card_row" style="margin-top: 5px;">
          <el-col :span="24">
            <div>自查时间:{{item.selfCheckTime}}</div>
@@ -64,9 +64,13 @@
         </el-col>
       </el-row>
+          <span v-if="item.status==3">已停工"</span>
+
+
      <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(item,0)"  v-hasPermi="['business:threestep:edit']" v-if="queryParams.pageStatus==1 && item.status==1 && item.checkEndTime == null">抽查</el-button>
        <el-button size="mini" type="text" icon="el-icon-edit" @click="reSub(item)"  v-hasPermi="['business:threestep:add']" v-if="item.status==2">被驳回</el-button>
-
+        
+        
      <el-button size="mini" type="text" @click="handleUpdate(item,1)"  v-hasPermi="['business:threestep:edit']">查看详情</el-button>
      </el-card>
@@ -24,7 +24,7 @@ import com.trash.common.utils.poi.ExcelUtil;
 import com.trash.common.core.page.TableDataInfo;
 /**
- * 消纳场失信Controller
+ * 处理场所失信Controller
  *
  * @author trash
  * @date 2023-04-26
@@ -37,7 +37,7 @@ public class EarthsitesCreditController extends BaseController
     private IEarthsitesCreditService earthsitesCreditService;
     /**
-     * 查询消纳场失信列表
+     * 查询处理场所失信列表
      */
     @GetMapping("/list")
     public TableDataInfo list(EarthsitesCredit earthsitesCredit)
@@ -48,11 +48,11 @@ public class EarthsitesCreditController extends BaseController
     }
     /**
-     * 导出消纳场失信列表
+     * 导出处理场所失信列表
      */
-    @Log(title = "消纳场失信", businessType = BusinessType.EXPORT)
+    @Log(title = "处理场所失信", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(EarthsitesCredit earthsitesCredit)
     {	
@@ -71,11 +71,11 @@ public class EarthsitesCreditController extends BaseController
         	withOut.add("time");
         }
         ExcelUtil<EarthsitesCredit> util = new ExcelUtil<EarthsitesCredit>(EarthsitesCredit.class);
-        return util.exportExcel(list, "消纳场失信",withOut);
+        return util.exportExcel(list, "处理场所失信",withOut);
     }
     /**
-     * 获取消纳场失信详细信息
+     * 获取处理场所失信详细信息
      */
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
@@ -84,9 +84,9 @@ public class EarthsitesCreditController extends BaseController
     }
     /**
-     * 新增消纳场失信
+     * 新增处理场所失信
      */
-    @Log(title = "消纳场失信", businessType = BusinessType.INSERT)
+    @Log(title = "处理场所失信", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody EarthsitesCredit earthsitesCredit)
     {
@@ -94,9 +94,9 @@ public class EarthsitesCreditController extends BaseController
     }
     /**
-     * 修改消纳场失信
+     * 修改处理场所失信
      */
-    @Log(title = "消纳场失信", businessType = BusinessType.UPDATE)
+    @Log(title = "处理场所失信", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody EarthsitesCredit earthsitesCredit)
     {
@@ -104,9 +104,9 @@ public class EarthsitesCreditController extends BaseController
     }
     /**
-     * 删除消纳场失信
+     * 删除处理场所失信
      */
-    @Log(title = "消纳场失信", businessType = BusinessType.DELETE)
+    @Log(title = "处理场所失信", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
@@ -139,9 +139,16 @@ public class SupervisionThreestepController extends BaseController
     @PostMapping("/getByObjects")
     public AjaxResult getLists(@RequestBody SupervisionThreestep supervisionThreestep)
-    {
-        List<SupervisionThreestep> list = supervisionThreestepService.selectSupervisionThreestepList(supervisionThreestep);
-        return AjaxResult.success(list);
+    {	
+    	AjaxResult ajaxResult = AjaxResult.success();
+    	try {
+        	ajaxResult.put("result", supervisionThreestepService.selectSupervisionThreestepList(supervisionThreestep));
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+    	
+        return ajaxResult;
+    	
     }
     String[] outside = {"长沙县", "望城区", "浏阳市", "宁乡市", "株洲市", "湘潭市", "汩罗市", "湘阴县"};
@@ -177,7 +177,6 @@ public class TruckActivateController extends BaseController
         List<TruckActivate> list = truckActivateService.selectTruckActivateList(truckActivate);
         List<TruckActivateInfo> outList = new ArrayList<>();
-
     	for(int i = 0;i<list.size();i++){
     		TruckActivate turck = list.get(i);
@@ -199,7 +198,6 @@ public class TruckActivateController extends BaseController
         	info.setEffectiveFrom(object.getString("effectiveFrom"));
         	info.setEffectiveEnd(object.getString("effectiveEnd"));
-        	
         	outList.add(info);
         }
@@ -259,10 +257,17 @@ public class TruckActivateController extends BaseController
     @PostMapping(value="/getTruckListByObjects")
     public AjaxResult getTruckListByObjects(@RequestBody TruckActivate truckActivate)
-    {
-    	List<TruckActivate> list = truckActivateService.getTruckListByObjects(truckActivate);
-            	
-        return AjaxResult.success(list);
+    {         
+    	
+    	AjaxResult ajaxResult = AjaxResult.success();
+    	try {
+        	ajaxResult.put("result", truckActivateService.getTruckListByObjects(truckActivate));
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+    	
+        return ajaxResult;
+    	
     }
@@ -8,7 +8,7 @@ import com.trash.common.annotation.Excel;
 import com.trash.common.core.domain.BaseEntity;
 /**
- * 消纳场失信对象 earthsites_credit
+ * 处理场所失信对象 earthsites_credit
  *
  * @author trash
  * @date 2023-04-26
@@ -21,12 +21,12 @@ public class EarthsitesCredit extends BaseEntity
     @Excel(name = "序号")
     private Long id;
-    /** 消纳场名称 */
-    @Excel(name = "消纳场名称")
+    /** 处理场所名称 */
+    @Excel(name = "处理场所名称")
     private String name;
-    /** 消纳场类型 */
-    @Excel(name = "消纳场类型")
+    /** 处理场所类型 */
+    @Excel(name = "处理场所类型")
     private String type;
     /** 失信时间 */
@@ -20,7 +20,7 @@ public class SupervisionSpecial extends BaseEntity
     private String id;
     /** 类型 */
-    @Excel(name = "类型", readConverterExp = "0=工地,1=消纳场")
+    @Excel(name = "类型", readConverterExp = "0=工地,1=处理场所")
     private String type;
     /** 督查事项 */
@@ -24,8 +24,8 @@ public class SupervisionThreestep extends BaseEntity
     private Long id;
-    /** 项目类型 消纳场/工地 */
-    @Excel(name = "项目类型",readConverterExp = "0=工地,1=消纳场")
+    /** 项目类型 处理场所/工地 */
+    @Excel(name = "项目类型",readConverterExp = "0=工地,1=处理场所")
     private Long type;
     /** 工地名称 */
@@ -43,7 +43,7 @@ public class SupervisionThreestep extends BaseEntity
     /** 基础数据ID */
     private String objectId;
-    /** 消纳场ID */
+    /** 处理场所ID */
     private String earthsitesId;
     /** 检查时间 */
@@ -61,7 +61,7 @@ public class SupervisionThreestep extends BaseEntity
     @Excel(name = "报工状态",readConverterExp = "0=待巡查,1=巡查通过,1=巡查驳回")
     private Long status;
-    /** 消纳场名称 */
+    /** 处理场所名称 */
     private String earthsitesName;
     /** 消纳合同编号 */
@@ -39,8 +39,8 @@ public class TruckActivate extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date time;
-    /** 消纳场 */
-    @Excel(name = "消纳场")
+    /** 处理场所 */
+    @Excel(name = "处理场所")
     private String earthsite;
@@ -36,8 +36,8 @@ public class dayWork extends BaseEntity
     @Excel(name = "申请开工时间")
     private String selfCheckTime;
-    /** 消纳场名称 */
-    @Excel(name = "消纳场名称")
+    /** 处理场所名称 */
+    @Excel(name = "处理场所名称")
     private String ename;
     /** 管辖区 */
@@ -6,7 +6,7 @@ import com.trash.business.domain.ConstructionCredit;
 import com.trash.business.domain.EarthsitesCredit;
 /**
- * 消纳场失信Mapper接口
+ * 处理场所失信Mapper接口
  *
  * @author trash
  * @date 2023-04-26
@@ -14,47 +14,47 @@ import com.trash.business.domain.EarthsitesCredit;
 public interface EarthsitesCreditMapper
 {
     /**
-     * 查询消纳场失信
+     * 查询处理场所失信
      *
-     * @param id 消纳场失信ID
-     * @return 消纳场失信
+     * @param id 处理场所失信ID
+     * @return 处理场所失信
      */
     EarthsitesCredit selectEarthsitesCreditById(Long id);
     /**
-     * 查询消纳场失信列表
+     * 查询处理场所失信列表
      *
-     * @param earthsitesCredit 消纳场失信
-     * @return 消纳场失信集合
+     * @param earthsitesCredit 处理场所失信
+     * @return 处理场所失信集合
      */
     List<EarthsitesCredit> selectEarthsitesCreditList(EarthsitesCredit earthsitesCredit);
     /**
-     * 新增消纳场失信
+     * 新增处理场所失信
      *
-     * @param earthsitesCredit 消纳场失信
+     * @param earthsitesCredit 处理场所失信
      * @return 结果
      */
     int insertEarthsitesCredit(EarthsitesCredit earthsitesCredit);
     /**
-     * 修改消纳场失信
+     * 修改处理场所失信
      *
-     * @param earthsitesCredit 消纳场失信
+     * @param earthsitesCredit 处理场所失信
      * @return 结果
      */
     int updateEarthsitesCredit(EarthsitesCredit earthsitesCredit);
     /**
-     * 删除消纳场失信
+     * 删除处理场所失信
      *
-     * @param id 消纳场失信ID
+     * @param id 处理场所失信ID
      * @return 结果
      */
     int deleteEarthsitesCreditById(Long id);
     /**
-     * 批量删除消纳场失信
+     * 批量删除处理场所失信
      *
      * @param ids 需要删除的数据ID
      * @return 结果
@@ -6,7 +6,7 @@ import com.trash.business.domain.ConstructionCredit;
 import com.trash.business.domain.EarthsitesCredit;
 /**
- * 消纳场失信Service接口
+ * 处理场所失信Service接口
  *
  * @author trash
  * @date 2023-04-26
@@ -14,49 +14,49 @@ import com.trash.business.domain.EarthsitesCredit;
 public interface IEarthsitesCreditService
 {
     /**
-     * 查询消纳场失信
+     * 查询处理场所失信
      *
-     * @param id 消纳场失信ID
-     * @return 消纳场失信
+     * @param id 处理场所失信ID
+     * @return 处理场所失信
      */
     EarthsitesCredit selectEarthsitesCreditById(Long id);
     /**
-     * 查询消纳场失信列表
+     * 查询处理场所失信列表
      *
-     * @param earthsitesCredit 消纳场失信
-     * @return 消纳场失信集合
+     * @param earthsitesCredit 处理场所失信
+     * @return 处理场所失信集合
      */
     List<EarthsitesCredit> selectEarthsitesCreditList(EarthsitesCredit earthsitesCredit);
     /**
-     * 新增消纳场失信
+     * 新增处理场所失信
      *
-     * @param earthsitesCredit 消纳场失信
+     * @param earthsitesCredit 处理场所失信
      * @return 结果
      */
     int insertEarthsitesCredit(EarthsitesCredit earthsitesCredit);
     /**
-     * 修改消纳场失信
+     * 修改处理场所失信
      *
-     * @param earthsitesCredit 消纳场失信
+     * @param earthsitesCredit 处理场所失信
      * @return 结果
      */
     int updateEarthsitesCredit(EarthsitesCredit earthsitesCredit);
     /**
-     * 批量删除消纳场失信
+     * 批量删除处理场所失信
      *
-     * @param ids 需要删除的消纳场失信ID
+     * @param ids 需要删除的处理场所失信ID
      * @return 结果
      */
     int deleteEarthsitesCreditByIds(Long[] ids);
     /**
-     * 删除消纳场失信信息
+     * 删除处理场所失信信息
      *
-     * @param id 消纳场失信ID
+     * @param id 处理场所失信ID
      * @return 结果
      */
     int deleteEarthsitesCreditById(Long id);
@@ -15,7 +15,7 @@ import com.trash.business.service.IEarthsitesCreditService;
 import com.trash.common.utils.RemoteServerUtils;
 /**
- * 消纳场失信Service业务层处理
+ * 处理场所失信Service业务层处理
  *
  * @author trash
  * @date 2023-04-26
@@ -27,10 +27,10 @@ public class EarthsitesCreditServiceImpl implements IEarthsitesCreditService
     private EarthsitesCreditMapper earthsitesCreditMapper;
     /**
-     * 查询消纳场失信
+     * 查询处理场所失信
      *
-     * @param id 消纳场失信ID
-     * @return 消纳场失信
+     * @param id 处理场所失信ID
+     * @return 处理场所失信
      */
     @Override
     public EarthsitesCredit selectEarthsitesCreditById(Long id)
@@ -39,10 +39,10 @@ public class EarthsitesCreditServiceImpl implements IEarthsitesCreditService
     }
     /**
-     * 查询消纳场失信列表
+     * 查询处理场所失信列表
      *
-     * @param earthsitesCredit 消纳场失信
-     * @return 消纳场失信
+     * @param earthsitesCredit 处理场所失信
+     * @return 处理场所失信
      */
     @Override
     public List<EarthsitesCredit> selectEarthsitesCreditList(EarthsitesCredit earthsitesCredit)
@@ -51,9 +51,9 @@ public class EarthsitesCreditServiceImpl implements IEarthsitesCreditService
     }
     /**
-     * 新增消纳场失信
+     * 新增处理场所失信
      *
-     * @param earthsitesCredit 消纳场失信
+     * @param earthsitesCredit 处理场所失信
      * @return 结果
      */
     @Override
@@ -91,9 +91,9 @@ public class EarthsitesCreditServiceImpl implements IEarthsitesCreditService
     }
     /**
-     * 修改消纳场失信
+     * 修改处理场所失信
      *
-     * @param earthsitesCredit 消纳场失信
+     * @param earthsitesCredit 处理场所失信
      * @return 结果
      */
     @Override
@@ -120,9 +120,9 @@ public class EarthsitesCreditServiceImpl implements IEarthsitesCreditService
     }
     /**
-     * 批量删除消纳场失信
+     * 批量删除处理场所失信
      *
-     * @param ids 需要删除的消纳场失信ID
+     * @param ids 需要删除的处理场所失信ID
      * @return 结果
      */
     @Override
@@ -132,9 +132,9 @@ public class EarthsitesCreditServiceImpl implements IEarthsitesCreditService
     }
     /**
-     * 删除消纳场失信信息
+     * 删除处理场所失信信息
      *
-     * @param id 消纳场失信ID
+     * @param id 处理场所失信ID
      * @return 结果
      */
     @Override
@@ -26,10 +26,10 @@ public class CaseOffline extends BaseEntity
     private String number;
     /** 案卷类型 */
-    @Excel(name = "案卷类型",readConverterExp = "0=渣土处置工地（含消纳场）的渣土运输车辆出场车身不洁，"
+    @Excel(name = "案卷类型",readConverterExp = "0=渣土处置工地（含处理场所）的渣土运输车辆出场车身不洁，"
     		+ "车轮带泥,1=未洗车出场或者出场清洁不彻底,2=渣土运输车辆货箱顶盖未按规定关闭到位或未按规定和标准装载渣土出场,"
     		+ "3=非核准车辆进入渣土处置工地运输渣土,4=渣土处置工地未按规定时间开停工,"
-    		+ "5=渣土处置工地洗车设施等破损、未正常使用及措施不到位的,6=渣土处置工地、消纳场(含回填场）出入口两侧50米范围内出现渣土污染、污水外排等现象"
+    		+ "5=渣土处置工地洗车设施等破损、未正常使用及措施不到位的,6=渣土处置工地、处理场所(含回填场）出入口两侧50米范围内出现渣土污染、污水外排等现象"
     		+ "7=无许可消纳（工）,8=无许可消纳（消）,9=使用非专用车辆")
     private String type;
@@ -80,13 +80,13 @@ public class CaseOfflineServiceImpl implements ICaseOfflineService
     String[] typeName = {
-    		"渣土处置工地（含消纳场）的渣土运输车辆出场车身不洁，车轮带泥",
+    		"渣土处置工地（含处理场所）的渣土运输车辆出场车身不洁，车轮带泥",
     		"未洗车出场或者出场清洁不彻底",
     		"渣土运输车辆货箱顶盖未按规定关闭到位或未按规定和标准装载渣土出场",
     	    "非核准车辆进入渣土处置工地运输渣土",
     	    "渣土处置工地未按规定时间开停工",
     	    "渣土处置工地洗车设施等破损、未正常使用及措施不到位的",
-    	    "渣土处置工地、消纳场(含回填场）出入口两侧50米范围内出现渣土污染、污水外排等现象",
+    	    "渣土处置工地、处理场所(含回填场）出入口两侧50米范围内出现渣土污染、污水外排等现象",
     	    "无许可消纳（工）",
     	    "无许可消纳（消）",
     	    "使用非专用车辆"};
@@ -39,7 +39,7 @@ public class RemoteServerController {
     public AjaxResult getEarthSitesList(){
         JSONArray jsonArray = redisCache.getCacheObject("earthSitesList");
         if(jsonArray==null){
-            return AjaxResult.error("获取消纳场列表失败!请稍后重试或联系管理员");
+            return AjaxResult.error("获取处理场所列表失败!请稍后重试或联系管理员");
         }
         return AjaxResult.success(jsonArray);
     }
@@ -195,7 +195,7 @@ public class ViolationCaseFileController extends BaseController
     String[] caseType = {"进入非专用车辆","无许可手续（工）","无许可手续（消）","黄土覆盖情况","出入口路面污染","出入口道路硬化","车辆冲洗是否到位",
     	"雾炮机是否正常开启","使用费专用车运输","监控点位未对准","未报开工作业","视频设备离线超时报警","三无车辆进入工地","未按时间作业",
-    	"未报开工作业","视频设备离线超时报警","三无车辆进入消纳场","未到指定的消纳场作业","离线运输报警（工）","离线运输报警（消）","未激活车辆作业",
+    	"未报开工作业","视频设备离线超时报警","三无车辆进入处理场所","未到指定的处理场所作业","离线运输报警（工）","离线运输报警（消）","未激活车辆作业",
     		"未核准作业车辆作业","未按线路行驶","闯禁行驶","失信车辆作业","卫星定位异常","其他2","其他3","其他4","其他5"};
     @GetMapping(value = "/caseTable")
@@ -196,7 +196,7 @@ public class ViolationWarningInformationController extends BaseController
     String[] caseType = {"工地预警-未报开工作业", "工地预警-视频设备离线超时报警", "工地预警-三无车辆进入工地", "工地预警-未按时间作业",
-            "消纳场预警-未报开工作业", "消纳场预警-视频设备离线超时报警", "消纳场预警-三无车辆进入消纳场", "消纳场预警-未到指定的消纳场作业",
+            "处理场所预警-未报开工作业", "处理场所预警-视频设备离线超时报警", "处理场所预警-三无车辆进入处理场所", "处理场所预警-未到指定的处理场所作业",
             "离线运输报警(工)", "离线运输报警(消)", "未激活车辆作业", "未核准作业车辆作业", "未按线路行驶",
             "闯禁行驶", "失信车辆作业"};
@@ -33,7 +33,7 @@ public class ViolationCaseFile extends BaseEntity
     private String projectName;
     /** 违规对象类型 */
-    @Excel(name = "违规对象类型",readConverterExp = "0=工地,1=消纳场,2=企业")
+    @Excel(name = "违规对象类型",readConverterExp = "0=工地,1=处理场所,2=企业")
     private String violationObjectType;
@@ -43,7 +43,7 @@ public class ViolationWarningInformation extends BaseEntity {
     /**
      * 违规对象类型
      */
-    @Excel(name = "违规对象类型",readConverterExp = "0=工地,1=消纳场,2=企业")
+    @Excel(name = "违规对象类型",readConverterExp = "0=工地,1=处理场所,2=企业")
     private String violationObjectType;
     /**
@@ -61,7 +61,7 @@ public class Consumer {
     public void autoViolationWarning(String data,String id) throws InterruptedException, IOException {
         String[] code = {"44030020=工地预警-未报开工作业", "44030021=工地预警-视频设备离线超时报警", "44030022=工地预警-三无车辆进入工地", "44030023=工地预警-未按时间作业",
-                "44030024=消纳场预警-未报开工作业", "44030025=消纳场预警-视频设备离线超时报警", "44030026=消纳场预警-三无车辆进入消纳场", "44030027=消纳场预警-未到指定的消纳场作业",
+                "44030024=处理场所预警-未报开工作业", "44030025=处理场所预警-视频设备离线超时报警", "44030026=处理场所预警-三无车辆进入处理场所", "44030027=处理场所预警-未到指定的处理场所作业",
                 "44030028=离线运输报警(工)", "44030029=离线运输报警(消)", "44030030=未激活车辆作业", "44030031=未核准作业车辆作业", "44030032=未按线路行驶",
                 "44030033=闯禁行驶", "44030034=失信车辆作业", "44030035=卫星定位异常"};
@@ -135,7 +135,7 @@ public class Consumer {
             violationWarningInformation.setCreateBy("长沙市建筑垃圾智慧监管平台");
             //推送对象
             violationWarningInformation.setViolationGrade("一般类");
-            //项目名称（工地名称，消纳场名称）
+            //项目名称（工地名称，处理场所名称）
             violationWarningInformation.setSendObject("区管理部门");
             String describe = "";
@@ -273,7 +273,7 @@ public class Consumer {
                     violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
                     break;
-                case "44030024"://消纳场预警-未报开工作业
+                case "44030024"://处理场所预警-未报开工作业
                     //获取报警次数
                     count = redisCache.getCacheObject(nowDate+jsonObject.getString("siteId")+"44030024")==null?1:Integer.parseInt(redisCache.getCacheObject(nowDate+jsonObject.getString("siteId")+"44030024").toString())+1;
                     //获取累计报警描述
@@ -305,10 +305,10 @@ public class Consumer {
                     //累计描述
                     redisCache.setCacheObject(nowDate+jsonObject.getString("siteId")+"44030024describe",describe,1, TimeUnit.DAYS);
                     break;
-                case "44030027"://消纳场预警-未到指定的消纳场作业
-                case "44030026"://消纳场预警-三无车辆进入消纳场
+                case "44030027"://处理场所预警-未到指定的处理场所作业
+                case "44030026"://处理场所预警-三无车辆进入处理场所
                 case "44030029"://离线运输报警(消)
-                case "44030025"://消纳场预警-视频设备离线超时报警
+                case "44030025"://处理场所预警-视频设备离线超时报警
                     violationWarningInformation.setViolationObjectType("1");
                     violationWarningInformation.setSendObject("区管理部门");
                     violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
@@ -128,7 +128,7 @@ public class ViolationCaseFileServiceImpl implements IViolationCaseFileService
         		i = 2;
         	}
         }
-        if(violationCaseFile.getViolationType().equals("三无车辆进入工地")||violationCaseFile.getViolationType().equals("三无车辆进入消纳场")||violationCaseFile.getViolationType().equals("三无车辆运输")){
+        if(violationCaseFile.getViolationType().equals("三无车辆进入工地")||violationCaseFile.getViolationType().equals("三无车辆进入处理场所")||violationCaseFile.getViolationType().equals("三无车辆运输")){
             i = 2;
         }
@@ -167,8 +167,8 @@ public class ProjectCheck extends BaseEntity
     @Excel(name = "周边市容环境")
     private String environment;
-    /** 在用消纳场地及对应线路 */
-    @Excel(name = "在用消纳场地及对应线路")
+    /** 在用处理场所地及对应线路 */
+    @Excel(name = "在用处理场所地及对应线路")
     private String line;
     /** 主要问题以及整改意见 */
@@ -84,7 +84,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
 	@Autowired
 	SysLoginService loginService;
-	String siteType[] = { "消纳场", "建筑垃圾资源化处置场", "盾构土环保处置场", "盾构土应急消纳场", "回填场" };
+	String siteType[] = { "处理场所", "建筑垃圾资源化处置场", "盾构土环保处置场", "盾构土应急处理场所", "回填场" };
 	String outArea = "株洲市,湘潭市,汨罗市,湘阴县";