youxiw2000 / trash · Commits

Commit 32cd2a0236b7e79f0ff7ad272a7dfc2ee3043037

Authored by 273548560@qq.com
2 parents cbf64206 d05520da
build: skipped

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

# Conflicts:
#	trash-workFlow/src/main/java/com/trash/casefile/kafka/Consumer.java
Inline Side-by-side
Showing 37 changed files with 371 additions and 224 deletions
sql/threestep_history.sql 0 → 100644
  View file @32cd2a0
  1 +/*
  2 + Navicat Premium Data Transfer
  3 +
  4 + Source Server : rrr
  5 + Source Server Type : MySQL
  6 + Source Server Version : 100508 (10.5.8-MariaDB)
  7 + Source Host : localhost:3306
  8 + Source Schema : trash
  9 +
  10 + Target Server Type : MySQL
  11 + Target Server Version : 100508 (10.5.8-MariaDB)
  12 + File Encoding : 65001
  13 +
  14 + Date: 18/08/2023 16:39:46
  15 +*/
  16 +
  17 +SET NAMES utf8mb4;
  18 +SET FOREIGN_KEY_CHECKS = 0;
  19 +
  20 +-- ----------------------------
  21 +-- Table structure for threestep_history
  22 +-- ----------------------------
  23 +DROP TABLE IF EXISTS `threestep_history`;
  24 +CREATE TABLE `threestep_history` (
  25 + `id` int NOT NULL AUTO_INCREMENT COMMENT '序号',
  26 + `name` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '名称',
  27 + `type` int NULL DEFAULT NULL COMMENT '类型',
  28 + `project_type` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '作业类型',
  29 + `place` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '所属区域',
  30 + `reason` longtext CHARACTER SET utf8 COLLATE utf8_general_ci NULL COMMENT '开停工原因',
  31 + `status` int NULL DEFAULT 0 COMMENT '1开工 3停工',
  32 + `object_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '基础数据ID',
  33 + `create_by` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人',
  34 + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间',
  35 + `person` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '执法部门负责人',
  36 + `person_number` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系方式',
  37 + `person1` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '管理部门负责人',
  38 + `person1_number` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系方式',
  39 + PRIMARY KEY (`id`) USING BTREE
  40 +) ENGINE = InnoDB AUTO_INCREMENT = 115 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = DYNAMIC;
  41 +
  42 +SET FOREIGN_KEY_CHECKS = 1;
... ...
trash-ui/dist.rar
View file @32cd2a0
No preview for this file type
trash-ui/src/api/caseOfflineInfo.js
  View file @32cd2a0
... ... @@ -92,15 +92,14 @@ export default {
92 92 let id = this.businessKey.split(":");
93 93  
94 94 if (id.length == 2) {
95   - this.businessKey = id[1];
96   - } else {
97   - this.businessKey = id;
  95 + id = id[1];
98 96 }
  97 +
99 98 getArea().then(res => {
100 99 this.areas = res.result;
101 100 this.handleUpdate();
102 101 });
103   - listReplyApprovalProcess({tableName: "workflow_caseoffline:"+this.businessKey}).then(response => {
  102 + listReplyApprovalProcess({tableName: "workflow_caseoffline:"+id}).then(response => {
104 103 this.replyApprovalProcessList = response.rows;
105 104 });
106 105 },
... ... @@ -148,11 +147,9 @@ export default {
148 147 let id = this.businessKey.split(":");
149 148  
150 149 if (id.length == 2) {
151   - this.businessKey = id[1];
152   - } else {
153   - this.businessKey = id;
154   - }
155   - getCaseOffline(this.businessKey).then(response => {
  150 + id = id[1];
  151 + }
  152 + getCaseOffline(id).then(response => {
156 153 this.form = response.data;
157 154 if (this.form.attach && this.form.attach != "")
158 155 this.form.attach = this.form.attach.split(",");
... ... @@ -161,7 +158,7 @@ export default {
161 158 this.form.type = this.getCaseType(this.form.type);
162 159 this.form.place = this.getAreaName(this.form.place);
163 160  
164   - getAdviceList(this.workflow + ":" + this.businessKey).then(res => {
  161 + getAdviceList(this.workflow + ":" + id).then(res => {
165 162 if (res.data) {
166 163 if (res.data.advice1) {
167 164 this.adviceList.push({
... ...
trash-ui/src/api/truck_active.js
  View file @32cd2a0
... ... @@ -112,6 +112,21 @@ export default {
112 112 },
113 113 created() {
114 114  
  115 +
  116 + if(window.location.search){
  117 + let params = window.location.search.replace("?","");
  118 + let arr = params.split("&");
  119 + for(let j in arr){
  120 + if(arr[j].split("=")[0] == "objType"){
  121 + this.queryParams.activateStatus = arr[j].split("=")[1];
  122 + }
  123 + if(arr[j].split("=")[0] == "objValue"){
  124 + this.queryParams.construction = arr[j].split("=")[1];
  125 + }
  126 + }
  127 + }
  128 +
  129 +
115 130 let dep = {type: "CSUserDepartmentType"};
116 131  
117 132 getDict(dep).then(res => {
... ... @@ -346,6 +361,9 @@ export default {
346 361 /** 重置按钮操作 */
347 362 resetQuery() {
348 363 this.resetForm("queryForm");
  364 + this.queryParams.activateStatus = null;
  365 + this.queryParams.construction = null;
  366 +
349 367 this.handleQuery();
350 368 },
351 369 // 多选框选中数据
... ...
trash-ui/src/api/truck_credit.js
  View file @32cd2a0
... ... @@ -201,6 +201,7 @@ import h5Page from '@/views/h5/Pagination';
201 201 status: null,
202 202 lostCredit: null
203 203 };
  204 + this.queryParams.licensePlate = null;
204 205 this.resetForm("form");
205 206 },
206 207 /** 搜索按钮操作 */
... ... @@ -211,7 +212,6 @@ import h5Page from '@/views/h5/Pagination';
211 212 /** 重置按钮操作 */
212 213 resetQuery() {
213 214 this.resetForm("queryForm");
214   - console.log(this.queryParams);
215 215 this.handleQuery();
216 216 },
217 217 // 多选框选中数据
... ...
trash-ui/src/api/vio_casefile.js
  View file @32cd2a0
... ... @@ -153,7 +153,6 @@ export default {
153 153 },
154 154 created() {
155 155 getArea().then(res => {
156   -
157 156 this.areas = res.result;
158 157 });
159 158  
... ... @@ -171,6 +170,39 @@ export default {
171 170 this.companyList = res.result.list;
172 171 });
173 172  
  173 + if(window.location.search){
  174 + let params = window.location.search.replace("?","");
  175 + let arr = params.split("&");
  176 + let type = -1;
  177 + let name = null;
  178 + for(let j in arr){
  179 + if(arr[j].split("=")[0] == "objType"){
  180 + if(arr[j].split("=")[1] == "company"){
  181 + type = 1;
  182 + this.queryParams.violationObjectType = "2";
  183 + }else if(arr[j].split("=")[1] == "construction"){
  184 + type = 0;
  185 + this.queryParams.violationObjectType = "0";
  186 + }else if(arr[j].split("=")[1] == "earthSite"){
  187 + type = 0;
  188 + this.queryParams.violationObjectType = "1";
  189 + }
  190 + }
  191 + if(arr[j].split("=")[0] == "objValue"){
  192 + name = arr[j].split("=")[1];
  193 + }
  194 + }
  195 +
  196 + if(type == 0){
  197 + this.queryParams.projectName = decodeURIComponent(name);
  198 + }
  199 + if(type == 1){
  200 + this.queryParams.companyName = decodeURIComponent(name);
  201 + }
  202 +
  203 +
  204 + }
  205 +
174 206  
175 207 this.getList();
176 208 },
... ... @@ -241,7 +273,11 @@ export default {
241 273 },
242 274 /** 重置按钮操作 */
243 275 resetQuery() {
  276 +
244 277 this.resetForm("queryForm");
  278 + this.queryParams.violationObjectType =null;
  279 + this.queryParams.projectName = null;
  280 + this.queryParams.companyName = null;
245 281 this.handleQuery();
246 282 },
247 283 // 多选框选中数据
... ... @@ -486,10 +522,10 @@ export default {
486 522 const minute = now.getMinutes() < 10 ? `0${now.getMinutes()}` : now.getMinutes();
487 523 const second = now.getSeconds() < 10 ? `0${now.getSeconds()}` : now.getSeconds();
488 524 const code = `${year}/${month}/${day} ${hour}:${minute}:${second}`;
489   -
  525 +
490 526 let companyName = formData.companyName ? formData.companyName : "";
491 527 let projectName = formData.projectName ? formData.projectName : "";
492   -
  528 +
493 529 this.form.describe = code + companyName + "在" + projectName + "出现" + formData.violationType;
494 530 this.rules.companyName = null;
495 531 this.rules.projectName = null;
... ...
trash-ui/src/api/warningInfo.js
  View file @32cd2a0
... ... @@ -227,6 +227,39 @@ export default {
227 227 getCompanyList(this.remoteQueryData).then(res => {
228 228 this.companyList = res.data;
229 229 });
  230 + debugger;
  231 + if(window.location.search){
  232 + let params = window.location.search.replace("?","");
  233 + let arr = params.split("&");
  234 + let type = -1;
  235 + let name = null;
  236 + for(let j in arr){
  237 + if(arr[j].split("=")[0] == "objType"){
  238 + if(arr[j].split("=")[1] == "company"){
  239 + type = 1;
  240 + this.queryParams.violationObjectType = "2";
  241 + }else if(arr[j].split("=")[1] == "construction"){
  242 + type = 0;
  243 + this.queryParams.violationObjectType = "0";
  244 + }else if(arr[j].split("=")[1] == "earthSite"){
  245 + type = 0;
  246 + this.queryParams.violationObjectType = "1";
  247 + }
  248 + }
  249 + if(arr[j].split("=")[0] == "objValue"){
  250 + name = arr[j].split("=")[1];
  251 + }
  252 + }
  253 + if(type == 0){
  254 + this.queryParams.projectName = decodeURIComponent(name);
  255 + }
  256 + if(type == 1){
  257 + this.queryParams.companyName = decodeURIComponent(name);
  258 + }
  259 +
  260 + }
  261 +
  262 +
230 263 this.getList();
231 264 },
232 265 methods: {
... ... @@ -556,9 +589,9 @@ export default {
556 589  
557 590 let companyName = formData.companyName ? formData.companyName : "";
558 591 let projectName = formData.projectName ? formData.projectName : "";
559   -
  592 +
560 593 this.form.describe = code + companyName + "在" + projectName + "出现" + formData.violationType;
561   -
  594 +
562 595 this.rules.companyName = null;
563 596 this.rules.projectName = null;
564 597 }
... ...
trash-ui/src/layout/index.vue
  View file @32cd2a0
1 1 <template>
2   - <div :class="classObj" class="app-wrapper">
3   - <sidebar class="sidebar-container"/>
4   - <div :class="{hasTagsView:needTagsView}" class="main-container">
5   - <tags-view v-if="needTagsView"/>
6   - <app-main/>
7   -
8   - </div>
9   - </div>
  2 + <app-main />
10 3 </template>
11 4  
12 5 <script>
13 6 import RightPanel from '@/components/RightPanel'
14   -import {AppMain, Navbar, Settings, Sidebar, TagsView} from './components'
  7 +import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
15 8 import ResizeMixin from './mixin/ResizeHandler'
16   -import {mapState} from 'vuex'
  9 +import { mapState } from 'vuex'
17 10  
18 11 export default {
19 12 name: 'Layout',
... ... @@ -45,63 +38,52 @@ export default {
45 38 },
46 39 methods: {
47 40 handleClickOutside() {
48   - this.$store.dispatch('app/closeSideBar', {withoutAnimation: false})
  41 + this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
49 42 }
50 43 }
51 44 }
52 45 </script>
53 46  
54 47 <style lang="scss" scoped>
55   -@import "~@/assets/styles/mixin.scss";
56   -@import "~@/assets/styles/variables.scss";
  48 + @import "~@/assets/styles/mixin.scss";
  49 + @import "~@/assets/styles/variables.scss";
57 50  
58   -.app-wrapper {
59   - @include clearfix;
60   - position: relative;
61   - height: 100%;
62   - width: 100%;
  51 + .app-wrapper {
  52 + @include clearfix;
  53 + position: relative;
  54 + height: 100%;
  55 + width: 100%;
63 56  
64   - &.mobile.openSidebar {
65   - position: fixed;
66   - top: 0;
  57 + &.mobile.openSidebar {
  58 + position: fixed;
  59 + top: 0;
  60 + }
67 61 }
68   -}
69 62  
70   -.drawer-bg {
71   - background: #000;
72   - opacity: 0.3;
73   - width: 100%;
74   - top: 0;
75   - height: 100%;
76   - position: absolute;
77   - z-index: 999;
78   -}
79   -
80   -.fixed-header {
81   - position: fixed;
82   - top: 0;
83   - right: 0;
84   - z-index: 9;
85   - width: calc(100% - #{$sideBarWidth});
86   - transition: width 0.28s;
87   -}
88   -
89   -.hideSidebar .fixed-header {
90   - width: calc(100% - 54px)
91   -}
  63 + .drawer-bg {
  64 + background: #000;
  65 + opacity: 0.3;
  66 + width: 100%;
  67 + top: 0;
  68 + height: 100%;
  69 + position: absolute;
  70 + z-index: 999;
  71 + }
92 72  
93   -.mobile .fixed-header {
94   - width: 100%;
95   -}
  73 + .fixed-header {
  74 + position: fixed;
  75 + top: 0;
  76 + right: 0;
  77 + z-index: 9;
  78 + width: calc(100% - #{$sideBarWidth});
  79 + transition: width 0.28s;
  80 + }
96 81  
97   -.preview figure {
98   - float: left;
99   - width: 30%;
100   - height:calc(30vw - 0px);
101   - margin: 1.5%;
102   -}
  82 + .hideSidebar .fixed-header {
  83 + width: calc(100% - 54px)
  84 + }
103 85  
104   -.preview figure img {
105   - width: 400px;
106   -}
  86 + .mobile .fixed-header {
  87 + width: 100%;
  88 + }
107 89 </style>
... ...
trash-ui/src/layout/index5.vue renamed to trash-ui/src/layout/index44.vue
  View file @32cd2a0
1 1 <template>
2   - <app-main />
  2 + <div :class="classObj" class="app-wrapper">
  3 + <sidebar class="sidebar-container"/>
  4 + <div :class="{hasTagsView:needTagsView}" class="main-container">
  5 + <tags-view v-if="needTagsView"/>
  6 + <app-main/>
  7 +
  8 + </div>
  9 + </div>
3 10 </template>
4 11  
5 12 <script>
6 13 import RightPanel from '@/components/RightPanel'
7   -import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
  14 +import {AppMain, Navbar, Settings, Sidebar, TagsView} from './components'
8 15 import ResizeMixin from './mixin/ResizeHandler'
9   -import { mapState } from 'vuex'
  16 +import {mapState} from 'vuex'
10 17  
11 18 export default {
12 19 name: 'Layout',
... ... @@ -38,52 +45,63 @@ export default {
38 45 },
39 46 methods: {
40 47 handleClickOutside() {
41   - this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
  48 + this.$store.dispatch('app/closeSideBar', {withoutAnimation: false})
42 49 }
43 50 }
44 51 }
45 52 </script>
46 53  
47 54 <style lang="scss" scoped>
48   - @import "~@/assets/styles/mixin.scss";
49   - @import "~@/assets/styles/variables.scss";
50   -
51   - .app-wrapper {
52   - @include clearfix;
53   - position: relative;
54   - height: 100%;
55   - width: 100%;
56   -
57   - &.mobile.openSidebar {
58   - position: fixed;
59   - top: 0;
60   - }
61   - }
  55 +@import "~@/assets/styles/mixin.scss";
  56 +@import "~@/assets/styles/variables.scss";
62 57  
63   - .drawer-bg {
64   - background: #000;
65   - opacity: 0.3;
66   - width: 100%;
67   - top: 0;
68   - height: 100%;
69   - position: absolute;
70   - z-index: 999;
71   - }
  58 +.app-wrapper {
  59 + @include clearfix;
  60 + position: relative;
  61 + height: 100%;
  62 + width: 100%;
72 63  
73   - .fixed-header {
  64 + &.mobile.openSidebar {
74 65 position: fixed;
75 66 top: 0;
76   - right: 0;
77   - z-index: 9;
78   - width: calc(100% - #{$sideBarWidth});
79   - transition: width 0.28s;
80 67 }
  68 +}
81 69  
82   - .hideSidebar .fixed-header {
83   - width: calc(100% - 54px)
84   - }
  70 +.drawer-bg {
  71 + background: #000;
  72 + opacity: 0.3;
  73 + width: 100%;
  74 + top: 0;
  75 + height: 100%;
  76 + position: absolute;
  77 + z-index: 999;
  78 +}
85 79  
86   - .mobile .fixed-header {
87   - width: 100%;
88   - }
  80 +.fixed-header {
  81 + position: fixed;
  82 + top: 0;
  83 + right: 0;
  84 + z-index: 9;
  85 + width: calc(100% - #{$sideBarWidth});
  86 + transition: width 0.28s;
  87 +}
  88 +
  89 +.hideSidebar .fixed-header {
  90 + width: calc(100% - 54px)
  91 +}
  92 +
  93 +.mobile .fixed-header {
  94 + width: 100%;
  95 +}
  96 +
  97 +.preview figure {
  98 + float: left;
  99 + width: 30%;
  100 + height:calc(30vw - 0px);
  101 + margin: 1.5%;
  102 +}
  103 +
  104 +.preview figure img {
  105 + width: 400px;
  106 +}
89 107 </style>
... ...
trash-ui/src/main.js
  View file @32cd2a0
... ... @@ -37,8 +37,8 @@ Vue.prototype.handleTree = handleTree
37 37 Vue.prototype.parseStatus = parseStatus
38 38 Vue.prototype.checkPer = checkPermi
39 39  
40   -Vue.prototype.remoteFrame = "http://183.66.242.6:14601"
41   -// Vue.prototype.remoteFrame = "http://175.6.47.84:8008"
  40 +// Vue.prototype.remoteFrame = "http://183.66.242.6:14601"
  41 +Vue.prototype.remoteFrame = "http://175.6.47.84:8008"
42 42  
43 43 Vue.prototype.msgSuccess = function (msg) {
44 44 this.$message({ showClose: true, message: msg, type: "success" });
... ...
trash-ui/src/views/business/CompanyCredit/index.vue
  View file @32cd2a0
... ... @@ -61,7 +61,8 @@
61 61  
62 62 <el-row :gutter="10" class="mb8">
63 63 <el-col :span="1.5">
64   - <el-button type="primary" size="mini" @click="handleAdd" v-if="queryParams.status==0 && checkPer(['businessmanage.credit.CompanyCredit.add'])">新增</el-button>
  64 + <el-button type="primary" size="mini" @click="handleAdd"
  65 + v-if="queryParams.status==0 && checkPer(['businessmanage.credit.CompanyCredit.add'])">新增</el-button>
65 66 </el-col>
66 67 <el-col :span="1.5">
67 68 <el-button size="mini" @click="handleExport" v-hasPermi="['Company:credit:export']">导出</el-button>
... ...
trash-ui/src/views/business/dayWorkReport/index.vue
  View file @32cd2a0
... ... @@ -16,10 +16,14 @@
16 16 </el-col>
17 17  
18 18 <el-col :span="1.5">
19   - <el-button :class="{'el-button':true, 'el-button--primary':this.queryParams.pageStatus==4}" size="mini" @click="getList(4);">工地开停工</el-button>
  19 + <el-button :class="{'el-button':true, 'el-button--primary':this.queryParams.pageStatus==4}" size="mini" @click="getList(4);"
  20 + v-if="checkPer(['business.supervision.dayWorkReport.csopen'])"
  21 + >工地开停工</el-button>
20 22 </el-col>
21 23 <el-col :span="1.5">
22   - <el-button :class="{'el-button':true,'el-button--primary':this.queryParams.pageStatus==5}" size="mini" @click="getList(5);">处理场所开停工</el-button>
  24 + <el-button :class="{'el-button':true,'el-button--primary':this.queryParams.pageStatus==5}" size="mini" @click="getList(5);"
  25 + v-if="checkPer(['business.supervision.dayWorkReport.esopen'])"
  26 + >处理场所开停工</el-button>
23 27 </el-col>
24 28 </el-row>
25 29  
... ...
trash-ui/src/views/business/threestep/index.vue
  View file @32cd2a0
... ... @@ -88,7 +88,7 @@
88 88 </el-table-column>
89 89 <el-table-column label="报工状态" align="center" prop="status" width="180">
90 90 <template slot-scope="scope">
91   - <span>{{ scope.row.status==0 ? "待巡查" : scope.row.status==1 ? "巡查通过" : "巡查驳回"}}</span>
  91 + <span>{{ scope.row.status==0 ? "待巡查" : scope.row.status==1 ? "巡查通过" : scope.row.status==2 ? "巡查驳回" : "已停工"}}</span>
92 92 </template>
93 93 </el-table-column>
94 94 <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
... ...
trash-ui/src/views/daily/situation/index.vue
  View file @32cd2a0
... ... @@ -134,19 +134,19 @@
134 134 <editor v-model="form.numberOfVehicles" :min-height="192"/>
135 135 </el-form-item>
136 136  
137   - <el-form-item label="平台各类预警值信息(案卷情况)" prop="numberOfVehicles">
  137 + <el-form-item label="平台各类预警信息（案卷）情况" prop="numberOfVehicles">
138 138 <editor v-model="form.caseFileInfo" :min-height="192"/>
139 139 </el-form-item>
140 140  
141   - <el-form-item label="平台推送各类预警信息(案卷情况)" prop="numberOfVehicles">
  141 + <el-form-item label="平台推送各类预警（信息）案卷情况" prop="numberOfVehicles">
142 142 <editor v-model="form.warningCaseFileInfo" :min-height="192"/>
143 143 </el-form-item>
144 144  
145   - <el-form-item label="抽查预警信息(案卷情况)回复情况" prop="desc1">
  145 + <el-form-item label="抽查预警案卷回复情况" prop="desc1">
146 146 <editor v-model="form.desc1" :min-height="192"/>
147 147 </el-form-item>
148 148  
149   - <el-form-item label="'三无'违规情况" prop="desc2">
  149 + <el-form-item label="“三无”违规情况" prop="desc2">
150 150 <editor v-model="form.desc2" :min-height="192"/>
151 151 </el-form-item>
152 152  
... ... @@ -184,22 +184,22 @@
184 184 </el-row>
185 185 <el-row type="flex" justify="center" class="bd_left bd_right bd_bottom ">
186 186 <el-col :span="4"> <p >3</p></el-col>
187   - <el-col :span="6" class="bd_left bd_right"> <p >平台各类预警值信息(案卷情况)</p></el-col>
  187 + <el-col :span="6" class="bd_left bd_right"> <p >平台各类预警信息（案卷）情况</p></el-col>
188 188 <el-col :span="14"> <editor v-model="form.caseFileInfo" disabled/></el-col>
189 189 </el-row>
190 190 <el-row type="flex" justify="center" class="bd_left bd_right bd_bottom ">
191 191 <el-col :span="4"> <p >4</p></el-col>
192   - <el-col :span="6" class="bd_left bd_right"> <p >平台推送各类预警信息(案卷情况)</p></el-col>
  192 + <el-col :span="6" class="bd_left bd_right"> <p >平台推送各类预警（信息）案卷情况</p></el-col>
193 193 <el-col :span="14"> <editor v-model="form.warningCaseFileInfo" disabled/></el-col>
194 194 </el-row>
195 195 <el-row type="flex" justify="center" class="bd_left bd_right bd_bottom ">
196 196 <el-col :span="4"> <p >5</p></el-col>
197   - <el-col :span="6" class="bd_left bd_right"> <p >抽查预警信息(案卷情况)回复情况</p></el-col>
  197 + <el-col :span="6" class="bd_left bd_right"> <p >抽查预警案卷回复情况</p></el-col>
198 198 <el-col :span="14"> <editor v-model="form.desc1" disabled/></el-col>
199 199 </el-row>
200 200 <el-row type="flex" justify="center" class="bd_left bd_right bd_bottom ">
201 201 <el-col :span="4"> <p >6</p></el-col>
202   - <el-col :span="6" class="bd_left bd_right"> <p >三无'违规情况</p></el-col>
  202 + <el-col :span="6" class="bd_left bd_right"> <p >“三无”违规情况</p></el-col>
203 203 <el-col :span="14"> <editor v-model="form.desc2" disabled/></el-col>
204 204 </el-row>
205 205  
... ...
trash-ui/src/views/h5/threestep/index.vue
  View file @32cd2a0
... ... @@ -51,7 +51,7 @@
51 51 <span >{{item.place}}</span>
52 52 </el-col>
53 53 </el-row>
54   -
  54 +
55 55 <el-row class="card_row" style="margin-top: 5px;">
56 56 <el-col :span="24">
57 57 <div>自查时间:{{item.selfCheckTime}}</div>
... ... @@ -64,9 +64,13 @@
64 64 </el-col>
65 65 </el-row>
66 66  
  67 + <span v-if="item.status==3">已停工"</span>
  68 +
  69 +
67 70 <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>
68 71 <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>
69   -
  72 +
  73 +
70 74 <el-button size="mini" type="text" @click="handleUpdate(item,1)" v-hasPermi="['business:threestep:edit']">查看详情</el-button>
71 75  
72 76 </el-card>
... ...
trash-workFlow/src/main/java/com/trash/business/controller/EarthsitesCreditController.java
  View file @32cd2a0
... ... @@ -24,7 +24,7 @@ import com.trash.common.utils.poi.ExcelUtil;
24 24 import com.trash.common.core.page.TableDataInfo;
25 25  
26 26 /**
27   - * 消纳场失信Controller
  27 + * 处理场所失信Controller
28 28 *
29 29 * @author trash
30 30 * @date 2023-04-26
... ... @@ -37,7 +37,7 @@ public class EarthsitesCreditController extends BaseController
37 37 private IEarthsitesCreditService earthsitesCreditService;
38 38  
39 39 /**
40   - * 查询消纳场失信列表
  40 + * 查询处理场所失信列表
41 41 */
42 42 @GetMapping("/list")
43 43 public TableDataInfo list(EarthsitesCredit earthsitesCredit)
... ... @@ -48,11 +48,11 @@ public class EarthsitesCreditController extends BaseController
48 48 }
49 49  
50 50 /**
51   - * 导出消纳场失信列表
  51 + * 导出处理场所失信列表
52 52 */
53 53  
54 54  
55   - @Log(title = "消纳场失信", businessType = BusinessType.EXPORT)
  55 + @Log(title = "处理场所失信", businessType = BusinessType.EXPORT)
56 56 @GetMapping("/export")
57 57 public AjaxResult export(EarthsitesCredit earthsitesCredit)
58 58 {
... ... @@ -71,11 +71,11 @@ public class EarthsitesCreditController extends BaseController
71 71 withOut.add("time");
72 72 }
73 73 ExcelUtil<EarthsitesCredit> util = new ExcelUtil<EarthsitesCredit>(EarthsitesCredit.class);
74   - return util.exportExcel(list, "消纳场失信",withOut);
  74 + return util.exportExcel(list, "处理场所失信",withOut);
75 75 }
76 76  
77 77 /**
78   - * 获取消纳场失信详细信息
  78 + * 获取处理场所失信详细信息
79 79 */
80 80 @GetMapping(value = "/{id}")
81 81 public AjaxResult getInfo(@PathVariable("id") Long id)
... ... @@ -84,9 +84,9 @@ public class EarthsitesCreditController extends BaseController
84 84 }
85 85  
86 86 /**
87   - * 新增消纳场失信
  87 + * 新增处理场所失信
88 88 */
89   - @Log(title = "消纳场失信", businessType = BusinessType.INSERT)
  89 + @Log(title = "处理场所失信", businessType = BusinessType.INSERT)
90 90 @PostMapping
91 91 public AjaxResult add(@RequestBody EarthsitesCredit earthsitesCredit)
92 92 {
... ... @@ -94,9 +94,9 @@ public class EarthsitesCreditController extends BaseController
94 94 }
95 95  
96 96 /**
97   - * 修改消纳场失信
  97 + * 修改处理场所失信
98 98 */
99   - @Log(title = "消纳场失信", businessType = BusinessType.UPDATE)
  99 + @Log(title = "处理场所失信", businessType = BusinessType.UPDATE)
100 100 @PutMapping
101 101 public AjaxResult edit(@RequestBody EarthsitesCredit earthsitesCredit)
102 102 {
... ... @@ -104,9 +104,9 @@ public class EarthsitesCreditController extends BaseController
104 104 }
105 105  
106 106 /**
107   - * 删除消纳场失信
  107 + * 删除处理场所失信
108 108 */
109   - @Log(title = "消纳场失信", businessType = BusinessType.DELETE)
  109 + @Log(title = "处理场所失信", businessType = BusinessType.DELETE)
110 110 @DeleteMapping("/{ids}")
111 111 public AjaxResult remove(@PathVariable Long[] ids)
112 112 {
... ...
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionThreestepController.java
  View file @32cd2a0
... ... @@ -139,9 +139,16 @@ public class SupervisionThreestepController extends BaseController
139 139  
140 140 @PostMapping("/getByObjects")
141 141 public AjaxResult getLists(@RequestBody SupervisionThreestep supervisionThreestep)
142   - {
143   - List<SupervisionThreestep> list = supervisionThreestepService.selectSupervisionThreestepList(supervisionThreestep);
144   - return AjaxResult.success(list);
  142 + {
  143 + AjaxResult ajaxResult = AjaxResult.success();
  144 + try {
  145 + ajaxResult.put("result", supervisionThreestepService.selectSupervisionThreestepList(supervisionThreestep));
  146 + } catch (Exception e) {
  147 + e.printStackTrace();
  148 + }
  149 +
  150 + return ajaxResult;
  151 +
145 152 }
146 153  
147 154 String[] outside = {"长沙县", "望城区", "浏阳市", "宁乡市", "株洲市", "湘潭市", "汩罗市", "湘阴县"};
... ...
trash-workFlow/src/main/java/com/trash/business/controller/TruckActivateController.java
  View file @32cd2a0
... ... @@ -177,7 +177,6 @@ public class TruckActivateController extends BaseController
177 177 List<TruckActivate> list = truckActivateService.selectTruckActivateList(truckActivate);
178 178 List<TruckActivateInfo> outList = new ArrayList<>();
179 179  
180   -
181 180 for(int i = 0;i<list.size();i++){
182 181  
183 182 TruckActivate turck = list.get(i);
... ... @@ -199,7 +198,6 @@ public class TruckActivateController extends BaseController
199 198 info.setEffectiveFrom(object.getString("effectiveFrom"));
200 199 info.setEffectiveEnd(object.getString("effectiveEnd"));
201 200  
202   -
203 201 outList.add(info);
204 202  
205 203 }
... ... @@ -259,10 +257,17 @@ public class TruckActivateController extends BaseController
259 257  
260 258 @PostMapping(value="/getTruckListByObjects")
261 259 public AjaxResult getTruckListByObjects(@RequestBody TruckActivate truckActivate)
262   - {
263   - List<TruckActivate> list = truckActivateService.getTruckListByObjects(truckActivate);
264   -
265   - return AjaxResult.success(list);
  260 + {
  261 +
  262 + AjaxResult ajaxResult = AjaxResult.success();
  263 + try {
  264 + ajaxResult.put("result", truckActivateService.getTruckListByObjects(truckActivate));
  265 + } catch (Exception e) {
  266 + e.printStackTrace();
  267 + }
  268 +
  269 + return ajaxResult;
  270 +
266 271 }
267 272  
268 273  
... ...
trash-workFlow/src/main/java/com/trash/business/domain/EarthsitesCredit.java
  View file @32cd2a0
... ... @@ -8,7 +8,7 @@ import com.trash.common.annotation.Excel;
8 8 import com.trash.common.core.domain.BaseEntity;
9 9  
10 10 /**
11   - * 消纳场失信对象 earthsites_credit
  11 + * 处理场所失信对象 earthsites_credit
12 12 *
13 13 * @author trash
14 14 * @date 2023-04-26
... ... @@ -21,12 +21,12 @@ public class EarthsitesCredit extends BaseEntity
21 21 @Excel(name = "序号")
22 22 private Long id;
23 23  
24   - /** 消纳场名称 */
25   - @Excel(name = "消纳场名称")
  24 + /** 处理场所名称 */
  25 + @Excel(name = "处理场所名称")
26 26 private String name;
27 27  
28   - /** 消纳场类型 */
29   - @Excel(name = "消纳场类型")
  28 + /** 处理场所类型 */
  29 + @Excel(name = "处理场所类型")
30 30 private String type;
31 31  
32 32 /** 失信时间 */
... ...
trash-workFlow/src/main/java/com/trash/business/domain/SupervisionSpecial.java
  View file @32cd2a0
... ... @@ -20,7 +20,7 @@ public class SupervisionSpecial extends BaseEntity
20 20 private String id;
21 21  
22 22 /** 类型 */
23   - @Excel(name = "类型", readConverterExp = "0=工地,1=消纳场")
  23 + @Excel(name = "类型", readConverterExp = "0=工地,1=处理场所")
24 24 private String type;
25 25  
26 26 /** 督查事项 */
... ...
trash-workFlow/src/main/java/com/trash/business/domain/SupervisionThreestep.java
  View file @32cd2a0
... ... @@ -24,8 +24,8 @@ public class SupervisionThreestep extends BaseEntity
24 24 private Long id;
25 25  
26 26  
27   - /** 项目类型 消纳场/工地 */
28   - @Excel(name = "项目类型",readConverterExp = "0=工地,1=消纳场")
  27 + /** 项目类型 处理场所/工地 */
  28 + @Excel(name = "项目类型",readConverterExp = "0=工地,1=处理场所")
29 29 private Long type;
30 30  
31 31 /** 工地名称 */
... ... @@ -43,7 +43,7 @@ public class SupervisionThreestep extends BaseEntity
43 43 /** 基础数据ID */
44 44 private String objectId;
45 45  
46   - /** 消纳场ID */
  46 + /** 处理场所ID */
47 47 private String earthsitesId;
48 48  
49 49 /** 检查时间 */
... ... @@ -61,7 +61,7 @@ public class SupervisionThreestep extends BaseEntity
61 61 @Excel(name = "报工状态",readConverterExp = "0=待巡查,1=巡查通过,1=巡查驳回")
62 62 private Long status;
63 63  
64   - /** 消纳场名称 */
  64 + /** 处理场所名称 */
65 65 private String earthsitesName;
66 66  
67 67 /** 消纳合同编号 */
... ...
trash-workFlow/src/main/java/com/trash/business/domain/TruckActivate.java
  View file @32cd2a0
... ... @@ -39,8 +39,8 @@ public class TruckActivate extends BaseEntity
39 39 @JsonFormat(pattern = "yyyy-MM-dd")
40 40 private Date time;
41 41  
42   - /** 消纳场 */
43   - @Excel(name = "消纳场")
  42 + /** 处理场所 */
  43 + @Excel(name = "处理场所")
44 44 private String earthsite;
45 45  
46 46  
... ...
trash-workFlow/src/main/java/com/trash/business/domain/dayWork.java
  View file @32cd2a0
... ... @@ -36,8 +36,8 @@ public class dayWork extends BaseEntity
36 36 @Excel(name = "申请开工时间")
37 37 private String selfCheckTime;
38 38  
39   - /** 消纳场名称 */
40   - @Excel(name = "消纳场名称")
  39 + /** 处理场所名称 */
  40 + @Excel(name = "处理场所名称")
41 41 private String ename;
42 42  
43 43 /** 管辖区 */
... ...
trash-workFlow/src/main/java/com/trash/business/mapper/EarthsitesCreditMapper.java
  View file @32cd2a0
... ... @@ -6,7 +6,7 @@ import com.trash.business.domain.ConstructionCredit;
6 6 import com.trash.business.domain.EarthsitesCredit;
7 7  
8 8 /**
9   - * 消纳场失信Mapper接口
  9 + * 处理场所失信Mapper接口
10 10 *
11 11 * @author trash
12 12 * @date 2023-04-26
... ... @@ -14,47 +14,47 @@ import com.trash.business.domain.EarthsitesCredit;
14 14 public interface EarthsitesCreditMapper
15 15 {
16 16 /**
17   - * 查询消纳场失信
  17 + * 查询处理场所失信
18 18 *
19   - * @param id 消纳场失信ID
20   - * @return 消纳场失信
  19 + * @param id 处理场所失信ID
  20 + * @return 处理场所失信
21 21 */
22 22 EarthsitesCredit selectEarthsitesCreditById(Long id);
23 23  
24 24 /**
25   - * 查询消纳场失信列表
  25 + * 查询处理场所失信列表
26 26 *
27   - * @param earthsitesCredit 消纳场失信
28   - * @return 消纳场失信集合
  27 + * @param earthsitesCredit 处理场所失信
  28 + * @return 处理场所失信集合
29 29 */
30 30 List<EarthsitesCredit> selectEarthsitesCreditList(EarthsitesCredit earthsitesCredit);
31 31  
32 32 /**
33   - * 新增消纳场失信
  33 + * 新增处理场所失信
34 34 *
35   - * @param earthsitesCredit 消纳场失信
  35 + * @param earthsitesCredit 处理场所失信
36 36 * @return 结果
37 37 */
38 38 int insertEarthsitesCredit(EarthsitesCredit earthsitesCredit);
39 39  
40 40 /**
41   - * 修改消纳场失信
  41 + * 修改处理场所失信
42 42 *
43   - * @param earthsitesCredit 消纳场失信
  43 + * @param earthsitesCredit 处理场所失信
44 44 * @return 结果
45 45 */
46 46 int updateEarthsitesCredit(EarthsitesCredit earthsitesCredit);
47 47  
48 48 /**
49   - * 删除消纳场失信
  49 + * 删除处理场所失信
50 50 *
51   - * @param id 消纳场失信ID
  51 + * @param id 处理场所失信ID
52 52 * @return 结果
53 53 */
54 54 int deleteEarthsitesCreditById(Long id);
55 55  
56 56 /**
57   - * 批量删除消纳场失信
  57 + * 批量删除处理场所失信
58 58 *
59 59 * @param ids 需要删除的数据ID
60 60 * @return 结果
... ...
trash-workFlow/src/main/java/com/trash/business/service/IEarthsitesCreditService.java
  View file @32cd2a0
... ... @@ -6,7 +6,7 @@ import com.trash.business.domain.ConstructionCredit;
6 6 import com.trash.business.domain.EarthsitesCredit;
7 7  
8 8 /**
9   - * 消纳场失信Service接口
  9 + * 处理场所失信Service接口
10 10 *
11 11 * @author trash
12 12 * @date 2023-04-26
... ... @@ -14,49 +14,49 @@ import com.trash.business.domain.EarthsitesCredit;
14 14 public interface IEarthsitesCreditService
15 15 {
16 16 /**
17   - * 查询消纳场失信
  17 + * 查询处理场所失信
18 18 *
19   - * @param id 消纳场失信ID
20   - * @return 消纳场失信
  19 + * @param id 处理场所失信ID
  20 + * @return 处理场所失信
21 21 */
22 22 EarthsitesCredit selectEarthsitesCreditById(Long id);
23 23  
24 24 /**
25   - * 查询消纳场失信列表
  25 + * 查询处理场所失信列表
26 26 *
27   - * @param earthsitesCredit 消纳场失信
28   - * @return 消纳场失信集合
  27 + * @param earthsitesCredit 处理场所失信
  28 + * @return 处理场所失信集合
29 29 */
30 30 List<EarthsitesCredit> selectEarthsitesCreditList(EarthsitesCredit earthsitesCredit);
31 31  
32 32 /**
33   - * 新增消纳场失信
  33 + * 新增处理场所失信
34 34 *
35   - * @param earthsitesCredit 消纳场失信
  35 + * @param earthsitesCredit 处理场所失信
36 36 * @return 结果
37 37 */
38 38 int insertEarthsitesCredit(EarthsitesCredit earthsitesCredit);
39 39  
40 40 /**
41   - * 修改消纳场失信
  41 + * 修改处理场所失信
42 42 *
43   - * @param earthsitesCredit 消纳场失信
  43 + * @param earthsitesCredit 处理场所失信
44 44 * @return 结果
45 45 */
46 46 int updateEarthsitesCredit(EarthsitesCredit earthsitesCredit);
47 47  
48 48 /**
49   - * 批量删除消纳场失信
  49 + * 批量删除处理场所失信
50 50 *
51   - * @param ids 需要删除的消纳场失信ID
  51 + * @param ids 需要删除的处理场所失信ID
52 52 * @return 结果
53 53 */
54 54 int deleteEarthsitesCreditByIds(Long[] ids);
55 55  
56 56 /**
57   - * 删除消纳场失信信息
  57 + * 删除处理场所失信信息
58 58 *
59   - * @param id 消纳场失信ID
  59 + * @param id 处理场所失信ID
60 60 * @return 结果
61 61 */
62 62 int deleteEarthsitesCreditById(Long id);
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/EarthsitesCreditServiceImpl.java
  View file @32cd2a0
... ... @@ -15,7 +15,7 @@ import com.trash.business.service.IEarthsitesCreditService;
15 15 import com.trash.common.utils.RemoteServerUtils;
16 16  
17 17 /**
18   - * 消纳场失信Service业务层处理
  18 + * 处理场所失信Service业务层处理
19 19 *
20 20 * @author trash
21 21 * @date 2023-04-26
... ... @@ -27,10 +27,10 @@ public class EarthsitesCreditServiceImpl implements IEarthsitesCreditService
27 27 private EarthsitesCreditMapper earthsitesCreditMapper;
28 28  
29 29 /**
30   - * 查询消纳场失信
  30 + * 查询处理场所失信
31 31 *
32   - * @param id 消纳场失信ID
33   - * @return 消纳场失信
  32 + * @param id 处理场所失信ID
  33 + * @return 处理场所失信
34 34 */
35 35 @Override
36 36 public EarthsitesCredit selectEarthsitesCreditById(Long id)
... ... @@ -39,10 +39,10 @@ public class EarthsitesCreditServiceImpl implements IEarthsitesCreditService
39 39 }
40 40  
41 41 /**
42   - * 查询消纳场失信列表
  42 + * 查询处理场所失信列表
43 43 *
44   - * @param earthsitesCredit 消纳场失信
45   - * @return 消纳场失信
  44 + * @param earthsitesCredit 处理场所失信
  45 + * @return 处理场所失信
46 46 */
47 47 @Override
48 48 public List<EarthsitesCredit> selectEarthsitesCreditList(EarthsitesCredit earthsitesCredit)
... ... @@ -51,9 +51,9 @@ public class EarthsitesCreditServiceImpl implements IEarthsitesCreditService
51 51 }
52 52  
53 53 /**
54   - * 新增消纳场失信
  54 + * 新增处理场所失信
55 55 *
56   - * @param earthsitesCredit 消纳场失信
  56 + * @param earthsitesCredit 处理场所失信
57 57 * @return 结果
58 58 */
59 59 @Override
... ... @@ -91,9 +91,9 @@ public class EarthsitesCreditServiceImpl implements IEarthsitesCreditService
91 91 }
92 92  
93 93 /**
94   - * 修改消纳场失信
  94 + * 修改处理场所失信
95 95 *
96   - * @param earthsitesCredit 消纳场失信
  96 + * @param earthsitesCredit 处理场所失信
97 97 * @return 结果
98 98 */
99 99 @Override
... ... @@ -120,9 +120,9 @@ public class EarthsitesCreditServiceImpl implements IEarthsitesCreditService
120 120 }
121 121  
122 122 /**
123   - * 批量删除消纳场失信
  123 + * 批量删除处理场所失信
124 124 *
125   - * @param ids 需要删除的消纳场失信ID
  125 + * @param ids 需要删除的处理场所失信ID
126 126 * @return 结果
127 127 */
128 128 @Override
... ... @@ -132,9 +132,9 @@ public class EarthsitesCreditServiceImpl implements IEarthsitesCreditService
132 132 }
133 133  
134 134 /**
135   - * 删除消纳场失信信息
  135 + * 删除处理场所失信信息
136 136 *
137   - * @param id 消纳场失信ID
  137 + * @param id 处理场所失信ID
138 138 * @return 结果
139 139 */
140 140 @Override
... ...
trash-workFlow/src/main/java/com/trash/caseOffline/domain/CaseOffline.java
  View file @32cd2a0
... ... @@ -26,10 +26,10 @@ public class CaseOffline extends BaseEntity
26 26 private String number;
27 27  
28 28 /** 案卷类型 */
29   - @Excel(name = "案卷类型",readConverterExp = "0=渣土处置工地（含消纳场）的渣土运输车辆出场车身不洁，"
  29 + @Excel(name = "案卷类型",readConverterExp = "0=渣土处置工地（含处理场所）的渣土运输车辆出场车身不洁，"
30 30 + "车轮带泥,1=未洗车出场或者出场清洁不彻底,2=渣土运输车辆货箱顶盖未按规定关闭到位或未按规定和标准装载渣土出场,"
31 31 + "3=非核准车辆进入渣土处置工地运输渣土,4=渣土处置工地未按规定时间开停工,"
32   - + "5=渣土处置工地洗车设施等破损、未正常使用及措施不到位的,6=渣土处置工地、消纳场(含回填场）出入口两侧50米范围内出现渣土污染、污水外排等现象"
  32 + + "5=渣土处置工地洗车设施等破损、未正常使用及措施不到位的,6=渣土处置工地、处理场所(含回填场）出入口两侧50米范围内出现渣土污染、污水外排等现象"
33 33 + "7=无许可消纳（工）,8=无许可消纳（消）,9=使用非专用车辆")
34 34 private String type;
35 35  
... ...
trash-workFlow/src/main/java/com/trash/caseOffline/service/impl/CaseOfflineServiceImpl.java
  View file @32cd2a0
... ... @@ -80,13 +80,13 @@ public class CaseOfflineServiceImpl implements ICaseOfflineService
80 80  
81 81  
82 82 String[] typeName = {
83   - "渣土处置工地（含消纳场）的渣土运输车辆出场车身不洁，车轮带泥",
  83 + "渣土处置工地（含处理场所）的渣土运输车辆出场车身不洁，车轮带泥",
84 84 "未洗车出场或者出场清洁不彻底",
85 85 "渣土运输车辆货箱顶盖未按规定关闭到位或未按规定和标准装载渣土出场",
86 86 "非核准车辆进入渣土处置工地运输渣土",
87 87 "渣土处置工地未按规定时间开停工",
88 88 "渣土处置工地洗车设施等破损、未正常使用及措施不到位的",
89   - "渣土处置工地、消纳场(含回填场）出入口两侧50米范围内出现渣土污染、污水外排等现象",
  89 + "渣土处置工地、处理场所(含回填场）出入口两侧50米范围内出现渣土污染、污水外排等现象",
90 90 "无许可消纳（工）",
91 91 "无许可消纳（消）",
92 92 "使用非专用车辆"};
... ...
trash-workFlow/src/main/java/com/trash/casefile/controller/RemoteServerController.java
  View file @32cd2a0
... ... @@ -39,7 +39,7 @@ public class RemoteServerController {
39 39 public AjaxResult getEarthSitesList(){
40 40 JSONArray jsonArray = redisCache.getCacheObject("earthSitesList");
41 41 if(jsonArray==null){
42   - return AjaxResult.error("获取消纳场列表失败!请稍后重试或联系管理员");
  42 + return AjaxResult.error("获取处理场所列表失败!请稍后重试或联系管理员");
43 43 }
44 44 return AjaxResult.success(jsonArray);
45 45 }
... ...
trash-workFlow/src/main/java/com/trash/casefile/controller/ViolationCaseFileController.java
  View file @32cd2a0
... ... @@ -195,7 +195,7 @@ public class ViolationCaseFileController extends BaseController
195 195  
196 196 String[] caseType = {"进入非专用车辆","无许可手续（工）","无许可手续（消）","黄土覆盖情况","出入口路面污染","出入口道路硬化","车辆冲洗是否到位",
197 197 "雾炮机是否正常开启","使用费专用车运输","监控点位未对准","未报开工作业","视频设备离线超时报警","三无车辆进入工地","未按时间作业",
198   - "未报开工作业","视频设备离线超时报警","三无车辆进入消纳场","未到指定的消纳场作业","离线运输报警（工）","离线运输报警（消）","未激活车辆作业",
  198 + "未报开工作业","视频设备离线超时报警","三无车辆进入处理场所","未到指定的处理场所作业","离线运输报警（工）","离线运输报警（消）","未激活车辆作业",
199 199 "未核准作业车辆作业","未按线路行驶","闯禁行驶","失信车辆作业","卫星定位异常","其他2","其他3","其他4","其他5"};
200 200  
201 201 @GetMapping(value = "/caseTable")
... ...
trash-workFlow/src/main/java/com/trash/casefile/controller/ViolationWarningInformationController.java
  View file @32cd2a0
... ... @@ -196,7 +196,7 @@ public class ViolationWarningInformationController extends BaseController
196 196  
197 197  
198 198 String[] caseType = {"工地预警-未报开工作业", "工地预警-视频设备离线超时报警", "工地预警-三无车辆进入工地", "工地预警-未按时间作业",
199   - "消纳场预警-未报开工作业", "消纳场预警-视频设备离线超时报警", "消纳场预警-三无车辆进入消纳场", "消纳场预警-未到指定的消纳场作业",
  199 + "处理场所预警-未报开工作业", "处理场所预警-视频设备离线超时报警", "处理场所预警-三无车辆进入处理场所", "处理场所预警-未到指定的处理场所作业",
200 200 "离线运输报警(工)", "离线运输报警(消)", "未激活车辆作业", "未核准作业车辆作业", "未按线路行驶",
201 201 "闯禁行驶", "失信车辆作业"};
202 202  
... ...
trash-workFlow/src/main/java/com/trash/casefile/domain/ViolationCaseFile.java
  View file @32cd2a0
... ... @@ -33,7 +33,7 @@ public class ViolationCaseFile extends BaseEntity
33 33 private String projectName;
34 34  
35 35 /** 违规对象类型 */
36   - @Excel(name = "违规对象类型",readConverterExp = "0=工地,1=消纳场,2=企业")
  36 + @Excel(name = "违规对象类型",readConverterExp = "0=工地,1=处理场所,2=企业")
37 37 private String violationObjectType;
38 38  
39 39  
... ...
trash-workFlow/src/main/java/com/trash/casefile/domain/ViolationWarningInformation.java
  View file @32cd2a0
... ... @@ -43,7 +43,7 @@ public class ViolationWarningInformation extends BaseEntity {
43 43 /**
44 44 * 违规对象类型
45 45 */
46   - @Excel(name = "违规对象类型",readConverterExp = "0=工地,1=消纳场,2=企业")
  46 + @Excel(name = "违规对象类型",readConverterExp = "0=工地,1=处理场所,2=企业")
47 47 private String violationObjectType;
48 48  
49 49 /**
... ...
trash-workFlow/src/main/java/com/trash/casefile/kafka/Consumer.java
  View file @32cd2a0
... ... @@ -61,7 +61,7 @@ public class Consumer {
61 61 public void autoViolationWarning(String data,String id) throws InterruptedException, IOException {
62 62  
63 63 String[] code = {"44030020=工地预警-未报开工作业", "44030021=工地预警-视频设备离线超时报警", "44030022=工地预警-三无车辆进入工地", "44030023=工地预警-未按时间作业",
64   - "44030024=消纳场预警-未报开工作业", "44030025=消纳场预警-视频设备离线超时报警", "44030026=消纳场预警-三无车辆进入消纳场", "44030027=消纳场预警-未到指定的消纳场作业",
  64 + "44030024=处理场所预警-未报开工作业", "44030025=处理场所预警-视频设备离线超时报警", "44030026=处理场所预警-三无车辆进入处理场所", "44030027=处理场所预警-未到指定的处理场所作业",
65 65 "44030028=离线运输报警(工)", "44030029=离线运输报警(消)", "44030030=未激活车辆作业", "44030031=未核准作业车辆作业", "44030032=未按线路行驶",
66 66 "44030033=闯禁行驶", "44030034=失信车辆作业", "44030035=卫星定位异常"};
67 67  
... ... @@ -135,7 +135,7 @@ public class Consumer {
135 135 violationWarningInformation.setCreateBy("长沙市建筑垃圾智慧监管平台");
136 136 //推送对象
137 137 violationWarningInformation.setViolationGrade("一般类");
138   - //项目名称（工地名称，消纳场名称）
  138 + //项目名称（工地名称，处理场所名称）
139 139  
140 140 violationWarningInformation.setSendObject("区管理部门");
141 141 String describe = "";
... ... @@ -273,7 +273,7 @@ public class Consumer {
273 273 violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
274 274 break;
275 275  
276   - case "44030024"://消纳场预警-未报开工作业
  276 + case "44030024"://处理场所预警-未报开工作业
277 277 //获取报警次数
278 278 count = redisCache.getCacheObject(nowDate+jsonObject.getString("siteId")+"44030024")==null?1:Integer.parseInt(redisCache.getCacheObject(nowDate+jsonObject.getString("siteId")+"44030024").toString())+1;
279 279 //获取累计报警描述
... ... @@ -305,10 +305,10 @@ public class Consumer {
305 305 //累计描述
306 306 redisCache.setCacheObject(nowDate+jsonObject.getString("siteId")+"44030024describe",describe,1, TimeUnit.DAYS);
307 307 break;
308   - case "44030027"://消纳场预警-未到指定的消纳场作业
309   - case "44030026"://消纳场预警-三无车辆进入消纳场
  308 + case "44030027"://处理场所预警-未到指定的处理场所作业
  309 + case "44030026"://处理场所预警-三无车辆进入处理场所
310 310 case "44030029"://离线运输报警(消)
311   - case "44030025"://消纳场预警-视频设备离线超时报警
  311 + case "44030025"://处理场所预警-视频设备离线超时报警
312 312 violationWarningInformation.setViolationObjectType("1");
313 313 violationWarningInformation.setSendObject("区管理部门");
314 314 violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
... ...
trash-workFlow/src/main/java/com/trash/casefile/service/impl/ViolationCaseFileServiceImpl.java
  View file @32cd2a0
... ... @@ -128,7 +128,7 @@ public class ViolationCaseFileServiceImpl implements IViolationCaseFileService
128 128 i = 2;
129 129 }
130 130 }
131   - if(violationCaseFile.getViolationType().equals("三无车辆进入工地")||violationCaseFile.getViolationType().equals("三无车辆进入消纳场")||violationCaseFile.getViolationType().equals("三无车辆运输")){
  131 + if(violationCaseFile.getViolationType().equals("三无车辆进入工地")||violationCaseFile.getViolationType().equals("三无车辆进入处理场所")||violationCaseFile.getViolationType().equals("三无车辆运输")){
132 132 i = 2;
133 133 }
134 134  
... ...
trash-workFlow/src/main/java/com/trash/other/domain/ProjectCheck.java
  View file @32cd2a0
... ... @@ -167,8 +167,8 @@ public class ProjectCheck extends BaseEntity
167 167 @Excel(name = "周边市容环境")
168 168 private String environment;
169 169  
170   - /** 在用消纳场地及对应线路 */
171   - @Excel(name = "在用消纳场地及对应线路")
  170 + /** 在用处理场所地及对应线路 */
  171 + @Excel(name = "在用处理场所地及对应线路")
172 172 private String line;
173 173  
174 174 /** 主要问题以及整改意见 */
... ...
trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
  View file @32cd2a0
... ... @@ -84,7 +84,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
84 84 @Autowired
85 85 SysLoginService loginService;
86 86  
87   - String siteType[] = { "消纳场", "建筑垃圾资源化处置场", "盾构土环保处置场", "盾构土应急消纳场", "回填场" };
  87 + String siteType[] = { "处理场所", "建筑垃圾资源化处置场", "盾构土环保处置场", "盾构土应急处理场所", "回填场" };
88 88  
89 89 String outArea = "株洲市,湘潭市,汨罗市,湘阴县";
90 90  
... ...