m

youxiw2000
1 parent 3309e731
Showing 11 changed files with 122 additions and 21 deletions
trash-admin/src/main/java/com/trash/Application.java
trash-admin/src/main/resources/application-dev.yml
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderCar.java
trash-ui/dist.7z
trash-ui/src/api/truck_active.js
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionThreestepController.java
trash-workFlow/src/main/java/com/trash/business/controller/TruckActivateController.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/resources/mapper/TruckActivateMapper.xml
 package com.trash;
  
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+
+import com.alibaba.fastjson.JSONObject;
+import com.trash.common.core.domain.entity.SysDept;
+import com.trash.common.core.domain.entity.SysRole;
+import com.trash.common.core.domain.entity.SysUser;
+import com.trash.common.core.domain.model.LoginUser;
+import com.trash.common.utils.RemoteServerUtils;
+import com.trash.framework.web.service.TokenService;
  
 /**
  * 启动程序
@@ -13,11 +27,13 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
 @EnableScheduling
 public class Application
-{
+{	
+	@Autowired
+	TokenService tokenService;
+	
     public static void main(String[] args)
     {
         // System.setProperty("spring.devtools.restart.enabled", "false");
         SpringApplication.run(Application.class, args);
-        System.out.println("Application start success");
     }
 }
@@ -9,8 +9,8 @@ trash:
     # 实例演示开关
     demoEnabled: true
     # 文件路径 示例（ Windows配置D:/trash/uploadPath，Linux配置 /home/trash/uploadPath，存储桶 trash/uploadPath,nginx配置 /trash/upload）
-    profile: /home/trash/uploadPath
-#    profile: E:/trash/uploadPath
+    #profile: /home/trash/uploadPath
+    profile: E:/trash/uploadPath
 #    profile: F:/work/project/Documents/uploadPath/trash
 #     获取ip地址开关
     addressEnabled: false
@@ -94,7 +94,6 @@ public class GarbageOrderController {
             // 上传并返回新文件名称
             fileName = FileUploadUtils.upload(filePath, file);
         } catch (IOException e) {
-            log.error("上传图片异常",e);
             throw new BizException(ResultCode.CODE_400, ResultCode.CODE_400.getMsg());
         }
         String url = serverConfig.getUrl() + fileName;
@@ -146,4 +146,21 @@ public class GarOrderCar implements Serializable {
     public void setGarRemark(String garRemark) {
         this.garRemark = garRemark;
     }
+
+	public Integer getCarId() {
+		return carId;
+	}
+
+	public void setCarId(Integer carId) {
+		this.carId = carId;
+	}
+
+	public String getContainerVolume() {
+		return containerVolume;
+	}
+
+	public void setContainerVolume(String containerVolume) {
+		this.containerVolume = containerVolume;
+	}
+    
 }
 \ No newline at end of file
@@ -255,9 +255,9 @@ export default {
           size:1000
         }
  
-
-        for(let i in res.result.unitCompanyList){
-            let unit = res.result.unitCompanyList[i];
+        let vids = res.result.transportCompanyVehicleId;
+        for(let idx in res.result.unitCompanyList){
+            let unit = res.result.unitCompanyList[idx];
             if(!unit.companyName)
               continue;
  
@@ -267,6 +267,7 @@ export default {
                continue;
             }
  
+
             for(let i in this.remoteCompanys){
               if(this.remoteCompanys[i].id == unit.companyId){
                 if(this.remoteCompanys[i].auditStatus != 1){
@@ -284,6 +285,10 @@ export default {
                   name: unit.companyName + credit,
                   creditStatus: this.remoteCompanys[i].dishonestState
                 });
+
+                for(let j in unit.vehicleList){
+                    vids.push(unit.vehicleList[j].id);
+                }
                 break;
               }
             }
@@ -293,13 +298,16 @@ export default {
           let list = tres.result.list;
  
           let qr = {
-            status:0
+            status:0,
+            constructionId:item.objectId
           }
  
           listTruckActivate(qr).then(response => {
             let taList = response.rows;
             for(let i = 0;i< list.length;i++){
-
+              if(vids.indexOf(list[i].id) == -1){
+                continue;
+              }
               let count = 0;
                 for(let j in taList){
                   if(taList[j].objectId == list[i].id){
@@ -128,7 +128,7 @@ public class SupervisionThreestepController extends BaseController {
  
 	}
  
-	String[] outside = { "长沙县", "望城区", "浏阳市", "宁乡市", "株洲市", "湘潭市", "汩罗市", "湘阴县" };
+	String[] outside = {"株洲市", "湘潭市", "汩罗市", "湘阴县" };
  
 	/**
 	 * 查询三查机制列表
@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
  
+import com.github.pagehelper.PageHelper;
 import com.trash.business.domain.TruckActivate;
 import com.trash.business.domain.TruckActivateInfo;
 import com.trash.business.mapper.TruckActivateMapper;
@@ -22,10 +23,14 @@ import com.trash.common.annotation.Log;
 import com.trash.common.annotation.RepeatSubmit;
 import com.trash.common.core.controller.BaseController;
 import com.trash.common.core.domain.AjaxResult;
+import com.trash.common.core.page.PageDomain;
 import com.trash.common.core.page.TableDataInfo;
+import com.trash.common.core.page.TableSupport;
 import com.trash.common.core.redis.RedisCache;
 import com.trash.common.enums.BusinessType;
+import com.trash.common.utils.StringUtils;
 import com.trash.common.utils.poi.ExcelUtil;
+import com.trash.common.utils.sql.SqlUtil;
  
 /**
  * 车辆激活Controller
@@ -54,19 +59,72 @@ public class TruckActivateController extends BaseController
     @GetMapping("/list")
     public TableDataInfo list(TruckActivate truckActivate)
     {	
-    	
+        startPage();
+    	    	
     	if(truckActivate.getStatus() == 0){
     		truckActivate.setMyTables(new ArrayList<>());
     		truckActivate.getMyTables().add("truck_activate");
+    		return getDataTable(truckActivateService.selectTruckActivateList(truckActivate));
     	}else{
-    		List<String> tables = truckActivateMapper.getTables("truck_activate%");
-    		truckActivate.setMyTables(tables);
+    		PageDomain pageDomain = TableSupport.buildPageRequest();
+    	    Integer pageNum = pageDomain.getPageNum();
+    	    Integer pageSize = pageDomain.getPageSize();
+
+			String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
+
+	        PageHelper.startPage(pageNum, pageSize, orderBy);
+	        
+    	    
+    		truckActivate.setMyTables(new ArrayList<>());
+    		truckActivate.getMyTables().add("truck_activate");
+    		    		
+    		TableDataInfo info = getDataTable(truckActivateService.selectTruckActivateList(truckActivate));
+    		
+    		
+    		if(pageSize*pageNum - info.getTotal() > 10 ){
+    			info.getRows().clear();
+    		}
+    		
+    		if(info.getRows().size() == pageSize){
+	    		List<String> tables = truckActivateMapper.getTables("truck_activate_%");
+	    		for(String tb:tables){
+	    	        startPage();
+	    			truckActivate.setMyTables(new ArrayList<>());
+	        		truckActivate.getMyTables().add(tb);
+	        		info.setTotal(info.getTotal() +getDataTable(truckActivateService.selectTruckActivateList(truckActivate)).getTotal());
+	    		}
+    		}else{
+    			List<String> tables = truckActivateMapper.getTables("truck_activate_%");
+	    		for(String tb:tables){
+	    			int oSize = 0;
+	    			if(info.getRows().size() < pageSize){
+	    				pageDomain = TableSupport.buildPageRequest();
+		    	        pageNum = pageDomain.getPageNum();
+		    	        pageSize = pageDomain.getPageSize();
+		    			int oPage = (int)(((pageNum * pageSize) - info.getTotal()) / pageSize);
+		    	        PageHelper.startPage(oPage, pageSize, orderBy);
+		    	        
+	    			}else{
+	    				pageNum = 1;
+	    				pageSize = 0;
+	    			}
+	    			
+	    			truckActivate.setMyTables(new ArrayList<>());
+	        		truckActivate.getMyTables().add(tb);
+	        		List list = truckActivateService.selectTruckActivateList(truckActivate);
+	        		info.getRows().addAll(list);
+	        		info.setTotal(info.getTotal() +getDataTable(list).getTotal());
+	        		if(pageSize*pageNum - info.getTotal() > 10 ){
+	        			info.getRows().clear();
+	        		}
+	    		}
+    			
+    			
+    			
+    		}
+    		
+    		return info;
     	}
-    	
-    	
-        startPage();
-        
-        return getDataTable(truckActivateService.selectTruckActivateList(truckActivate));
     }
  
     /**
@@ -266,7 +266,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
 		return supervisionThreestepMapper.getNames(supervisionThreestep);
 	}
  
-	String[] outside = { "长沙县", "望城区", "浏阳市", "宁乡市", "株洲市", "湘潭市", "汩罗市", "湘阴县" };
+	String[] outside = {"株洲市", "湘潭市", "汩罗市", "湘阴县" };
  
 	@SuppressWarnings("unchecked")
 	@Override
@@ -77,6 +77,9 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
  
  
 		List<TruckActivate> list = new ArrayList<>();
+		if(1==1){
+			return truckActivateMapper.selectTruckActivateList(truckActivate);
+		}
  
 				List<String> companys = SecurityUtils.getLoginUser().getUser().getCompanyIds();
 				List<String> tList = SecurityUtils.getLoginUser().getUser().getTruckList();
@@ -79,7 +79,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
 				        </foreach>
 	        </if>
         </where>
-        ORDER BY create_time desc
+        ORDER BY id desc
     </select>
  
         <select id="selectTruckActivateListByConstructions" parameterType="TruckActivate" resultMap="TruckActivateResult">