m

youxiw2000
1 parent b507aac8
Showing 5 changed files with 197 additions and 183 deletions
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/dist.zip
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
trash-workFlow/src/main/java/com/trash/casefile/kafka/Consumer.java
@@ -221,7 +221,9 @@ public class SysLoginService
        		 JSONObject con = (JSONObject) obj;
        		 if(con.getString("abbreviation").equals(user.getUserName().replace("公司", ""))){
-       			user.setCompanyName(con.getString("name"));;
+       			user.setCompanyName(con.getString("name"));
+       	        user.setUserName(con.getString("abbreviation"));
+       	        user.setNickName(con.getString("abbreviation")); 
        			 break;
        		 }
@@ -43,79 +43,72 @@ import com.trash.workflow.service.IWorkflowService;
  * @author trash
  */
 @Component("DriverTask")
-public class DriverTask
-{	
+public class DriverTask {
 	String TOKEN;
-	SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");	
-    /** 系统基础配置 */
-    @Autowired
-    private trashConfig trashConfig;
+	SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+	/** 系统基础配置 */
+	@Autowired
+	private trashConfig trashConfig;
 	@Autowired
 	private RedisCache redisCache;
-    public void checkCredit(){
+	public void checkCredit() {
-    	if(RemoteServerUtils.remote == null){
-    		RemoteServerUtils.remote = trashConfig.getRemotePath();
-    	}
-    	if(TOKEN == null){
-    		TOKEN = trashConfig.getToken();
-    	}
+		if (RemoteServerUtils.remote == null) {
+			RemoteServerUtils.remote = trashConfig.getRemotePath();
+		}
+		if (TOKEN == null) {
+			TOKEN = trashConfig.getToken();
+		}
-        LogUtils.getBlock("=================== checkCredit 定时器执行 当前时间:      " + simpleDateFormat.format(new Date()));
-        
-        
+		LogUtils.getBlock("=================== checkCredit 定时器执行 当前时间:      " + simpleDateFormat.format(new Date()));
-    	try {
-        	checkTruckActive();
+		try {
+			checkTruckActive();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-    	
-    }
-    
-    @SuppressWarnings("deprecation")
+	}
+
+	@SuppressWarnings("deprecation")
 	private void checkTruckActive() {
-    	if(TOKEN == null){
-    		TOKEN = trashConfig.getToken();
-    	}
-    	try {
-     	      SpringUtils.getBean(ISupervisionThreestepService.class).checkDataToActiveTruck(TOKEN);
+		if (TOKEN == null) {
+			TOKEN = trashConfig.getToken();
+		}
+		try {
+			SpringUtils.getBean(ISupervisionThreestepService.class).checkDataToActiveTruck(TOKEN);
 		} catch (Exception e) {
 			// TODO: handle exception
 		}
-    	
 	}
-
-    
 	private void checkDriverCredit() {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-    	if(RemoteServerUtils.remote == null){
-    		RemoteServerUtils.remote = trashConfig.getRemotePath();
-    	}
-    	if(TOKEN == null){
-    		TOKEN = trashConfig.getToken();
-    	}
-
-        JSONArray drivers = RemoteServerUtils.getDriverList(TOKEN);
-        
-        
-        for(Object object :drivers){
-        	
-        	JSONObject json = (JSONObject)object;
-        	
+		if (RemoteServerUtils.remote == null) {
+			RemoteServerUtils.remote = trashConfig.getRemotePath();
+		}
+		if (TOKEN == null) {
+			TOKEN = trashConfig.getToken();
+		}
+
+		JSONArray drivers = RemoteServerUtils.getDriverList(TOKEN);
+
+		for (Object object : drivers) {
+
+			JSONObject json = (JSONObject) object;
+
 			try {
-				if(sdf.parse(json.getString("endAt")).getTime() < sdf.parse(sdf.format(new Date())).getTime() || 
-						sdf.parse(json.getString("qualificationCertValidEndAt")).getTime() < sdf.parse(sdf.format(new Date())).getTime()){
+				if (sdf.parse(json.getString("endAt")).getTime() < sdf.parse(sdf.format(new Date())).getTime()
+						|| sdf.parse(json.getString("qualificationCertValidEndAt")).getTime() < sdf
+								.parse(sdf.format(new Date())).getTime()) {
 					DriverCredit driver = new DriverCredit();
-					
+
 					driver.setIdNumber(json.getString("identityNo"));
 					driver.setName(json.getString("name"));
 					driver.setCreateBy("长沙市建筑垃圾智慧监管平台");
@@ -123,7 +116,6 @@ public class DriverTask
 					driver.setTime(new Date());
 					driver.setStatus(0L);
 					driver.setObjectId(json.getString("id"));
-					
 					SpringUtils.getBean(IDriverCreditService.class).insertDriverCredit(driver);
 				}
@@ -131,51 +123,52 @@ public class DriverTask
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
-        	
-        }
-		
-	}
-	
+		}
+
+	}
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	private void checkTruckCredit() {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		Map map = new HashMap<>();
-        map.put("size",9999);
-        map.put("valid",0);
-        map.put("page",1);
-        
-        JSONArray trucks = RemoteServerUtils.getTruckList(map,TOKEN);
-    	
-        List<Map> listParam = new ArrayList<Map>();
-        
-        if(trucks!=null){
-        	for(Object jsonObject:trucks){
-    			JSONObject truck = (JSONObject)jsonObject;
-    			    			
-    			try {
-					if(sdf.parse(truck.getString("transportCertValid")).getTime() < sdf.parse(sdf.format(new Date())).getTime() || 
-							sdf.parse(truck.getString("licenseValid")).getTime() < sdf.parse(sdf.format(new Date())).getTime()){
-						
+		map.put("size", 9999);
+		map.put("valid", 0);
+		map.put("page", 1);
+
+		JSONArray trucks = RemoteServerUtils.getTruckList(map, TOKEN);
+
+		List<Map> listParam = new ArrayList<Map>();
+
+		if (trucks != null) {
+			for (Object jsonObject : trucks) {
+				JSONObject truck = (JSONObject) jsonObject;
+
+				try {
+					if (sdf.parse(truck.getString("transportCertValid")).getTime() < sdf.parse(sdf.format(new Date()))
+							.getTime()
+							|| sdf.parse(truck.getString("licenseValid")).getTime() < sdf.parse(sdf.format(new Date()))
+									.getTime()) {
+
 						TruckCredit truckCredit = new TruckCredit();
 						truckCredit.setTime(new Date());
 						truckCredit.setCreateBy("长沙市建筑垃圾智慧监管平台");
-						truckCredit.setReason("道路运输证有效期:"+truck.getString("transportCertValid") + " 行驶证有效期:" +  truck.getString("licenseValid") +  ",证件过期");
+						truckCredit.setReason("道路运输证有效期:" + truck.getString("transportCertValid") + " 行驶证有效期:"
+								+ truck.getString("licenseValid") + ",证件过期");
 						truckCredit.setLostCredit(1L);
 						truckCredit.setObjectId(truck.getString("id"));
 						truckCredit.setLicensePlate(truck.getString("licenseplateNo"));
 						truckCredit.setCompanyId(truck.getString("companyName"));
 						truckCredit.setStatus(0L);
-						
+
 						Map param = new HashMap<>();
-						
+
 						param.put("id", truck.getString("id"));
 						param.put("creditStatus", 1);
-						
+
 						listParam.add(param);
-						
+
 						SpringUtils.getBean(ITruckCreditService.class).insertTruckCredit(truckCredit);
 					}
 				} catch (BeansException e) {
@@ -188,182 +181,200 @@ public class DriverTask
 					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
-        	}
-        	
-        	if(listParam.size() > 0)
-        		RemoteServerUtils.updateTruckList(listParam,TOKEN);
-        	
-        }
-    	
-    }
-    
+			}
+
+			if (listParam.size() > 0)
+				RemoteServerUtils.updateTruckList(listParam, TOKEN);
+
+		}
+
+	}
+
 	public void checkCompanyCredit() {
-    	try {
-        	checkTruckCredit();
+		try {
+			checkTruckCredit();
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-    	
-    	try {
-        	checkDriverCredit(); //检查驾驶员信用
+
+		try {
+			checkDriverCredit(); // 检查驾驶员信用
 		} catch (Exception e) {
 			e.printStackTrace();
-		}	
+		}
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-		
-       	Map map = new HashMap<>();
-        map.put("size",9999);
-        map.put("page",1);
-        
-    	JSONArray companys = RemoteServerUtils.getCompanyList(map,TOKEN);
-    	if(companys != null){
-    		for(Object jsonObject:companys){
-    			JSONObject company = (JSONObject)jsonObject;
-    			try {
-    				if(sdf.parse(company.getString("registrationValidTime")).getTime() < sdf.parse(sdf.format(new Date())).getTime() 
-    						|| sdf.parse(company.getString("businessLicenseValidTime")).getTime() < sdf.parse(sdf.format(new Date())).getTime()){
-        				CompanyCredit companyCredit = new CompanyCredit();
-        				companyCredit.setTime(new Date());
-        				companyCredit.setCreateBy("长沙市建筑垃圾智慧监管平台");
-        				companyCredit.setReason("企业道路运输经营许可证有效期:" + company.getString("businessLicenseValidTime") + " 企业营业执照有效期:" + company.getString("registrationValidTime") + ",证件过期");
-        				companyCredit.setLostCredit(1L);
-        				companyCredit.setObjectId(company.getString("id"));
-        				companyCredit.setName(company.getString("name"));
-        				companyCredit.setPlace(company.getString("areaName"));
-        				companyCredit.setStatus(0L);
-        		    	SpringUtils.getBean(ICompanyCreditService.class).insertCompanyCredit(companyCredit,TOKEN);
-        			}
+
+		Map map = new HashMap<>();
+		map.put("size", 9999);
+		map.put("page", 1);
+
+		JSONArray companys = RemoteServerUtils.getCompanyList(map, TOKEN);
+		if (companys != null) {
+			for (Object jsonObject : companys) {
+				JSONObject company = (JSONObject) jsonObject;
+				try {
+					if (sdf.parse(company.getString("registrationValidTime")).getTime() < sdf
+							.parse(sdf.format(new Date())).getTime()
+							|| sdf.parse(company.getString("businessLicenseValidTime")).getTime() < sdf
+									.parse(sdf.format(new Date())).getTime()) {
+						CompanyCredit companyCredit = new CompanyCredit();
+						companyCredit.setTime(new Date());
+						companyCredit.setCreateBy("长沙市建筑垃圾智慧监管平台");
+						companyCredit.setReason("企业道路运输经营许可证有效期:" + company.getString("businessLicenseValidTime")
+								+ " 企业营业执照有效期:" + company.getString("registrationValidTime") + ",证件过期");
+						companyCredit.setLostCredit(1L);
+						companyCredit.setObjectId(company.getString("id"));
+						companyCredit.setName(company.getString("name"));
+						companyCredit.setPlace(company.getString("areaName"));
+						companyCredit.setStatus(0L);
+						SpringUtils.getBean(ICompanyCreditService.class).insertCompanyCredit(companyCredit, TOKEN);
+					}
 				} catch (Exception e) {
 					e.printStackTrace();
 				}
-    			
-    		}
-    	}
-    	
-    	CompanyCredit companyCredit = new CompanyCredit();
-    	companyCredit.setLostCredit(1L);
-    	companyCredit.setStatus(0L);
-    		
-    	List<CompanyCredit> companyList = SpringUtils.getBean(CompanyCreditMapper.class).selectCompanyCreditList(companyCredit);
-    	
-    	for(CompanyCredit c:companyList){
-    		SpringUtils.getBean(ICompanyCreditService.class).updateRemoteCompanyAndTruck(c,TOKEN);
-    	}
+
+			}
+		}
+
+		CompanyCredit companyCredit = new CompanyCredit();
+		companyCredit.setLostCredit(1L);
+		companyCredit.setStatus(0L);
+
+		List<CompanyCredit> companyList = SpringUtils.getBean(CompanyCreditMapper.class)
+				.selectCompanyCreditList(companyCredit);
+
+		for (CompanyCredit c : companyList) {
+			SpringUtils.getBean(ICompanyCreditService.class).updateRemoteCompanyAndTruck(c, TOKEN);
+		}
 	}
-	public void checkAllTask()
-    {	
-        LogUtils.getBlock("===================  删除超时报工数据     定时器执行 当前时间:      " + simpleDateFormat.format(new Date()));
-        
-    	if(TOKEN == null){
-    		TOKEN = trashConfig.getToken();
-    	}
-    	SpringUtils.getBean(ISupervisionThreestepService.class).updateTodayData(TOKEN);
-        
-    	SpringUtils.getBean(IActTaskService.class).endAllThreesteptask("workflow_threestep");
-    	
-    	SpringUtils.getBean(IWorkflowService.class).deleteWorkflowByName("workflow_threestep");
-
-        SpringUtils.getBean(ITruckActivateService.class).endAllTruckUnActive();
-        
-    	
-    }
+	public void checkAllTask() {
+		LogUtils.getBlock("===================  删除超时报工数据     定时器执行 当前时间:      " + simpleDateFormat.format(new Date()));
+
+		if (TOKEN == null) {
+			TOKEN = trashConfig.getToken();
+		}
+		try {
+			SpringUtils.getBean(ISupervisionThreestepService.class).updateTodayData(TOKEN);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		try {
+			SpringUtils.getBean(IActTaskService.class).endAllThreesteptask("workflow_threestep");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		try {
+			SpringUtils.getBean(IWorkflowService.class).deleteWorkflowByName("workflow_threestep");
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		try {
+			SpringUtils.getBean(ITruckActivateService.class).endAllTruckUnActive();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
+	}
 	/**
 	 * kafka补偿机制，每半小时一次
+	 * 
 	 * @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());
+		List<KafkaCompensation> kafkaCompensationList = SpringUtils.getBean(KafkaCompensationMapper.class)
+				.selectKafkaCompensationList(kafkaCompensation);
+		for (KafkaCompensation k : kafkaCompensationList) {
+			SpringUtils.getBean(Consumer.class).autoViolationWarning(k.getData(), k.getId().toString());
 		}
 	}
 	/**
 	 * 每分钟更新一次公司列表
 	 */
-	public void getCompanyList(){
-		if(RemoteServerUtils.remote == null){
+	public void getCompanyList() {
+		if (RemoteServerUtils.remote == null) {
 			RemoteServerUtils.remote = trashConfig.getRemotePath();
 		}
 		Map<String, Object> map = new HashMap<>();
-		map.put("size",99999);
-		map.put("page",1);
+		map.put("size", 99999);
+		map.put("page", 1);
 		JSONArray jsonArray = RemoteServerUtils.getCompanyList(map, trashConfig.getToken());
-		redisCache.setCacheObject("companyList",jsonArray);
+		redisCache.setCacheObject("companyList", jsonArray);
 	}
-	
-	public void getContractList(){
-		if(RemoteServerUtils.remote == null){
+
+	public void getContractList() {
+		if (RemoteServerUtils.remote == null) {
 			RemoteServerUtils.remote = trashConfig.getRemotePath();
 		}
 		Map<String, Object> map = new HashMap<>();
-		map.put("size",99999);
-		map.put("page",1);
+		map.put("size", 99999);
+		map.put("page", 1);
 		map.put("contractStatus", 1);
 		map.put("auditStatus", 1);
 		JSONArray jsonArray = RemoteServerUtils.getContractList(map, trashConfig.getToken());
-		redisCache.setCacheObject("contractList",jsonArray);
+		redisCache.setCacheObject("contractList", jsonArray);
 	}
 	/**
 	 * 每分钟更新一次工地列表
 	 */
-	public void getConstructionList(){
-		if(RemoteServerUtils.remote == null){
+	public void getConstructionList() {
+		if (RemoteServerUtils.remote == null) {
 			RemoteServerUtils.remote = trashConfig.getRemotePath();
 		}
 		Map<String, Object> map = new HashMap<>();
-		map.put("size",99999);
-		map.put("page",1);
-		JSONArray jsonArray = RemoteServerUtils.getConstructionList(map,trashConfig.getToken());
-		redisCache.setCacheObject("constructionList",jsonArray);
+		map.put("size", 99999);
+		map.put("page", 1);
+		JSONArray jsonArray = RemoteServerUtils.getConstructionList(map, trashConfig.getToken());
+		redisCache.setCacheObject("constructionList", jsonArray);
 	}
 	/**
 	 * 每分钟更新一次消纳场列表
 	 */
-	public void getEarthSitesList(){
-		if(RemoteServerUtils.remote == null){
+	public void getEarthSitesList() {
+		if (RemoteServerUtils.remote == null) {
 			RemoteServerUtils.remote = trashConfig.getRemotePath();
 		}
 		Map<String, Object> map = new HashMap<>();
-		map.put("size",99999);
-		map.put("page",1);
-		JSONArray jsonArray = RemoteServerUtils.getEarthSitesList(map,trashConfig.getToken());
-		redisCache.setCacheObject("earthSitesList",jsonArray);
+		map.put("size", 99999);
+		map.put("page", 1);
+		JSONArray jsonArray = RemoteServerUtils.getEarthSitesList(map, trashConfig.getToken());
+		redisCache.setCacheObject("earthSitesList", jsonArray);
 	}
 	/**
 	 * 每分钟更新一次区域列表
 	 */
-	public void getTruckList(){
-		if(RemoteServerUtils.remote == null){
+	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);
+		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){
+	public void getAreaList() {
+		if (RemoteServerUtils.remote == null) {
 			RemoteServerUtils.remote = trashConfig.getRemotePath();
 		}
 		Map<String, Object> map = new HashMap<>();
-		map.put("size",99999);
-		map.put("page",1);
+		map.put("size", 99999);
+		map.put("page", 1);
 		JSONArray jsonArray = RemoteServerUtils.getAreas(trashConfig.getToken());
-		redisCache.setCacheObject("areaList",jsonArray);
+		redisCache.setCacheObject("areaList", jsonArray);
 	}
 }
@@ -1003,7 +1003,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 			redisCache.setCacheObject("contractList", contracts);
 		}
-		if (list.size() > 0) {
+		if (list.size() > 0 && contracts != null) {
 			for (SupervisionThreestep s : list) {
 				String cid = "";
@@ -348,6 +348,7 @@ public class Consumer {
                     break;
                 case "44030034"://失信车辆作业
+                case "44030035"://失信车辆作业
                 	violationWarningInformation.setViolationObjectType("2");
                     violationWarningInformation.setSendObject("运输企业");
                     describe = DateFormatUtils.format(alarmTime, "yyyy/MM/dd HH:mm:ss") + " "