m

youxiw2000
1 parent 21c52f23
Showing 11 changed files with 163 additions and 136 deletions
trash-workFlow/src/main/java/com/trash/business/controller/CompanyCreditController.java
trash-workFlow/src/main/java/com/trash/business/controller/ConstructionCreditController.java
trash-workFlow/src/main/java/com/trash/business/controller/DriverCreditController.java
trash-workFlow/src/main/java/com/trash/business/controller/EarthsitesCreditController.java
trash-workFlow/src/main/java/com/trash/business/controller/TruckCreditController.java
trash-workFlow/src/main/java/com/trash/business/service/impl/CompanyCreditServiceImpl.java
trash-workFlow/src/main/java/com/trash/business/service/impl/ConstructionCreditServiceImpl.java
trash-workFlow/src/main/java/com/trash/business/service/impl/DriverCreditServiceImpl.java
trash-workFlow/src/main/java/com/trash/business/service/impl/EarthsitesCreditServiceImpl.java
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckCreditServiceImpl.java
 package com.trash.business.controller;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import com.trash.business.domain.ConstructionCredit;
@@ -111,6 +112,10 @@ public class CompanyCreditController extends BaseController {
 	@PostMapping
 	public AjaxResult add(@RequestBody CompanyCredit companyCredit) {
 		try {
+
+			companyCredit.setCreateBy(SecurityUtils.getUsername());
+			companyCredit.setTime(new Date());
+
 			return toAjax(companyCreditService.insertCompanyCredit(companyCredit));
 		} catch (Exception e) {
 			return AjaxResult.error(e.getMessage());
 package com.trash.business.controller;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -103,7 +104,9 @@ public class ConstructionCreditController extends BaseController
     @Log(title = "工地失信", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ConstructionCredit constructionCredit)
-    {
+    {	
+    	constructionCredit.setTime(new Date());
+    	constructionCredit.setCreateBy(SecurityUtils.getUsername());
         return toAjax(constructionCreditService.insertConstructionCredit(constructionCredit));
     }
 package com.trash.business.controller;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import com.trash.business.domain.ConstructionCredit;
@@ -21,6 +22,7 @@ import com.trash.common.enums.BusinessType;
 import com.trash.business.domain.DriverCredit;
 import com.trash.business.mapper.DriverCreditMapper;
 import com.trash.business.service.IDriverCreditService;
+import com.trash.common.utils.SecurityUtils;
 import com.trash.common.utils.poi.ExcelUtil;
 import com.trash.common.core.page.TableDataInfo;
@@ -32,115 +34,107 @@ import com.trash.common.core.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/business/driverCredit")
-public class DriverCreditController extends BaseController
-{
-    @Autowired
-    private IDriverCreditService driverCreditService;
-    
-    @Autowired
-    private DriverCreditMapper mapper;
-
-    /**
-     * 查询驾驶员失信列表
-     */
-    @GetMapping("/list")
-    public TableDataInfo list(DriverCredit driverCredit)
-    {
-        startPage();
-        List<DriverCredit> list = driverCreditService.selectDriverCreditList(driverCredit);
-        return getDataTable(list);
-    }
-
-    @GetMapping("/historyCredit")
-    public TableDataInfo historyCredit(DriverCredit driverCredit)
-    {
-        startPage();
-        List<DriverCredit> list = driverCreditService.selectDriverCreditHistory(driverCredit);
-        return getDataTable(list);
-    }
-
-    @GetMapping("/names")
-    public List<String> getNames(DriverCredit credit)
-    {
-    	
-    	if(credit.getStatus() == 1){
-    		credit.setStatus(null);
-    	}
-        return mapper.getNames(credit);
-    }
-
-    @GetMapping("/licenseplates")
-    public List<String> getLicenseplates(DriverCredit credit)
-    {
-    	
-    	if(credit.getStatus() == 1){
-    		credit.setStatus(null);
-    	}
-        return mapper.getLicenseplate(credit);
-    }
-
-    /**
-     * 导出驾驶员失信列表
-     */
-    @Log(title = "驾驶员失信", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(DriverCredit driverCredit)
-    {	
-    	
-    	List<DriverCredit> list = null;
-    	List<String> withOut = new ArrayList<String>();
-        
-        if(driverCredit.getStatus() == 1){
-        	withOut.add("time");
-            list = driverCreditService.selectDriverCreditHistory(driverCredit);
-        }else{
-
-            list = driverCreditService.selectDriverCreditList(driverCredit);
-
-        }
-    	for(int i = 0;i<list.size();i++){
-        	list.get(i).setId((long)i+1);
-        }
-        ExcelUtil<DriverCredit> util = new ExcelUtil<DriverCredit>(DriverCredit.class);
-        return util.exportExcel(list, "驾驶员失信",withOut);
-    }
-
-    /**
-     * 获取驾驶员失信详细信息
-     */
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
-        return AjaxResult.success(driverCreditService.selectDriverCreditById(id));
-    }
-
-    /**
-     * 新增驾驶员失信
-     */
-    @Log(title = "驾驶员失信", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody DriverCredit driverCredit)
-    {
-        return toAjax(driverCreditService.insertDriverCredit(driverCredit));
-    }
-
-    /**
-     * 修改驾驶员失信
-     */
-    @Log(title = "驾驶员失信", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody DriverCredit driverCredit)
-    {
-        return toAjax(driverCreditService.updateDriverCredit(driverCredit));
-    }
-
-    /**
-     * 删除驾驶员失信
-     */
-    @Log(title = "驾驶员失信", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
-        return toAjax(driverCreditService.deleteDriverCreditByIds(ids));
-    }
+public class DriverCreditController extends BaseController {
+	@Autowired
+	private IDriverCreditService driverCreditService;
+
+	@Autowired
+	private DriverCreditMapper mapper;
+
+	/**
+	 * 查询驾驶员失信列表
+	 */
+	@GetMapping("/list")
+	public TableDataInfo list(DriverCredit driverCredit) {
+		startPage();
+		List<DriverCredit> list = driverCreditService.selectDriverCreditList(driverCredit);
+		return getDataTable(list);
+	}
+
+	@GetMapping("/historyCredit")
+	public TableDataInfo historyCredit(DriverCredit driverCredit) {
+		startPage();
+		List<DriverCredit> list = driverCreditService.selectDriverCreditHistory(driverCredit);
+		return getDataTable(list);
+	}
+
+	@GetMapping("/names")
+	public List<String> getNames(DriverCredit credit) {
+
+		if (credit.getStatus() == 1) {
+			credit.setStatus(null);
+		}
+		return mapper.getNames(credit);
+	}
+
+	@GetMapping("/licenseplates")
+	public List<String> getLicenseplates(DriverCredit credit) {
+
+		if (credit.getStatus() == 1) {
+			credit.setStatus(null);
+		}
+		return mapper.getLicenseplate(credit);
+	}
+
+	/**
+	 * 导出驾驶员失信列表
+	 */
+	@Log(title = "驾驶员失信", businessType = BusinessType.EXPORT)
+	@GetMapping("/export")
+	public AjaxResult export(DriverCredit driverCredit) {
+
+		List<DriverCredit> list = null;
+		List<String> withOut = new ArrayList<String>();
+
+		if (driverCredit.getStatus() == 1) {
+			withOut.add("time");
+			list = driverCreditService.selectDriverCreditHistory(driverCredit);
+		} else {
+
+			list = driverCreditService.selectDriverCreditList(driverCredit);
+
+		}
+		for (int i = 0; i < list.size(); i++) {
+			list.get(i).setId((long) i + 1);
+		}
+		ExcelUtil<DriverCredit> util = new ExcelUtil<DriverCredit>(DriverCredit.class);
+		return util.exportExcel(list, "驾驶员失信", withOut);
+	}
+
+	/**
+	 * 获取驾驶员失信详细信息
+	 */
+	@GetMapping(value = "/{id}")
+	public AjaxResult getInfo(@PathVariable("id") Long id) {
+		return AjaxResult.success(driverCreditService.selectDriverCreditById(id));
+	}
+
+	/**
+	 * 新增驾驶员失信
+	 */
+	@Log(title = "驾驶员失信", businessType = BusinessType.INSERT)
+	@PostMapping
+	public AjaxResult add(@RequestBody DriverCredit driverCredit) {
+		driverCredit.setCreateBy(SecurityUtils.getUsername());
+		driverCredit.setTime(new Date());
+		return toAjax(driverCreditService.insertDriverCredit(driverCredit));
+	}
+
+	/**
+	 * 修改驾驶员失信
+	 */
+	@Log(title = "驾驶员失信", businessType = BusinessType.UPDATE)
+	@PutMapping
+	public AjaxResult edit(@RequestBody DriverCredit driverCredit) {
+		return toAjax(driverCreditService.updateDriverCredit(driverCredit));
+	}
+
+	/**
+	 * 删除驾驶员失信
+	 */
+	@Log(title = "驾驶员失信", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+	public AjaxResult remove(@PathVariable Long[] ids) {
+		return toAjax(driverCreditService.deleteDriverCreditByIds(ids));
+	}
 }
 package com.trash.business.controller;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import com.alibaba.fastjson.JSONArray;
@@ -96,7 +97,9 @@ public class EarthsitesCreditController extends BaseController
     @Log(title = "处理场所失信", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody EarthsitesCredit earthsitesCredit)
-    {
+    {    	earthsitesCredit.setCreateBy(SecurityUtils.getUsername());
+    earthsitesCredit.setTime(new Date());
+
         return toAjax(earthsitesCreditService.insertEarthsitesCredit(earthsitesCredit));
     }
 package com.trash.business.controller;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import com.trash.business.domain.ConstructionCredit;
@@ -20,6 +21,7 @@ import com.trash.common.core.domain.AjaxResult;
 import com.trash.common.enums.BusinessType;
 import com.trash.business.domain.TruckCredit;
 import com.trash.business.service.ITruckCreditService;
+import com.trash.common.utils.SecurityUtils;
 import com.trash.common.utils.poi.ExcelUtil;
 import com.trash.common.core.page.TableDataInfo;
@@ -114,6 +116,8 @@ public class TruckCreditController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TruckCredit truckCredit)
     {
+        truckCredit.setCreateBy(SecurityUtils.getUsername());
+        truckCredit.setTime(new Date());
         return toAjax(truckCreditService.insertTruckCredit(truckCredit));
     }
@@ -91,16 +91,13 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
 	@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);
+		List old = companyCreditMapper.selectCompanyCreditList(cc);
 		if (old.size() > 0) {
 			i = 1;
@@ -134,7 +134,6 @@ public class ConstructionCreditServiceImpl implements IConstructionCreditService
     public int insertConstructionCredit(ConstructionCredit constructionCredit)
     {	
-    	constructionCredit.setTime(new Date());
     	List<Map> map = new ArrayList<Map>();
@@ -144,7 +143,7 @@ public class ConstructionCreditServiceImpl implements IConstructionCreditService
         cc.setLostCredit(constructionCredit.getLostCredit());
         cc.setObjectId(constructionCredit.getObjectId());
-        List old = selectConstructionCreditList(cc);
+        List old = constructionCreditMapper.selectConstructionCreditList(cc);
         int i = 0;
@@ -116,8 +116,7 @@ List&lt;String&gt; areas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
     @Override
     public int insertDriverCredit(DriverCredit driverCredit)
     {
-    	driverCredit.setCreateBy(SecurityUtils.getUsername());
-        driverCredit.setTime(new Date());
+
         int i;
         DriverCredit cc = new DriverCredit();
@@ -126,7 +125,7 @@ List&lt;String&gt; areas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
         cc.setLostCredit(driverCredit.getLostCredit());
         cc.setObjectId(driverCredit.getObjectId());
-        List old = selectDriverCreditList(cc);
+        List old = driverCreditMapper.selectDriverCreditList(cc);
         if(old.size() > 0){
         	i = 1;
@@ -9,6 +9,7 @@ import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.trash.business.mapper.EarthsitesCreditMapper;
+import com.trash.business.mapper.TruckCreditMapper;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.trash.business.domain.ConstructionCredit;
@@ -96,8 +97,6 @@ public class EarthsitesCreditServiceImpl implements IEarthsitesCreditService
     @Override
     public int insertEarthsitesCredit(EarthsitesCredit earthsitesCredit)
     {
-    	earthsitesCredit.setCreateBy(SecurityUtils.getUsername());
-        earthsitesCredit.setTime(new Date());
         List<Map> map = new ArrayList<Map>();
@@ -107,7 +106,7 @@ public class EarthsitesCreditServiceImpl implements IEarthsitesCreditService
         cc.setLostCredit(earthsitesCredit.getLostCredit());
         cc.setObjectId(earthsitesCredit.getObjectId());
-        List old = selectEarthsitesCreditList(cc);
+        List old = earthsitesCreditMapper.selectEarthsitesCreditList(cc);
         int i = 0;
@@ -620,17 +620,44 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		String companyName = SecurityUtils.getLoginUser().getUser().getCompanyName();
-		if(companyName != null){
-			supervisionThreestep.setCompanys(companyName);
-		}
+		
 		List<SupervisionThreestep> threesteps = supervisionThreestepMapper.selectTodayDataList(supervisionThreestep);
+		
+		if(companyName != null){
-			
-			
-			return threesteps;
-			
+	         JSONArray array = redisCache.getCacheObject("constructionList");
+	         
+	         for(SupervisionThreestep three:threesteps){
+	        	 for(Object obj:array){
+	        		 JSONObject con = (JSONObject) obj;
+	        		 if(three.getObjectId().equals(con.getString("id"))){
+	        			 
+	        			 if(con.getString("transportCompany") != null && con.getString("transportCompany").equals(companyName)){
+	        				 
+	        				 data.add(three);
+	        				 
+	        				 continue;
+	        			 }
+	        			 
+	        			 JSONArray array2 = RemoteServerUtils.getUnitetransport(con.getString("id"));
+	        			 
+	        			 for(Object comObj:array2){
+	        				 JSONObject company = (JSONObject) comObj;
+	        				 
+	        				 if(company.getString("companyName") != null && company.getString("companyName").equals(companyName)){
+	        					 
+	        					 data.add(three);
+	        	        		 break;
+	        				 }
+	        			 }
+	        		 }
+	        	 }
+	         }
+	         return data;
+		}
+		return threesteps;		
 	}
 	/**
@@ -118,16 +118,13 @@ public class TruckCreditServiceImpl implements ITruckCreditService
         int i; 
-        truckCredit.setCreateBy(SecurityUtils.getUsername());
-        truckCredit.setTime(new Date());
-        
         TruckCredit cc = new TruckCredit();
         cc.setStatus(0L);
         cc.setLostCredit(truckCredit.getLostCredit());
         cc.setObjectId(truckCredit.getObjectId());
-        List old = selectTruckCreditList(cc);
+        List old = truckCreditMapper.selectTruckCreditList(cc);
         if(old.size() > 0){
         	i = 1;