youxiw2000 / trash · Commits

Commit 8a86ae3b8521552b45f348291d418dd83d078f7f

Authored by youxiw2000
1 parent 982959cf
build: skipped

m

Inline Side-by-side
Showing 24 changed files with 529 additions and 439 deletions
trash-admin/src/main/resources/application-dev.yml
  View file @8a86ae3
... ... @@ -16,10 +16,10 @@ trash:
16 16 # 验证码类型 math 数组计算 char 字符验证
17 17 captchaType: math
18 18 # 远程服务器地址
19   - #remotePath: http://175.6.47.84:8008
20   - #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
21   - remotePath: http://183.66.242.6:14601
22   - token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
  19 + remotePath: http://175.6.47.84:8008
  20 + token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
  21 + #remotePath: http://183.66.242.6:14601
  22 + #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
23 23  
24 24  
25 25  
... ...
trash-ui/dist.zip
View file @8a86ae3
No preview for this file type
trash-ui/src/api/truck_active.js
  View file @8a86ae3
... ... @@ -176,8 +176,22 @@ export default {
176 176 this.openActivateTime = true;
177 177 this.queryParams.status = "1";
178 178 }
179   - this.loading = true;
180   - listTruckActivate(this.queryParams).then(response => {
  179 + this.loading = true;
  180 +
  181 + if(this.queryParams.createTime){
  182 + this.queryParams.startTime = this.queryParams.createTime[0];
  183 + this.queryParams.endTime = this.queryParams.createTime[1];
  184 + }
  185 +
  186 + const query = {};
  187 +
  188 + for(var i in this.queryParams){
  189 + query[i] = this.queryParams[i];
  190 + }
  191 +
  192 + query.createTime = null;
  193 +
  194 + listTruckActivate(query).then(response => {
181 195 this.truckActivateList = response.rows;
182 196 this.total = response.total;
183 197 this.loading = false;
... ... @@ -426,14 +440,26 @@ export default {
426 440 })
427 441 },
428 442 /** 导出按钮操作 */
429   - handleExport() {
430   - const queryParams = this.queryParams;
  443 + handleExport() {
  444 + if(this.queryParams.createTime){
  445 + this.queryParams.startTime = this.queryParams.createTime[0];
  446 + this.queryParams.endTime = this.queryParams.createTime[1];
  447 + }
  448 +
  449 + const query = {};
  450 +
  451 + for(var i in this.queryParams){
  452 + query[i] = this.queryParams[i];
  453 + }
  454 +
  455 + query.createTime = null;
  456 +
431 457 this.$confirm('是否确认导出所有车辆激活数据项?', "警告", {
432 458 confirmButtonText: "确定",
433 459 cancelButtonText: "取消",
434 460 type: "warning"
435 461 }).then(function() {
436   - return exportTruckActivate(queryParams);
  462 + return exportTruckActivate(query);
437 463 }).then(response => {
438 464 this.download(response.message);
439 465 })
... ...
trash-ui/src/api/warningInfo.js
  View file @8a86ae3
... ... @@ -163,6 +163,10 @@ export default {
163 163 {
164 164 code: 14,
165 165 name: "失信车辆作业"
  166 + },
  167 + {
  168 + code: 14,
  169 + name: "卫星定位异常"
166 170 }
167 171 ],
168 172 projectNameList: {},
... ... @@ -276,16 +280,16 @@ export default {
276 280 this.queryParams.startTime = this.queryParams.createTime[0];
277 281 this.queryParams.endTime = this.queryParams.createTime[1];
278 282 }
279   -
  283 +
280 284 let query = {};
281   -
  285 +
282 286 for(var i in this.queryParams){
283 287 query[i] = this.queryParams[i];
284 288 }
285   -
  289 +
286 290 query.createTime = null;
287   -
288   -
  291 +
  292 +
289 293 listViolationWarningInformation(query).then(response => {
290 294 this.violationWarningInformationList = response.rows;
291 295 this.total = response.total;
... ... @@ -440,20 +444,20 @@ export default {
440 444 },
441 445 /** 导出按钮操作 */
442 446 handleExport() {
443   -
  447 +
444 448 if(this.queryParams.createTime){
445 449 this.queryParams.startTime = this.queryParams.createTime[0];
446 450 this.queryParams.endTime = this.queryParams.createTime[1];
447 451 }
448   -
  452 +
449 453 const query = {};
450   -
  454 +
451 455 for(var i in this.queryParams){
452 456 query[i] = this.queryParams[i];
453 457 }
454   -
  458 +
455 459 query.createTime = null;
456   -
  460 +
457 461 this.$confirm('是否确认导出所有违规预警信息数据项?', "警告", {
458 462 confirmButtonText: "确定",
459 463 cancelButtonText: "取消",
... ...
trash-ui/src/layout/index.vue
  View file @8a86ae3
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/layout/index55.vue renamed to trash-ui/src/layout/index3.vue
  View file @8a86ae3
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/views/business/truckActivate/index.vue
  View file @8a86ae3
... ... @@ -34,13 +34,11 @@
34 34 <el-option label="已激活" value="1"/>
35 35 </el-select>
36 36 </el-form-item>
37   - <el-form-item label="激活时间" prop="activateDate" v-if="openActivateTime">
38   - <el-date-picker size="small" style="width: 200px"
39   - v-model="queryParams.activateDate"
40   - type="datetime"
41   - format="yyyy-MM-dd HH:mm:ss"
42   - value-format="yyyy-MM-dd HH:mm:ss"
43   - placeholder="选择激活时间">
  37 + <el-form-item label="激活时间" prop="createTime" v-if="openActivateTime">
  38 + <el-date-picker v-model="queryParams.createTime" type="datetimerange"
  39 + start-placeholder="开始日期"
  40 + value-format="yyyy-MM-dd HH:mm:ss"
  41 + end-placeholder="结束日期">
44 42 </el-date-picker>
45 43 </el-form-item>
46 44 <el-form-item>
... ...
trash-ui/src/views/h5/truckActivate/index.vue
  View file @8a86ae3
... ... @@ -33,13 +33,11 @@
33 33 <el-option label="已激活" value="1"/>
34 34 </el-select>
35 35 </el-form-item>
36   - <el-form-item label="激活时间" prop="activateDate" v-if="openActivateTime">
37   - <el-date-picker size="small" style="width: 200px"
38   - v-model="queryParams.activateDate"
39   - type="datetime"
40   - format="yyyy-MM-dd HH:mm:ss"
41   - value-format="yyyy-MM-dd HH:mm:ss"
42   - placeholder="选择激活时间">
  36 + <el-form-item label="激活时间" prop="createTime" v-if="openActivateTime">
  37 + <el-date-picker v-model="queryParams.createTime" type="datetimerange"
  38 + start-placeholder="开始日期"
  39 + value-format="yyyy-MM-dd HH:mm:ss"
  40 + end-placeholder="结束日期">
43 41 </el-date-picker>
44 42 </el-form-item>
45 43 <el-form-item>
... ...
trash-ui/vue.config.js
  View file @8a86ae3
... ... @@ -41,13 +41,13 @@ module.exports = {
41 41 }
42 42 },
43 43 ['/api']: {
44   - target: `http://183.66.242.6:14601`,
45   - // target: `http://175.6.47.84:8008`,
  44 + // target: `http://183.66.242.6:14601`,
  45 + target: `http://175.6.47.84:8008`,
46 46 changeOrigin: true,
47 47 },
48 48 ['^/remotedown']: {
49   - target: `http://183.66.242.6:14601/upload_files`,
50   - // target: `http://175.6.47.84:8008/upload_files`,
  49 + // target: `http://183.66.242.6:14601/upload_files`,
  50 + target: `http://175.6.47.84:8008/upload_files`,
51 51 changeOrigin: true,
52 52 },
53 53  
... ...
trash-workFlow/src/main/java/com/trash/business/controller/CompanyCreditController.java
  View file @8a86ae3
... ... @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody;
16 16 import org.springframework.web.bind.annotation.RequestMapping;
17 17 import org.springframework.web.bind.annotation.RestController;
18 18 import com.trash.common.annotation.Log;
  19 +import com.trash.common.annotation.RepeatSubmit;
19 20 import com.trash.common.core.controller.BaseController;
20 21 import com.trash.common.core.domain.AjaxResult;
21 22 import com.trash.common.enums.BusinessType;
... ... @@ -110,6 +111,7 @@ public class CompanyCreditController extends BaseController {
110 111 */
111 112 @Log(title = "企业失信", businessType = BusinessType.INSERT)
112 113 @PostMapping
  114 + @RepeatSubmit
113 115 public AjaxResult add(@RequestBody CompanyCredit companyCredit) {
114 116 try {
115 117  
... ...
trash-workFlow/src/main/java/com/trash/business/controller/ConstructionCreditController.java
  View file @8a86ae3
... ... @@ -21,6 +21,7 @@ import com.trash.business.domain.CompanyCredit;
21 21 import com.trash.business.domain.ConstructionCredit;
22 22 import com.trash.business.service.IConstructionCreditService;
23 23 import com.trash.common.annotation.Log;
  24 +import com.trash.common.annotation.RepeatSubmit;
24 25 import com.trash.common.core.controller.BaseController;
25 26 import com.trash.common.core.domain.AjaxResult;
26 27 import com.trash.common.core.page.TableDataInfo;
... ... @@ -103,6 +104,7 @@ public class ConstructionCreditController extends BaseController
103 104 */
104 105 @Log(title = "工地失信", businessType = BusinessType.INSERT)
105 106 @PostMapping
  107 + @RepeatSubmit
106 108 public AjaxResult add(@RequestBody ConstructionCredit constructionCredit)
107 109 {
108 110 constructionCredit.setTime(new Date());
... ...
trash-workFlow/src/main/java/com/trash/business/controller/DriverCreditController.java
  View file @8a86ae3
... ... @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody;
16 16 import org.springframework.web.bind.annotation.RequestMapping;
17 17 import org.springframework.web.bind.annotation.RestController;
18 18 import com.trash.common.annotation.Log;
  19 +import com.trash.common.annotation.RepeatSubmit;
19 20 import com.trash.common.core.controller.BaseController;
20 21 import com.trash.common.core.domain.AjaxResult;
21 22 import com.trash.common.enums.BusinessType;
... ... @@ -114,6 +115,7 @@ public class DriverCreditController extends BaseController {
114 115 */
115 116 @Log(title = "驾驶员失信", businessType = BusinessType.INSERT)
116 117 @PostMapping
  118 + @RepeatSubmit
117 119 public AjaxResult add(@RequestBody DriverCredit driverCredit) {
118 120 driverCredit.setCreateBy(SecurityUtils.getUsername());
119 121 driverCredit.setTime(new Date());
... ...
trash-workFlow/src/main/java/com/trash/business/controller/EarthsitesCreditController.java
  View file @8a86ae3
... ... @@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestBody;
18 18 import org.springframework.web.bind.annotation.RequestMapping;
19 19 import org.springframework.web.bind.annotation.RestController;
20 20 import com.trash.common.annotation.Log;
  21 +import com.trash.common.annotation.RepeatSubmit;
21 22 import com.trash.common.core.controller.BaseController;
22 23 import com.trash.common.core.domain.AjaxResult;
23 24 import com.trash.common.enums.BusinessType;
... ... @@ -96,6 +97,7 @@ public class EarthsitesCreditController extends BaseController
96 97 */
97 98 @Log(title = "处理场所失信", businessType = BusinessType.INSERT)
98 99 @PostMapping
  100 + @RepeatSubmit
99 101 public AjaxResult add(@RequestBody EarthsitesCredit earthsitesCredit)
100 102 { earthsitesCredit.setCreateBy(SecurityUtils.getUsername());
101 103 earthsitesCredit.setTime(new Date());
... ...
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionSpecialController.java
  View file @8a86ae3
... ... @@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody;
12 12 import org.springframework.web.bind.annotation.RequestMapping;
13 13 import org.springframework.web.bind.annotation.RestController;
14 14 import com.trash.common.annotation.Log;
  15 +import com.trash.common.annotation.RepeatSubmit;
15 16 import com.trash.common.core.controller.BaseController;
16 17 import com.trash.common.core.domain.AjaxResult;
17 18 import com.trash.common.enums.BusinessType;
... ... @@ -74,6 +75,7 @@ public class SupervisionSpecialController extends BaseController
74 75 */
75 76 @Log(title = "专项督察", businessType = BusinessType.INSERT)
76 77 @PostMapping
  78 + @RepeatSubmit
77 79 public AjaxResult add(@RequestBody SupervisionSpecial supervisionSpecial)
78 80 {
79 81 return toAjax(supervisionSpecialService.insertSupervisionSpecial(supervisionSpecial));
... ...
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionThreestepController.java
  View file @8a86ae3
... ... @@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController;
27 27 import org.springframework.web.multipart.MultipartFile;
28 28  
29 29 import com.trash.common.annotation.Log;
  30 +import com.trash.common.annotation.RepeatSubmit;
30 31 import com.trash.common.config.trashConfig;
31 32 import com.trash.common.core.controller.BaseController;
32 33 import com.trash.common.core.domain.AjaxResult;
... ... @@ -308,6 +309,7 @@ public class SupervisionThreestepController extends BaseController
308 309 */
309 310 @Log(title = "三查机制", businessType = BusinessType.INSERT)
310 311 @PostMapping
  312 + @RepeatSubmit
311 313 public AjaxResult add(@RequestBody SupervisionThreestep supervisionThreestep)
312 314 {
313 315  
... ...
trash-workFlow/src/main/java/com/trash/business/controller/ThreestepHistoryController.java
  View file @8a86ae3
... ... @@ -17,6 +17,7 @@ import com.trash.business.domain.ThreestepHistory;
17 17 import com.trash.business.domain.TruckActivate;
18 18 import com.trash.business.service.IThreestepHistoryService;
19 19 import com.trash.common.annotation.Log;
  20 +import com.trash.common.annotation.RepeatSubmit;
20 21 import com.trash.common.core.controller.BaseController;
21 22 import com.trash.common.core.domain.AjaxResult;
22 23 import com.trash.common.core.page.TableDataInfo;
... ... @@ -83,6 +84,7 @@ public class ThreestepHistoryController extends BaseController
83 84 @PreAuthorize("@ss.hasPermi('threehistory:threeHistory:add')")
84 85 @Log(title = "开停工", businessType = BusinessType.INSERT)
85 86 @PostMapping
  87 + @RepeatSubmit
86 88 public AjaxResult add(@RequestBody ThreestepHistory threestepHistory)
87 89 {
88 90 return toAjax(threestepHistoryService.insertThreestepHistory(threestepHistory));
... ...
trash-workFlow/src/main/java/com/trash/business/controller/TruckActivateController.java
  View file @8a86ae3
... ... @@ -115,15 +115,13 @@ public class TruckActivateController extends BaseController
115 115 info.setConstruction(turck.getConstruction());
116 116 info.setCompany(turck.getCompany());
117 117  
118   - JSONObject object = RemoteServerUtils.getConstructionLicenseById(turck.getConstructionId());
119   -
120   - info.setAddress(object.getString("address"));
121   - info.setEarthName(object.getString("earthName"));
122   - info.setRouteName(object.getString("routeName"));
123   - info.setTransportEndTime(object.getString("transportEndTime"));
124   - info.setTransportStartTime(object.getString("transportStartTime"));
125   - info.setEffectiveFrom(object.getString("effectiveFrom"));
126   - info.setEffectiveEnd(object.getString("effectiveEnd"));
  118 + info.setAddress(turck.getAddress());
  119 + info.setEarthName(turck.getEarthName());
  120 + info.setRouteName(turck.getRouteName());
  121 + info.setTransportEndTime(turck.getTransportStartTime());
  122 + info.setTransportStartTime(turck.getTransportStartTime());
  123 + info.setEffectiveFrom(turck.getEffectiveFrom());
  124 + info.setEffectiveEnd(turck.getEffectiveEnd());
127 125  
128 126 outList.add(info);
129 127  
... ...
trash-workFlow/src/main/java/com/trash/business/controller/TruckCreditController.java
  View file @8a86ae3
... ... @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestBody;
16 16 import org.springframework.web.bind.annotation.RequestMapping;
17 17 import org.springframework.web.bind.annotation.RestController;
18 18 import com.trash.common.annotation.Log;
  19 +import com.trash.common.annotation.RepeatSubmit;
19 20 import com.trash.common.core.controller.BaseController;
20 21 import com.trash.common.core.domain.AjaxResult;
21 22 import com.trash.common.enums.BusinessType;
... ... @@ -114,6 +115,7 @@ public class TruckCreditController extends BaseController
114 115 */
115 116 @Log(title = "车辆失信", businessType = BusinessType.INSERT)
116 117 @PostMapping
  118 + @RepeatSubmit
117 119 public AjaxResult add(@RequestBody TruckCredit truckCredit)
118 120 {
119 121 truckCredit.setCreateBy(SecurityUtils.getUsername());
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckActivateServiceImpl.java
  View file @8a86ae3
... ... @@ -73,12 +73,18 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
73 73 truckActivate.setActivateDate(DateFormatUtils.format(truckActivate.getActivateTime(), "yyyy-MM-dd"));
74 74 }
75 75  
  76 +
76 77 List<TruckActivate> list = new ArrayList<>();
77 78  
78 79 List<String> companys = SecurityUtils.getLoginUser().getUser().getCompanyIds();
79 80 List<String> tList = SecurityUtils.getLoginUser().getUser().getTruckList();
80 81 List<String> areas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
  82 +
  83 + JSONArray dArea = redis.getCacheObject("areaList");
81 84  
  85 + if(areas.size() == (dArea.size()+1)){
  86 + return truckActivateMapper.selectTruckActivateList(truckActivate);
  87 + }
82 88  
83 89 if(areas.size() > 0) {
84 90 JSONArray array = redis.getCacheObject("companyList");
... ...
trash-workFlow/src/main/java/com/trash/casefile/controller/ViolationWarningInformationController.java
  View file @8a86ae3
... ... @@ -138,7 +138,7 @@ public class ViolationWarningInformationController extends BaseController
138 138 String[] caseType = {"工地预警-未报开工作业", "工地预警-视频设备离线超时报警", "工地预警-三无车辆进入工地", "工地预警-未按时间作业",
139 139 "处理场所预警-未报开工作业", "处理场所预警-视频设备离线超时报警", "处理场所预警-三无车辆进入处理场所", "处理场所预警-未到指定的处理场所作业",
140 140 "离线运输报警(工)", "离线运输报警(消)", "未激活车辆作业", "未核准作业车辆作业", "未按线路行驶",
141   - "闯禁行驶", "失信车辆作业"};
  141 + "闯禁行驶", "失信车辆作业", "卫星定位异常"};
142 142  
143 143 @GetMapping(value = "/caseTable")
144 144 public AjaxResult getTable(String owningRegion,String startDate,String endDate){
... ...
trash-workFlow/src/main/java/com/trash/casefile/kafka/Consumer.java
  View file @8a86ae3
... ... @@ -319,7 +319,6 @@ public class Consumer {
319 319 break;
320 320 case "44030032"://未按线路行驶
321 321 violationWarningInformation.setViolationObjectType("0");
322   - violationWarningInformation.setViolationGrade("重点类");
323 322 violationWarningInformation.setSendObject("区管理部门");
324 323 describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
325 324 + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
... ... @@ -348,7 +347,7 @@ public class Consumer {
348 347 break;
349 348  
350 349 case "44030034"://失信车辆作业
351   - case "44030035"://失信车辆作业
  350 + case "44030035"://卫星
352 351 violationWarningInformation.setViolationObjectType("2");
353 352 violationWarningInformation.setSendObject("运输企业");
354 353 describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
... ...
trash-workFlow/src/main/java/com/trash/casefile/service/impl/ViolationCaseFileServiceImpl.java
  View file @8a86ae3
... ... @@ -88,6 +88,9 @@ public class ViolationCaseFileServiceImpl implements IViolationCaseFileService
88 88  
89 89 List<String> names = new ArrayList<>();
90 90  
  91 +
  92 +
  93 +
91 94 List<String> cLish = SecurityUtils.getLoginUser().getUser().getConList();
92 95 List<String> cArea = SecurityUtils.getLoginUser().getUser().getConAreas();
93 96 List<String> eLish = SecurityUtils.getLoginUser().getUser().getEarthList();
... ... @@ -95,6 +98,18 @@ public class ViolationCaseFileServiceImpl implements IViolationCaseFileService
95 98  
96 99 JSONArray earthList = redisCache.getCacheObject("earthSitesList");
97 100 JSONArray construList = redisCache.getCacheObject("constructionList");
  101 + JSONArray companyList = redisCache.getCacheObject("companyList");
  102 +
  103 + List<String> companyAreas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
  104 + List<String> companyIds = SecurityUtils.getLoginUser().getUser().getCompanyIds();
  105 + for(Object obj:companyList) {
  106 + JSONObject jsonObject = (JSONObject)obj;
  107 + if(companyIds.indexOf(jsonObject.getString("id")) > -1 || companyAreas.indexOf(jsonObject.getString("areaCode"))> -1){
  108 + names.add(jsonObject.getString("name"));
  109 + }
  110 + }
  111 +
  112 +
98 113  
99 114 for(Object obj:earthList){
100 115 JSONObject jsonObject = (JSONObject) obj;
... ... @@ -147,6 +162,7 @@ public class ViolationCaseFileServiceImpl implements IViolationCaseFileService
147 162 JSONObject jo = (JSONObject) o;
148 163 if (violationCaseFile.getCompanyName().equals(jo.getString("name"))) {
149 164 violationCaseFile.setAbbreviation(jo.getString("abbreviation"));
  165 + break;
150 166 }
151 167 }
152 168 }
... ...
trash-workFlow/src/main/java/com/trash/casefile/service/impl/ViolationWarningInformationServiceImpl.java
  View file @8a86ae3
... ... @@ -41,317 +41,347 @@ import org.springframework.web.multipart.MultipartFile;
41 41 * @date 2023-05-09
42 42 */
43 43 @Service
44   -public class ViolationWarningInformationServiceImpl implements IViolationWarningInformationService
45   -{
46   - private static final Logger log = LoggerFactory.getLogger(ViolationWarningInformationServiceImpl.class);
47   - @Autowired
48   - private ViolationWarningInformationMapper violationWarningInformationMapper;
49   - @Autowired
50   - private UploadFileMapper uploadFileMapper;
51   - @Autowired
52   - IWorkflowService WorkflowService;
53   - @Autowired
54   - RedisCache redisCache;
55   - /**
56   - * 查询违规预警信息
57   - *
58   - * @param id 违规预警信息ID
59   - * @return 违规预警信息
60   - */
61   - @Override
62   - public ViolationWarningInformationVo selectViolationWarningInformationById(Long id) {
63   - ViolationWarningInformationVo violationWarningInformationVo = new ViolationWarningInformationVo();
64   - violationWarningInformationVo.setViolationWarningInformation(violationWarningInformationMapper.selectViolationWarningInformationById(id));
65   - if(violationWarningInformationVo.getViolationWarningInformation()!=null){
66   - UploadFile uploadFile = new UploadFile();
67   - uploadFile.setTableName("violation_warning_information");
68   - uploadFile.setTableNumber(violationWarningInformationVo.getViolationWarningInformation().getId().toString());
69   - List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);
70   - violationWarningInformationVo.setUploadFiles(list);
71   - }
72   - return violationWarningInformationVo;
73   - }
74   -
75   - /**
76   - * 查询违规预警信息列表
77   - *
78   - * @param violationWarningInformation 违规预警信息
79   - * @return 违规预警信息
80   - */
81   - @Override
82   - public List<ViolationWarningInformation> selectViolationWarningInformationList(ViolationWarningInformation violationWarningInformation)
83   - {
84   -
85   - List<ViolationWarningInformation> list = new ArrayList<>();
86   - JSONArray areas = redisCache.getCacheObject("areas");
87   -
88   - List<String> names = new ArrayList<>();
89   -
90   - List<String> cLish = SecurityUtils.getLoginUser().getUser().getConList();
91   - List<String> cArea = SecurityUtils.getLoginUser().getUser().getConAreas();
92   - List<String> eLish = SecurityUtils.getLoginUser().getUser().getEarthList();
93   - List<String> eArea = SecurityUtils.getLoginUser().getUser().getEarthAreas();
94   -
95   - JSONArray earthList = redisCache.getCacheObject("earthSitesList");
96   - JSONArray construList = redisCache.getCacheObject("constructionList");
97   -
98   - for(Object obj:earthList){
99   - JSONObject jsonObject = (JSONObject) obj;
100   - if(eLish.indexOf(jsonObject.getString("id")) > -1 || eArea.indexOf(jsonObject.getString("areaCode"))> -1){
101   - names.add(jsonObject.getString("name"));
102   - }
  44 +public class ViolationWarningInformationServiceImpl implements IViolationWarningInformationService {
  45 + private static final Logger log = LoggerFactory.getLogger(ViolationWarningInformationServiceImpl.class);
  46 + @Autowired
  47 + private ViolationWarningInformationMapper violationWarningInformationMapper;
  48 + @Autowired
  49 + private UploadFileMapper uploadFileMapper;
  50 + @Autowired
  51 + IWorkflowService WorkflowService;
  52 + @Autowired
  53 + RedisCache redisCache;
  54 +
  55 + /**
  56 + * 查询违规预警信息
  57 + *
  58 + * @param id
  59 + * 违规预警信息ID
  60 + * @return 违规预警信息
  61 + */
  62 + @Override
  63 + public ViolationWarningInformationVo selectViolationWarningInformationById(Long id) {
  64 + ViolationWarningInformationVo violationWarningInformationVo = new ViolationWarningInformationVo();
  65 + violationWarningInformationVo.setViolationWarningInformation(
  66 + violationWarningInformationMapper.selectViolationWarningInformationById(id));
  67 + if (violationWarningInformationVo.getViolationWarningInformation() != null) {
  68 + UploadFile uploadFile = new UploadFile();
  69 + uploadFile.setTableName("violation_warning_information");
  70 + uploadFile
  71 + .setTableNumber(violationWarningInformationVo.getViolationWarningInformation().getId().toString());
  72 + List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);
  73 + violationWarningInformationVo.setUploadFiles(list);
  74 + }
  75 + return violationWarningInformationVo;
  76 + }
  77 +
  78 + /**
  79 + * 查询违规预警信息列表
  80 + *
  81 + * @param violationWarningInformation
  82 + * 违规预警信息
  83 + * @return 违规预警信息
  84 + */
  85 + @Override
  86 + public List<ViolationWarningInformation> selectViolationWarningInformationList(
  87 + ViolationWarningInformation violationWarningInformation) {
  88 +
  89 + List<ViolationWarningInformation> list = new ArrayList<>();
  90 + JSONArray areas = redisCache.getCacheObject("areas");
  91 +
  92 + List<String> names = new ArrayList<>();
  93 +
  94 + List<String> cLish = SecurityUtils.getLoginUser().getUser().getConList();
  95 + List<String> cArea = SecurityUtils.getLoginUser().getUser().getConAreas();
  96 + List<String> eLish = SecurityUtils.getLoginUser().getUser().getEarthList();
  97 + List<String> eArea = SecurityUtils.getLoginUser().getUser().getEarthAreas();
  98 +
  99 + JSONArray earthList = redisCache.getCacheObject("earthSitesList");
  100 + JSONArray construList = redisCache.getCacheObject("constructionList");
  101 +
  102 + JSONArray companyList = redisCache.getCacheObject("companyList");
  103 +
  104 + List<String> companyAreas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
  105 + List<String> companyIds = SecurityUtils.getLoginUser().getUser().getCompanyIds();
  106 + for (Object obj : companyList) {
  107 + JSONObject jsonObject = (JSONObject) obj;
  108 + if (companyIds.indexOf(jsonObject.getString("id")) > -1
  109 + || companyAreas.indexOf(jsonObject.getString("areaCode")) > -1) {
  110 + names.add(jsonObject.getString("name"));
103 111 }
104   - for(Object obj:construList){
105   - JSONObject jsonObject = (JSONObject) obj;
106   - if(cLish.indexOf(jsonObject.getString("id")) > -1 || cArea.indexOf(jsonObject.getString("areaCode"))> -1){
107   - names.add(jsonObject.getString("name"));
  112 + }
  113 +
  114 + for (Object obj : earthList) {
  115 + JSONObject jsonObject = (JSONObject) obj;
  116 + if (eLish.indexOf(jsonObject.getString("id")) > -1
  117 + || eArea.indexOf(jsonObject.getString("areaCode")) > -1) {
  118 + names.add(jsonObject.getString("name"));
  119 + }
  120 + }
  121 + for (Object obj : construList) {
  122 + JSONObject jsonObject = (JSONObject) obj;
  123 + if (cLish.indexOf(jsonObject.getString("id")) > -1
  124 + || cArea.indexOf(jsonObject.getString("areaCode")) > -1) {
  125 + names.add(jsonObject.getString("name"));
  126 + }
  127 + }
  128 +
  129 + if (names.size() == 0) {
  130 + return list;
  131 + } else {
  132 + violationWarningInformation.setNames(names);
  133 + }
  134 +
  135 + return violationWarningInformationMapper.selectViolationWarningInformationList(violationWarningInformation);
  136 + }
  137 +
  138 + @Override
  139 + public List<ViolationWarningInformation> selectViolationWarningInformationListByTable(String owningRegion,
  140 + String startDate, String endDate) {
  141 + return violationWarningInformationMapper.selectViolationWarningInformationListByTable(owningRegion, startDate,
  142 + endDate);
  143 + }
  144 +
  145 + /**
  146 + * 新增违规预警信息
  147 + *
  148 + * @param violationWarningInformation
  149 + * 违规预警信息
  150 + * @return 结果
  151 + */
  152 +
  153 + String innerArea = "湘江新区,芙蓉区,天心区,开福区,雨花区";
  154 + String warnString = "处理场所预警-未报开工作业、处理场所预警-视频设备离线超时报警、处理场所预警-三无车辆进入处理场所、处理场所预警-未到指定的处理场所作业";
  155 +
  156 + @Override
  157 + @Transactional
  158 + public int insertViolationWarningInformation(MultipartFile[] files,
  159 + ViolationWarningInformation violationWarningInformation) throws IOException {
  160 +
  161 + if (!innerArea.contains(violationWarningInformation.getOwningRegion())
  162 + && warnString.contains(violationWarningInformation.getViolationType())
  163 + && violationWarningInformation.getViolationObjectType() == "1") {
  164 +
  165 + log.info("不记录预警信息" + violationWarningInformation.getOwningRegion() + " "
  166 + + violationWarningInformation.getViolationType());
  167 +
  168 + return 1;
  169 +
  170 + }
  171 +
  172 + if (violationWarningInformation.getCreateTime() == null) {
  173 + violationWarningInformation.setCreateTime(DateUtils.getNowDate());
  174 + }
  175 + if (StringUtils.isEmpty(violationWarningInformation.getCreateBy())) {
  176 + violationWarningInformation.setCreateBy(SecurityUtils.getUsername());
  177 + }
  178 + // 判断公司是否为空，如果不为空则查询公司简称
  179 + if (StringUtils.isNotEmpty(violationWarningInformation.getCompanyName())) {
  180 + JSONArray companyList = redisCache.getCacheObject("companyList");
  181 + for (Object o : companyList) {
  182 + JSONObject jo = (JSONObject) o;
  183 + if (violationWarningInformation.getCompanyName().equals(jo.getString("name"))) {
  184 + violationWarningInformation.setAbbreviation(jo.getString("abbreviation"));
  185 + break;
108 186 }
109 187 }
110   -
111   - if(names.size() == 0){
112   - return list;
113   - }else{
114   - violationWarningInformation.setNames(names);
  188 + }
  189 + violationWarningInformation.setStatus(0);
  190 +
  191 + if (violationWarningInformation.getViolationObjectType().equals("2")) {
  192 + violationWarningInformation.setProjectName(violationWarningInformation.getCompanyName());
  193 + }
  194 +
  195 + log.info("违规预警信息新增");
  196 + Integer result = violationWarningInformationMapper
  197 + .insertViolationWarningInformation(violationWarningInformation);
  198 + log.info("违规预警信息新增成功,resultSize:" + result);
  199 + if (StringUtils.isNotEmpty(files)) {
  200 + // 文件上传
  201 + for (MultipartFile file : files) {
  202 + UploadFile uploadFile = new UploadFile();
  203 + uploadFile.setTableName("violation_warning_information");
  204 + uploadFile.setTableNumber(violationWarningInformation.getId().toString());
  205 + uploadFile.setFileName(file.getOriginalFilename());
  206 + uploadFile.setFilePath(FileUploadUtils.uploadFile(file));
  207 + uploadFileMapper.insertUploadFile(uploadFile);
  208 + }
  209 + }
  210 + int i = 0;
  211 + // 根据发送对象判断流程
  212 + if (violationWarningInformation.getSendObject().equals("区管理部门")) {
  213 +
  214 + if (violationWarningInformation.getViolationGrade().equals("一般类")) {
  215 + i = 1;
  216 + } else {
  217 + i = 2;
  218 + }
  219 + }
  220 +
  221 + try {
  222 +
  223 + Map map = null;
  224 + try {
  225 + map = redisCache.getCacheMap("warningParam");
  226 + } catch (Exception e) {
  227 + e.printStackTrace();
  228 + }
  229 +
  230 + if (map == null || map.size() == 0) {
  231 + map = getTypeToRedis();
  232 + }
  233 +
  234 + if (map != null && map.get(violationWarningInformation.getViolationType()) != null
  235 + && map.get(violationWarningInformation.getViolationType()).equals("0")) {
  236 + System.out.println(violationWarningInformation.getViolationType() + " "
  237 + + map.get(violationWarningInformation.getViolationType()));
  238 + return result;
115 239 }
116   -
117   -
118   -
119   - return violationWarningInformationMapper.selectViolationWarningInformationList(violationWarningInformation);
120   - }
121   -
122   - @Override
123   - public List<ViolationWarningInformation> selectViolationWarningInformationListByTable(String owningRegion,String startDate,String endDate)
124   - {
125   - return violationWarningInformationMapper.selectViolationWarningInformationListByTable(owningRegion,startDate,endDate);
126   - }
127   -
128   - /**
129   - * 新增违规预警信息
130   - *
131   - * @param violationWarningInformation 违规预警信息
132   - * @return 结果
133   - */
134   -
135   - String innerArea = "湘江新区,芙蓉区,天心区,开福区,雨花区";
136   - String warnString = "处理场所预警-未报开工作业、处理场所预警-视频设备离线超时报警、处理场所预警-三无车辆进入处理场所、处理场所预警-未到指定的处理场所作业";
137   -
138   - @Override
139   - @Transactional
140   - public int insertViolationWarningInformation(MultipartFile[] files,ViolationWarningInformation violationWarningInformation) throws IOException {
141   -
142   -
143   - if(!innerArea.contains(violationWarningInformation.getOwningRegion()) && warnString.contains(violationWarningInformation.getViolationType())
144   - && violationWarningInformation.getViolationObjectType() == "1") {
145   -
146   - log.info("不记录预警信息" + violationWarningInformation.getOwningRegion() + " " + violationWarningInformation.getViolationType());
147   -
148   - return 1;
149   -
150   - }
151   -
152   -
153   - if(violationWarningInformation.getCreateTime()==null){
154   - violationWarningInformation.setCreateTime(DateUtils.getNowDate());
155   - }
156   - if(StringUtils.isEmpty(violationWarningInformation.getCreateBy())){
157   - violationWarningInformation.setCreateBy(SecurityUtils.getUsername());
158   - }
159   - //判断公司是否为空，如果不为空则查询公司简称
160   - if(StringUtils.isNotEmpty(violationWarningInformation.getCompanyName())){
161   - JSONArray companyList = redisCache.getCacheObject("companyList");
162   - for(Object o:companyList){
163   - JSONObject jo = (JSONObject) o;
164   - if(violationWarningInformation.getCompanyName().equals(jo.getString("name"))){
165   - violationWarningInformation.setAbbreviation(jo.getString("abbreviation"));
166   - }
167   - }
168   - }
169   - violationWarningInformation.setStatus(0);
170   -
171   - if(violationWarningInformation.getViolationObjectType().equals("2")) {
172   - violationWarningInformation.setProjectName(violationWarningInformation.getCompanyName());
173   - }
174   -
175   - log.info("违规预警信息新增");
176   - Integer result = violationWarningInformationMapper.insertViolationWarningInformation(violationWarningInformation);
177   - log.info("违规预警信息新增成功,resultSize:"+result);
178   - if(StringUtils.isNotEmpty(files)){
179   - //文件上传
180   - for (MultipartFile file : files) {
181   - UploadFile uploadFile = new UploadFile();
182   - uploadFile.setTableName("violation_warning_information");
183   - uploadFile.setTableNumber(violationWarningInformation.getId().toString());
184   - uploadFile.setFileName(file.getOriginalFilename());
185   - uploadFile.setFilePath(FileUploadUtils.uploadFile(file));
186   - uploadFileMapper.insertUploadFile(uploadFile);
187   - }
188   - }
189   - int i = 0;
190   - //根据发送对象判断流程
191   - if(violationWarningInformation.getSendObject().equals("区管理部门")){
192   -
193   - if(violationWarningInformation.getViolationGrade().equals("一般类")){
194   - i = 1;
195   - }else{
196   - i = 2;
197   - }
198   - }
199   -
200   - Map map = null;
201   - try {
202   - map = redisCache.getCacheMap("warningParam");
203 240 } catch (Exception e) {
204 241 e.printStackTrace();
205 242 }
206   -
207   -
208   - if(map == null || map.size() == 0){
209   - map = getTypeToRedis();
210   - }
211   -
212   - if(map!= null && map.get(violationWarningInformation.getViolationType()) != null &&
213   - map.get(violationWarningInformation.getViolationType()).equals("0")){
214   - System.out.println(violationWarningInformation.getViolationType() + " " + map.get(violationWarningInformation.getViolationType()));
215   - return result;
216   - }
217   -//
218   -
219   - if(violationWarningInformation.getCreateBy().equals("长沙市建筑垃圾智慧监管平台")){
220   - WorkflowService.createCaseFile1(violationWarningInformation,i,1);
221   - }else{
222   - WorkflowService.createCaseFile1(violationWarningInformation,i,0);
223   - }
224   -
225   - return result;
226   - }
227   -
228   -
229   - public Map getTypeToRedis(){
230   -
231   -
232   - File file = new File("d:/warningParam.txt");
233   -
234   - Map map = null;
235   -
236   - try {
  243 +
  244 + if (violationWarningInformation.getCreateBy().equals("长沙市建筑垃圾智慧监管平台")) {
  245 + WorkflowService.createCaseFile1(violationWarningInformation, i, 1);
  246 + } else {
  247 + WorkflowService.createCaseFile1(violationWarningInformation, i, 0);
  248 + }
  249 +
  250 + return result;
  251 + }
  252 +
  253 + public Map getTypeToRedis() {
  254 +
  255 + File file = new File("d:/warningParam.txt");
  256 +
  257 + Map map = null;
  258 +
  259 + try {
237 260 BufferedReader fReader = new BufferedReader(new FileReader(file));
238   -
  261 +
239 262 String result = null;
240 263 map = new HashMap<>();
241   - while(true){
  264 + while (true) {
242 265 try {
243 266 result = fReader.readLine();
244   -
245   - if(result == null){
  267 +
  268 + if (result == null) {
246 269 break;
247 270 }
248   -
  271 +
249 272 map.put(result.split(" ")[0], result.split(" ")[1]);
250   -
251   - System.out.println(result.split(" ")[0] +"," + result.split(" ")[1]);
252   -
  273 +
  274 + System.out.println(result.split(" ")[0] + "," + result.split(" ")[1]);
  275 +
253 276 } catch (Exception e) {
254 277 e.printStackTrace();
255 278 }
256   -
  279 +
257 280 }
258   -
259   - redisCache.setCacheObject("warningParam", map,15,TimeUnit.MINUTES);
260   -
  281 +
  282 + redisCache.setCacheObject("warningParam", map, 15, TimeUnit.MINUTES);
  283 +
261 284 return map;
262 285 } catch (FileNotFoundException e) {
263 286 // TODO Auto-generated catch block
264 287 e.printStackTrace();
265 288 }
266   - return null;
267   - }
268   -
269   - /**
270   - * 修改违规预警信息
271   - *
272   - * @param violationWarningInformationVo 违规预警信息
273   - * @return 结果
274   - */
275   - @Override
276   - @Transactional
277   - public int updateViolationWarningInformation(MultipartFile[] files,ViolationWarningInformationVo violationWarningInformationVo) throws IOException {
278   - violationWarningInformationVo.getViolationWarningInformation().setUpdateBy(SecurityUtils.getUsername());
279   - //查询该合同下的文件上传数据然后删除数据库中的数据和文件
280   - UploadFile uploadFile = new UploadFile();
281   - uploadFile.setTableName("violation_warning_information");
282   - uploadFile.setTableNumber(violationWarningInformationVo.getViolationWarningInformation().getId().toString());
283   - List<UploadFile> uploadFileList = uploadFileMapper.selectUploadFileList(uploadFile);
284   - //判断getUploadFiles里是否有旧文件，如果有文件上传则先删除数据库中的数据，再添加新的数据，如果没有文件上传，则删除数据库中的数据和文件
285   - if (violationWarningInformationVo.getUploadFiles().size() != 0) {
286   - //获取两个list的交集
287   - List<UploadFile> distinctList = uploadFileList.stream().filter(item -> violationWarningInformationVo.getUploadFiles().stream().anyMatch(item2 -> item.getId().equals(item2.getId()))).collect(Collectors.toList());
288   - //去掉交集得到需要删除的数据
289   - uploadFileList.removeAll(distinctList);
290   -
291   - for (UploadFile distinctFile : uploadFileList) {
292   - uploadFileMapper.deleteUploadFileById(distinctFile.getId());
293   - //删除文件
294   - FileUploadUtils.deleteFile(distinctFile.getFilePath());
295   - }
296   - } else {
297   - for (UploadFile uploadFile1 : uploadFileList) {
298   - //删除数据库数据
299   - uploadFileMapper.deleteUploadFileById(uploadFile1.getId());
300   - //删除文件
301   - FileUploadUtils.deleteFile(uploadFile1.getFilePath());
302   - }
303   - }
304   -
305   - //添加新的文件
306   - for (MultipartFile file : files) {
307   - UploadFile newUploadFile = new UploadFile();
308   - newUploadFile.setTableName("violation_warning_information");
309   - newUploadFile.setTableNumber(violationWarningInformationVo.getViolationWarningInformation().getId().toString());
310   - newUploadFile.setFileName(file.getOriginalFilename());
311   - newUploadFile.setFilePath(FileUploadUtils.uploadFile(file));
312   - uploadFileMapper.insertUploadFile(newUploadFile);
313   - }
314   - return violationWarningInformationMapper.updateViolationWarningInformation(violationWarningInformationVo.getViolationWarningInformation());
315   - }
316   -
317   - /**
318   - * 批量删除违规预警信息
319   - *
320   - * @param ids 需要删除的违规预警信息ID
321   - * @return 结果
322   - */
323   - @Override
324   - @Transactional
325   - public int deleteViolationWarningInformationByIds(Long[] ids)
326   - {
327   - for (Long id : ids) {
328   - ViolationWarningInformation violationWarningInformation = violationWarningInformationMapper.selectViolationWarningInformationById(id);
329   - UploadFile uploadFile = new UploadFile();
330   - uploadFile.setTableName("violation_warning_information");
331   - uploadFile.setTableNumber(violationWarningInformation.getId().toString());
332   - List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);
333   - //遍历删除文件
334   - for (UploadFile file : list) {
335   - uploadFileMapper.deleteUploadFileById(file.getId());
336   - FileUploadUtils.deleteFile(file.getFilePath());
337   - }
338   - }
339   - return violationWarningInformationMapper.deleteViolationWarningInformationByIds(ids);
340   - }
341   -
342   - /**
343   - * 删除违规预警信息信息
344   - *
345   - * @param id 违规预警信息ID
346   - * @return 结果
347   - */
348   - @Override
349   - public int deleteViolationWarningInformationById(Long id)
350   - {
351   - return violationWarningInformationMapper.deleteViolationWarningInformationById(id);
352   - }
353   -
354   - public void updateViolationCaseFile(ViolationWarningInformation violationWarningInformation){
355   - violationWarningInformationMapper.updateViolationWarningInformation(violationWarningInformation);
356   - }
  289 + return null;
  290 + }
  291 +
  292 + /**
  293 + * 修改违规预警信息
  294 + *
  295 + * @param violationWarningInformationVo
  296 + * 违规预警信息
  297 + * @return 结果
  298 + */
  299 + @Override
  300 + @Transactional
  301 + public int updateViolationWarningInformation(MultipartFile[] files,
  302 + ViolationWarningInformationVo violationWarningInformationVo) throws IOException {
  303 + violationWarningInformationVo.getViolationWarningInformation().setUpdateBy(SecurityUtils.getUsername());
  304 + // 查询该合同下的文件上传数据然后删除数据库中的数据和文件
  305 + UploadFile uploadFile = new UploadFile();
  306 + uploadFile.setTableName("violation_warning_information");
  307 + uploadFile.setTableNumber(violationWarningInformationVo.getViolationWarningInformation().getId().toString());
  308 + List<UploadFile> uploadFileList = uploadFileMapper.selectUploadFileList(uploadFile);
  309 + // 判断getUploadFiles里是否有旧文件，如果有文件上传则先删除数据库中的数据，再添加新的数据，如果没有文件上传，则删除数据库中的数据和文件
  310 + if (violationWarningInformationVo.getUploadFiles().size() != 0) {
  311 + // 获取两个list的交集
  312 + List<UploadFile> distinctList = uploadFileList.stream().filter(item -> violationWarningInformationVo
  313 + .getUploadFiles().stream().anyMatch(item2 -> item.getId().equals(item2.getId())))
  314 + .collect(Collectors.toList());
  315 + // 去掉交集得到需要删除的数据
  316 + uploadFileList.removeAll(distinctList);
  317 +
  318 + for (UploadFile distinctFile : uploadFileList) {
  319 + uploadFileMapper.deleteUploadFileById(distinctFile.getId());
  320 + // 删除文件
  321 + FileUploadUtils.deleteFile(distinctFile.getFilePath());
  322 + }
  323 + } else {
  324 + for (UploadFile uploadFile1 : uploadFileList) {
  325 + // 删除数据库数据
  326 + uploadFileMapper.deleteUploadFileById(uploadFile1.getId());
  327 + // 删除文件
  328 + FileUploadUtils.deleteFile(uploadFile1.getFilePath());
  329 + }
  330 + }
  331 +
  332 + // 添加新的文件
  333 + for (MultipartFile file : files) {
  334 + UploadFile newUploadFile = new UploadFile();
  335 + newUploadFile.setTableName("violation_warning_information");
  336 + newUploadFile
  337 + .setTableNumber(violationWarningInformationVo.getViolationWarningInformation().getId().toString());
  338 + newUploadFile.setFileName(file.getOriginalFilename());
  339 + newUploadFile.setFilePath(FileUploadUtils.uploadFile(file));
  340 + uploadFileMapper.insertUploadFile(newUploadFile);
  341 + }
  342 + return violationWarningInformationMapper
  343 + .updateViolationWarningInformation(violationWarningInformationVo.getViolationWarningInformation());
  344 + }
  345 +
  346 + /**
  347 + * 批量删除违规预警信息
  348 + *
  349 + * @param ids
  350 + * 需要删除的违规预警信息ID
  351 + * @return 结果
  352 + */
  353 + @Override
  354 + @Transactional
  355 + public int deleteViolationWarningInformationByIds(Long[] ids) {
  356 + for (Long id : ids) {
  357 + ViolationWarningInformation violationWarningInformation = violationWarningInformationMapper
  358 + .selectViolationWarningInformationById(id);
  359 + UploadFile uploadFile = new UploadFile();
  360 + uploadFile.setTableName("violation_warning_information");
  361 + uploadFile.setTableNumber(violationWarningInformation.getId().toString());
  362 + List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);
  363 + // 遍历删除文件
  364 + for (UploadFile file : list) {
  365 + uploadFileMapper.deleteUploadFileById(file.getId());
  366 + FileUploadUtils.deleteFile(file.getFilePath());
  367 + }
  368 + }
  369 + return violationWarningInformationMapper.deleteViolationWarningInformationByIds(ids);
  370 + }
  371 +
  372 + /**
  373 + * 删除违规预警信息信息
  374 + *
  375 + * @param id
  376 + * 违规预警信息ID
  377 + * @return 结果
  378 + */
  379 + @Override
  380 + public int deleteViolationWarningInformationById(Long id) {
  381 + return violationWarningInformationMapper.deleteViolationWarningInformationById(id);
  382 + }
  383 +
  384 + public void updateViolationCaseFile(ViolationWarningInformation violationWarningInformation) {
  385 + violationWarningInformationMapper.updateViolationWarningInformation(violationWarningInformation);
  386 + }
357 387 }
... ...
trash-workFlow/src/main/resources/mapper/TruckActivateMapper.xml
  View file @8a86ae3
... ... @@ -29,17 +29,15 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
29 29 <result property="routeInfo" column="route_info" />
30 30 <result property="earthList" column="earth_list" />
31 31 <result property="coord" column="coord" />
32   -
33   -
34 32 </resultMap>
35 33  
36 34 <sql id="selectTruckActivateVo">
37   - select id, company, license_plate, time, construction,construction_id, status, earthsite, object_id,
38   - create_by, create_type, activate_time, create_time,create_count,address,effective_from,effective_end,
39   - transport_start_time,transport_end_time,route_name,earth_name,route_info,earth_list,coord
  35 + select id, company, license_plate, time, construction,construction_id, status, earthsite, object_id, create_by, create_type, activate_time, create_time,create_count
  36 + ,address,effective_from,effective_end,transport_start_time,transport_end_time,route_name,earth_name
40 37 from truck_activate
41 38 </sql>
42   -
  39 +
  40 +
43 41 <select id="selectTruckActivateList" parameterType="TruckActivate" resultMap="TruckActivateResult">
44 42 <include refid="selectTruckActivateVo"/>
45 43 <where>
... ... @@ -65,6 +63,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
65 63 </foreach>
66 64 </if>
67 65 </where>
  66 + ORDER BY create_time desc
68 67 </select>
69 68  
70 69 <select id="selectTruckActivateListByConstructions" parameterType="TruckActivate" resultMap="TruckActivateResult">
... ... @@ -230,7 +229,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
230 229 </select>
231 230  
232 231 <select id="getTruckHistoryListByObjects" parameterType="TruckActivate" resultMap="TruckActivateResult">
233   - <include refid="selectTruckActivateVo"/>
  232 + from truck_activate
234 233 <where>
235 234 <if test="startTime != null "> and activate_time BETWEEN #{startTime} and #{endTime}</if>
236 235 and object_id in
... ...