m

youxiw2000
1 parent 04d31709
Showing 13 changed files with 938 additions and 854 deletions
trash-admin/src/main/resources/application.yml
trash-common/src/main/java/com/trash/common/core/domain/entity/SysUser.java
trash-framework/src/main/java/com/trash/framework/web/service/SysLoginService.java
trash-quartz/src/main/java/com/trash/quartz/task/DriverTask.java
trash-ui/src/layout/index.vue
trash-ui/src/layout/index55.vue → trash-ui/src/layout/index4.vue
trash-ui/src/views/activiti/taskhistory/index.vue
trash-workFlow/src/main/java/com/trash/business/domain/SupervisionThreestep.java
trash-workFlow/src/main/java/com/trash/business/service/impl/CompanyCreditServiceImpl.java
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckActivateServiceImpl.java
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckCreditServiceImpl.java
trash-workFlow/src/main/java/com/trash/casefile/kafka/Consumer.java
@@ -11,6 +11,7 @@ spring:
     bootstrap-servers: 183.66.242.6:9101
     listener:
       ack-mode: manual_immediate
+      missing-topics-fatal: false
     producer:
       x-serializer: org.apache.kafka.common.serialization.StringSerializer
       value-serializer: org.apache.kafka.common.serialization.StringSerializer
@@ -102,11 +102,22 @@ public class SysUser extends BaseEntity
     List<String> conList = new ArrayList<String>();
     List<String> earthList = new ArrayList<String>();
     List<String> conAreas = new ArrayList<String>();
+    List<String> companyAreas = new ArrayList<String>();
     List<String> earthAreas = new ArrayList<String>();
     List<String> truckList = new ArrayList<String>();
  
  
-    public List<String> getTruckList() {
+   
+
+	public List<String> getCompanyAreas() {
+		return companyAreas;
+	}
+
+	public void setCompanyAreas(List<String> companyAreas) {
+		this.companyAreas = companyAreas;
+	}
+
+	public List<String> getTruckList() {
 		return truckList;
 	}
  
@@ -258,6 +258,11 @@ public class SysLoginService
             			List<String> companyIds = json.getJSONArray("companyIds").toJavaList(String.class);
                 		user.setCompanyIds(companyIds);
             		}
+
+            		if(json.getJSONArray("adCodes") != null){
+    	        		List<String> areas = json.getJSONArray("adCodes").toJavaList(String.class);
+    	        		user.setCompanyAreas(areas);
+            		}
             	}else if(json.getInteger("sourceType") == 3){
             		if(json.getJSONArray("sourceIds") != null){
     	        		List<String> companyIds = json.getJSONArray("sourceIds").toJavaList(String.class);
@@ -273,12 +273,12 @@ public class DriverTask
 	 * @throws InterruptedException
 	 */
 	public void kafkaCompensation() throws InterruptedException, IOException {
-//		KafkaCompensation kafkaCompensation = new KafkaCompensation();
-//		kafkaCompensation.setStatus(0);
-//		List<KafkaCompensation> kafkaCompensationList = SpringUtils.getBean(KafkaCompensationMapper.class).selectKafkaCompensationList(kafkaCompensation);
-//		for(KafkaCompensation k:kafkaCompensationList){
-//			SpringUtils.getBean(Consumer.class).autoViolationWarning(k.getData(),k.getId().toString());
-//		}
+		KafkaCompensation kafkaCompensation = new KafkaCompensation();
+		kafkaCompensation.setStatus(0);
+		List<KafkaCompensation> kafkaCompensationList = SpringUtils.getBean(KafkaCompensationMapper.class).selectKafkaCompensationList(kafkaCompensation);
+		for(KafkaCompensation k:kafkaCompensationList){
+			SpringUtils.getBean(Consumer.class).autoViolationWarning(k.getData(),k.getId().toString());
+		}
 	}
  
 	/**
@@ -339,6 +339,21 @@ public class DriverTask
 	/**
 	 * 每分钟更新一次区域列表
 	 */
+	public void getTruckList(){
+		if(RemoteServerUtils.remote == null){
+			RemoteServerUtils.remote = trashConfig.getRemotePath();
+		}
+		Map<String, Object> map = new HashMap<>();
+        map.put("size",99999);
+        map.put("valid",0);
+        map.put("page",1);
+        
+        JSONArray jsonArray = RemoteServerUtils.getTruckList(map,trashConfig.getToken());
+		redisCache.setCacheObject("truckList",jsonArray);
+	}
+	/**
+	 * 每分钟更新一次区域列表
+	 */
 	public void getAreaList(){
 		if(RemoteServerUtils.remote == null){
 			RemoteServerUtils.remote = trashConfig.getRemotePath();
 <template>
-      <app-main />
+  <div :class="classObj" class="app-wrapper">
+    <sidebar class="sidebar-container"/>
+    <div :class="{hasTagsView:needTagsView}" class="main-container">
+      <tags-view v-if="needTagsView"/>
+      <app-main/>
+
+    </div>
+  </div>
 </template>
  
 <script>
 import RightPanel from '@/components/RightPanel'
-import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
+import {AppMain, Navbar, Settings, Sidebar, TagsView} from './components'
 import ResizeMixin from './mixin/ResizeHandler'
-import { mapState } from 'vuex'
+import {mapState} from 'vuex'
  
 export default {
   name: 'Layout',
@@ -38,52 +45,63 @@ export default {
   },
   methods: {
     handleClickOutside() {
-      this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
+      this.$store.dispatch('app/closeSideBar', {withoutAnimation: false})
     }
   }
 }
 </script>
  
 <style lang="scss" scoped>
-  @import "~@/assets/styles/mixin.scss";
-  @import "~@/assets/styles/variables.scss";
-
-  .app-wrapper {
-    @include clearfix;
-    position: relative;
-    height: 100%;
-    width: 100%;
-
-    &.mobile.openSidebar {
-      position: fixed;
-      top: 0;
-    }
-  }
+@import "~@/assets/styles/mixin.scss";
+@import "~@/assets/styles/variables.scss";
  
-  .drawer-bg {
-    background: #000;
-    opacity: 0.3;
-    width: 100%;
-    top: 0;
-    height: 100%;
-    position: absolute;
-    z-index: 999;
-  }
+.app-wrapper {
+  @include clearfix;
+  position: relative;
+  height: 100%;
+  width: 100%;
  
-  .fixed-header {
+  &.mobile.openSidebar {
     position: fixed;
     top: 0;
-    right: 0;
-    z-index: 9;
-    width: calc(100% - #{$sideBarWidth});
-    transition: width 0.28s;
   }
+}
  
-  .hideSidebar .fixed-header {
-    width: calc(100% - 54px)
-  }
+.drawer-bg {
+  background: #000;
+  opacity: 0.3;
+  width: 100%;
+  top: 0;
+  height: 100%;
+  position: absolute;
+  z-index: 999;
+}
  
-  .mobile .fixed-header {
-    width: 100%;
-  }
+.fixed-header {
+  position: fixed;
+  top: 0;
+  right: 0;
+  z-index: 9;
+  width: calc(100% - #{$sideBarWidth});
+  transition: width 0.28s;
+}
+
+.hideSidebar .fixed-header {
+  width: calc(100% - 54px)
+}
+
+.mobile .fixed-header {
+  width: 100%;
+}
+
+.preview figure {
+  float: left;
+  width: 30%;
+  height:calc(30vw - 0px);
+  margin: 1.5%;
+}
+
+.preview figure img {
+  width: 400px;
+}
 </style>
 <template>
-  <div :class="classObj" class="app-wrapper">
-    <sidebar class="sidebar-container"/>
-    <div :class="{hasTagsView:needTagsView}" class="main-container">
-      <tags-view v-if="needTagsView"/>
-      <app-main/>
-
-    </div>
-  </div>
+      <app-main />
 </template>
  
 <script>
 import RightPanel from '@/components/RightPanel'
-import {AppMain, Navbar, Settings, Sidebar, TagsView} from './components'
+import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
 import ResizeMixin from './mixin/ResizeHandler'
-import {mapState} from 'vuex'
+import { mapState } from 'vuex'
  
 export default {
   name: 'Layout',
@@ -45,63 +38,52 @@ export default {
   },
   methods: {
     handleClickOutside() {
-      this.$store.dispatch('app/closeSideBar', {withoutAnimation: false})
+      this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
     }
   }
 }
 </script>
  
 <style lang="scss" scoped>
-@import "~@/assets/styles/mixin.scss";
-@import "~@/assets/styles/variables.scss";
+  @import "~@/assets/styles/mixin.scss";
+  @import "~@/assets/styles/variables.scss";
  
-.app-wrapper {
-  @include clearfix;
-  position: relative;
-  height: 100%;
-  width: 100%;
+  .app-wrapper {
+    @include clearfix;
+    position: relative;
+    height: 100%;
+    width: 100%;
  
-  &.mobile.openSidebar {
-    position: fixed;
-    top: 0;
+    &.mobile.openSidebar {
+      position: fixed;
+      top: 0;
+    }
   }
-}
  
-.drawer-bg {
-  background: #000;
-  opacity: 0.3;
-  width: 100%;
-  top: 0;
-  height: 100%;
-  position: absolute;
-  z-index: 999;
-}
-
-.fixed-header {
-  position: fixed;
-  top: 0;
-  right: 0;
-  z-index: 9;
-  width: calc(100% - #{$sideBarWidth});
-  transition: width 0.28s;
-}
-
-.hideSidebar .fixed-header {
-  width: calc(100% - 54px)
-}
+  .drawer-bg {
+    background: #000;
+    opacity: 0.3;
+    width: 100%;
+    top: 0;
+    height: 100%;
+    position: absolute;
+    z-index: 999;
+  }
  
-.mobile .fixed-header {
-  width: 100%;
-}
+  .fixed-header {
+    position: fixed;
+    top: 0;
+    right: 0;
+    z-index: 9;
+    width: calc(100% - #{$sideBarWidth});
+    transition: width 0.28s;
+  }
  
-.preview figure {
-  float: left;
-  width: 30%;
-  height:calc(30vw - 0px);
-  margin: 1.5%;
-}
+  .hideSidebar .fixed-header {
+    width: calc(100% - 54px)
+  }
  
-.preview figure img {
-  width: 400px;
-}
+  .mobile .fixed-header {
+    width: 100%;
+  }
 </style>
@@ -58,7 +58,7 @@
       </el-table>
     </el-dialog>
  
-    <el-dialog :title="title" :visible.sync="construct" width="1200px" append-to-body>
+    <el-dialog :title="title" :visible.sync="construct" width="1500px" append-to-body>
         <companyInfo :businessKey="businessKey" :businessType="2" :signData="signData" v-if="construct"/>
       <el-table :data="hisfromData" v-if="hisfromData != null">
         <el-table-column label="审批意见" align="center" prop="controlValue"/>
@@ -77,7 +77,7 @@
     </el-dialog>
  
  
-    <el-dialog :title="title" :visible.sync="earthsites" width="1200px" append-to-body>
+    <el-dialog :title="title" :visible.sync="earthsites" width="1500px" append-to-body>
       <companyInfo :businessKey="businessKey" :businessType="3" v-if="earthsites"/>
       <el-table :data="hisfromData" v-if="hisfromData != null">
         <el-table-column label="审批意见" align="center" prop="controlValue"/>
@@ -86,7 +86,7 @@
       </el-table>
     </el-dialog>
  
-    <el-dialog :title="title" :visible.sync="contract" width="1200px" append-to-body>
+    <el-dialog :title="title" :visible.sync="contract" width="1500px" append-to-body>
       <companyInfo :businessKey="businessKey" :businessType="4"   v-if="contract"/>
       <el-table :data="hisfromData" v-if="hisfromData != null">
  
@@ -138,7 +138,7 @@
       </el-table>
     </el-dialog>
  
-      <el-dialog :title="title" :visible.sync="company" width="1200px" append-to-body :close-on-click-modal="false">
+      <el-dialog :title="title" :visible.sync="company" width="1500px" append-to-body :close-on-click-modal="false">
       <companyInfo :businessKey="businessKey" :businessType="0" v-if="company"/>
         <el-table :data="hisfromData" v-if="hisfromData != null">
  
@@ -135,8 +135,11 @@ public class SupervisionThreestep extends BaseEntity
     private String attchItem1;
     private String attchItem2;
     private String attchItem3;
-
+    
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date workStartTime;
+    
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date workEndTime;
  
  
@@ -17,8 +17,10 @@ import com.trash.business.domain.TruckCredit;
 import com.trash.business.mapper.CompanyCreditMapper;
 import com.trash.business.service.ICompanyCreditService;
 import com.trash.business.service.ITruckCreditService;
+import com.trash.common.core.redis.RedisCache;
 import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.SecurityUtils;
+
 /**
  * 企业失信Service业务层处理
  *
@@ -26,274 +28,283 @@ import com.trash.common.utils.SecurityUtils;
  * @date 2023-04-25
  */
 @Service
-public class CompanyCreditServiceImpl implements ICompanyCreditService
-{
-    @Autowired
-    private CompanyCreditMapper companyCreditMapper;
-    
-
-    @Autowired
-    private ITruckCreditService truckService;;
-    
-    /**
-     * 查询企业失信
-     *
-     * @param id 企业失信ID
-     * @return 企业失信
-     */
-    @Override
-    public CompanyCredit selectCompanyCreditById(Long id)
-    {
-        return companyCreditMapper.selectCompanyCreditById(id);
-    }
-
-    /**
-     * 查询企业失信列表
-     *
-     * @param companyCredit 企业失信
-     * @return 企业失信
-     */
-    @Override
-    public List<CompanyCredit> selectCompanyCreditList(CompanyCredit companyCredit)
-    {	
-    	List<CompanyCredit> list = new ArrayList<>();
-
-			if (SecurityUtils.getLoginUser().getUser().getCompanyIds().size() > 0) {
-				companyCredit.setIds(SecurityUtils.getLoginUser().getUser().getCompanyIds());
-				list = companyCreditMapper.selectCompanyCreditList(companyCredit);
-			}
+public class CompanyCreditServiceImpl implements ICompanyCreditService {
+	@Autowired
+	private CompanyCreditMapper companyCreditMapper;
+
+	@Autowired
+	private ITruckCreditService truckService;;
+	
+	@Autowired
+	RedisCache redisCache;
+	/**
+	 * 查询企业失信
+	 *
+	 * @param id 企业失信ID
+	 * @return 企业失信
+	 */
+	@Override
+	public CompanyCredit selectCompanyCreditById(Long id) {
+		return companyCreditMapper.selectCompanyCreditById(id);
+	}
  
+	/**
+	 * 查询企业失信列表
+	 *
+	 * @param companyCredit 企业失信
+	 * @return 企业失信
+	 */
+	@Override
+	public List<CompanyCredit> selectCompanyCreditList(CompanyCredit companyCredit) {
+		List<CompanyCredit> list = new ArrayList<>();
+		
+		List<String> areas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
+		List<String> ids = SecurityUtils.getLoginUser().getUser().getCompanyIds();
  
-        return list;
-    }
-
-    /**
-     * 新增企业失信
-     *
-     * @param companyCredit 企业失信
-     * @return 结果
-     */
-    @SuppressWarnings("unchecked")
+		if(areas.size() > 0) {
+			JSONArray array = redisCache.getCacheObject("companyList");
+			if(array != null) {
+				for(Object obj:array) {
+					JSONObject json = (JSONObject)obj;
+					if(areas.indexOf(json.getString("areaCode")) > -1) {
+						ids.add(json.getString("id"));
+					}
+				}
+			}
+		}
+		
+		if ( ids.size()> 0) {
+			companyCredit.setIds(SecurityUtils.getLoginUser().getUser().getCompanyIds());
+			list = companyCreditMapper.selectCompanyCreditList(companyCredit);
+		}
+
+		return list;
+	}
+
+	/**
+	 * 新增企业失信
+	 *
+	 * @param companyCredit 企业失信
+	 * @return 结果
+	 */
+	@SuppressWarnings("unchecked")
 	@Override
-    public int insertCompanyCredit(CompanyCredit companyCredit)
-    { 
-    	int i = 0;
-        companyCredit.setCreateBy(SecurityUtils.getUsername());
-        companyCredit.setTime(new Date());
-        
-        
-        CompanyCredit cc = new CompanyCredit();
-        
-        cc.setStatus(0L);
-        cc.setLostCredit(companyCredit.getLostCredit());
-        cc.setObjectId(companyCredit.getObjectId());
-        
-        
-        List old = selectCompanyCreditList(cc);
-        
-        if(old.size() > 0){
-        	i = 1;
-        }else{
-            i = companyCreditMapper.insertCompanyCredit(companyCredit);
-        }
-        
-        updateRemoteCompanyAndTruck(companyCredit,null);
-        
-        return i;
-    }
-    
-    
-
-	public void insertCompanyCredit(CompanyCredit companyCredit, String token){
-		 companyCredit.setTime(new Date());
-
-	        int i = companyCreditMapper.insertCompanyCredit(companyCredit);
-	        
-	        updateRemoteCompanyAndTruck(companyCredit,token);
-	        
-	        return;
+	public int insertCompanyCredit(CompanyCredit companyCredit) {
+		int i = 0;
+		companyCredit.setCreateBy(SecurityUtils.getUsername());
+		companyCredit.setTime(new Date());
+
+		CompanyCredit cc = new CompanyCredit();
+
+		cc.setStatus(0L);
+		cc.setLostCredit(companyCredit.getLostCredit());
+		cc.setObjectId(companyCredit.getObjectId());
+
+		List old = selectCompanyCreditList(cc);
+
+		if (old.size() > 0) {
+			i = 1;
+		} else {
+			i = companyCreditMapper.insertCompanyCredit(companyCredit);
+		}
+
+		updateRemoteCompanyAndTruck(companyCredit, null);
+
+		return i;
+	}
+
+	public void insertCompanyCredit(CompanyCredit companyCredit, String token) {
+		companyCredit.setTime(new Date());
+
+		int i = companyCreditMapper.insertCompanyCredit(companyCredit);
+
+		updateRemoteCompanyAndTruck(companyCredit, token);
+
+		return;
 	}
-    
-    
-    @Override
-    public void updateRemoteCompanyAndTruck(CompanyCredit companyCredit,String token){
-        long credit = companyCredit.getLostCredit();
-        String companyId = companyCredit.getObjectId();
-        
-        
-        List<Map> cpcList = new ArrayList<>();
-        Map cpc = new HashedMap<>();
-        cpc.put("dishonestState", credit);
-        cpc.put("id", companyId);
-        
-        cpcList.add(cpc);
-        
-        
-        
-        Map map = new HashedMap<>();
-        
-        map.put("companyID",companyId);
-        map.put("valid",0);
-        JSONArray turckList = null;
-        if(token == null){
-            RemoteServerUtils.updateCompanyList(cpcList);
-        	turckList = RemoteServerUtils.getTruckList(map);
-        }else{
-            RemoteServerUtils.updateCompanyList(cpcList, token);
-        	turckList = RemoteServerUtils.getTruckList(map,token);
-        }
-        
-        
-        if(turckList != null){
-        	 for(Object objec:turckList){
-
-        	     List<Map> updateList = new ArrayList();
-        		 JSONObject truck = (JSONObject)objec;
-        		 
-        		 String truckId = truck.getString("id");
-        		 
-        		 TruckCredit tredit = new TruckCredit();
-        		 
-        		 tredit.setStatus(0L);
-        		 tredit.setObjectId(truckId);
-        		 
-        		 List<TruckCredit> oldData = truckService.selectTruckCreditList(tredit);
-        		 TruckCredit data;
-        		 if(oldData.size() > 0){
-        			 data = oldData.get(0);
-        			 if(data.getLostCredit() != credit){
-        				 if(credit == 0 && (data.getCreateType() != null &&  data.getCreateType() == 1)){
-            				 data.setLostCredit(credit);
-            				 data.setReason("公司失信恢复");
-            				 truckService.updateTruckCredit(data);
-            				 Map upParam = new HashedMap<>();
-            				 upParam.put("creditStatus", credit);
-            				 upParam.put("id", truckId);
-            				 updateList.add(upParam);
-
-            				 if(token != null)
-                    			 RemoteServerUtils.updateTruckList(updateList,token);
-                    		 else
-                    			 RemoteServerUtils.updateTruckList(updateList);
-            				 
-            				 continue;
-        				 }
-        			 }
-        		 }else{
-        			 if(credit==0)
-        				 continue;
-        			 
-        			 data = new TruckCredit();
-        			 
-        			 data.setLostCredit(credit);
-        			 
-        			 data.setCompanyId(companyCredit.getName());
-        			 
-        			 data.setLicensePlate(truck.getString("licenseplateNo"));
-        			 
-        			 data.setTime(new Date());
-        			 
+
+	@Override
+	public void updateRemoteCompanyAndTruck(CompanyCredit companyCredit, String token) {
+		long credit = companyCredit.getLostCredit();
+		String companyId = companyCredit.getObjectId();
+
+		List<Map> cpcList = new ArrayList<>();
+		Map cpc = new HashedMap<>();
+		cpc.put("dishonestState", credit);
+		cpc.put("id", companyId);
+
+		cpcList.add(cpc);
+
+		Map map = new HashedMap<>();
+
+		map.put("companyID", companyId);
+		map.put("valid", 0);
+		JSONArray turckList = null;
+		if (token == null) {
+			RemoteServerUtils.updateCompanyList(cpcList);
+			turckList = RemoteServerUtils.getTruckList(map);
+		} else {
+			RemoteServerUtils.updateCompanyList(cpcList, token);
+			turckList = RemoteServerUtils.getTruckList(map, token);
+		}
+
+		if (turckList != null) {
+			for (Object objec : turckList) {
+
+				List<Map> updateList = new ArrayList();
+				JSONObject truck = (JSONObject) objec;
+
+				String truckId = truck.getString("id");
+
+				TruckCredit tredit = new TruckCredit();
+
+				tredit.setStatus(0L);
+				tredit.setObjectId(truckId);
+
+				List<TruckCredit> oldData = truckService.selectTruckCreditList(tredit);
+				TruckCredit data;
+				if (oldData.size() > 0) {
+					data = oldData.get(0);
+					if (data.getLostCredit() != credit) {
+						if (credit == 0 && (data.getCreateType() != null && data.getCreateType() == 1)) {
+							data.setLostCredit(credit);
+							data.setReason("公司失信恢复");
+							truckService.updateTruckCredit(data);
+							Map upParam = new HashedMap<>();
+							upParam.put("creditStatus", credit);
+							upParam.put("id", truckId);
+							updateList.add(upParam);
+
+							if (token != null)
+								RemoteServerUtils.updateTruckList(updateList, token);
+							else
+								RemoteServerUtils.updateTruckList(updateList);
+
+							continue;
+						}
+					}
+				} else {
+					if (credit == 0)
+						continue;
+
+					data = new TruckCredit();
+
+					data.setLostCredit(credit);
+
+					data.setCompanyId(companyCredit.getName());
+
+					data.setLicensePlate(truck.getString("licenseplateNo"));
+
+					data.setTime(new Date());
+
 //        			 data.setCreateBy(SecurityUtils.getUsername());
-        			 data.setCreateBy("");
-        			 
-        			 data.setReason("公司失信");
-        			 
-        			 data.setCreateType(1L);
-        			 
-        			 data.setObjectId(truckId);
-        			 
-        			 truckService.insertTruckCredit(data);
-        			 
-    				 Map upParam = new HashedMap<>();
-    				 upParam.put("creditStatus", credit);
-    				 upParam.put("id", truckId);
-    				 updateList.add(upParam);
-    				 if(token != null)
-            			 RemoteServerUtils.updateTruckList(updateList,token);
-            		 else
-            			 RemoteServerUtils.updateTruckList(updateList);
-    				 
-        		 }
-        	 }
-        }
-        
-    }
-
-    /**
-     * 修改企业失信
-     *
-     * @param companyCredit 企业失信
-     * @return 结果
-     */
-    @Override
-    @Transactional
-    public int updateCompanyCredit(CompanyCredit companyCredit)
-    {
-
-        CompanyCredit cc = companyCreditMapper.selectCompanyCreditById(companyCredit.getId());
-
-        cc.setStatus(1L);
-
-        try {
-            companyCreditMapper.updateCompanyCredit(cc);
-
-            cc.setReason(companyCredit.getReason());
-            cc.setLostCredit(0L);
-
-            return insertCompanyCredit(cc);
-
-        } catch (Exception e) {
-        	e.printStackTrace();
-
-        }
-
-        return 0;
-    }
-
-    /**
-     * 批量删除企业失信
-     *
-     * @param ids 需要删除的企业失信ID
-     * @return 结果
-     */
-    @Override
-    public int deleteCompanyCreditByIds(Long[] ids)
-    {
-        return companyCreditMapper.deleteCompanyCreditByIds(ids);
-    }
-
-    public List<String> getNames(CompanyCredit companyCredit){
-        return companyCreditMapper.getNames(companyCredit);
-    }
-
-    public List<String> getPlaces(CompanyCredit companyCredit){
-        return companyCreditMapper.getPlaces(companyCredit);
-    }
-    
-    
-    @Override
-    public List<CompanyCredit> selectCompanyCreditHistory(CompanyCredit companyCredit)
-    {	
-    	List<CompanyCredit> list = new ArrayList<>();
-
-			if (SecurityUtils.getLoginUser().getUser().getCompanyIds().size() > 0) {
-				companyCredit.setIds(SecurityUtils.getLoginUser().getUser().getCompanyIds());
-				list = companyCreditMapper.selectCompanyCreditHistory(companyCredit);
+					data.setCreateBy("");
+
+					data.setReason("公司失信");
+
+					data.setCreateType(1L);
+
+					data.setObjectId(truckId);
+
+					truckService.insertTruckCredit(data);
+
+					Map upParam = new HashedMap<>();
+					upParam.put("creditStatus", credit);
+					upParam.put("id", truckId);
+					updateList.add(upParam);
+					if (token != null)
+						RemoteServerUtils.updateTruckList(updateList, token);
+					else
+						RemoteServerUtils.updateTruckList(updateList);
+
+				}
 			}
+		}
+
+	}
+
+	/**
+	 * 修改企业失信
+	 *
+	 * @param companyCredit 企业失信
+	 * @return 结果
+	 */
+	@Override
+	@Transactional
+	public int updateCompanyCredit(CompanyCredit companyCredit) {
+
+		CompanyCredit cc = companyCreditMapper.selectCompanyCreditById(companyCredit.getId());
+
+		cc.setStatus(1L);
+
+		try {
+			companyCreditMapper.updateCompanyCredit(cc);
+
+			cc.setReason(companyCredit.getReason());
+			cc.setLostCredit(0L);
  
+			return insertCompanyCredit(cc);
+
+		} catch (Exception e) {
+			e.printStackTrace();
+
+		}
+
+		return 0;
+	}
+
+	/**
+	 * 批量删除企业失信
+	 *
+	 * @param ids 需要删除的企业失信ID
+	 * @return 结果
+	 */
+	@Override
+	public int deleteCompanyCreditByIds(Long[] ids) {
+		return companyCreditMapper.deleteCompanyCreditByIds(ids);
+	}
+
+	public List<String> getNames(CompanyCredit companyCredit) {
+		return companyCreditMapper.getNames(companyCredit);
+	}
+
+	public List<String> getPlaces(CompanyCredit companyCredit) {
+		return companyCreditMapper.getPlaces(companyCredit);
+	}
+
+	@Override
+	public List<CompanyCredit> selectCompanyCreditHistory(CompanyCredit companyCredit) {
+		List<CompanyCredit> list = new ArrayList<>();
+		List<String> areas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
+		List<String> ids = SecurityUtils.getLoginUser().getUser().getCompanyIds();
  
-        return list;
-    }
-
-    /**
-     * 删除企业失信信息
-     *
-     * @param id 企业失信ID
-     * @return 结果
-     */
-    @Override
-    public int deleteCompanyCreditById(Long id)
-    {
-        return companyCreditMapper.deleteCompanyCreditById(id);
-    }
+		if(areas.size() > 0) {
+			JSONArray array = redisCache.getCacheObject("companyList");
+			if(array != null) {
+				for(Object obj:array) {
+					JSONObject json = (JSONObject)obj;
+					if(areas.indexOf(json.getString("areaCode")) > -1) {
+						ids.add(json.getString("id"));
+					}
+				}
+			}
+		}
+		if (SecurityUtils.getLoginUser().getUser().getCompanyIds().size() > 0) {
+			companyCredit.setIds(SecurityUtils.getLoginUser().getUser().getCompanyIds());
+			list = companyCreditMapper.selectCompanyCreditHistory(companyCredit);
+		}
+
+		return list;
+	}
+
+	/**
+	 * 删除企业失信信息
+	 *
+	 * @param id 企业失信ID
+	 * @return 结果
+	 */
+	@Override
+	public int deleteCompanyCreditById(Long id) {
+		return companyCreditMapper.deleteCompanyCreditById(id);
+	}
 }
 \ No newline at end of file
@@ -83,6 +83,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 			String start, end;
  
 			SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
+			SimpleDateFormat dateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			Date date = new Date();
  
 			if (new Date().getHours() < 8) {
@@ -182,6 +183,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 			String start, end;
  
 			SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
+			SimpleDateFormat dateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			Date date = new Date();
  
 			if (new Date().getHours() < 8) {
@@ -224,7 +226,6 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		return supervisionThreestepMapper.getNames(supervisionThreestep);
 	}
  
-	SimpleDateFormat dateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
  
 	String[] outside = { "长沙县", "望城区", "浏阳市", "宁乡市", "株洲市", "湘潭市", "汩罗市", "湘阴县" };
  
@@ -233,6 +234,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 	public List<Map<String, String>> selectDayWorkList(SupervisionThreestep supervisionThreestep) {
  
 		SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
+		SimpleDateFormat dateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		if (supervisionThreestep.getWorkStartTime() == null) {
 			String start, end;
  
@@ -520,33 +522,36 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
  
 	@Override
 	public List<Map> selectDayWorkListByType(SupervisionThreestep supervisionThreestep) {
-
-		SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
-		String start, end;
+		
  
 		Date date = new Date();
-
-		if (new Date().getHours() < 8) {
-			end = yearFomat.format(date);
-			date.setDate(date.getDate() - 1);
-			start = yearFomat.format(date);
-		} else {
-			start = yearFomat.format(date);
-			date.setDate(date.getDate() + 1);
-			end = yearFomat.format(date);
-		}
-
-		end += " 4:00:00";
-		start += " 8:00:00";
-
-		try {
-			supervisionThreestep.setWorkStartTime(dateTime.parse(start));
-			supervisionThreestep.setWorkEndTime(dateTime.parse(end));
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
+		SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
+		SimpleDateFormat dateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		if(supervisionThreestep.getWorkStartTime() == null){
+			String start, end;
+	
+	
+			if (new Date().getHours() < 8) {
+				end = yearFomat.format(date);
+				date.setDate(date.getDate() - 1);
+				start = yearFomat.format(date);
+			} else {
+				start = yearFomat.format(date);
+				date.setDate(date.getDate() + 1);
+				end = yearFomat.format(date);
+			}
+	
+			end += " 4:00:00";
+			start += " 8:00:00";
+	
+			try {
+				supervisionThreestep.setWorkStartTime(dateTime.parse(start));
+				supervisionThreestep.setWorkEndTime(dateTime.parse(end));
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
 		}
-
 		List<Map> map = supervisionThreestepMapper.selectDayWorkListByType(supervisionThreestep);
  
 		List<Map> list = new ArrayList<>();
@@ -583,6 +588,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 	public List<SupervisionThreestep> selectTodayDataList(SupervisionThreestep supervisionThreestep) {
  
 		SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
+		SimpleDateFormat dateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		if (supervisionThreestep.getWorkStartTime() == null) {
 			String start, end;
  
@@ -656,6 +662,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		}
  
 		SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
+		SimpleDateFormat dateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		if (supervisionThreestep.getId() != null) {
 			supervisionThreestepMapper.deleteSupervisionThreestepById(supervisionThreestep.getId());
 		}
@@ -728,6 +735,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		int j = supervisionThreestepMapper.updateSupervisionThreestep(supervisionThreestep);
  
 		SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
+		SimpleDateFormat dateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
  
 		supervisionThreestep = supervisionThreestepMapper.selectSupervisionThreestepById(supervisionThreestep.getId());
  
@@ -934,6 +942,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 	public void updateTodayData(String token) {
  
 		SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
+		SimpleDateFormat dateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
  
 		SupervisionThreestep supervisionThreestep = new SupervisionThreestep();
  
@@ -1023,6 +1032,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		if (supervisionThreestep.getWorkStartTime() == null) {
  
 			SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
+			SimpleDateFormat dateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
  
 			String start, end;
  
@@ -90,7 +90,20 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
  
 				List<String> companys = SecurityUtils.getLoginUser().getUser().getCompanyIds();
 				List<String> tList = SecurityUtils.getLoginUser().getUser().getTruckList();
-
+				List<String> areas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
+				
+				
+				if(areas.size() > 0) {
+					JSONArray array = redis.getCacheObject("companyList");
+					if(array != null) {
+						for(Object obj:array) {
+							JSONObject json = (JSONObject)obj;
+							if(areas.indexOf(json.getString("areaCode")) > -1) {
+								companys.add(json.getString("id"));
+							}
+						}
+					}
+				}
 				if (tList.size() > 0 || companys.size() > 0 || cList.size() > 0) {
 					List<String> ids = new ArrayList<>();
 					for (String str : tList) {
@@ -99,12 +112,7 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
  
 					if (companys.size() > 0) {
  
-						Map map = new HashMap<>();
-						map.put("size", 99999);
-						map.put("valid", 0);
-						map.put("page", 1);
-
-						JSONArray jsonArray = RemoteServerUtils.getTruckList(map);
+						JSONArray jsonArray = redis.getCacheObject("truckList");
  
 						for (Object obj : jsonArray) {
 							JSONObject json = (JSONObject) obj;
@@ -17,6 +17,7 @@ import com.trash.business.domain.EarthsitesCredit;
 import com.trash.business.domain.TruckCredit;
 import com.trash.business.mapper.TruckCreditMapper;
 import com.trash.business.service.ITruckCreditService;
+import com.trash.common.core.redis.RedisCache;
 import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.SecurityUtils;
  
@@ -32,6 +33,8 @@ public class TruckCreditServiceImpl implements ITruckCreditService
     @Autowired
     private TruckCreditMapper truckCreditMapper;
  
+    @Autowired
+    RedisCache redisCache;
     /**
      * 查询车辆失信
      *
@@ -58,6 +61,21 @@ public class TruckCreditServiceImpl implements ITruckCreditService
  
 			List<String> companys = SecurityUtils.getLoginUser().getUser().getCompanyIds();
 			List<String> tList = SecurityUtils.getLoginUser().getUser().getTruckList();
+			List<String> areas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
+			
+			
+			if(areas.size() > 0) {
+				JSONArray array = redisCache.getCacheObject("companyList");
+				if(array != null) {
+					for(Object obj:array) {
+						JSONObject json = (JSONObject)obj;
+						if(areas.indexOf(json.getString("areaCode")) > -1) {
+							companys.add(json.getString("id"));
+						}
+					}
+				}
+			}
+
  
 			if (tList.size() > 0 || companys.size() > 0) {
 				List<String> ids = new ArrayList<>();
@@ -68,13 +86,7 @@ public class TruckCreditServiceImpl implements ITruckCreditService
  
 				if(companys.size() > 0){
  
-					Map map = new HashMap<>();
-			        map.put("size",99999);
-			        map.put("valid",0);
-			        map.put("page",1);
-			        
-			        JSONArray jsonArray = RemoteServerUtils.getTruckList(map);
-					
+					JSONArray jsonArray = redisCache.getCacheObject("truckList");
  
 					for(Object obj:jsonArray){
 						JSONObject json = (JSONObject) obj;
@@ -175,7 +187,20 @@ public class TruckCreditServiceImpl implements ITruckCreditService
     	List<TruckCredit> list = new ArrayList<>();
 			List<String> companys = SecurityUtils.getLoginUser().getUser().getCompanyIds();
 			List<String> tList = SecurityUtils.getLoginUser().getUser().getTruckList();
+			List<String> areas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
  
+			
+			if(areas.size() > 0) {
+				JSONArray array = redisCache.getCacheObject("companyList");
+				if(array != null) {
+					for(Object obj:array) {
+						JSONObject json = (JSONObject)obj;
+						if(areas.indexOf(json.getString("areaCode")) > -1) {
+							companys.add(json.getString("id"));
+						}
+					}
+				}
+			}
 			if (tList.size() > 0 || companys.size() > 0) {
 				List<String> ids = new ArrayList<>();
 				for(String str:tList){
@@ -185,12 +210,7 @@ public class TruckCreditServiceImpl implements ITruckCreditService
  
 				if(companys.size() > 0){
  
-					Map map = new HashMap<>();
-			        map.put("size",99999);
-			        map.put("valid",0);
-			        map.put("page",1);
-			        
-			        JSONArray jsonArray = RemoteServerUtils.getTruckList(map);
+					JSONArray jsonArray = redisCache.getCacheObject("truckList");
  
  
 					for(Object obj:jsonArray){
-//package com.trash.casefile.kafka;
-//
-//import com.alibaba.fastjson.JSONArray;
-//import com.alibaba.fastjson.JSONObject;
-//import com.trash.casefile.domain.KafkaCompensation;
-//import com.trash.casefile.domain.ViolationWarningInformation;
-//import com.trash.casefile.mapper.KafkaCompensationMapper;
-//import com.trash.casefile.mapper.ViolationWarningInformationMapper;
-//import com.trash.casefile.service.IViolationWarningInformationService;
-//import com.trash.common.config.trashConfig;
-//import com.trash.common.core.redis.RedisCache;
-//import com.trash.common.utils.DateUtils;
-//import com.trash.common.utils.RemoteServerUtils;
-//import com.trash.common.utils.StringUtils;
-//import com.trash.common.utils.spring.SpringUtils;
-//import com.trash.framework.web.service.SysLoginService;
-//import org.apache.commons.lang3.time.DateFormatUtils;
-//import org.apache.kafka.clients.consumer.ConsumerRecord;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.kafka.annotation.KafkaListener;
-//import org.springframework.kafka.support.Acknowledgment;
-//import org.springframework.kafka.support.KafkaHeaders;
-//import org.springframework.messaging.handler.annotation.Header;
-//import org.springframework.messaging.handler.annotation.Payload;
-//import org.springframework.stereotype.Component;
-//import org.springframework.transaction.annotation.Transactional;
-//
-//import java.io.IOException;
-//import java.time.LocalTime;
-//import java.time.format.DateTimeFormatter;
-//import java.util.*;
-//import java.util.concurrent.TimeUnit;
-//
-//@Component
-//public class Consumer {
-//    private static final Logger log = LoggerFactory.getLogger(Consumer.class);
-//
-//    @Autowired
-//    private IViolationWarningInformationService violationWarningInformationService;
-//
-//    @KafkaListener(topics = "record_process_alarm")
-//    public void consume(ConsumerRecord<?, ?> record, Acknowledgment ack) throws InterruptedException, IOException {
-//        log.info("kafka消费数据成功,offset:"+ record.offset() +",data:" + record.value());
-//        String id = insertKafkaCompensation(record.value().toString());
-//        autoViolationWarning(record.value().toString(),id);
-//        //手动提交offset
-//        ack.acknowledge();
-//    }
-//
-//    @Autowired
-//    trashConfig trashConfig;
-//
-//    @Autowired
-//    SysLoginService loginService;
-//
-//    @Autowired
-//    RedisCache redisCache;
-//
-//    public void autoViolationWarning(String data,String id) throws InterruptedException, IOException {
-//    	
-//        String[] code = {"44030020=工地预警-未报开工作业", "44030021=工地预警-视频设备离线超时报警", "44030022=工地预警-三无车辆进入工地", "44030023=工地预警-未按时间作业",
-//                "44030024=处理场所预警-未报开工作业", "44030025=处理场所预警-视频设备离线超时报警", "44030026=处理场所预警-三无车辆进入处理场所", "44030027=处理场所预警-未到指定的处理场所作业",
-//                "44030028=离线运输报警(工)", "44030029=离线运输报警(消)", "44030030=未激活车辆作业", "44030031=未核准作业车辆作业", "44030032=未按线路行驶",
-//                "44030033=闯禁行驶", "44030034=失信车辆作业", "44030035=卫星定位异常"};
-//        
-//
-//        JSONObject jsonObject = JSONObject.parseObject(data);
-//        //报警时间
-//        Date alarmTime = new Date(jsonObject.getLong("alarmTime")*1000L);
-//
-//        //这一块是一天内同一工地，同一类型的报警，只报有一条数据，不重复报工，只累加
-//        String nowHour = DateFormatUtils.format(alarmTime, "HH");
-//        String nowDate = null;
-//        String tomorrowDate = null;
-//        if(Integer.valueOf(nowHour)<8){
-//            nowDate = DateFormatUtils.format(DateUtils.addDays(alarmTime, -1), "yyyy-MM-dd");
-//            tomorrowDate = DateFormatUtils.format(alarmTime, "yyyy-MM-dd");
-//        }else{
-//            nowDate = DateFormatUtils.format(alarmTime, "yyyy-MM-dd");
-//            tomorrowDate = DateFormatUtils.format(DateUtils.addDays(alarmTime, 1), "yyyy-MM-dd");
-//        }
-//
-//
-//
-//
-//        //违规类型code
-//        String violationTypeCode = jsonObject.getString("alarmType");
-//        //违规类型
-//        String violationType = jsonObject.getString("alarmName");
-//        if(RemoteServerUtils.remote==null){
-//            //登录
-//            RemoteServerUtils.remote = trashConfig.getRemotePath();
-//            loginService.loginByRemote(trashConfig.getToken());
-//        }
-//        ViolationWarningInformation violationWarningInformation1 = null;
-//        JSONArray company1 = null;
-//        JSONObject basevehicleInfo = null;
-//        //这些类型无需累加
-//        if(violationTypeCode.equals("44030021") || violationTypeCode.equals("44030025")||violationTypeCode.equals("44030023")){
-//            violationWarningInformation1 = null;
-//        }else if(violationTypeCode.equals("44030033")||violationTypeCode.equals("44030034")){//这两种类型根据公司累加
-//            company1 = redisCache.getCacheObject("companyList");
-//            basevehicleInfo = RemoteServerUtils.getBasevehicleInfo(jsonObject.getString("vehicleId"),trashConfig.getToken());
-//            if(company1==null){
-//                throw new RuntimeException("获取公司列表失败！！！");
-//            }
-//
-//            if(basevehicleInfo==null){
-//                throw new RuntimeException("获取公司详情失败！vehicleId:"+jsonObject.getString("vehicleId"));
-//            }
-//        }else{//其他都是根据工地/消纳站累加
-//            String project = jsonObject.getString("siteName");
-//            violationWarningInformation1 = SpringUtils.getBean(ViolationWarningInformationMapper.class).selectViolationWarningInformation(null,project, violationType, nowDate, tomorrowDate);
-//        }
-//        String siteName = jsonObject.getString("siteName");
-//        //判断该类型，该工地，该时间段是否已经存在报警信息，如果存在则不再新增，如果不存在则新增
-//        if (violationWarningInformation1 == null) {
-//            ViolationWarningInformation violationWarningInformation = new ViolationWarningInformation();
-//            String siteType = jsonObject.getString("siteType");
-//            if ("2".equals(siteType)) {//消纳场
-//                violationWarningInformation.setViolationObjectType("1");
-//            }
-//            //所属区域
-//            violationWarningInformation.setOwningRegion(jsonObject.getString("areaName"));
-//            //案卷编码
-//            String number = DateFormatUtils.format(alarmTime, "yyyyMMddHHmmssSSS");
-//            violationWarningInformation.setNumber(number.substring(2));
-//            //公司名称
-//            violationWarningInformation.setCompanyName(jsonObject.getString("enterpriseName"));
-//            //违规类型
-//            violationWarningInformation.setViolationType(jsonObject.getString("alarmName"));
-//            //发送人
-//            violationWarningInformation.setCreateBy("长沙市建筑垃圾智慧监管平台");
-//            //推送对象
-//            violationWarningInformation.setViolationGrade("一般类");
-//            //项目名称（工地名称，处理场所名称）
-//
-//            violationWarningInformation.setSendObject("区管理部门");
-//            String describe = "";
-//            String alarmTimeString = DateFormatUtils.format(alarmTime,"HH:mm");
-//            //根据不同违规类型，走不同流程
-//            switch (violationTypeCode) {
-//                case "44030020"://工地预警-未报开工作业
-//                    //获取报警次数
-//                    int count44030020 = redisCache.getCacheObject(nowDate+jsonObject.getString("siteId")+"44030020")==null?1:Integer.parseInt(redisCache.getCacheObject(nowDate+jsonObject.getString("siteId")+"44030020").toString())+1;
-//                    //获取累计报警描述
-//                    String describe44030020 = redisCache.getCacheObject(nowDate+jsonObject.getString("siteId")+"44030020describe")==null?"":redisCache.getCacheObject(nowDate+jsonObject.getString("siteId")+"44030020describe").toString();
-//                    if(!StringUtils.isEmpty(describe44030020)){
-//                        describe44030020 = describe44030020 + ";\n" + DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
-//                                + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
-//                                jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
-//                    }else{
-//                        describe44030020 = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
-//                                + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
-//                                jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
-//                    }
-//                    //报警次数等于5推送案卷
-//                    if(count44030020==5){
-//                        violationWarningInformation.setViolationObjectType("0");
-//                        violationWarningInformation.setSendObject("区管理部门");
-//                        violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
-//                        violationWarningInformation.setCreateTime(alarmTime);
-//                        violationWarningInformation.setDescribe(describe44030020);
-//                        // 业务逻辑
-//                        violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
-//                    }
-//                    //次数+1
-//                    redisCache.setCacheObject(nowDate+jsonObject.getString("siteId")+"44030020",count44030020,24, TimeUnit.HOURS);
-//                    //累计描述
-//                    redisCache.setCacheObject(nowDate+jsonObject.getString("siteId")+"44030020describe",describe44030020,24, TimeUnit.HOURS);
-//                    break;
-//                case "44030023"://工地预警-未按时间作业
-//                    try{
-//                        //获取工地信息
-//                        JSONObject object = RemoteServerUtils.getConstructionLicenseById(jsonObject.getString("siteId"), trashConfig.getToken());
-//                        String transportEndTime = object.getString("transportEndTime");
-//                        String transportStartTime = object.getString("transportStartTime");
-//                        String endTime = manipulateTime(transportEndTime,30);
-//                        String startTime = manipulateTime(transportStartTime,-30);
-//                        //获取结束运输报警次数
-//                        String countKey = nowDate+jsonObject.getString("siteId")+"44030023"+transportEndTime;
-//                        int count44030023 = redisCache.getCacheObject(countKey)==null?1:Integer.parseInt(redisCache.getCacheObject(countKey).toString())+1;
-//                        //获取结束运输累计报警描述
-//                        String describeKey = nowDate+jsonObject.getString("siteId")+"44030023describe"+transportEndTime;
-//                        String describe44030023 = redisCache.getCacheObject(describeKey)==null?"":redisCache.getCacheObject(describeKey).toString();
-//                        //获取结束运输报警次数
-//                        String countEKey = nowDate+jsonObject.getString("siteId")+"44030023"+transportStartTime;
-//                        int countE = redisCache.getCacheObject(countEKey)==null?1:Integer.parseInt(redisCache.getCacheObject(countEKey).toString())+1;
-//                        //获取结束运输累计报警描述
-//                        String describeEKey = nowDate+jsonObject.getString("siteId")+"44030023describe"+transportStartTime;
-//                        String describeE = redisCache.getCacheObject(describeEKey)==null?"":redisCache.getCacheObject(describeEKey).toString();
-//
-//                        if(!StringUtils.isEmpty(describe44030023)){
-//                            describe44030023 = describe44030023 + ";\n" + DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
-//                                    + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
-//                                    jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
-//                        }else{
-//                            describe44030023 = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
-//                                    + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
-//                                    jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
-//                        }
-//                        //报警次数等于5推送案卷
-//                        if(count44030023==5){
-//                            violationWarningInformation.setViolationObjectType("0");
-//                            violationWarningInformation.setSendObject("区管理部门");
-//                            violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
-//
-//                            violationWarningInformation.setCreateTime(alarmTime);
-//                            violationWarningInformation.setDescribe(describe44030023);
-//                            // 业务逻辑
-//                            violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
-//                        }
-//
-//                        if(!StringUtils.isEmpty(describeE)){
-//                            describeE = describeE + ";\n" + DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
-//                                    + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
-//                                    jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
-//                        }else{
-//                            describeE = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
-//                                    + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
-//                                    jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
-//                        }
-//                        //报警次数等于5推送案卷
-//                        if(countE==5){
-//                            violationWarningInformation.setViolationObjectType("0");
-//                            violationWarningInformation.setSendObject("区管理部门");
-//                            violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
-//
-//                            violationWarningInformation.setCreateTime(alarmTime);
-//                            violationWarningInformation.setDescribe(describeE);
-//                            // 业务逻辑
-//                            violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
-//                        }
-//
-//
-//                        //判断结束运输
-//                        if(isTimeWithinRange(alarmTimeString,transportEndTime,endTime)){
-//                            //次数+1
-//                            redisCache.setCacheObject(countKey,count44030023,12, TimeUnit.HOURS);
-//                            //累计描述
-//                            redisCache.setCacheObject(describeKey,describe44030023,12, TimeUnit.HOURS);
-//                        }else if(isTimeWithinRange(alarmTimeString,startTime,transportStartTime)){
-//                            //次数+1
-//                            redisCache.setCacheObject(countEKey,countE,12, TimeUnit.HOURS);
-//                            //累计描述
-//                            redisCache.setCacheObject(describeEKey,describeE,12, TimeUnit.HOURS);
-//                        }
-//                    }catch (NullPointerException e){
-//                        throw e;
-//                    }
-//                    break;
-//
-//                case "44030030"://未激活车辆作业
-//                case "44030031"://未核准作业车辆作业
-//                case "44030022"://工地预警-三无车辆进入工地
-//                case "44030021"://工地预警-视频设备离线超时报警
-//                case "44030028"://离线运输报警(工)
-//
-//                    violationWarningInformation.setViolationObjectType("0");
-//                    violationWarningInformation.setSendObject("区管理部门");
-//                    violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
-//                    describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
-//                            + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
-//                            jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
-//                    violationWarningInformation.setCreateTime(alarmTime);
-//                    violationWarningInformation.setDescribe(describe);
-//                    // 业务逻辑
-//                    violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
-//                    break;
-//
-//                case "44030024"://处理场所预警-未报开工作业
-//                    //获取报警次数
-//                    int count44030024 = redisCache.getCacheObject(nowDate+jsonObject.getString("siteId")+"44030024")==null?1:Integer.parseInt(redisCache.getCacheObject(nowDate+jsonObject.getString("siteId")+"44030024").toString())+1;
-//                    //获取累计报警描述
-//                    String describe44030024 = redisCache.getCacheObject(nowDate+jsonObject.getString("siteId")+"44030024describe")==null?"":redisCache.getCacheObject(nowDate+jsonObject.getString("siteId")+"44030024describe").toString();
-//                    if(!StringUtils.isEmpty(describe44030024)){
-//                        describe44030024 = describe44030024 + ";\n" + DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
-//                                + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
-//                                jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
-//                    }else{
-//                        describe44030024 = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
-//                                + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
-//                                jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
-//                    }
-//                    //报警次数等于5推送案卷
-//                    if(count44030024==5){
-//                        violationWarningInformation.setViolationObjectType("1");
-//                        violationWarningInformation.setSendObject("区管理部门");
-//                        violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
-//
-//                        violationWarningInformation.setCreateTime(alarmTime);
-//                        violationWarningInformation.setDescribe(describe44030024);
-//                        // 业务逻辑
-//                        violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
-//                    }
-//
-//
-//                    //次数+1
-//                    redisCache.setCacheObject(nowDate+jsonObject.getString("siteId")+"44030024",count44030024,24, TimeUnit.HOURS);
-//                    //累计描述
-//                    redisCache.setCacheObject(nowDate+jsonObject.getString("siteId")+"44030024describe",describe44030024,24, TimeUnit.HOURS);
-//                    break;
-//                case "44030027"://处理场所预警-未到指定的处理场所作业
-//                case "44030026"://处理场所预警-三无车辆进入处理场所
-//                case "44030029"://离线运输报警(消)
-//                case "44030025"://处理场所预警-视频设备离线超时报警
-//                    violationWarningInformation.setViolationObjectType("1");
-//                    violationWarningInformation.setSendObject("区管理部门");
-//                    violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
-//                    describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
-//                            + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
-//                            jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
-//                    violationWarningInformation.setCreateTime(alarmTime);
-//                    violationWarningInformation.setDescribe(describe);
-//                    // 业务逻辑
-//                    violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
-//                    break;
-//                case "44030032"://未按线路行驶
-//                    violationWarningInformation.setViolationObjectType("0");
-//                    violationWarningInformation.setViolationGrade("重点类");
-//                    violationWarningInformation.setSendObject("区管理部门");
-//                    describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
-//                            + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
-//                            jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
-//                    violationWarningInformation.setCreateTime(alarmTime);
-//                    violationWarningInformation.setDescribe(describe);
-//                    // 业务逻辑
-//                    violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
-//                    break;
-//                case "44030033"://闯禁行驶
-//                    violationWarningInformation.setViolationObjectType("0");
-//                    violationWarningInformation.setSendObject("区管理部门");
-//                    describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
-//                            + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "出现" + violationWarningInformation.getViolationType();
-//                    //设置公司简称
-//                    for(Object o:company1){
-//                        JSONObject jo = (JSONObject) o;
-//                        if(basevehicleInfo.getString("companyID").equals(jo.getString("id"))){
-//                            violationWarningInformation.setAbbreviation(jo.getString("abbreviation"));
-//                        }
-//                    }
-//                    violationWarningInformation.setCreateTime(alarmTime);
-//                    violationWarningInformation.setDescribe(describe);
-//                    // 业务逻辑
-//                    violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
-//                    break;
-//
-//                case "44030034"://失信车辆作业
-//                	violationWarningInformation.setViolationObjectType("2");
-//                    violationWarningInformation.setSendObject("运输企业");
-//                    describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
-//                            + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "出现" + violationWarningInformation.getViolationType();
-//                    //设置公司简称
-//                    for(Object o:company1){
-//                        JSONObject jo = (JSONObject) o;
-//                        if(basevehicleInfo.getString("companyID").equals(jo.getString("id"))){
-//                            violationWarningInformation.setAbbreviation(jo.getString("abbreviation"));
-//                        }
-//                    }
-//                    violationWarningInformation.setCreateTime(alarmTime);
-//                    violationWarningInformation.setDescribe(describe);
-//                    // 业务逻辑
-//                    violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
-//                    break;
-//            }
-//
-//
-//
-//
-//        } else {
-//            String describe = "";
-//            if(violationTypeCode.equals("44030033")||violationTypeCode.equals("44030034")){
-//                describe = violationWarningInformation1.getDescribe() + ";\n" + DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
-//                        + jsonObject.getString("enterpriseName") + " " + jsonObject.get("licenseplateNo") + "出现" + jsonObject.getString("alarmName");
-//            }else{
-//                describe = violationWarningInformation1.getDescribe() + ";\n" + DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
-//                        + jsonObject.getString("enterpriseName") + " " + jsonObject.get("licenseplateNo") + "在" +
-//                        jsonObject.get("siteName") + "出现" + jsonObject.getString("alarmName");
-//            }
-//
-//            violationWarningInformation1.setDescribe(describe);
-//            SpringUtils.getBean(ViolationWarningInformationMapper.class).updateViolationWarningInformation(violationWarningInformation1);
-//        }
-//        //kafka消费成功
-//        KafkaCompensation kafkaCompensation = new KafkaCompensation();
-//        kafkaCompensation.setId(Long.valueOf(id));
-//        kafkaCompensation.setStatus(1);
-//        SpringUtils.getBean(KafkaCompensationMapper.class).updateKafkaCompensation(kafkaCompensation);
-//
-//    }
-//
-//    public String insertKafkaCompensation(String data){
-//        KafkaCompensation kafkaCompensation = new KafkaCompensation();
-//        kafkaCompensation.setData(data);
-//        kafkaCompensation.setCreateTime(DateUtils.getNowDate());
-//        kafkaCompensation.setStatus(0);
-//        SpringUtils.getBean(KafkaCompensationMapper.class).insertKafkaCompensation(kafkaCompensation);
-//        return kafkaCompensation.getId().toString();
-//    }
-//
-//    /**
-//     * 对HH:mm格式时间进行分钟的加减
-//     * @param timeStr
-//     * @param minutesToAddOrSubtract
-//     * @return
-//     */
-//    public  String manipulateTime(String timeStr, int minutesToAddOrSubtract) {
-//        // 定义输入时间格式的日期时间格式器
-//        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm");
-//
-//        // 解析输入的时间字符串为 LocalTime 对象
-//        LocalTime time = LocalTime.parse(timeStr, formatter);
-//
-//        // 执行加减分钟的操作
-//        LocalTime modifiedTime = time.plusMinutes(minutesToAddOrSubtract);
-//
-//        // 将修改后的时间格式化为 HH:mm 格式
-//        String formattedModifiedTime = modifiedTime.format(formatter);
-//
-//        return formattedModifiedTime;
-//    }
-//
-//    /**
-//     * 判断timeStr是否在startTimeStr-endTimeStr区间
-//     * @param timeStr
-//     * @param startTimeStr
-//     * @param endTimeStr
-//     * @return
-//     */
-//    public boolean isTimeWithinRange(String timeStr, String startTimeStr, String endTimeStr) {
-//        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm");
-//        LocalTime time = LocalTime.parse(timeStr, formatter);
-//        LocalTime startTime = LocalTime.parse(startTimeStr, formatter);
-//        LocalTime endTime = LocalTime.parse(endTimeStr, formatter);
-//
-//        return !time.isBefore(startTime) && !time.isAfter(endTime);
-//
-//    }
-//}
+package com.trash.casefile.kafka;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.trash.casefile.domain.KafkaCompensation;
+import com.trash.casefile.domain.ViolationWarningInformation;
+import com.trash.casefile.mapper.KafkaCompensationMapper;
+import com.trash.casefile.mapper.ViolationWarningInformationMapper;
+import com.trash.casefile.service.IViolationWarningInformationService;
+import com.trash.common.config.trashConfig;
+import com.trash.common.core.redis.RedisCache;
+import com.trash.common.utils.DateUtils;
+import com.trash.common.utils.RemoteServerUtils;
+import com.trash.common.utils.StringUtils;
+import com.trash.common.utils.spring.SpringUtils;
+import com.trash.framework.web.service.SysLoginService;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.kafka.clients.consumer.ConsumerRecord;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.kafka.annotation.KafkaListener;
+import org.springframework.kafka.support.Acknowledgment;
+import org.springframework.kafka.support.KafkaHeaders;
+import org.springframework.messaging.handler.annotation.Header;
+import org.springframework.messaging.handler.annotation.Payload;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.IOException;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+@Component
+public class Consumer {
+    private static final Logger log = LoggerFactory.getLogger(Consumer.class);
+
+    @Autowired
+    private IViolationWarningInformationService violationWarningInformationService;
+
+    @KafkaListener(topics = "record_process_alarm")
+    public void consume(ConsumerRecord<?, ?> record, Acknowledgment ack) throws InterruptedException, IOException {
+        log.info("kafka消费数据成功,offset:"+ record.offset() +",data:" + record.value());
+        String id = insertKafkaCompensation(record.value().toString());
+        autoViolationWarning(record.value().toString(),id);
+        //手动提交offset
+        ack.acknowledge();
+    }
+
+    @Autowired
+    trashConfig trashConfig;
+
+    @Autowired
+    SysLoginService loginService;
+
+    @Autowired
+    RedisCache redisCache;
+
+    public void autoViolationWarning(String data,String id) throws InterruptedException, IOException {
+    	
+        String[] code = {"44030020=工地预警-未报开工作业", "44030021=工地预警-视频设备离线超时报警", "44030022=工地预警-三无车辆进入工地", "44030023=工地预警-未按时间作业",
+                "44030024=处理场所预警-未报开工作业", "44030025=处理场所预警-视频设备离线超时报警", "44030026=处理场所预警-三无车辆进入处理场所", "44030027=处理场所预警-未到指定的处理场所作业",
+                "44030028=离线运输报警(工)", "44030029=离线运输报警(消)", "44030030=未激活车辆作业", "44030031=未核准作业车辆作业", "44030032=未按线路行驶",
+                "44030033=闯禁行驶", "44030034=失信车辆作业", "44030035=卫星定位异常"};
+        
+
+        JSONObject jsonObject = JSONObject.parseObject(data);
+        //报警时间
+        Date alarmTime = new Date(jsonObject.getLong("alarmTime")*1000L);
+
+        //这一块是一天内同一工地，同一类型的报警，只报有一条数据，不重复报工，只累加
+        String nowHour = DateFormatUtils.format(alarmTime, "HH");
+        String nowDate = null;
+        String tomorrowDate = null;
+        if(Integer.valueOf(nowHour)<8){
+            nowDate = DateFormatUtils.format(DateUtils.addDays(alarmTime, -1), "yyyy-MM-dd");
+            tomorrowDate = DateFormatUtils.format(alarmTime, "yyyy-MM-dd");
+        }else{
+            nowDate = DateFormatUtils.format(alarmTime, "yyyy-MM-dd");
+            tomorrowDate = DateFormatUtils.format(DateUtils.addDays(alarmTime, 1), "yyyy-MM-dd");
+        }
+
+
+
+
+        //违规类型code
+        String violationTypeCode = jsonObject.getString("alarmType");
+        //违规类型
+        String violationType = jsonObject.getString("alarmName");
+        if(RemoteServerUtils.remote==null){
+            //登录
+            RemoteServerUtils.remote = trashConfig.getRemotePath();
+            loginService.loginByRemote(trashConfig.getToken());
+        }
+        ViolationWarningInformation violationWarningInformation1 = null;
+        JSONArray company1 = null;
+        JSONObject basevehicleInfo = null;
+        //这些类型无需累加
+        if(violationTypeCode.equals("44030021") || violationTypeCode.equals("44030025")||violationTypeCode.equals("44030023")){
+            violationWarningInformation1 = null;
+        }else if(violationTypeCode.equals("44030033")||violationTypeCode.equals("44030034")){//这两种类型根据公司累加
+            company1 = redisCache.getCacheObject("companyList");
+            basevehicleInfo = RemoteServerUtils.getBasevehicleInfo(jsonObject.getString("vehicleId"),trashConfig.getToken());
+            if(company1==null){
+                throw new RuntimeException("获取公司列表失败！！！");
+            }
+
+            if(basevehicleInfo==null){
+                throw new RuntimeException("获取公司详情失败！vehicleId:"+jsonObject.getString("vehicleId"));
+            }
+        }else{//其他都是根据工地/消纳站累加
+            String project = jsonObject.getString("siteName");
+            violationWarningInformation1 = SpringUtils.getBean(ViolationWarningInformationMapper.class).selectViolationWarningInformation(null,project, violationType, nowDate, tomorrowDate);
+        }
+        String siteName = jsonObject.getString("siteName");
+        //判断该类型，该工地，该时间段是否已经存在报警信息，如果存在则不再新增，如果不存在则新增
+        if (violationWarningInformation1 == null) {
+            ViolationWarningInformation violationWarningInformation = new ViolationWarningInformation();
+            String siteType = jsonObject.getString("siteType");
+            if ("2".equals(siteType)) {//消纳场
+                violationWarningInformation.setViolationObjectType("1");
+            }
+            //所属区域
+            violationWarningInformation.setOwningRegion(jsonObject.getString("areaName"));
+            //案卷编码
+            String number = DateFormatUtils.format(alarmTime, "yyyyMMddHHmmssSSS");
+            violationWarningInformation.setNumber(number.substring(2));
+            //公司名称
+            violationWarningInformation.setCompanyName(jsonObject.getString("enterpriseName"));
+            //违规类型
+            violationWarningInformation.setViolationType(jsonObject.getString("alarmName"));
+            //发送人
+            violationWarningInformation.setCreateBy("长沙市建筑垃圾智慧监管平台");
+            //推送对象
+            violationWarningInformation.setViolationGrade("一般类");
+            //项目名称（工地名称，处理场所名称）
+
+            violationWarningInformation.setSendObject("区管理部门");
+            String describe = "";
+            String alarmTimeString = DateFormatUtils.format(alarmTime,"HH:mm");
+            //根据不同违规类型，走不同流程
+            switch (violationTypeCode) {
+                case "44030020"://工地预警-未报开工作业
+                    //获取报警次数
+                    int count44030020 = redisCache.getCacheObject(nowDate+jsonObject.getString("siteId")+"44030020")==null?1:Integer.parseInt(redisCache.getCacheObject(nowDate+jsonObject.getString("siteId")+"44030020").toString())+1;
+                    //获取累计报警描述
+                    String describe44030020 = redisCache.getCacheObject(nowDate+jsonObject.getString("siteId")+"44030020describe")==null?"":redisCache.getCacheObject(nowDate+jsonObject.getString("siteId")+"44030020describe").toString();
+                    if(!StringUtils.isEmpty(describe44030020)){
+                        describe44030020 = describe44030020 + ";\n" + DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+                                + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
+                                jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
+                    }else{
+                        describe44030020 = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+                                + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
+                                jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
+                    }
+                    //报警次数等于5推送案卷
+                    if(count44030020==5){
+                        violationWarningInformation.setViolationObjectType("0");
+                        violationWarningInformation.setSendObject("区管理部门");
+                        violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
+                        violationWarningInformation.setCreateTime(alarmTime);
+                        violationWarningInformation.setDescribe(describe44030020);
+                        // 业务逻辑
+                        violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
+                    }
+                    //次数+1
+                    redisCache.setCacheObject(nowDate+jsonObject.getString("siteId")+"44030020",count44030020,24, TimeUnit.HOURS);
+                    //累计描述
+                    redisCache.setCacheObject(nowDate+jsonObject.getString("siteId")+"44030020describe",describe44030020,24, TimeUnit.HOURS);
+                    break;
+                case "44030023"://工地预警-未按时间作业
+                    try{
+                        //获取工地信息
+                        JSONObject object = RemoteServerUtils.getConstructionLicenseById(jsonObject.getString("siteId"), trashConfig.getToken());
+                        String transportEndTime = object.getString("transportEndTime");
+                        String transportStartTime = object.getString("transportStartTime");
+                        String endTime = manipulateTime(transportEndTime,30);
+                        String startTime = manipulateTime(transportStartTime,-30);
+                        //获取结束运输报警次数
+                        String countKey = nowDate+jsonObject.getString("siteId")+"44030023"+transportEndTime;
+                        int count44030023 = redisCache.getCacheObject(countKey)==null?1:Integer.parseInt(redisCache.getCacheObject(countKey).toString())+1;
+                        //获取结束运输累计报警描述
+                        String describeKey = nowDate+jsonObject.getString("siteId")+"44030023describe"+transportEndTime;
+                        String describe44030023 = redisCache.getCacheObject(describeKey)==null?"":redisCache.getCacheObject(describeKey).toString();
+                        //获取结束运输报警次数
+                        String countEKey = nowDate+jsonObject.getString("siteId")+"44030023"+transportStartTime;
+                        int countE = redisCache.getCacheObject(countEKey)==null?1:Integer.parseInt(redisCache.getCacheObject(countEKey).toString())+1;
+                        //获取结束运输累计报警描述
+                        String describeEKey = nowDate+jsonObject.getString("siteId")+"44030023describe"+transportStartTime;
+                        String describeE = redisCache.getCacheObject(describeEKey)==null?"":redisCache.getCacheObject(describeEKey).toString();
+
+                        if(!StringUtils.isEmpty(describe44030023)){
+                            describe44030023 = describe44030023 + ";\n" + DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+                                    + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
+                                    jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
+                        }else{
+                            describe44030023 = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+                                    + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
+                                    jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
+                        }
+                        //报警次数等于5推送案卷
+                        if(count44030023==5){
+                            violationWarningInformation.setViolationObjectType("0");
+                            violationWarningInformation.setSendObject("区管理部门");
+                            violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
+
+                            violationWarningInformation.setCreateTime(alarmTime);
+                            violationWarningInformation.setDescribe(describe44030023);
+                            // 业务逻辑
+                            violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
+                        }
+
+                        if(!StringUtils.isEmpty(describeE)){
+                            describeE = describeE + ";\n" + DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+                                    + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
+                                    jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
+                        }else{
+                            describeE = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+                                    + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
+                                    jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
+                        }
+                        //报警次数等于5推送案卷
+                        if(countE==5){
+                            violationWarningInformation.setViolationObjectType("0");
+                            violationWarningInformation.setSendObject("区管理部门");
+                            violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
+
+                            violationWarningInformation.setCreateTime(alarmTime);
+                            violationWarningInformation.setDescribe(describeE);
+                            // 业务逻辑
+                            violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
+                        }
+
+
+                        //判断结束运输
+                        if(isTimeWithinRange(alarmTimeString,transportEndTime,endTime)){
+                            //次数+1
+                            redisCache.setCacheObject(countKey,count44030023,12, TimeUnit.HOURS);
+                            //累计描述
+                            redisCache.setCacheObject(describeKey,describe44030023,12, TimeUnit.HOURS);
+                        }else if(isTimeWithinRange(alarmTimeString,startTime,transportStartTime)){
+                            //次数+1
+                            redisCache.setCacheObject(countEKey,countE,12, TimeUnit.HOURS);
+                            //累计描述
+                            redisCache.setCacheObject(describeEKey,describeE,12, TimeUnit.HOURS);
+                        }
+                    }catch (NullPointerException e){
+                        throw e;
+                    }
+                    break;
+
+                case "44030030"://未激活车辆作业
+                case "44030031"://未核准作业车辆作业
+                case "44030022"://工地预警-三无车辆进入工地
+                case "44030021"://工地预警-视频设备离线超时报警
+                case "44030028"://离线运输报警(工)
+
+                    violationWarningInformation.setViolationObjectType("0");
+                    violationWarningInformation.setSendObject("区管理部门");
+                    violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
+                    describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+                            + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
+                            jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
+                    violationWarningInformation.setCreateTime(alarmTime);
+                    violationWarningInformation.setDescribe(describe);
+                    // 业务逻辑
+                    violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
+                    break;
+
+                case "44030024"://处理场所预警-未报开工作业
+                    //获取报警次数
+                    int count44030024 = redisCache.getCacheObject(nowDate+jsonObject.getString("siteId")+"44030024")==null?1:Integer.parseInt(redisCache.getCacheObject(nowDate+jsonObject.getString("siteId")+"44030024").toString())+1;
+                    //获取累计报警描述
+                    String describe44030024 = redisCache.getCacheObject(nowDate+jsonObject.getString("siteId")+"44030024describe")==null?"":redisCache.getCacheObject(nowDate+jsonObject.getString("siteId")+"44030024describe").toString();
+                    if(!StringUtils.isEmpty(describe44030024)){
+                        describe44030024 = describe44030024 + ";\n" + DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+                                + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
+                                jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
+                    }else{
+                        describe44030024 = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+                                + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
+                                jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
+                    }
+                    //报警次数等于5推送案卷
+                    if(count44030024==5){
+                        violationWarningInformation.setViolationObjectType("1");
+                        violationWarningInformation.setSendObject("区管理部门");
+                        violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
+
+                        violationWarningInformation.setCreateTime(alarmTime);
+                        violationWarningInformation.setDescribe(describe44030024);
+                        // 业务逻辑
+                        violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
+                    }
+
+
+                    //次数+1
+                    redisCache.setCacheObject(nowDate+jsonObject.getString("siteId")+"44030024",count44030024,24, TimeUnit.HOURS);
+                    //累计描述
+                    redisCache.setCacheObject(nowDate+jsonObject.getString("siteId")+"44030024describe",describe44030024,24, TimeUnit.HOURS);
+                    break;
+                case "44030027"://处理场所预警-未到指定的处理场所作业
+                case "44030026"://处理场所预警-三无车辆进入处理场所
+                case "44030029"://离线运输报警(消)
+                case "44030025"://处理场所预警-视频设备离线超时报警
+                    violationWarningInformation.setViolationObjectType("1");
+                    violationWarningInformation.setSendObject("区管理部门");
+                    violationWarningInformation.setProjectName(jsonObject.getString("siteName"));
+                    describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+                            + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
+                            jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
+                    violationWarningInformation.setCreateTime(alarmTime);
+                    violationWarningInformation.setDescribe(describe);
+                    // 业务逻辑
+                    violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
+                    break;
+                case "44030032"://未按线路行驶
+                    violationWarningInformation.setViolationObjectType("0");
+                    violationWarningInformation.setViolationGrade("重点类");
+                    violationWarningInformation.setSendObject("区管理部门");
+                    describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+                            + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "在" +
+                            jsonObject.get("siteName") + "出现" + violationWarningInformation.getViolationType();
+                    violationWarningInformation.setCreateTime(alarmTime);
+                    violationWarningInformation.setDescribe(describe);
+                    // 业务逻辑
+                    violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
+                    break;
+                case "44030033"://闯禁行驶
+                    violationWarningInformation.setViolationObjectType("0");
+                    violationWarningInformation.setSendObject("区管理部门");
+                    describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+                            + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "出现" + violationWarningInformation.getViolationType();
+                    //设置公司简称
+                    for(Object o:company1){
+                        JSONObject jo = (JSONObject) o;
+                        if(basevehicleInfo.getString("companyID").equals(jo.getString("id"))){
+                            violationWarningInformation.setAbbreviation(jo.getString("abbreviation"));
+                        }
+                    }
+                    violationWarningInformation.setCreateTime(alarmTime);
+                    violationWarningInformation.setDescribe(describe);
+                    // 业务逻辑
+                    violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
+                    break;
+
+                case "44030034"://失信车辆作业
+                	violationWarningInformation.setViolationObjectType("2");
+                    violationWarningInformation.setSendObject("运输企业");
+                    describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+                            + violationWarningInformation.getCompanyName() + " " + jsonObject.get("licenseplateNo") + "出现" + violationWarningInformation.getViolationType();
+                    //设置公司简称
+                    for(Object o:company1){
+                        JSONObject jo = (JSONObject) o;
+                        if(basevehicleInfo.getString("companyID").equals(jo.getString("id"))){
+                            violationWarningInformation.setAbbreviation(jo.getString("abbreviation"));
+                        }
+                    }
+                    violationWarningInformation.setCreateTime(alarmTime);
+                    violationWarningInformation.setDescribe(describe);
+                    // 业务逻辑
+                    violationWarningInformationService.insertViolationWarningInformation(null, violationWarningInformation);
+                    break;
+            }
+
+
+
+
+        } else {
+            String describe = "";
+            if(violationTypeCode.equals("44030033")||violationTypeCode.equals("44030034")){
+                describe = violationWarningInformation1.getDescribe() + ";\n" + DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+                        + jsonObject.getString("enterpriseName") + " " + jsonObject.get("licenseplateNo") + "出现" + jsonObject.getString("alarmName");
+            }else{
+                describe = violationWarningInformation1.getDescribe() + ";\n" + DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "
+                        + jsonObject.getString("enterpriseName") + " " + jsonObject.get("licenseplateNo") + "在" +
+                        jsonObject.get("siteName") + "出现" + jsonObject.getString("alarmName");
+            }
+
+            violationWarningInformation1.setDescribe(describe);
+            SpringUtils.getBean(ViolationWarningInformationMapper.class).updateViolationWarningInformation(violationWarningInformation1);
+        }
+        //kafka消费成功
+        KafkaCompensation kafkaCompensation = new KafkaCompensation();
+        kafkaCompensation.setId(Long.valueOf(id));
+        kafkaCompensation.setStatus(1);
+        SpringUtils.getBean(KafkaCompensationMapper.class).updateKafkaCompensation(kafkaCompensation);
+
+    }
+
+    public String insertKafkaCompensation(String data){
+        KafkaCompensation kafkaCompensation = new KafkaCompensation();
+        kafkaCompensation.setData(data);
+        kafkaCompensation.setCreateTime(DateUtils.getNowDate());
+        kafkaCompensation.setStatus(0);
+        SpringUtils.getBean(KafkaCompensationMapper.class).insertKafkaCompensation(kafkaCompensation);
+        return kafkaCompensation.getId().toString();
+    }
+
+    /**
+     * 对HH:mm格式时间进行分钟的加减
+     * @param timeStr
+     * @param minutesToAddOrSubtract
+     * @return
+     */
+    public  String manipulateTime(String timeStr, int minutesToAddOrSubtract) {
+        // 定义输入时间格式的日期时间格式器
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm");
+
+        // 解析输入的时间字符串为 LocalTime 对象
+        LocalTime time = LocalTime.parse(timeStr, formatter);
+
+        // 执行加减分钟的操作
+        LocalTime modifiedTime = time.plusMinutes(minutesToAddOrSubtract);
+
+        // 将修改后的时间格式化为 HH:mm 格式
+        String formattedModifiedTime = modifiedTime.format(formatter);
+
+        return formattedModifiedTime;
+    }
+
+    /**
+     * 判断timeStr是否在startTimeStr-endTimeStr区间
+     * @param timeStr
+     * @param startTimeStr
+     * @param endTimeStr
+     * @return
+     */
+    public boolean isTimeWithinRange(String timeStr, String startTimeStr, String endTimeStr) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm");
+        LocalTime time = LocalTime.parse(timeStr, formatter);
+        LocalTime startTime = LocalTime.parse(startTimeStr, formatter);
+        LocalTime endTime = LocalTime.parse(endTimeStr, formatter);
+
+        return !time.isBefore(startTime) && !time.isAfter(endTime);
+
+    }
+}