m

youxiw2000
1 parent 5502c360
Showing 2 changed files with 27 additions and 11 deletions
trash-quartz/src/main/java/com/trash/quartz/task/DriverTask.java
trash-workFlow/src/main/java/com/trash/business/service/impl/CompanyCreditServiceImpl.java
@@ -24,6 +24,7 @@ import com.trash.business.domain.CompanyCredit;
 import com.trash.business.domain.DriverCredit;
 import com.trash.business.domain.SupervisionThreestep;
 import com.trash.business.domain.TruckCredit;
+import com.trash.business.mapper.CompanyCreditMapper;
 import com.trash.business.mapper.SupervisionThreestepMapper;
 import com.trash.business.service.ICompanyCreditService;
 import com.trash.business.service.IDriverCreditService;
@@ -94,7 +95,8 @@ public class DriverTask
 	private void checkDriverCredit() {
-		
+
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
     	if(RemoteServerUtils.remote == null){
     		RemoteServerUtils.remote = trashConfig.getRemotePath();
     	}
@@ -134,14 +136,14 @@ public class DriverTask
 	}
-	SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	private void checkTruckCredit() {
+
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		Map map = new HashMap<>();
         map.put("size",9999);
-        map.put("dishonestState",0);
         map.put("valid",0);
         map.put("page",1);
@@ -207,11 +209,11 @@ public class DriverTask
 		} catch (Exception e) {
 			e.printStackTrace();
 		}	
-		
+
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
        	Map map = new HashMap<>();
         map.put("size",9999);
-        map.put("dishonestState",0);
         map.put("page",1);
     	JSONArray companys = RemoteServerUtils.getCompanyList(map,TOKEN);
@@ -243,7 +245,7 @@ public class DriverTask
     	companyCredit.setLostCredit(1L);
     	companyCredit.setStatus(0L);
-    	List<CompanyCredit> companyList = SpringUtils.getBean(ICompanyCreditService.class).selectCompanyCreditList(companyCredit);
+    	List<CompanyCredit> companyList = SpringUtils.getBean(CompanyCreditMapper.class).selectCompanyCreditList(companyCredit);
     	for(CompanyCredit c:companyList){
     		SpringUtils.getBean(ICompanyCreditService.class).updateRemoteCompanyAndTruck(c,TOKEN);
@@ -15,6 +15,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.trash.business.domain.CompanyCredit;
 import com.trash.business.domain.TruckCredit;
 import com.trash.business.mapper.CompanyCreditMapper;
+import com.trash.business.mapper.TruckCreditMapper;
 import com.trash.business.service.ICompanyCreditService;
 import com.trash.business.service.ITruckCreditService;
 import com.trash.common.core.redis.RedisCache;
@@ -33,8 +34,10 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
 	private CompanyCreditMapper companyCreditMapper;
 	@Autowired
-	private ITruckCreditService truckService;;
-	
+	private TruckCreditMapper truckMapper;
+
+	@Autowired
+	private ITruckCreditService truckService;
 	@Autowired
 	RedisCache redisCache;
 	/**
@@ -111,9 +114,20 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
 	}
 	public void insertCompanyCredit(CompanyCredit companyCredit, String token) {
-		companyCredit.setTime(new Date());
+		int i = 0;
+		CompanyCredit cc = new CompanyCredit();
+
+		cc.setStatus(0L);
+		cc.setLostCredit(companyCredit.getLostCredit());
+		cc.setObjectId(companyCredit.getObjectId());
-		int i = companyCreditMapper.insertCompanyCredit(companyCredit);
+		List old = companyCreditMapper.selectCompanyCreditList(cc);
+
+		if (old.size() > 0) {
+			i = 1;
+		} else {
+			i = companyCreditMapper.insertCompanyCredit(companyCredit);
+		}
 		updateRemoteCompanyAndTruck(companyCredit, token);
@@ -158,7 +172,7 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
 				tredit.setStatus(0L);
 				tredit.setObjectId(truckId);
-				List<TruckCredit> oldData = truckService.selectTruckCreditList(tredit);
+				List<TruckCredit> oldData = truckMapper.selectTruckCreditList(tredit);
 				TruckCredit data;
 				if (oldData.size() > 0) {
 					data = oldData.get(0);