youxiw2000 / trash · Commits

Commit 31bf7358e17f39dd3816fc8b6eec0c446dbab2d4

Authored by youxiw2000
2 parents 4673ae9a ac347cf4
build: skipped

Merge branch 'dev' of http://101.95.0.106:8888/youxiw20000/trash into dev

Inline Side-by-side
Showing 1 changed file with 3 additions and 2 deletions
trash-workFlow/src/main/java/com/trash/casefile/kafka/Consumer.java
  View file @31bf735
@@ -135,8 +135,6 @@ public class Consumer { @@ -135,8 +135,6 @@ public class Consumer {
135 violationWarningInformation.setCreateBy("长沙市建筑垃圾智慧监管平台"); 135 violationWarningInformation.setCreateBy("长沙市建筑垃圾智慧监管平台");
136 //推送对象 136 //推送对象
137 violationWarningInformation.setViolationGrade("一般类"); 137 violationWarningInformation.setViolationGrade("一般类");
138 - //项目名称（工地名称，处理场所名称）  
139 - violationWarningInformation.setProjectName(siteName);  
140 violationWarningInformation.setSendObject("区管理部门"); 138 violationWarningInformation.setSendObject("区管理部门");
141 String describe = ""; 139 String describe = "";
142 String alarmTimeString = DateFormatUtils.format(alarmTime,"HH:mm"); 140 String alarmTimeString = DateFormatUtils.format(alarmTime,"HH:mm");
@@ -320,6 +318,7 @@ public class Consumer { @@ -320,6 +318,7 @@ public class Consumer {
320 case "44030032"://未按线路行驶 318 case "44030032"://未按线路行驶
321 violationWarningInformation.setViolationObjectType("0"); 319 violationWarningInformation.setViolationObjectType("0");
322 violationWarningInformation.setSendObject("区管理部门"); 320 violationWarningInformation.setSendObject("区管理部门");
  321 + violationWarningInformation.setProjectName(siteName);
323 describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " " 322 describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
324 + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" + 323 + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
325 jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType(); 324 jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
@@ -331,6 +330,7 @@ public class Consumer { @@ -331,6 +330,7 @@ public class Consumer {
331 case "44030033"://闯禁行驶 330 case "44030033"://闯禁行驶
332 violationWarningInformation.setViolationObjectType("0"); 331 violationWarningInformation.setViolationObjectType("0");
333 violationWarningInformation.setSendObject("区管理部门"); 332 violationWarningInformation.setSendObject("区管理部门");
  333 + violationWarningInformation.setProjectName(siteName);
334 describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " " 334 describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
335 + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "出现" + violationWarningInformation.getViolationType(); 335 + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "出现" + violationWarningInformation.getViolationType();
336 //设置公司简称 336 //设置公司简称
@@ -348,6 +348,7 @@ public class Consumer { @@ -348,6 +348,7 @@ public class Consumer {
348 348
349 case "44030034"://失信车辆作业 349 case "44030034"://失信车辆作业
350 case "44030035"://卫星 350 case "44030035"://卫星
  351 + violationWarningInformation.setProjectName(siteName);
351 violationWarningInformation.setViolationObjectType("2"); 352 violationWarningInformation.setViolationObjectType("2");
352 violationWarningInformation.setSendObject("运输企业"); 353 violationWarningInformation.setSendObject("运输企业");
353 describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " " 354 describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "