youxiw2000 / trash · Commits

Commit 9d500e9db99ee5c82d2a139e0a1f314e667d3672

Authored by 273548560@qq.com
1 parent 8014e9dc
build: skipped

修复bug

Inline Side-by-side
Showing 24 changed files with 400 additions and 52 deletions
trash-quartz/src/main/java/com/trash/quartz/task/DriverTask.java
  View file @9d500e9
... ... @@ -14,6 +14,9 @@ import javax.servlet.ServletException;
14 14 import javax.servlet.http.HttpServletRequest;
15 15 import javax.servlet.http.HttpServletResponse;
16 16  
  17 +import com.trash.casefile.domain.KafkaCompensation;
  18 +import com.trash.casefile.kafka.Consumer;
  19 +import com.trash.casefile.mapper.KafkaCompensationMapper;
17 20 import org.springframework.beans.BeansException;
18 21 import org.springframework.beans.factory.annotation.Autowired;
19 22 import org.springframework.stereotype.Component;
... ... @@ -253,5 +256,14 @@ public class DriverTask
253 256  
254 257  
255 258 }
  259 +
  260 + public void kafkaCompensation() throws InterruptedException {
  261 + KafkaCompensation kafkaCompensation = new KafkaCompensation();
  262 + kafkaCompensation.setStatus(0);
  263 + List<KafkaCompensation> kafkaCompensationList = SpringUtils.getBean(KafkaCompensationMapper.class).selectKafkaCompensationList(kafkaCompensation);
  264 + for(KafkaCompensation k:kafkaCompensationList){
  265 + SpringUtils.getBean(Consumer.class).autoViolationWarning(k.getData(),k.getId().toString());
  266 + }
  267 + }
256 268  
257 269 }
... ...
trash-ui/src/api/dict.js
  View file @9d500e9
... ... @@ -147,3 +147,11 @@ export function getDict(params) {
147 147 params: params
148 148 });
149 149 }
  150 +
  151 +export function getSupervision(data) {
  152 + return requestRemote({
  153 + url: '/api/gpsservice/cs/supervision/ledger/list',
  154 + method: 'post',
  155 + data: data
  156 + });
  157 +}
... ...
trash-ui/src/views/activiti/task/SupervisionInfo.vue 0 → 100644
  View file @9d500e9
  1 +<template>
  2 + <div style="border:1px solid black;">
  3 + <el-row class="bd_bottom">
  4 + <el-col :span="4" class="bd_right bd_padding">名称</el-col>
  5 + <el-col :span="8" class="bd_padding">{{ infoData.name }}</el-col>
  6 + <el-col :span="4" class="bd_left bd_right bd_padding">所属区域</el-col>
  7 + <el-col :span="8" class="bd_padding">{{ infoData.areaCodeName }}</el-col>
  8 + </el-row>
  9 + <el-row class="bd_bottom">
  10 + <el-col :span="4" class="bd_right bd_padding">督察类型</el-col>
  11 + <el-col :span="8" class="bd_padding">{{ infoData.typeName }}</el-col>
  12 + <el-col :span="4" class="bd_left bd_right bd_padding">督察结果</el-col>
  13 + <el-col :span="8" class="bd_padding">{{ infoData.supervisionResultName }}</el-col>
  14 + </el-row>
  15 +
  16 +
  17 + <el-row class="bd_bottom">
  18 + <el-col :span="4" class="bd_right bd_padding">督察状态</el-col>
  19 + <el-col :span="8" class="bd_padding">{{ infoData.supervisionStatus == 0 ? "未督察" : "已督察" }}</el-col>
  20 + <el-col :span="4" class="bd_left bd_right bd_padding">督察时间</el-col>
  21 + <el-col :span="8" class="bd_padding">{{ infoData.supervisionAt }}</el-col>
  22 + </el-row>
  23 + <el-row class="bd_bottom">
  24 + <el-col :span="4" class="bd_right bd_padding">创建时间</el-col>
  25 + <el-col :span="20" class="bd_padding">{{ infoData.createAt }}</el-col>
  26 + </el-row>
  27 + </div>
  28 +</template>
  29 +
  30 +<script>
  31 +
  32 +
  33 +export default {
  34 + name: "SupervisionInfo",
  35 + props: {
  36 + infoData: {
  37 + type: Object
  38 + },
  39 + },
  40 + data() {
  41 + return {}
  42 + },
  43 + created() {
  44 +
  45 + },
  46 + methods: {}
  47 +
  48 +}
  49 +</script>
... ...
trash-ui/src/views/activiti/task/index.vue
  View file @9d500e9
... ... @@ -329,6 +329,14 @@
329 329 <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
330 330 </div>
331 331 </el-dialog>
  332 +
  333 + <el-dialog :title="title" :visible.sync="supervisionOpen" width="700px" append-to-body :close-on-click-modal="false">
  334 + <supervisionInfo :infoData="supervisionData"/>
  335 + <div slot="footer" class="dialog-footer">
  336 + <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
  337 + <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
  338 + </div>
  339 + </el-dialog>
332 340 </div>
333 341 </template>
334 342  
... ... @@ -354,7 +362,8 @@ import {updateViolationCaseFileReader1} from &quot;@/api/casefile/violationWarningInf
354 362 import {
355 363 getArea,
356 364 getDict,
357   - getUsers
  365 + getUsers,
  366 + getSupervision
358 367 } from "@/api/dict";
359 368  
360 369 import {
... ... @@ -381,6 +390,7 @@ import handleInfo from &quot;@/views/office/handle/handleInfo&quot;;
381 390 import caseOfflineInfo from "@/views/caseOffline/caseOffline/caseOfflineInfo";
382 391 import violationCaseFileInfo from "@/views/casefile/violationCaseFile/violationCaseFileInfo";
383 392 import violationWarningInformationInfo from "@/views/casefile/violationWarningInformation/violationWarningInformationInfo";
  393 +import supervisionInfo from "./SupervisionInfo";
384 394  
385 395 export default {
386 396 name: "task",
... ... @@ -398,7 +408,8 @@ export default {
398 408 contractInfo,
399 409 caseOfflineInfo,
400 410 violationCaseFileInfo,
401   - violationWarningInformationInfo
  411 + violationWarningInformationInfo,
  412 + supervisionInfo
402 413 },
403 414 data() {
404 415 return {
... ... @@ -485,6 +496,8 @@ export default {
485 496 options: [],
486 497 usersName: [],
487 498 deptName:null,
  499 + supervisionData: null,
  500 + supervisionOpen:false,
488 501 };
489 502 },
490 503 created() {
... ... @@ -665,6 +678,21 @@ export default {
665 678 this.violationCaseFile1 = true;
666 679 return;
667 680 }
  681 + if(this.definitionKey.indexOf("supervision")>-1){
  682 + console.log(row)
  683 + const params = {
  684 + id: "1fee149a03a3482ba45367745fea6669",
  685 + type:1,
  686 + page:1,
  687 + size:1
  688 + }
  689 + getSupervision(params).then(res=>{
  690 + console.log(res)
  691 + this.supervisionData = res.result.list[0];
  692 + this.supervisionOpen = true;
  693 + })
  694 + return;
  695 + }
668 696 this.open = true;
669 697 this.title = "审批";
670 698 });
... ... @@ -914,6 +942,15 @@ export default {
914 942 }
915 943 }
916 944 }
  945 +
  946 + if(this.definitionKey.indexOf("supervision")>-1){
  947 + formDataSave(this.id, this.form.formData).then(response => {
  948 + this.msgSuccess("审批成功");
  949 + this.supervisionOpen = false;
  950 + this.getList();
  951 + });
  952 + }
  953 +
917 954 },
918 955 conferenceSubmitForm(value) {
919 956 this.form.formData[0].controlValue = value;
... ...
trash-ui/src/views/casefile/violationCaseFile/index.vue
  View file @9d500e9
... ... @@ -219,7 +219,7 @@
219 219 <el-upload
220 220 ref="upload"
221 221 action=""
222   - accept=".docx,.xlsx,.xls,.ppt,.doc,.pdf,.png,.jpeg,.png,.jpg"
  222 + accept=".docx,.doc,.pdf,.png,.jpeg,.png,.jpg"
223 223 :on-change="fileChange"
224 224 :auto-upload="false"
225 225 :show-file-list="false"
... ... @@ -627,7 +627,7 @@ export default {
627 627 },
628 628 /**
629 629 * 文件改变时,限制文件上传格式和大小
630   - * 文件格式只能为docx/xlsx/xls/ppt/doc/pdf/png/jpeg/png/jpg
  630 + * 文件格式只能为docx/doc/pdf/png/jpeg/png/jpg
631 631 * 大小不超过20M
632 632 * */
633 633 fileChange(file, fileList) {
... ... @@ -655,7 +655,7 @@ export default {
655 655 }
656 656 let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase();
657 657 //格式符合后判断大小
658   - if ("docx,xlsx,xls,ppt,doc,pdf,png,jpeg,png,jpg".indexOf(fileType) != -1) {
  658 + if ("docx,doc,pdf,png,jpeg,png,jpg".indexOf(fileType) != -1) {
659 659 let max5M = file.size / 1024 / 1024 < 20;
660 660 if (!max5M) {
661 661 this.$message({
... ... @@ -669,9 +669,10 @@ export default {
669 669 }
670 670 } else {
671 671 this.$message({
672   - message: '上传文件只能是 docx、xlsx、xls、ppt、doc、pdf、png、jpeg、png、jpg格式!',
  672 + message: '上传文件只能是 docx、doc、pdf、png、jpeg、png、jpg格式!',
673 673 type: 'warning'
674 674 });
  675 + fileList = fileList.splice(fileList.length - 1, 1);
675 676 }
676 677 },
677 678 // 删除文件
... ...
trash-ui/src/views/casefile/violationCaseFile/violationCaseTable.vue
  View file @9d500e9
... ... @@ -78,8 +78,8 @@ export default {
78 78 let allRepCount = 0;
79 79 for (let i in data) {
80 80  
81   - allCount += Number(data[i].count);
82   - allRepCount += Number(data[i].repCount);
  81 + allCount += Number(data[i].count==null?0:data[i].count);
  82 + allRepCount += Number(data[i].repCount==null?0:data[i].repCount);
83 83  
84 84 }
85 85  
... ... @@ -97,7 +97,11 @@ export default {
97 97 }
98 98  
99 99 if (index == 4) {
100   - sums[4] = ((allRepCount / allCount) * 100).toFixed(2) + "%";
  100 + if(allCount==0||allRepCount==0){
  101 + sums[4] = "0" + "%";
  102 + }else{
  103 + sums[4] = ((allRepCount / allCount) * 100).toFixed(2) + "%";
  104 + }
101 105 }
102 106 })
103 107  
... ...
trash-ui/src/views/casefile/violationWarningInformation/index.vue
  View file @9d500e9
... ... @@ -204,7 +204,7 @@
204 204 <el-upload
205 205 ref="upload"
206 206 action=""
207   - accept=".docx,.xlsx,.xls,.ppt,.doc,.pdf,.png,.jpeg,.png,.jpg"
  207 + accept=".docx,.doc,.pdf,.png,.jpeg,.png,.jpg"
208 208 :on-change="fileChange"
209 209 :auto-upload="false"
210 210 :show-file-list="false"
... ... @@ -589,7 +589,7 @@ export default {
589 589 },
590 590 /**
591 591 * 文件改变时,限制文件上传格式和大小
592   - * 文件格式只能为docx/xlsx/xls/ppt/doc/pdf/png/jpeg/png/jpg
  592 + * 文件格式只能为docx/doc/pdf/png/jpeg/png/jpg
593 593 * 大小不超过20M
594 594 * */
595 595 fileChange(file, fileList) {
... ... @@ -617,7 +617,7 @@ export default {
617 617 }
618 618 let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase();
619 619 //格式符合后判断大小
620   - if ("docx,xlsx,xls,ppt,doc,pdf,png,jpeg,png,jpg".indexOf(fileType) != -1) {
  620 + if ("docx,doc,pdf,png,jpeg,png,jpg".indexOf(fileType) != -1) {
621 621 let max5M = file.size / 1024 / 1024 < 20;
622 622 if (!max5M) {
623 623 this.$message({
... ... @@ -631,9 +631,10 @@ export default {
631 631 }
632 632 } else {
633 633 this.$message({
634   - message: '上传文件只能是 docx、xlsx、xls、ppt、doc、pdf、png、jpeg、png、jpg格式!',
  634 + message: '上传文件只能是 docx、doc、pdf、png、jpeg、png、jpg格式!',
635 635 type: 'warning'
636 636 });
  637 + fileList = fileList.splice(fileList.length - 1, 1);
637 638 }
638 639 },
639 640 // 删除文件
... ...
trash-ui/src/views/casefile/violationWarningInformation/violationWarningInformationTable.vue
  View file @9d500e9
... ... @@ -77,9 +77,8 @@ export default {
77 77 let allCount = 0;
78 78 let allRepCount = 0;
79 79 for (let i in data) {
80   -
81   - allCount += Number(data[i].count);
82   - allRepCount += Number(data[i].repCount);
  80 + allCount += Number(data[i].count==null?0:data[i].count);
  81 + allRepCount += Number(data[i].repCount==null?0:data[i].repCount);
83 82  
84 83 }
85 84  
... ... @@ -97,7 +96,12 @@ export default {
97 96 }
98 97  
99 98 if (index == 4) {
100   - sums[4] = ((allRepCount / allCount) * 100).toFixed(2) + "%";
  99 + if(allCount==0||allRepCount==0){
  100 + sums[4] = "0" + "%";
  101 + }else{
  102 + sums[4] = ((allRepCount / allCount) * 100).toFixed(2) + "%";
  103 + }
  104 +
101 105 }
102 106 })
103 107  
... ...
trash-ui/src/views/office/conference/index.vue
  View file @9d500e9
... ... @@ -490,6 +490,7 @@ export default {
490 490 message: '上传文件只能是 docx、xlsx、xls、ppt、rar、zip、doc、pdf、png、jpeg、png、jpg格式!',
491 491 type: 'warning'
492 492 });
  493 + fileList = fileList.splice(fileList.length - 1, 1);
493 494 }
494 495 },
495 496 // 删除文件
... ...
trash-ui/src/views/office/handle/index.vue
  View file @9d500e9
... ... @@ -499,7 +499,6 @@ export default {
499 499 * 大小不超过5M
500 500 * */
501 501 fileChange(file, fileList) {
502   - console.log(fileList)
503 502 let count = 0;
504 503 for (let i = 0; i < fileList.length; i++) {
505 504 // console.log(fileList.length)
... ... @@ -541,6 +540,7 @@ export default {
541 540 message: '上传文件只能是 docx、xlsx、xls、ppt、rar、zip、doc、pdf、png、jpeg、png、jpg格式!',
542 541 type: 'warning'
543 542 });
  543 + fileList = fileList.splice(fileList.length - 1, 1);
544 544 }
545 545 },
546 546 // 删除文件
... ...
trash-ui/src/views/office/leaveApplication/index.vue
  View file @9d500e9
... ... @@ -528,6 +528,7 @@ export default {
528 528 message: '上传文件只能是 docx、xlsx、xls、ppt、doc、pdf、png、jpeg、png、jpg格式!',
529 529 type: 'warning'
530 530 });
  531 + fileList = fileList.splice(fileList.length - 1, 1);
531 532 }
532 533 },
533 534 // 删除文件
... ...
trash-ui/src/views/office/management/index.vue
  View file @9d500e9
... ... @@ -569,6 +569,7 @@ export default {
569 569 message: '上传文件只能是 docx、xlsx、xls、ppt、rar、zip、doc、pdf、png、jpeg、png、jpg格式!',
570 570 type: 'warning'
571 571 });
  572 + fileList = fileList.splice(fileList.length - 1, 1);
572 573 }
573 574 },
574 575 // 删除文件
... ...
trash-workFlow/src/main/java/com/trash/casefile/controller/ViolationCaseFileController.java
  View file @9d500e9
... ... @@ -137,6 +137,10 @@ public class ViolationCaseFileController extends BaseController
137 137 public AjaxResult getTable(String owningRegion,String startDate,String endDate){
138 138 List<HashMap<String, String>> maps = new ArrayList<HashMap<String,String>>();
139 139  
  140 + if(owningRegion.equals("长沙市")){
  141 + owningRegion = "";
  142 + }
  143 +
140 144 if(startDate != null && endDate != null&&startDate!=""&&endDate!=""){
141 145 startDate = startDate.substring(0,10);
142 146 endDate = endDate.substring(0,10);
... ... @@ -174,7 +178,7 @@ public class ViolationCaseFileController extends BaseController
174 178 maps.add(map);
175 179 }else{
176 180 double pct = ((double)repCount)/((double)count);
177   - map.put("repPct",(pct*100) + "%");
  181 + map.put("repPct",String.format("%.2f", (pct*100)) + "%");
178 182 maps.add(map);
179 183 }
180 184  
... ...
trash-workFlow/src/main/java/com/trash/casefile/controller/ViolationWarningInformationController.java
  View file @9d500e9
... ... @@ -67,7 +67,7 @@ public class ViolationWarningInformationController extends BaseController
67 67 list.get(i).setId((long)i+1);
68 68 }
69 69 ExcelUtil<ViolationWarningInformation> util = new ExcelUtil<ViolationWarningInformation>(ViolationWarningInformation.class);
70   - return util.exportExcel(list, "violationWarningInformation");
  70 + return util.exportExcel(list, "违规预警信息");
71 71 }
72 72  
73 73 /**
... ... @@ -138,7 +138,9 @@ public class ViolationWarningInformationController extends BaseController
138 138 public AjaxResult getTable(String owningRegion,String startDate,String endDate){
139 139 List<HashMap<String, String>> maps = new ArrayList<HashMap<String,String>>();
140 140  
141   -
  141 + if(owningRegion.equals("长沙市")){
  142 + owningRegion = "";
  143 + }
142 144 if(startDate != null && endDate != null&&startDate!=""&&endDate!=""){
143 145 startDate = startDate.substring(0,10);
144 146 endDate = endDate.substring(0,10);
... ... @@ -169,18 +171,19 @@ public class ViolationWarningInformationController extends BaseController
169 171 map.put("count", count + "");
170 172 map.put("repCount", repCount + "");
171 173  
172   - if(count == 0){
  174 + if(repCount == 0){
173 175 double pct = ((double)repCount)/((double)count);
174 176 map.put("repPct","0%");
175 177 maps.add(map);
176 178 }else{
177 179 double pct = ((double)repCount)/((double)count);
178   - map.put("repPct",(pct*100) + "%");
  180 + map.put("repPct",String.format("%.2f", (pct*100)) + "%");
179 181 maps.add(map);
180 182 }
181 183  
182 184  
183 185  
  186 +
184 187 }
185 188  
186 189  
... ...
trash-workFlow/src/main/java/com/trash/casefile/domain/KafkaCompensation.java 0 → 100644
  View file @9d500e9
  1 +package com.trash.casefile.domain;
  2 +
  3 +import org.apache.commons.lang3.builder.ToStringBuilder;
  4 +import org.apache.commons.lang3.builder.ToStringStyle;
  5 +import com.trash.common.annotation.Excel;
  6 +import com.trash.common.core.domain.BaseEntity;
  7 +
  8 +/**
  9 + * kafka补偿对象 kafka_compensation
  10 + *
  11 + * @author 2c
  12 + * @date 2023-05-23
  13 + */
  14 +public class KafkaCompensation extends BaseEntity
  15 +{
  16 + private static final long serialVersionUID = 1L;
  17 +
  18 + /** $column.columnComment */
  19 + private Long id;
  20 +
  21 + /** kafka数据 */
  22 + private String data;
  23 +
  24 + /** 消费状态，0:未消费，1:已消费 */
  25 + private Integer status;
  26 +
  27 + public void setId(Long id)
  28 + {
  29 + this.id = id;
  30 + }
  31 +
  32 + public Long getId()
  33 + {
  34 + return id;
  35 + }
  36 + public void setData(String data)
  37 + {
  38 + this.data = data;
  39 + }
  40 +
  41 + public String getData()
  42 + {
  43 + return data;
  44 + }
  45 + public void setStatus(Integer status)
  46 + {
  47 + this.status = status;
  48 + }
  49 +
  50 + public Integer getStatus()
  51 + {
  52 + return status;
  53 + }
  54 +
  55 + @Override
  56 + public String toString() {
  57 + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
  58 + .append("id", getId())
  59 + .append("data", getData())
  60 + .append("createTime", getCreateTime())
  61 + .append("status", getStatus())
  62 + .toString();
  63 + }
  64 +}
... ...
trash-workFlow/src/main/java/com/trash/casefile/domain/ViolationWarningInformation.java
  View file @9d500e9
... ... @@ -25,20 +25,19 @@ public class ViolationWarningInformation extends BaseEntity {
25 25 /**
26 26 * 案卷编号
27 27 */
28   - @Excel(name = "案卷编号")
29   - private String number;
30 28  
31   - /**
32   - * 违规对象类型
33   - */
34   - @Excel(name = "违规对象类型")
35   - private String violationObjectType;
  29 + private String number;
36 30  
37 31 /**
38 32 * 所属区域
39 33 */
40 34 @Excel(name = "所属区域")
41 35 private String owningRegion;
  36 + /**
  37 + * 违规对象类型
  38 + */
  39 + @Excel(name = "违规对象类型",readConverterExp = "0=工地,1=消纳场,2=企业")
  40 + private String violationObjectType;
42 41  
43 42 /**
44 43 * 违规类型
... ... @@ -49,7 +48,6 @@ public class ViolationWarningInformation extends BaseEntity {
49 48 /**
50 49 * 违规等级
51 50 */
52   - @Excel(name = "违规等级")
53 51 private String violationGrade;
54 52  
55 53 /**
... ... @@ -64,50 +62,59 @@ public class ViolationWarningInformation extends BaseEntity {
64 62 @Excel(name = "企业名称")
65 63 private String companyName;
66 64  
  65 + @Excel(name = "日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
  66 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
  67 + private Date createTime;
  68 +
67 69 /**
68 70 * 违规描述
69 71 */
70   - @Excel(name = "违规描述")
71 72 private String describe;
72 73  
73 74 /**
74 75 * 推送对象
75 76 */
76   - @Excel(name = "推送对象")
77 77 private String sendObject;
78 78  
79 79 /**
80 80 * 审批状态
81 81 */
  82 + @Excel(name = "审批状态",readConverterExp = "0=审批中,1=审批通过,2=被驳回")
82 83 private Integer status;
83 84  
84 85 /**
85 86 * 接收人
86 87 */
87   - @Excel(name = "接收人")
88 88 private String receive;
89 89  
90 90 /**
91 91 * 接收状态
92 92 */
93   - @Excel(name = "接收状态")
94 93 private Integer receiveStatus;
95 94  
96 95 /**
97 96 * 阅览人
98 97 */
99   - @Excel(name = "阅览人")
100 98 private String readBy;
101 99  
102 100 /**
103 101 * 阅览时间
104 102 */
105 103 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
106   - @Excel(name = "阅览时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
107 104 private Date readTime;
108 105  
109 106 private String abbreviation;
110 107  
  108 + @Override
  109 + public Date getCreateTime() {
  110 + return createTime;
  111 + }
  112 +
  113 + @Override
  114 + public void setCreateTime(Date createTime) {
  115 + this.createTime = createTime;
  116 + }
  117 +
111 118 public String getAbbreviation() {
112 119 return abbreviation;
113 120 }
... ...
trash-workFlow/src/main/java/com/trash/casefile/kafka/Consumer.java
  View file @9d500e9
... ... @@ -2,7 +2,9 @@ package com.trash.casefile.kafka;
2 2  
3 3 import com.alibaba.fastjson.JSONArray;
4 4 import com.alibaba.fastjson.JSONObject;
  5 +import com.trash.casefile.domain.KafkaCompensation;
5 6 import com.trash.casefile.domain.ViolationWarningInformation;
  7 +import com.trash.casefile.mapper.KafkaCompensationMapper;
6 8 import com.trash.casefile.mapper.ViolationWarningInformationMapper;
7 9 import com.trash.casefile.service.IViolationWarningInformationService;
8 10 import com.trash.common.config.trashConfig;
... ... @@ -36,7 +38,8 @@ public class Consumer {
36 38 @KafkaListener(topics = "record_process_alarm")
37 39 public void consume(@Payload String data) throws InterruptedException {
38 40 log.info("kafka消费数据成功,data:" + data);
39   - autoViolationWarning(data);
  41 + String id = insertKafkaCompensation(data);
  42 + autoViolationWarning(data,id);
40 43 }
41 44  
42 45 @Autowired
... ... @@ -48,13 +51,15 @@ public class Consumer {
48 51 @Autowired
49 52 RedisCache redisCache;
50 53  
51   - public void autoViolationWarning(String data) throws InterruptedException {
  54 + public void autoViolationWarning(String data,String id) throws InterruptedException {
  55 +
  56 +
52 57 String[] code = {"44030020=工地预警-未报开工作业", "44030021=工地预警-视频设备离线超时报警", "44030022=工地预警-三无车辆进入工地", "44030023=工地预警未按时间作业",
53 58 "44030024=消纳场预警-未报开工作业", "44030025=消纳场预警-视频设备离线超时报警", "44030026=消纳场预警-三无车辆进入消纳场", "44030027=消纳场预警-未到指定的消纳场作业",
54 59 "44030028=离线运输报警(工)", "44030029=离线运输报警(消)", "44030030=未激活车辆作业", "44030031=未核准作业车辆作业", "44030032=未按线路行驶",
55 60 "44030033=闯禁行驶", "44030034=失信车辆作业"};
56 61 JSONObject jsonObject = JSONObject.parseObject(data);
57   - //q:获取当前时间
  62 +
58 63 String nowHour = DateFormatUtils.format(new Date(), "HH");
59 64 String nowDate = null;
60 65 String tomorrowDate = null;
... ... @@ -177,13 +182,25 @@ public class Consumer {
177 182 e.printStackTrace();
178 183 }
179 184 } else {
180   - String describe = violationWarningInformation1.getDescribe() + ";" + DateFormatUtils.format(new Date(), "yyyy/MM/dd HH:mm:ss") + " "
  185 + String describe = violationWarningInformation1.getDescribe() + ";\n" + DateFormatUtils.format(new Date(), "yyyy/MM/dd HH:mm:ss") + " "
181 186 + jsonObject.getString("enterpriseName") + " " + jsonObject.get("licenseplateNo") + "在" +
182 187 jsonObject.get("siteName") + "出现" + jsonObject.getString("alarmName");
183 188 violationWarningInformation1.setDescribe(describe);
184 189 SpringUtils.getBean(ViolationWarningInformationMapper.class).updateViolationWarningInformation(violationWarningInformation1);
185 190 }
  191 + //kafka消费成功
  192 + KafkaCompensation kafkaCompensation = new KafkaCompensation();
  193 + kafkaCompensation.setId(Long.valueOf(id));
  194 + kafkaCompensation.setStatus(1);
  195 + SpringUtils.getBean(KafkaCompensationMapper.class).updateKafkaCompensation(kafkaCompensation);
  196 + }
186 197  
187   -
  198 + public String insertKafkaCompensation(String data){
  199 + KafkaCompensation kafkaCompensation = new KafkaCompensation();
  200 + kafkaCompensation.setData(data);
  201 + kafkaCompensation.setCreateTime(DateUtils.getNowDate());
  202 + kafkaCompensation.setStatus(0);
  203 + SpringUtils.getBean(KafkaCompensationMapper.class).insertKafkaCompensation(kafkaCompensation);
  204 + return kafkaCompensation.getId().toString();
188 205 }
189 206 }
... ...
trash-workFlow/src/main/java/com/trash/casefile/mapper/KafkaCompensationMapper.java 0 → 100644
  View file @9d500e9
  1 +package com.trash.casefile.mapper;
  2 +
  3 +import java.util.List;
  4 +import com.trash.casefile.domain.KafkaCompensation;
  5 +
  6 +/**
  7 + * kafka补偿Mapper接口
  8 + *
  9 + * @author 2c
  10 + * @date 2023-05-23
  11 + */
  12 +public interface KafkaCompensationMapper
  13 +{
  14 + /**
  15 + * 查询kafka补偿
  16 + *
  17 + * @param id kafka补偿ID
  18 + * @return kafka补偿
  19 + */
  20 + KafkaCompensation selectKafkaCompensationById(Long id);
  21 +
  22 + /**
  23 + * 查询kafka补偿列表
  24 + *
  25 + * @param kafkaCompensation kafka补偿
  26 + * @return kafka补偿集合
  27 + */
  28 + List<KafkaCompensation> selectKafkaCompensationList(KafkaCompensation kafkaCompensation);
  29 +
  30 + /**
  31 + * 新增kafka补偿
  32 + *
  33 + * @param kafkaCompensation kafka补偿
  34 + * @return 结果
  35 + */
  36 + int insertKafkaCompensation(KafkaCompensation kafkaCompensation);
  37 +
  38 + /**
  39 + * 修改kafka补偿
  40 + *
  41 + * @param kafkaCompensation kafka补偿
  42 + * @return 结果
  43 + */
  44 + int updateKafkaCompensation(KafkaCompensation kafkaCompensation);
  45 +
  46 + /**
  47 + * 删除kafka补偿
  48 + *
  49 + * @param id kafka补偿ID
  50 + * @return 结果
  51 + */
  52 + int deleteKafkaCompensationById(Long id);
  53 +
  54 + /**
  55 + * 批量删除kafka补偿
  56 + *
  57 + * @param ids 需要删除的数据ID
  58 + * @return 结果
  59 + */
  60 + int deleteKafkaCompensationByIds(Long[] ids);
  61 +}
... ...
trash-workFlow/src/main/java/com/trash/office/controller/LogisticsManagementController.java
  View file @9d500e9
... ... @@ -63,7 +63,7 @@ public class LogisticsManagementController extends BaseController
63 63 list.get(i).setId((long)i+1);
64 64 }
65 65 ExcelUtil<LogisticsManagementSeal> util = new ExcelUtil<>(LogisticsManagementSeal.class);
66   - return util.exportExcel(list, "后勤管理");
  66 + return util.exportExcel(list, "用章申请");
67 67 }else{
68 68 List<LogisticsManagementGoods> list = logisticsManagementService.selectLogisticsManagementGoodsList(logisticsManagement);
69 69  
... ... @@ -71,7 +71,12 @@ public class LogisticsManagementController extends BaseController
71 71 list.get(i).setId((long)i+1);
72 72 }
73 73 ExcelUtil<LogisticsManagementGoods> util = new ExcelUtil<>(LogisticsManagementGoods.class);
74   - return util.exportExcel(list, "后勤管理");
  74 + if(logisticsManagement.getType().equals("1")){
  75 + return util.exportExcel(list, "物品申请");
  76 + }else{
  77 + return util.exportExcel(list, "物品采购申请");
  78 + }
  79 +
75 80 }
76 81 }
77 82  
... ...
trash-workFlow/src/main/resources/mapper/casefile/KafkaCompensationMapper.xml 0 → 100644
  View file @9d500e9
  1 +<?xml version="1.0" encoding="UTF-8" ?>
  2 +<!DOCTYPE mapper
  3 +PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  4 +"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  5 +<mapper namespace="com.trash.casefile.mapper.KafkaCompensationMapper">
  6 +
  7 + <resultMap type="KafkaCompensation" id="KafkaCompensationResult">
  8 + <result property="id" column="id" />
  9 + <result property="data" column="data" />
  10 + <result property="createTime" column="create_time" />
  11 + <result property="status" column="status" />
  12 + </resultMap>
  13 +
  14 + <sql id="selectKafkaCompensationVo">
  15 + select id, data, create_time, status from kafka_compensation
  16 + </sql>
  17 +
  18 + <select id="selectKafkaCompensationList" parameterType="KafkaCompensation" resultMap="KafkaCompensationResult">
  19 + <include refid="selectKafkaCompensationVo"/>
  20 + <where>
  21 + <if test="data != null and data != ''"> and data = #{data}</if>
  22 + <if test="status != null "> and status = #{status}</if>
  23 + </where>
  24 + </select>
  25 +
  26 + <select id="selectKafkaCompensationById" parameterType="Long" resultMap="KafkaCompensationResult">
  27 + <include refid="selectKafkaCompensationVo"/>
  28 + where id = #{id}
  29 + </select>
  30 +
  31 + <insert id="insertKafkaCompensation" parameterType="KafkaCompensation" useGeneratedKeys="true" keyProperty="id">
  32 + insert into kafka_compensation
  33 + <trim prefix="(" suffix=")" suffixOverrides=",">
  34 + <if test="data != null">data,</if>
  35 + <if test="createTime != null">create_time,</if>
  36 + <if test="status != null">status,</if>
  37 + </trim>
  38 + <trim prefix="values (" suffix=")" suffixOverrides=",">
  39 + <if test="data != null">#{data},</if>
  40 + <if test="createTime != null">#{createTime},</if>
  41 + <if test="status != null">#{status},</if>
  42 + </trim>
  43 + </insert>
  44 +
  45 + <update id="updateKafkaCompensation" parameterType="KafkaCompensation">
  46 + update kafka_compensation
  47 + <trim prefix="SET" suffixOverrides=",">
  48 + <if test="data != null">data = #{data},</if>
  49 + <if test="createTime != null">create_time = #{createTime},</if>
  50 + <if test="status != null">status = #{status},</if>
  51 + </trim>
  52 + where id = #{id}
  53 + </update>
  54 +
  55 + <delete id="deleteKafkaCompensationById" parameterType="Long">
  56 + delete from kafka_compensation where id = #{id}
  57 + </delete>
  58 +
  59 + <delete id="deleteKafkaCompensationByIds" parameterType="String">
  60 + delete from kafka_compensation where id in
  61 + <foreach item="id" collection="array" open="(" separator="," close=")">
  62 + #{id}
  63 + </foreach>
  64 + </delete>
  65 +
  66 +</mapper>
0 67 \ No newline at end of file
... ...
trash-workFlow/src/main/resources/mapper/casefile/ViolationCaseFileMapper.xml
  View file @9d500e9
... ... @@ -50,6 +50,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
50 50 <if test="readTime != null "> and read_time = #{readTime}</if>
51 51 <if test="createTime != null "> and DATE_FORMAT(create_time,("%y%m%d")) = DATE_FORMAT(#{createTime},("%y%m%d"))</if>
52 52 </where>
  53 + order by create_time desc
53 54 </select>
54 55  
55 56 <select id="selectViolationCaseFileListByTable" parameterType="violationCaseFile" resultMap="violationCaseFileResult">
... ...
trash-workFlow/src/main/resources/mapper/casefile/ViolationWarningInformationMapper.xml
  View file @9d500e9
... ... @@ -42,6 +42,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
42 42 <if test="companyName != null and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
43 43 <if test="createTime != null"> and DATE_FORMAT(create_time,("%y%m%d")) = DATE_FORMAT(#{createTime},("%y%m%d"))</if>
44 44 </where>
  45 + order by create_time desc
45 46 </select>
46 47  
47 48 <select id="selectViolationWarningInformationListByTable" parameterType="ViolationWarningInformation" resultMap="ViolationWarningInformationResult">
... ...
trash-workFlow/src/main/resources/mapper/office/HandleAffairsMapper.xml
  View file @9d500e9
... ... @@ -33,14 +33,14 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
33 33 <select id="selectHandleAffairsList" parameterType="HandleAffairs" resultMap="HandleAffairsResult">
34 34 <include refid="selectHandleAffairsVo"/>
35 35 <where>
36   - <if test="company != null and company != ''"> and company = #{company}</if>
37   - <if test="receiveTime != null "> and receive_time = #{receiveTime}</if>
38   - <if test="title != null and title != ''"> and title = #{title}</if>
  36 + <if test="company != null and company != ''"> and company like concat('%',#{company},'%')</if>
  37 + <if test="receiveTime != null "> and receive_time like concat('%',SUBSTRING(#{receiveTime},1,10),'%')</if>
  38 + <if test="title != null and title != ''"> and title like concat('%',#{title},'%') </if>
39 39 <if test="type != null and type != ''"> and type = #{type}</if>
40   - <if test="appeal != null and appeal != ''"> and appeal = #{appeal}</if>
41   - <if test="sendPerson != null and sendPerson != ''"> and send_person = #{sendPerson}</if>
  40 + <if test="sendPerson != null and sendPerson != ''"> and send_person like concat('%',#{sendPerson},'%')</if>
42 41 <if test="status != null "> and status = #{status}</if>
43 42 <if test="deptName != null "> and dept_name = #{deptName}</if>
  43 + <if test="sendDate != null "> and send_date = #{sendDate}</if>
44 44 </where>
45 45 </select>
46 46  
... ...
trash-workFlow/src/main/resources/mapper/office/LogisticsManagementMapper.xml
  View file @9d500e9
... ... @@ -35,7 +35,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
35 35 <include refid="selectLogisticsManagementVo"/>
36 36 <where>
37 37 <if test="type != null "> and type = #{type}</if>
38   - <if test="deptName != null "> and dept_name = #{deptName}</if>
  38 + <if test="deptName != null and deptName != ''"> and dept_name = #{deptName}</if>
39 39 <if test="sealType != null and sealType != ''"> and seal_type = #{sealType}</if>
40 40 <if test="sealUpdateTime != null "> and seal_update_time = #{sealUpdateTime}</if>
41 41 <if test="sealEndTime != null "> and seal_end_time = #{sealEndTime}</if>
... ... @@ -52,7 +52,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
52 52 <include refid="selectLogisticsManagementVo"/>
53 53 <where>
54 54 <if test="type != null "> and type = #{type}</if>
55   - <if test="deptName != null "> and dept_name = #{deptName}</if>
  55 + <if test="deptName != null and deptName != ''"> and dept_name = #{deptName}</if>
56 56 <if test="sealType != null and sealType != ''"> and seal_type = #{sealType}</if>
57 57 <if test="sealUpdateTime != null "> and seal_update_time = #{sealUpdateTime}</if>
58 58 <if test="sealEndTime != null "> and seal_end_time = #{sealEndTime}</if>
... ... @@ -69,7 +69,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
69 69 <include refid="selectLogisticsManagementVo"/>
70 70 <where>
71 71 <if test="type != null "> and type = #{type}</if>
72   - <if test="deptName != null "> and dept_name = #{deptName}</if>
  72 + <if test="deptName != null and deptName != ''"> and dept_name = #{deptName} </if>
73 73 <if test="sealType != null and sealType != ''"> and seal_type = #{sealType}</if>
74 74 <if test="sealUpdateTime != null "> and seal_update_time = #{sealUpdateTime}</if>
75 75 <if test="sealEndTime != null "> and seal_end_time = #{sealEndTime}</if>
... ...