优化功能；订单无法导出、小程序打包过大、H5地图无法使用

liujun001
1 parent cab1c386
Showing 54 changed files with 2265 additions and 443 deletions
trash-admin/src/main/resources/static/company.png
trash-admin/src/main/resources/static/driver.png
trash-admin/src/main/resources/static/handler.png
trash-admin/src/main/resources/static/manager.png
trash-admin/src/main/resources/static/role/company.png
trash-admin/src/main/resources/static/role/disposal.png
trash-admin/src/main/resources/static/role/handler.png
trash-admin/src/main/resources/static/role/user.png
trash-admin/src/main/resources/static/user.png
trash-garbage/src/main/java/com/trash/garbage/controller/GarCarController.java
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageCarController.java
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
trash-garbage/src/main/java/com/trash/garbage/controller/Test.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderEvaluateMapper.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMapper.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMatchHandlerMapper.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/DockingQRCodeEntity.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrder.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderCar.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/DockingQRCodeDTO.java
+package com.trash.garbage.controller;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.http.HttpRequest;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageInfo;
+import com.trash.carInfo.domain.CarDriverRelation;
+import com.trash.carInfo.domain.CarInfo;
+import com.trash.carInfo.domain.vo.CarInfoVo;
+import com.trash.carInfo.service.impl.CarInfoServiceImpl;
+import com.trash.common.constant.HttpStatus;
+import com.trash.common.core.page.TableDataInfo;
+import com.trash.driver.domain.Driver;
+import com.trash.driver.domain.vo.DriverVo;
+import com.trash.driver.service.IDriverService;
+import com.trash.enterprise.domain.TransportationEnterprise;
+import com.trash.garbage.pojo.dto.GarCarInfoVo;
+import javafx.scene.control.SplitPane;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.time.FastDateFormat;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.text.ParseException;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping("/gar/car")
+@Slf4j
+public class GarCarController {
+    private final CarInfoServiceImpl carInfoServiceImpl;
+    private String contentType = "application/json";
+
+    @Value("${trash.token}")
+    private String authorization;
+    @Value("${trash.remotePath}")
+    private String remotePath;
+
+    @Autowired
+    private IDriverService driverService;
+
+    private final static FastDateFormat FAST_DATE_FORMAT = FastDateFormat.getInstance("yyyy-MM-dd");
+
+    public GarCarController(CarInfoServiceImpl carInfoServiceImpl) {
+        this.carInfoServiceImpl = carInfoServiceImpl;
+    }
+
+    @PostMapping("/list/group/by/carType")
+    public TableDataInfo listGroupByCarTypePost(GarCarInfoVo carInfo) throws ParseException{
+        return listGroupByCarType(carInfo);
+    }
+    @GetMapping("/list/group/by/carType")
+    public TableDataInfo listGroupByCarType(GarCarInfoVo carInfo) throws ParseException {
+        Map<String, String> headers = new HashMap<>();
+        headers.put("Authorization", authorization);
+        headers.put("Content-Type", contentType);
+
+        Map<String, Object> params = new HashMap<>();
+        if (Objects.nonNull(carInfo.getCompanyId())) {
+            if (StringUtils.length(carInfo.getCompanyId()) < 5) {
+                params.put("companyID", "zxljqy" + carInfo.getCompanyId());
+            } else {
+                params.put("companyID", carInfo.getCompanyId());
+            }
+        }
+
+        params.put("valid", 0);
+        params.put("tag", 1);
+        params.put("page", 1);
+        params.put("size", 100);
+
+        String json = null;
+        List<GarCarInfoVo> list = new ArrayList<>();
+        try {
+            String paramStr = JSON.toJSONString(params);
+            json = HttpRequest.get(remotePath + "/api/gpsservice/cs/basevehicle/ledger/list").header("Authorization", authorization).header("Content-Type", contentType)
+                    .timeout(15000).body(paramStr).execute().body();
+            log.info("/api/gpsservice/cs/basevehicle/ledger/list;params:[{}],returnJson:[{}]", paramStr, json);
+        } catch (Exception e) {
+            log.error("请求公司车辆信息异常", e);
+        }
+
+        if (StringUtils.isNotEmpty(json)) {
+            Map<String, Object> hash = JSON.parseObject(json, HashMap.class);
+            if (Objects.nonNull(hash)) {
+                if (Objects.nonNull(hash.get("code")) && StringUtils.equals(hash.get("code").toString(), "200")) {
+                    if (Objects.nonNull(hash.get("result")) && hash.get("result") instanceof JSONObject) {
+                        JSONObject resultObj = (JSONObject) hash.get("result");
+                        if (Objects.nonNull(resultObj) && Objects.nonNull(resultObj.get("list")) && resultObj.get("list") instanceof JSONArray) {
+                            JSONArray jsonArray = (JSONArray) resultObj.get("list");
+                            for (Object object : jsonArray) {
+                                JSONObject jsonObject = (JSONObject) object;
+
+                                GarCarInfoVo vo = new GarCarInfoVo();
+                                vo.setCarBrank(jsonObject.getString("brandName"));
+                                vo.setCarCode(jsonObject.getString("licenseplateNo"));
+                                vo.setCarColor(jsonObject.getString(""));
+                                vo.setCarIdentification(jsonObject.getString("licenseplateNo"));
+                                vo.setCarType(jsonObject.getString("energyTypeName"));
+                                if (Objects.nonNull(jsonObject.getString("companyID"))) {
+                                    vo.setCompanyId(StringUtils.replace(jsonObject.getString("companyID").toString(), "zxljqy", ""));
+                                }
+                                vo.setCompanyName(jsonObject.getString("companyName"));
+                                vo.setContainerVolume(jsonObject.getString("containerVolume"));
+                                vo.setEmissionStandard(jsonObject.getString("emissionStanName"));
+                                vo.setFarmeNumber(jsonObject.getString("frmaeNo"));
+                                vo.setId(StringUtils.replace(jsonObject.getString("id"), "zxljcl", ""));
+                                vo.setStatus(jsonObject.getInteger("auditStatus"));
+                                if (StringUtils.isNotEmpty(jsonObject.getString("transportCertValid"))) {
+                                    vo.setRoadTransportDate(FAST_DATE_FORMAT.parse(jsonObject.getString("transportCertValid")));
+                                }
+                                if (StringUtils.isNotEmpty(jsonObject.getString("registerAt"))) {
+                                    vo.setEnterDate(FAST_DATE_FORMAT.parse(jsonObject.getString("registerAt")));
+                                }
+
+                                if (Objects.nonNull(jsonObject.get("drivers")) && jsonObject.get("drivers") instanceof JSONArray) {
+                                    JSONArray das = (JSONArray) jsonObject.get("drivers");
+                                    int length = CollectionUtils.size(das);
+                                    if (length > 0) {
+                                        if (Objects.nonNull(das.get(0)) && das.get(0) instanceof JSONObject) {
+                                            JSONObject dro = (JSONObject) das.get(0);
+                                            vo.setDrivers(StringUtils.replace(dro.getString("driverId").toString(), "zxljjsy", ""));
+                                            vo.setDriversName(dro.getString("driverName"));
+                                        }
+
+                                        Set<DriverVo> driverVoList = new HashSet<>();
+                                        for (Object da : das) {
+                                            JSONObject dro = (JSONObject) da;
+                                            DriverVo driverVo = new DriverVo();
+                                            driverVo.setName(dro.getString("driverName"));
+                                            driverVo.setPhoneNo(dro.getString("driverPhone"));
+                                            driverVo.setId(StringUtils.replace(dro.getString("driverId"), "zxljjsy", ""));
+                                            driverVoList.add(driverVo);
+                                        }
+                                        vo.setDriverVoList(driverVoList);
+                                    }
+                                }
+
+
+                                if (StringUtils.isNotEmpty(vo.getCarType())) {
+                                    list.add(vo);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        saveOrUpdateCarInfoAndDriver(list);
+
+        TableDataInfo data = getDataTable(list);
+        if (CollectionUtils.isNotEmpty(list)) {
+            Map<String, List<GarCarInfoVo>> carMap = list.stream().map(car -> {
+                if (Objects.equals(car.getCarType(), "轻型货车")) {
+                    car.setCarLeft("car_1.png");
+                    car.setRemark("箱体长2.6m,宽1.7m,高1.5m；最多可容纳约90袋装修垃圾（75cm*5cm每袋）");
+                } else if (Objects.equals(car.getCarType(), "中型货车")) {
+                    car.setCarLeft("car_2.png");
+                    car.setRemark("箱体长3.2m,宽1.5m,高1.5m；最多可容纳约110袋装修垃圾（75cm*45cm每袋）");
+                } else if (Objects.equals(car.getCarType(), "大中型货车")) {
+                    car.setCarLeft("car_3.png");
+                    car.setRemark("箱体长3.2m,宽1.9m,高1.9m；最多可容纳约150袋装修垃圾（75cm*45cm每袋）");
+                }
+                return car;
+            }).collect(Collectors.groupingBy(GarCarInfoVo::getCarType));
+
+            List<GarCarInfoVo> carList = new ArrayList<>();
+            for (Map.Entry<String, List<GarCarInfoVo>> entry : carMap.entrySet()) {
+                if (CollectionUtils.isNotEmpty(entry.getValue())) {
+                    Optional<GarCarInfoVo> opt = entry.getValue().stream().filter(car -> Objects.equals(car.getCarEquipment(), "4") || Objects.equals(car.getCarEquipment(), "6") || Objects.equals(car.getCarEquipment(), "8")).findFirst();
+                    if (opt.isPresent()) {
+                        carList.add(opt.get());
+                    } else {
+                        carList.add(entry.getValue().get(0));
+                    }
+
+                }
+            }
+            carList = carList.stream().sorted(Comparator.comparing(GarCarInfoVo::convertContainerVolumeDefaultMaxValue)).collect(Collectors.toList());
+
+            data.setRows(carList);
+        }
+
+        return data;
+    }
+
+    private void saveOrUpdateCarInfoAndDriver(List<GarCarInfoVo> carInfoVos) {
+        if (CollectionUtils.isNotEmpty(carInfoVos)) {
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    for (GarCarInfoVo vo : carInfoVos) {
+                        try {
+                            CarInfo carInfo = carInfoServiceImpl.selectCarInfoByIdStr(vo.getId());
+                            CarInfo ci = new CarInfo();
+                            ci.setId(vo.getId());
+                            ci.setCarBrank(vo.getCarBrank());
+                            ci.setCarCode(vo.getCarCode());
+                            ci.setCarCode(vo.getCarCode());
+                            ci.setCarIdentification(vo.getCarIdentification());
+                            ci.setCarType(vo.getCarType());
+                            ci.setCompanyId(vo.getCompanyId());
+                            ci.setContainerVolume(vo.getContainerVolume());
+                            ci.setEmissionStandard(vo.getEmissionStandard());
+                            ci.setFarmeNumber(vo.getFarmeNumber());
+                            ci.setId(vo.getId());
+                            ci.setStatus(vo.getStatus());
+                            ci.setRoadTransportDate(vo.getRoadTransportDate());
+                            ci.setEnterDate(vo.getEnterDate());
+
+
+                            if (Objects.isNull(carInfo)) {
+                                carInfoServiceImpl.save(ci);
+                            } else {
+                                CarInfo source = new CarInfo();
+                                source.setCarBrank(carInfo.getCarBrank());
+                                source.setCarCode(carInfo.getCarCode());
+                                source.setCarCode(carInfo.getCarCode());
+                                source.setCarIdentification(carInfo.getCarIdentification());
+                                source.setCarType(carInfo.getCarType());
+                                source.setCompanyId(carInfo.getCompanyId());
+                                source.setContainerVolume(carInfo.getContainerVolume());
+                                source.setEmissionStandard(carInfo.getEmissionStandard());
+                                source.setFarmeNumber(carInfo.getFarmeNumber());
+                                source.setId(carInfo.getId());
+                                source.setStatus(carInfo.getStatus());
+                                source.setRoadTransportDate(carInfo.getRoadTransportDate());
+                                source.setEnterDate(carInfo.getEnterDate());
+
+                                if (!StringUtils.equals(JSON.toJSONString(source), JSON.toJSONString(ci))) {
+                                    carInfoServiceImpl.updateById(ci);
+                                }
+                            }
+
+                            if (CollectionUtils.isNotEmpty(vo.getDriverVoList())) {
+                                for (DriverVo driverVo : vo.getDriverVoList()) {
+                                    Driver driver = new Driver();
+                                    driver.setId(driverVo.getId());
+                                    driver.setCompanyId(vo.getCompanyId());
+                                    driver.setName(driverVo.getName());
+                                    driver.setPhoneNo(driverVo.getPhoneNo());
+                                    driver.setStatus(1);
+
+                                    Driver source = driverService.selectDriverById(driver.getId());
+                                    if (Objects.isNull(source)) {
+                                        driverService.save(driver,ci.getId());
+                                    }else{
+                                        Driver source1 = new Driver();
+                                        source1.setId(source.getId());
+                                        source1.setCompanyId(source.getCompanyId());
+                                        source1.setName(source.getName());
+                                        source1.setPhoneNo(source.getPhoneNo());
+                                        source1.setStatus(source.getStatus());
+
+                                        if(!StringUtils.equals(JSON.toJSONString(source1),JSON.toJSONString(driver))){
+                                            driverService.updateById(driver,ci.getId());
+                                        }
+                                    }
+                                }
+                            }
+
+                        } catch (Exception e) {
+                            log.error(e.getMessage(),e);
+                        }
+                    }
+                }
+            }).start();
+        }
+    }
+
+    /**
+     * 响应请求分页数据
+     */
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    protected TableDataInfo getDataTable(List<?> list) {
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(HttpStatus.SUCCESS);
+        rspData.setMsg("查询成功");
+        rspData.setRows(list);
+        rspData.setTotal(new PageInfo(list).getTotal());
+        return rspData;
+    }
+}
+package com.trash.garbage.controller;
+
+import com.trash.common.annotation.Log;
+import com.trash.common.core.domain.AjaxResult;
+import com.trash.common.enums.BusinessType;
+import com.trash.garbage.global.Result;
+import com.trash.garbage.pojo.domain.DockingQRCodeEntity;
+import com.trash.garbage.pojo.dto.DockingQRCodeDTO;
+import com.trash.garbage.pojo.dto.OrderDto;
+import com.trash.garbage.service.GarOrderService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.BindingResult;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/car/order")
+@Slf4j
+public class GarbageCarController {
+    @Autowired
+    private GarOrderService garOrderService;
+
+    @PostMapping("/processing")
+    public Result<?> saveOrder(@Validated @RequestBody DockingQRCodeDTO dto, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return Result.ERROR(bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<DockingQRCodeEntity> entities = garOrderService.queryReportByCarCode(dto.getCarCode());
+
+        return Result.OK(entities);
+    }
+}
 package com.trash.garbage.controller;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.http.HttpRequest;
+import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageHelper;
+import com.trash.carInfo.domain.vo.CarInfoVo;
 import com.trash.common.annotation.Log;
 import com.trash.common.config.trashConfig;
 import com.trash.common.core.domain.AjaxResult;
@@ -13,6 +17,7 @@ import com.trash.common.enums.BusinessType;
 import com.trash.common.utils.ServletUtils;
 import com.trash.common.utils.StringUtils;
 import com.trash.common.utils.file.FileUploadUtils;
+import com.trash.common.utils.file.FileUtils;
 import com.trash.common.utils.poi.ExcelUtil;
 import com.trash.common.utils.sql.SqlUtil;
 import com.trash.enterprise.domain.TransportationEnterprise;
@@ -37,11 +42,10 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 /**
  * 订单控制
@@ -86,20 +90,25 @@ public class GarbageOrderController {
     }
-    @RequestMapping("upload")
+    @RequestMapping("/upload")
     public Result<?> uploadFile(@RequestParam("file") MultipartFile file) {
+        log.info("上传文件");
         String fileName = null;
         try { // 上传文件路径
             String filePath = trashConfig.getUploadPath();
             // 上传并返回新文件名称
             fileName = FileUploadUtils.upload(filePath, file);
         } catch (IOException e) {
+            e.printStackTrace();
+            System.out.println("上传文件失败");
+            log.error("上传文件失败，请稍后再试",e);
             throw new BizException(ResultCode.CODE_400, ResultCode.CODE_400.getMsg());
         }
         String url = serverConfig.getUrl() + fileName;
         Map<String, String> urlMap = new HashMap<>();
         urlMap.put("url", url);
         urlMap.put("fileName", fileName);
+        log.info("上传文件完成");
         return Result.OK(urlMap, "图片上传成功");
     }
@@ -171,6 +180,12 @@ public class GarbageOrderController {
         return Result.OK(garOrderService.queryDispatch(orderId));
     }
+    @GetMapping("/queryDispatch/dss/{orderId}")
+    public Result<?> queryDispatchDss(@PathVariable("orderId") String orderId) {
+
+        return Result.OK(garOrderService.queryDispatch(orderId));
+    }
+
     @GetMapping("/queryDisposalDispatch/{orderId}")
     public Result<?> queryDisposalDispatch(@PathVariable("orderId") String orderId) {
         return Result.OK(garOrderService.queryDisposalDispatch(orderId));
@@ -193,10 +208,32 @@ public class GarbageOrderController {
     @PreAuthorize("@ss.hasPermi('garbage:order:export')")
     @Log(title = "清运订单", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(GarOrder garOrder) {
+    public AjaxResult export(GarOrder garOrder, HttpServletResponse response, HttpServletRequest request) {
         List<GarOrder> list = garOrderService.queryOrderListByGarOrder(garOrder);
         ExcelUtil<GarOrder> util = new ExcelUtil<GarOrder>(GarOrder.class);
-        return util.exportExcel(list, "order");
+        AjaxResult ajaxResult = util.exportExcel(list, "order");
+
+        return ajaxResult;
+//        try
+//        {
+//            String fileName = String.valueOf(ajaxResult.get(AjaxResult.MSG_TAG));
+//            if (!FileUtils.isValidFilename(fileName))
+//            {
+//                throw new Exception(StringUtils.format("文件名称({})非法，不允许下载。 ", fileName));
+//            }
+//            String realFileName = System.currentTimeMillis() + fileName.substring(fileName.indexOf("_") + 1);
+//            String filePath = trashConfig.getDownloadPath() + fileName;
+//
+//            response.setCharacterEncoding("utf-8");
+//            response.setContentType("multipart/form-data");
+//            response.setHeader("Content-Disposition",
+//                    "attachment;fileName=" + FileUtils.setFileDownloadHeader(request, realFileName));
+//            FileUtils.writeBytes(filePath, response.getOutputStream());
+//        }
+//        catch (Exception e)
+//        {
+//            log.error("下载文件失败", e);
+//        }
     }
     @GetMapping("list")
@@ -224,7 +261,7 @@ public class GarbageOrderController {
                 SysUser user = loginUser.getUser();
                 if (Objects.nonNull(user)) {
                     if (Objects.equals(dto.getUserTypeValue(), 2)) {
-                        Long id = garOrderService.queryCarIdOfDriver(user.getPhonenumber());
+                        String id = garOrderService.queryCarIdOfDriver(user.getPhonenumber());
                         dto.setId(id);
                     } else if (Objects.equals(dto.getUserTypeValue(), 3)) {
                         dto.setServicePhone(user.getPhonenumber());
@@ -237,6 +274,26 @@ public class GarbageOrderController {
         return Result.OK(garOrderService.queryEnterpriseList(dto));
     }
+    @GetMapping("/docking/up/company")
+    public Result<?> dockingUpCompany(TransportationEnterprise dto){
+        if (ArrayUtils.contains(USER_TYP_SELF_COMPANY, dto.getUserTypeValue())) {
+            LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+            if (Objects.nonNull(loginUser)) {
+                SysUser user = loginUser.getUser();
+                if (Objects.nonNull(user)) {
+//                    if (Objects.equals(dto.getUserTypeValue(), 2)) {
+//                        Long id = garOrderService.queryCarIdOfDriver(user.getPhonenumber());
+//                        dto.setId(id);
+//                    } else if (Objects.equals(dto.getUserTypeValue(), 3)) {
+//                        dto.setServicePhone(user.getPhonenumber());
+//                    }
+                    dto.setServicePhone(user.getPhonenumber());
+                }
+            }
+        }
+        return Result.OK(garOrderService.dockingUpEnterpriseList(dto));
+    }
+
     @GetMapping("/search/history")
     public Result<?> querySearchHistory() {
         return Result.OK(garOrderService.querySearchHistory());
@@ -247,6 +304,8 @@ public class GarbageOrderController {
         return Result.OK(garOrderService.queryBadgeByType(type));
     }
+
+
     protected void startPage() {
         PageDomain pageDomain = TableSupport.buildPageRequest();
         Integer pageNum = pageDomain.getPageNum();
+package com.trash.garbage.controller;
+
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
+import cn.hutool.http.Method;
+import com.alibaba.fastjson.JSON;
+import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.utils.HttpClientUtils;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class Test {
+    public static void main(String[] args) {
+        String json = null;
+        String url = "http://127.0.0.1:8100/dss/keybox/yarnCabinetState/page";
+        String authorization = "eyJhbGciOiJIUzUxMiJ9.eyJlcXVpcG1lbnRfa2V5IjoiMTExYzNiMzUtYWM1Yy00Mjc3LWE1NDgtYzU5NTkwNzRmMzc5In0.VDAyrdtPOLkn4nV7TG-9sACHZk1dL5ynSW7nBsMrxUyBUO5NdGB2ifb5rffBbEk4VFSiqen5nc7IIsjQ5kUgzA";
+        try {
+            Map<String, Object> params = new HashMap<>();
+            params.put("device", "111111");
+            params.put("pageSize", 10);
+            params.put("pageNum", 1);
+
+            Map<String,String> headMap = new HashMap<>();
+            headMap.put("Authorization",authorization);
+            headMap.put("Content-Type","application/json");
+
+
+            json =doPost(url,headMap,JSON.toJSONString(params));
+
+            System.out.println(json);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static String doPost(String url, Map<String, String> headers, String body) throws IOException {
+        HttpPost post = new HttpPost(url);
+        CloseableHttpClient client = HttpClients.createDefault();
+        if (MapUtils.isNotEmpty(headers)) {
+            for (Map.Entry<String, String> entry : headers.entrySet()) {
+                post.addHeader(entry.getKey(), entry.getValue());
+            }
+        }
+
+        if (StringUtils.isNotEmpty(body)) {
+            post.setEntity(new StringEntity(body));
+        }
+        CloseableHttpResponse response = client.execute(post);
+        if (response.getStatusLine().getStatusCode() == 200) {
+            String content = EntityUtils.toString(response.getEntity());
+
+            System.out.println(content);
+            return content;
+        }
+        return null;
+    }
+
+}
@@ -15,7 +15,7 @@ import java.util.List;
 */
 public interface GarOrderEvaluateMapper extends BaseMapper<GarOrderEvaluate> {
-    List<GarOrderEvaluate> queryEvaluateByEnterpriseIds(@Param("list") List<Long> enterpriseIds, @Param("type") Integer value);
+    List<GarOrderEvaluate> queryEvaluateByEnterpriseIds(@Param("list") List<String> enterpriseIds, @Param("type") Integer value);
     List<GarOrderEvaluate>  countIdGroupByOrderId(@Param("list") Collection<String> orderIds,@Param("type")  Integer type);
 }
 package com.trash.garbage.mapper;
+import com.trash.garbage.pojo.domain.DockingQRCodeEntity;
 import com.trash.garbage.pojo.domain.GarOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.trash.garbage.pojo.vo.GarOrderDisposalVo;
@@ -18,7 +19,7 @@ import java.util.List;
 */
 public interface GarOrderMapper extends BaseMapper<GarOrder> {
-    List<GarOrder> queryCleanNumberByEnterpriseIds(@Param("list") List<Long> list,@Param("status") Integer value);
+    List<GarOrder> queryCleanNumberByEnterpriseIds(@Param("list") List<String> list,@Param("status") Integer value);
     List<GarOrderDriverVo> queryDriverOrderListByTelWithType(@Param("garUserTel") String garUserTel, @Param("type") Integer type, @Param("cancelFlag") Integer cancelFlag);
@@ -38,7 +39,9 @@ public interface GarOrderMapper extends BaseMapper&lt;GarOrder&gt; {
     Integer queryDisposalOrderListByTelWithTypeCount(@Param("garUserTel") String garUserTel, @Param("type") Integer type, @Param("cancelFlag") Integer value);
-    Long queryCompanyIdByPhone(@Param("phone")String phone);
+    String queryCompanyIdByPhone(@Param("phone")String phone);
+
+    List<DockingQRCodeEntity> queryReportByCarCode(@Param("carCode") String carCode);
 }
@@ -17,7 +17,9 @@ import java.util.Set;
 */
 public interface GarOrderMatchHandlerMapper extends BaseMapper<GarOrderMatchHandler> {
-    List<DispatchDriverVo> queryDriverListWithDispatchStatus(@Param("orderId") String orderId, @Param("companyId") Long id,@Param("containerVolumees") Set<String> containerVolumees);
+    List<DispatchDriverVo> queryDriverListWithDispatchStatus(@Param("orderId") String orderId, @Param("companyId") String id,@Param("containerVolumees") Set<String> containerVolumees);
+
+    List<GarOrderMatchHandler> queryGarOrderMatchHandler(@Param("orderId") String orderId);
 }
+package com.trash.garbage.pojo.domain;
+
+public class DockingQRCodeEntity implements java.io.Serializable {
+
+    private String garOrderAddress;//订单所属区域
+    private String garOrderAddressDetails;//订单详细地址
+    private String garOrderAgreementTime;//订单预约时间
+    private String garUserName;//下单用户名
+    private String garUserTel;//下单用户手机号
+    private String containerVolume;//运输量  单位方
+    private String dsAddress;//场地地址
+    private String dsLocalArea;//场地所属区域
+    private String dsName;//处置场所名称
+
+
+    public String getGarOrderAddress() {
+        return garOrderAddress;
+    }
+
+    public void setGarOrderAddress(String garOrderAddress) {
+        this.garOrderAddress = garOrderAddress;
+    }
+
+    public String getGarOrderAddressDetails() {
+        return garOrderAddressDetails;
+    }
+
+    public void setGarOrderAddressDetails(String garOrderAddressDetails) {
+        this.garOrderAddressDetails = garOrderAddressDetails;
+    }
+
+    public String getGarOrderAgreementTime() {
+        return garOrderAgreementTime;
+    }
+
+    public void setGarOrderAgreementTime(String garOrderAgreementTime) {
+        this.garOrderAgreementTime = garOrderAgreementTime;
+    }
+
+    public String getGarUserName() {
+        return garUserName;
+    }
+
+    public void setGarUserName(String garUserName) {
+        this.garUserName = garUserName;
+    }
+
+    public String getGarUserTel() {
+        return garUserTel;
+    }
+
+    public void setGarUserTel(String garUserTel) {
+        this.garUserTel = garUserTel;
+    }
+
+    public String getContainerVolume() {
+        return containerVolume;
+    }
+
+    public void setContainerVolume(String containerVolume) {
+        this.containerVolume = containerVolume;
+    }
+
+    public String getDsAddress() {
+        return dsAddress;
+    }
+
+    public void setDsAddress(String dsAddress) {
+        this.dsAddress = dsAddress;
+    }
+
+    public String getDsLocalArea() {
+        return dsLocalArea;
+    }
+
+    public void setDsLocalArea(String dsLocalArea) {
+        this.dsLocalArea = dsLocalArea;
+    }
+
+    public String getDsName() {
+        return dsName;
+    }
+
+    public void setDsName(String dsName) {
+        this.dsName = dsName;
+    }
+}
@@ -6,31 +6,35 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.trash.common.annotation.Excel;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.Objects;
 /**
  * 建筑垃圾—订单表
+ *
  * @TableName gar_order
  */
-@TableName(value ="gar_order")
+@TableName(value = "gar_order")
 @Data
 public class GarOrder implements Serializable {
     /**
      * 订单id
      */
     @TableId
+    @Excel(name = "订单号")
     private String garOrderId;
-	/**
-	 * 新增的一列数据 用于存储count字段
-	 * 注解非常关键
-	 */
-	@TableField(exist = false)
-	private Long count;
+    /**
+     * 新增的一列数据 用于存储count字段
+     * 注解非常关键
+     */
+    @TableField(exist = false)
+    private Long count;
     /**
      * 用户id
@@ -39,24 +43,28 @@ public class GarOrder implements Serializable {
     private String garOrderUserId;
-	/**
+    /**
      * 订单地址
      */
+    @Excel(name = "订单地址")
     private String garOrderAddress;
     /**
      * 订单详细地址
      */
+    @Excel(name = "订单详细地址")
     private String garOrderAddressDetails;
     /**
      * 订单姓名
      */
+    @Excel(name = "用户姓名")
     private String garOrderContactName;
     /**
      * 垃圾类型
      */
+    @Excel(name = "垃圾类型")
     private String garOrderTrashType;
     private String garOrderCompanyUserId;
@@ -64,6 +72,7 @@ public class GarOrder implements Serializable {
     /**
      * 订单人电话
      */
+    @Excel(name = "订单人电话")
     private String garOrderContactTel;
     /**
@@ -74,22 +83,28 @@ public class GarOrder implements Serializable {
     /**
      * 公司名称
      */
+    @Excel(name = "经营单位")
     private String garOrderCompanyName;
     /**
      * 公司负责人电话
      */
+    @Excel(name = "公司负责人电话")
     private String garOrderCompanyTel;
     /**
      * 处理状态
      */
+
     private Integer garOrderHandlerStatus;
+    @Excel(name = "处理状态")
+    @TableField(exist = false)
+    private String garOrderHandlerStatusStr;
-	/**
-	 * 实际派发车辆
-	 */
-	private Integer garRealCarCount;
+    /**
+     * 实际派发车辆
+     */
+    private Integer garRealCarCount;
     /**
      * 约定时间
@@ -127,358 +142,373 @@ public class GarOrder implements Serializable {
     /**
      * 备注
      */
+    @Excel(name = "备注")
     private String garRemark;
     /**
      * 取消标识
      */
     private Integer garCancelFlag;
+    @Excel(name = "是否取消")
+    @TableField(exist = false)
+    private String garCancelFlagStr;
-	/**
-	 * 分配标识
-	 */
-	private Integer garOrderScanHandlerFlag;
+    /**
+     * 分配标识
+     */
+    private Integer garOrderScanHandlerFlag;
-	/**
-	 * 经度
-	 */
-	private Double garLongitude;
+    /**
+     * 经度
+     */
+    private Double garLongitude;
-	/**
-	 * 纬度
-	 */
-	private Double garLatitude;
+    /**
+     * 纬度
+     */
+    private Double garLatitude;
-	private String garCoordinate;
+    private String garCoordinate;
-	private Boolean garInCarStore;
+    private Boolean garInCarStore;
-	/**
+    /**
      * 评分标识
      */
-	private Integer garEvaluateFlag;
-	/**
-	 * 处理人评分标识
-	 */
-	private Integer garHandlerEvaluateFlag;
+    private Integer garEvaluateFlag;
+    /**
+     * 处理人评分标识
+     */
+    private Integer garHandlerEvaluateFlag;
-	/**
+    /**
      * 原因
      */
     private String garReason;
-	private Integer garTimeOutFlag;
-
-	private String garEstimatedCost;
+    private Integer garTimeOutFlag;
-	/**
-	 * 是否有用户的评价，默认值是0，默认没有
-	 *
-	 * @author liujun
-	 * @date 2024/6/20 14:39
-	 */
-	@TableField(exist = false)
-	private Integer haveEvaluateOfClient = 0;
+    private String garEstimatedCost;
+    /**
+     * 是否有用户的评价，默认值是0，默认没有
+     *
+     * @author liujun
+     * @date 2024/6/20 14:39
+     */
+    @TableField(exist = false)
+    private Integer haveEvaluateOfClient = 0;
-	@TableField(exist = false)
+    @TableField(exist = false)
     private static final long serialVersionUID = 1L;
-	public Integer getGarHandlerEvaluateFlag() {
-		return garHandlerEvaluateFlag;
-	}
+    public Integer getGarHandlerEvaluateFlag() {
+        return garHandlerEvaluateFlag;
+    }
-	public void setGarHandlerEvaluateFlag(Integer garHandlerEvaluateFlag) {
-		this.garHandlerEvaluateFlag = garHandlerEvaluateFlag;
-	}
+    public void setGarHandlerEvaluateFlag(Integer garHandlerEvaluateFlag) {
+        this.garHandlerEvaluateFlag = garHandlerEvaluateFlag;
+    }
-	public Integer getGarOrderScanHandlerFlag() {
-		return garOrderScanHandlerFlag;
-	}
+    public Integer getGarOrderScanHandlerFlag() {
+        return garOrderScanHandlerFlag;
+    }
-	public void setGarOrderScanHandlerFlag(Integer garOrderScanHandlerFlag) {
-		this.garOrderScanHandlerFlag = garOrderScanHandlerFlag;
-	}
+    public void setGarOrderScanHandlerFlag(Integer garOrderScanHandlerFlag) {
+        this.garOrderScanHandlerFlag = garOrderScanHandlerFlag;
+    }
-	public String getGarOrderId() {
-		return garOrderId;
-	}
+    public String getGarOrderId() {
+        return garOrderId;
+    }
-	public void setGarOrderId(String garOrderId) {
-		this.garOrderId = garOrderId;
-	}
+    public void setGarOrderId(String garOrderId) {
+        this.garOrderId = garOrderId;
+    }
-	public String getGarOrderUserId() {
-		return garOrderUserId;
-	}
+    public String getGarOrderUserId() {
+        return garOrderUserId;
+    }
-	public void setGarOrderUserId(String garOrderUserId) {
-		this.garOrderUserId = garOrderUserId;
-	}
+    public void setGarOrderUserId(String garOrderUserId) {
+        this.garOrderUserId = garOrderUserId;
+    }
-	public String getGarOrderAddress() {
-		return garOrderAddress;
-	}
+    public String getGarOrderAddress() {
+        return garOrderAddress;
+    }
-	public void setGarOrderAddress(String garOrderAddress) {
-		this.garOrderAddress = garOrderAddress;
-	}
+    public void setGarOrderAddress(String garOrderAddress) {
+        this.garOrderAddress = garOrderAddress;
+    }
-	public String getGarOrderAddressDetails() {
-		return garOrderAddressDetails;
-	}
+    public String getGarOrderAddressDetails() {
+        return garOrderAddressDetails;
+    }
-	public void setGarOrderAddressDetails(String garOrderAddressDetails) {
-		this.garOrderAddressDetails = garOrderAddressDetails;
-	}
+    public void setGarOrderAddressDetails(String garOrderAddressDetails) {
+        this.garOrderAddressDetails = garOrderAddressDetails;
+    }
-	public String getGarOrderContactName() {
-		return garOrderContactName;
-	}
+    public String getGarOrderContactName() {
+        return garOrderContactName;
+    }
-	public void setGarOrderContactName(String garOrderContactName) {
-		this.garOrderContactName = garOrderContactName;
-	}
+    public void setGarOrderContactName(String garOrderContactName) {
+        this.garOrderContactName = garOrderContactName;
+    }
-	public String getGarOrderTrashType() {
-		return garOrderTrashType;
-	}
+    public String getGarOrderTrashType() {
+        return garOrderTrashType;
+    }
-	public void setGarOrderTrashType(String garOrderTrashType) {
-		this.garOrderTrashType = garOrderTrashType;
-	}
+    public void setGarOrderTrashType(String garOrderTrashType) {
+        this.garOrderTrashType = garOrderTrashType;
+    }
-	public String getGarOrderContactTel() {
-		return garOrderContactTel;
-	}
+    public String getGarOrderContactTel() {
+        return garOrderContactTel;
+    }
-	public void setGarOrderContactTel(String garOrderContactTel) {
-		this.garOrderContactTel = garOrderContactTel;
-	}
+    public void setGarOrderContactTel(String garOrderContactTel) {
+        this.garOrderContactTel = garOrderContactTel;
+    }
-	public String getGarOrderCompanyId() {
-		return garOrderCompanyId;
-	}
+    public String getGarOrderCompanyId() {
+        return garOrderCompanyId;
+    }
-	public void setGarOrderCompanyId(String garOrderCompanyId) {
-		this.garOrderCompanyId = garOrderCompanyId;
-	}
+    public void setGarOrderCompanyId(String garOrderCompanyId) {
+        this.garOrderCompanyId = garOrderCompanyId;
+    }
-	public String getGarOrderCompanyName() {
-		return garOrderCompanyName;
-	}
+    public String getGarOrderCompanyName() {
+        return garOrderCompanyName;
+    }
-	public void setGarOrderCompanyName(String garOrderCompanyName) {
-		this.garOrderCompanyName = garOrderCompanyName;
-	}
+    public void setGarOrderCompanyName(String garOrderCompanyName) {
+        this.garOrderCompanyName = garOrderCompanyName;
+    }
-	public String getGarOrderCompanyTel() {
-		return garOrderCompanyTel;
-	}
+    public String getGarOrderCompanyTel() {
+        return garOrderCompanyTel;
+    }
-	public void setGarOrderCompanyTel(String garOrderCompanyTel) {
-		this.garOrderCompanyTel = garOrderCompanyTel;
-	}
+    public void setGarOrderCompanyTel(String garOrderCompanyTel) {
+        this.garOrderCompanyTel = garOrderCompanyTel;
+    }
-	public Integer getGarOrderHandlerStatus() {
-		return garOrderHandlerStatus;
-	}
+    public Integer getGarOrderHandlerStatus() {
+        return garOrderHandlerStatus;
+    }
-	public void setGarOrderHandlerStatus(Integer garOrderHandlerStatus) {
-		this.garOrderHandlerStatus = garOrderHandlerStatus;
-	}
+    public void setGarOrderHandlerStatus(Integer garOrderHandlerStatus) {
+        this.garOrderHandlerStatus = garOrderHandlerStatus;
+        if (Objects.equals(garOrderHandlerStatus, 0)) {
+            garOrderHandlerStatusStr = "未处理";
+        } else if (Objects.equals(garOrderHandlerStatus, 1)) {
+            garOrderHandlerStatusStr = "处理中";
+        } else if (Objects.equals(garOrderHandlerStatus, 3)) {
+            garOrderHandlerStatusStr = "已处理";
+        }
+    }
-	public String getGarOrderAgreementTime() {
-		return garOrderAgreementTime;
-	}
+    public String getGarOrderAgreementTime() {
+        return garOrderAgreementTime;
+    }
-	public void setGarOrderAgreementTime(String garOrderAgreementTime) {
-		this.garOrderAgreementTime = garOrderAgreementTime;
-	}
+    public void setGarOrderAgreementTime(String garOrderAgreementTime) {
+        this.garOrderAgreementTime = garOrderAgreementTime;
+    }
-	public Date getGarCreateTime() {
-		return garCreateTime;
-	}
+    public Date getGarCreateTime() {
+        return garCreateTime;
+    }
-	public void setGarCreateTime(Date garCreateTime) {
-		this.garCreateTime = garCreateTime;
-	}
+    public void setGarCreateTime(Date garCreateTime) {
+        this.garCreateTime = garCreateTime;
+    }
-	public Date getGarUpdateTime() {
-		return garUpdateTime;
-	}
+    public Date getGarUpdateTime() {
+        return garUpdateTime;
+    }
-	public void setGarUpdateTime(Date garUpdateTime) {
-		this.garUpdateTime = garUpdateTime;
-	}
+    public void setGarUpdateTime(Date garUpdateTime) {
+        this.garUpdateTime = garUpdateTime;
+    }
-	public String getGarCreateBy() {
-		return garCreateBy;
-	}
+    public String getGarCreateBy() {
+        return garCreateBy;
+    }
-	public void setGarCreateBy(String garCreateBy) {
-		this.garCreateBy = garCreateBy;
-	}
+    public void setGarCreateBy(String garCreateBy) {
+        this.garCreateBy = garCreateBy;
+    }
-	public String getGarUpdateBy() {
-		return garUpdateBy;
-	}
+    public String getGarUpdateBy() {
+        return garUpdateBy;
+    }
-	public void setGarUpdateBy(String garUpdateBy) {
-		this.garUpdateBy = garUpdateBy;
-	}
+    public void setGarUpdateBy(String garUpdateBy) {
+        this.garUpdateBy = garUpdateBy;
+    }
-	public String getGarRemark() {
-		return garRemark;
-	}
+    public String getGarRemark() {
+        return garRemark;
+    }
-	public void setGarRemark(String garRemark) {
-		this.garRemark = garRemark;
-	}
+    public void setGarRemark(String garRemark) {
+        this.garRemark = garRemark;
+    }
-	public Integer getGarCancelFlag() {
-		return garCancelFlag;
-	}
+    public Integer getGarCancelFlag() {
+        return garCancelFlag;
+    }
-	public void setGarCancelFlag(Integer garCancelFlag) {
-		this.garCancelFlag = garCancelFlag;
-	}
+    public void setGarCancelFlag(Integer garCancelFlag) {
+        this.garCancelFlag = garCancelFlag;
+        if (Objects.equals(0, garCancelFlag)) {
+            this.garCancelFlagStr = "未取消";
+        } else if (Objects.equals(1, garCancelFlag)) {
+            this.garCancelFlagStr = "已取消";
+        }
+    }
-	public Integer getGarEvaluateFlag() {
-		return garEvaluateFlag;
-	}
+    public Integer getGarEvaluateFlag() {
+        return garEvaluateFlag;
+    }
-	public void setGarEvaluateFlag(Integer garEvaluateFlag) {
-		this.garEvaluateFlag = garEvaluateFlag;
-	}
+    public void setGarEvaluateFlag(Integer garEvaluateFlag) {
+        this.garEvaluateFlag = garEvaluateFlag;
+    }
-	public String getGarReason() {
-		return garReason;
-	}
+    public String getGarReason() {
+        return garReason;
+    }
-	public void setGarReason(String garReason) {
-		this.garReason = garReason;
-	}
+    public void setGarReason(String garReason) {
+        this.garReason = garReason;
+    }
-	public Long getCount() {
-		return count;
-	}
+    public Long getCount() {
+        return count;
+    }
-	public void setCount(Long count) {
-		this.count = count;
-	}
+    public void setCount(Long count) {
+        this.count = count;
+    }
-	public Double getGarLongitude() {
-		return garLongitude;
-	}
+    public Double getGarLongitude() {
+        return garLongitude;
+    }
-	public void setGarLongitude(Double garLongitude) {
-		this.garLongitude = garLongitude;
-	}
+    public void setGarLongitude(Double garLongitude) {
+        this.garLongitude = garLongitude;
+    }
-	public Double getGarLatitude() {
-		return garLatitude;
-	}
+    public Double getGarLatitude() {
+        return garLatitude;
+    }
-	public void setGarLatitude(Double garLatitude) {
-		this.garLatitude = garLatitude;
-	}
+    public void setGarLatitude(Double garLatitude) {
+        this.garLatitude = garLatitude;
+    }
-	public String getGarCoordinate() {
-		return garCoordinate;
-	}
+    public String getGarCoordinate() {
+        return garCoordinate;
+    }
-	public void setGarCoordinate(String garCoordinate) {
-		this.garCoordinate = garCoordinate;
-	}
+    public void setGarCoordinate(String garCoordinate) {
+        this.garCoordinate = garCoordinate;
+    }
-	public Integer getGarRealCarCount() {
-		return garRealCarCount;
-	}
+    public Integer getGarRealCarCount() {
+        return garRealCarCount;
+    }
-	public void setGarRealCarCount(Integer garRealCarCount) {
-		this.garRealCarCount = garRealCarCount;
-	}
+    public void setGarRealCarCount(Integer garRealCarCount) {
+        this.garRealCarCount = garRealCarCount;
+    }
-	public String getGarOrderCompanyUserId() {
-		return garOrderCompanyUserId;
-	}
+    public String getGarOrderCompanyUserId() {
+        return garOrderCompanyUserId;
+    }
-	public void setGarOrderCompanyUserId(String garOrderCompanyUserId) {
-		this.garOrderCompanyUserId = garOrderCompanyUserId;
-	}
+    public void setGarOrderCompanyUserId(String garOrderCompanyUserId) {
+        this.garOrderCompanyUserId = garOrderCompanyUserId;
+    }
-	public Boolean getGarInCarStore() {
-		return garInCarStore;
-	}
+    public Boolean getGarInCarStore() {
+        return garInCarStore;
+    }
-	public void setGarInCarStore(Boolean garInCarStore) {
-		this.garInCarStore = garInCarStore;
-	}
+    public void setGarInCarStore(Boolean garInCarStore) {
+        this.garInCarStore = garInCarStore;
+    }
-	public Integer getGarTimeOutFlag() {
-		return garTimeOutFlag;
-	}
+    public Integer getGarTimeOutFlag() {
+        return garTimeOutFlag;
+    }
-	public void setGarTimeOutFlag(Integer garTimeOutFlag) {
-		this.garTimeOutFlag = garTimeOutFlag;
-	}
+    public void setGarTimeOutFlag(Integer garTimeOutFlag) {
+        this.garTimeOutFlag = garTimeOutFlag;
+    }
-	public Integer getHaveEvaluateOfClient() {
-		return haveEvaluateOfClient;
-	}
+    public Integer getHaveEvaluateOfClient() {
+        return haveEvaluateOfClient;
+    }
-	public void setHaveEvaluateOfClient(Integer haveEvaluateOfClient) {
-		this.haveEvaluateOfClient = haveEvaluateOfClient;
-	}
+    public void setHaveEvaluateOfClient(Integer haveEvaluateOfClient) {
+        this.haveEvaluateOfClient = haveEvaluateOfClient;
+    }
-	public String getGarEstimatedCost() {
-		return garEstimatedCost;
-	}
+    public String getGarEstimatedCost() {
+        return garEstimatedCost;
+    }
-	public void setGarEstimatedCost(String garEstimatedCost) {
-		this.garEstimatedCost = garEstimatedCost;
-	}
+    public void setGarEstimatedCost(String garEstimatedCost) {
+        this.garEstimatedCost = garEstimatedCost;
+    }
 }
 \ No newline at end of file
@@ -61,7 +61,7 @@ public class GarOrderCar implements Serializable {
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private String garUpdateBy;
     /**车辆ID*/
-    private Integer carId;
+    private String carId;
     /**车辆容积*/
     private String containerVolume;
@@ -147,11 +147,11 @@ public class GarOrderCar implements Serializable {
         this.garRemark = garRemark;
     }
-	public Integer getCarId() {
+	public String getCarId() {
 		return carId;
 	}
-	public void setCarId(Integer carId) {
+	public void setCarId(String carId) {
 		this.carId = carId;
 	}
+package com.trash.garbage.pojo.dto;
+
+import javax.validation.constraints.NotEmpty;
+
+public class DockingQRCodeDTO implements java.io.Serializable {
+    @NotEmpty(message = "车辆编号不能为空")
+    private String carCode;
+
+    public String getCarCode() {
+        return carCode;
+    }
+
+    public void setCarCode(String carCode) {
+        this.carCode = carCode;
+    }
+}
+package com.trash.garbage.pojo.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.trash.common.annotation.Excel;
+import com.trash.common.core.domain.BaseEntity;
+import com.trash.common.utils.StringUtils;
+import com.trash.driver.domain.vo.DriverVo;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+
+public class GarCarInfoVo extends BaseEntity {
+    /** $column.columnComment */
+    private String id;
+
+    /** 所属公司 */
+    @Excel(name = "所属公司")
+    private String companyId;
+
+    /** 车辆类型 */
+    @Excel(name = "车辆类型")
+    private String carType;
+
+    /** 车牌号 */
+    @Excel(name = "车牌号")
+    private String carCode;
+
+    /** 车辆品牌 */
+    @Excel(name = "车辆品牌")
+    private String carBrank;
+
+    /** 排放标准 */
+    @Excel(name = "排放标准")
+    private String emissionStandard;
+
+    /** 道路运输证有效期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "道路运输证有效期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date roadTransportDate;
+
+    /** 行驶证有效期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "行驶证有效期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date drivingLicenseDate;
+
+    /** 录入日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "录入日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date enterDate;
+
+    /** 车架号 */
+    @Excel(name = "车架号")
+    private String farmeNumber;
+
+    /** 车辆标识牌 */
+    @Excel(name = "车辆标识牌")
+    private String carIdentification;
+
+    /** 货箱体积 */
+    @Excel(name = "货箱体积")
+    private String containerVolume;
+
+    /** 货箱长宽高 */
+    @Excel(name = "货箱长宽高")
+    private String lengthWidthHeight;
+
+    /** 车辆颜色 */
+    @Excel(name = "车辆颜色")
+    private String carColor;
+
+    /** 车辆设备 */
+    @Excel(name = "车辆设备")
+    private String carEquipment;
+
+    /** 道路运输证 */
+    @Excel(name = "道路运输证")
+    private String roadTransport;
+
+    /** 行驶证 */
+    @Excel(name = "行驶证")
+    private String drivingLicense;
+
+    /** 车辆正面照片 */
+    @Excel(name = "车辆正面照片")
+    private String carFront;
+
+    /** 车辆左侧照片 */
+    @Excel(name = "车辆左侧照片")
+    private String carLeft;
+
+    /** 车辆尾部照片 */
+    @Excel(name = "车辆尾部照片")
+    private String carBehind;
+
+    /** 车辆右侧照片 */
+    @Excel(name = "车辆右侧照片")
+    private String carRight;
+
+    /** 驾驶员 */
+    @Excel(name = "驾驶员")
+    private String drivers;
+
+    /** 审批状态,0=审批中,1=审批通过,2=被驳回 */
+    @Excel(name = "审批状态",readConverterExp = "0=审批中,1=审批通过,2=被驳回")
+    private Integer status;
+
+    /** 信用状态 */
+    @Excel(name = "信用状态")
+    private String creditStatus;
+
+    /** 二维码 */
+    @Excel(name = "二维码")
+    private String qrCode;
+
+    private int isDel;
+
+    private String companyName;
+
+    private String driversName;
+
+    private String driverPhone;
+
+    private Collection<DriverVo> driverVoList;
+
+    public int getIsDel() {
+        return isDel;
+    }
+
+    public void setIsDel(int isDel) {
+        this.isDel = isDel;
+    }
+
+    public String getLengthWidthHeight() {
+        return lengthWidthHeight;
+    }
+
+    public void setLengthWidthHeight(String lengthWidthHeight) {
+        this.lengthWidthHeight = lengthWidthHeight;
+    }
+
+    public void setId(String id)
+    {
+        this.id = id;
+    }
+
+    public String getId()
+    {
+        return id;
+    }
+    public void setCompanyId(String companyId)
+    {
+        this.companyId = companyId;
+    }
+
+    public String getCompanyId()
+    {
+        return companyId;
+    }
+    public void setCarType(String carType)
+    {
+        this.carType = carType;
+    }
+
+    public String getCarType()
+    {
+        return carType;
+    }
+    public void setCarCode(String carCode)
+    {
+        this.carCode = carCode;
+    }
+
+    public String getCarCode()
+    {
+        return carCode;
+    }
+    public void setCarBrank(String carBrank)
+    {
+        this.carBrank = carBrank;
+    }
+
+    public String getCarBrank()
+    {
+        return carBrank;
+    }
+    public void setEmissionStandard(String emissionStandard)
+    {
+        this.emissionStandard = emissionStandard;
+    }
+
+    public String getEmissionStandard()
+    {
+        return emissionStandard;
+    }
+    public void setRoadTransportDate(Date roadTransportDate)
+    {
+        this.roadTransportDate = roadTransportDate;
+    }
+
+    public Date getRoadTransportDate()
+    {
+        return roadTransportDate;
+    }
+    public void setDrivingLicenseDate(Date drivingLicenseDate)
+    {
+        this.drivingLicenseDate = drivingLicenseDate;
+    }
+
+    public Date getDrivingLicenseDate()
+    {
+        return drivingLicenseDate;
+    }
+    public void setEnterDate(Date enterDate)
+    {
+        this.enterDate = enterDate;
+    }
+
+    public Date getEnterDate()
+    {
+        return enterDate;
+    }
+    public void setFarmeNumber(String farmeNumber)
+    {
+        this.farmeNumber = farmeNumber;
+    }
+
+    public String getFarmeNumber()
+    {
+        return farmeNumber;
+    }
+    public void setCarIdentification(String carIdentification)
+    {
+        this.carIdentification = carIdentification;
+    }
+
+    public String getCarIdentification()
+    {
+        return carIdentification;
+    }
+    public void setContainerVolume(String containerVolume)
+    {
+        this.containerVolume = containerVolume;
+    }
+
+    public String getContainerVolume()
+    {
+        return containerVolume;
+    }
+    public void setCarColor(String carColor)
+    {
+        this.carColor = carColor;
+    }
+
+    public String getCarColor()
+    {
+        return carColor;
+    }
+    public void setCarEquipment(String carEquipment)
+    {
+        this.carEquipment = carEquipment;
+    }
+
+    public String getCarEquipment()
+    {
+        return carEquipment;
+    }
+    public void setRoadTransport(String roadTransport)
+    {
+        this.roadTransport = roadTransport;
+    }
+
+    public String getRoadTransport()
+    {
+        return roadTransport;
+    }
+    public void setDrivingLicense(String drivingLicense)
+    {
+        this.drivingLicense = drivingLicense;
+    }
+
+    public String getDrivingLicense()
+    {
+        return drivingLicense;
+    }
+    public void setCarFront(String carFront)
+    {
+        this.carFront = carFront;
+    }
+
+    public String getCarFront()
+    {
+        return carFront;
+    }
+    public void setCarLeft(String carLeft)
+    {
+        this.carLeft = carLeft;
+    }
+
+    public String getCarLeft()
+    {
+        return carLeft;
+    }
+    public void setCarBehind(String carBehind)
+    {
+        this.carBehind = carBehind;
+    }
+
+    public String getCarBehind()
+    {
+        return carBehind;
+    }
+    public void setCarRight(String carRight)
+    {
+        this.carRight = carRight;
+    }
+
+    public String getCarRight()
+    {
+        return carRight;
+    }
+    public void setDrivers(String drivers)
+    {
+        this.drivers = drivers;
+    }
+
+    public String getDrivers()
+    {
+        return drivers;
+    }
+    public void setStatus(Integer status)
+    {
+        this.status = status;
+    }
+
+    public Integer getStatus()
+    {
+        return status;
+    }
+    public void setCreditStatus(String creditStatus)
+    {
+        this.creditStatus = creditStatus;
+    }
+
+    public String getCreditStatus()
+    {
+        return creditStatus;
+    }
+    public void setQrCode(String qrCode)
+    {
+        this.qrCode = qrCode;
+    }
+
+    public String getQrCode()
+    {
+        return qrCode;
+    }
+
+
+
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getDriversName() {
+        return driversName;
+    }
+
+    public void setDriversName(String driversName) {
+        this.driversName = driversName;
+    }
+
+    public String getDriverPhone() {
+        return driverPhone;
+    }
+
+    public void setDriverPhone(String driverPhone) {
+        this.driverPhone = driverPhone;
+    }
+
+    public Integer convertContainerVolumeDefaultMaxValue(){
+        try {
+            return StringUtils.isEmpty(org.apache.commons.lang3.StringUtils.trim(this.getContainerVolume())) ? Integer.MAX_VALUE : Integer.parseInt(this.getContainerVolume());
+        }catch (Exception e){
+            return Integer.MAX_VALUE;
+        }
+    }
+
+    public Collection<DriverVo> getDriverVoList() {
+        return driverVoList;
+    }
+
+    public void setDriverVoList(Collection<DriverVo> driverVoList) {
+        this.driverVoList = driverVoList;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("companyId", getCompanyId())
+                .append("carType", getCarType())
+                .append("carCode", getCarCode())
+                .append("carBrank", getCarBrank())
+                .append("emissionStandard", getEmissionStandard())
+                .append("roadTransportDate", getRoadTransportDate())
+                .append("drivingLicenseDate", getDrivingLicenseDate())
+                .append("enterDate", getEnterDate())
+                .append("farmeNumber", getFarmeNumber())
+                .append("carIdentification", getCarIdentification())
+                .append("containerVolume", getContainerVolume())
+                .append("carColor", getCarColor())
+                .append("carEquipment", getCarEquipment())
+                .append("remark", getRemark())
+                .append("roadTransport", getRoadTransport())
+                .append("drivingLicense", getDrivingLicense())
+                .append("carFront", getCarFront())
+                .append("carLeft", getCarLeft())
+                .append("carBehind", getCarBehind())
+                .append("carRight", getCarRight())
+                .append("drivers", getDrivers())
+                .append("status", getStatus())
+                .append("createTime", getCreateTime())
+                .append("createBy", getCreateBy())
+                .append("updateTime", getUpdateTime())
+                .append("updateBy", getUpdateBy())
+                .append("creditStatus", getCreditStatus())
+                .append("qrCode", getQrCode())
+                .toString();
+    }
+
+}
@@ -105,7 +105,7 @@ public class OrderDto {
          * 车子类型
          */
         private String carType;
-        private Integer id;
+        private String id;
         private String garOrderCarType;
         private String containerVolume;
@@ -137,11 +137,11 @@ public class OrderDto {
             this.carType = carType;
         }
-        public Integer getId() {
+        public String getId() {
             return id;
         }
-        public void setId(Integer id) {
+        public void setId(String id) {
             this.id = id;
         }
@@ -3,6 +3,7 @@ package com.trash.garbage.pojo.vo;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import java.util.Collection;
 import java.util.List;
 /**
@@ -22,7 +23,7 @@ public class DispatchDriverVo {
      */
     private String containerVolume;
-    private List<Personnel> personnelInfo;
+    private Collection<Personnel> personnelInfo;
     /**
      * 人员信息
@@ -80,11 +81,11 @@ public class DispatchDriverVo {
         }
     }
-    public List<Personnel> getPersonnelInfo() {
+    public Collection<Personnel> getPersonnelInfo() {
         return personnelInfo;
     }
-    public void setPersonnelInfo(List<Personnel> personnelInfo) {
+    public void setPersonnelInfo(Collection<Personnel> personnelInfo) {
         this.personnelInfo = personnelInfo;
     }
@@ -2,6 +2,8 @@ package com.trash.garbage.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.trash.garbage.pojo.domain.GarOrderCar;
+import com.trash.garbage.pojo.domain.GarOrderMatchHandler;
+import org.apache.ibatis.annotations.Param;
 import java.util.List;
@@ -12,4 +14,6 @@ import java.util.List;
 */
 public interface GarOrderCarService extends IService<GarOrderCar> {
     List<GarOrderCar> queryByOrderId(String orderId);
+
+    List<GarOrderMatchHandler> queryGarOrderMatchHandler( String orderId);
 }
@@ -13,7 +13,7 @@ import java.util.List;
 */
 public interface GarOrderEvaluateService extends IService<GarOrderEvaluate> {
-    List<GarOrderEvaluate> queryEvaluateByEnterpriseIds( List<Long> enterpriseIds, Integer value);
+    List<GarOrderEvaluate> queryEvaluateByEnterpriseIds( List<String> enterpriseIds, Integer value);
     Integer countId(GarOrderEvaluate evaluate);
     /***
@@ -14,5 +14,5 @@ import java.util.Set;
 */
 public interface GarOrderMatchHandlerService extends IService<GarOrderMatchHandler> {
-    List<DispatchDriverVo> queryDriverListWithDispatchStatus(String orderId, Long companyId, Set<String> containerVolumees);
+    List<DispatchDriverVo> queryDriverListWithDispatchStatus(String orderId, String companyId, Set<String> containerVolumees);
 }
@@ -3,6 +3,7 @@ package com.trash.garbage.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
 import com.trash.enterprise.domain.TransportationEnterprise;
+import com.trash.garbage.pojo.domain.DockingQRCodeEntity;
 import com.trash.garbage.pojo.domain.GarOrder;
 import com.trash.garbage.pojo.domain.GarOrderEvaluate;
 import com.trash.garbage.pojo.domain.GarOrderMatchHandler;
@@ -67,6 +68,8 @@ public interface GarOrderService extends IService&lt;GarOrder&gt; {
     PageInfo queryEnterpriseList(TransportationEnterprise dto);
+    PageInfo dockingUpEnterpriseList(TransportationEnterprise dto);
+
     List<GarOrderEvaluate> queryEvaluateDetail(String orderId);
     void dispatchDriverOrders(DispatchDto dto);
@@ -103,5 +106,7 @@ public interface GarOrderService extends IService&lt;GarOrder&gt; {
     MyBargeVo queryBadgeByType(Integer type);
-    Long queryCarIdOfDriver(String  phone);
+    String queryCarIdOfDriver(String  phone);
+
+    List<DockingQRCodeEntity>queryReportByCarCode(String carCode);
 }
@@ -2,11 +2,15 @@ package com.trash.garbage.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.trash.garbage.mapper.GarOrderMatchHandlerMapper;
 import com.trash.garbage.pojo.domain.GarOrderCar;
+import com.trash.garbage.pojo.domain.GarOrderMatchHandler;
 import com.trash.garbage.service.GarOrderCarService;
 import com.trash.garbage.mapper.GarOrderCarMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import java.util.Collections;
 import java.util.List;
 /**
@@ -18,12 +22,19 @@ import java.util.List;
 public class GarOrderCarServiceImpl extends ServiceImpl<GarOrderCarMapper, GarOrderCar>
         implements GarOrderCarService {
+    @Autowired
+    private GarOrderMatchHandlerMapper garOrderMatchHandlerMapper;
     @Override
     public List<GarOrderCar> queryByOrderId(String orderId) {
         LambdaQueryWrapper<GarOrderCar> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(GarOrderCar::getGarOrderId, orderId);
         return list(wrapper);
     }
+
+    @Override
+    public List<GarOrderMatchHandler> queryGarOrderMatchHandler(String orderId) {
+        return garOrderMatchHandlerMapper.queryGarOrderMatchHandler(orderId);
+    }
 }
@@ -23,7 +23,7 @@ public class GarOrderEvaluateServiceImpl extends ServiceImpl&lt;GarOrderEvaluateMap
     implements GarOrderEvaluateService{
     @Override
-    public List<GarOrderEvaluate> queryEvaluateByEnterpriseIds(List<Long> enterpriseIds, Integer value) {
+    public List<GarOrderEvaluate> queryEvaluateByEnterpriseIds(List<String> enterpriseIds, Integer value) {
         if (CollectionUtil.isEmpty(enterpriseIds)){
             return new ArrayList<>();
         }
@@ -20,7 +20,7 @@ public class GarOrderMatchHandlerServiceImpl extends ServiceImpl&lt;GarOrderMatchHa
         implements GarOrderMatchHandlerService {
     @Override
-    public List<DispatchDriverVo> queryDriverListWithDispatchStatus(String orderId, Long id, Set<String> containerVolumees) {
+    public List<DispatchDriverVo> queryDriverListWithDispatchStatus(String orderId, String id, Set<String> containerVolumees) {
         return baseMapper.queryDriverListWithDispatchStatus(orderId, id,containerVolumees);
     }
 }
 package com.trash.garbage.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.http.HtmlUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.trash.carInfo.domain.vo.CarInfoVo;
 import com.trash.common.core.redis.RedisCache;
 import com.trash.common.utils.SecurityUtils;
 import com.trash.common.utils.ServletUtils;
@@ -21,14 +29,18 @@ import com.trash.garbage.pojo.domain.*;
 import com.trash.garbage.pojo.dto.*;
 import com.trash.garbage.pojo.vo.*;
 import com.trash.garbage.service.*;
+import com.trash.garbage.utils.HttpUtil;
 import com.trash.garbage.utils.SMSUtils;
 import com.trash.garbage.utils.ValidateCodeUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.utils.HttpClientUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.util.HtmlUtils;
 import javax.annotation.Resource;
 import java.util.*;
@@ -81,6 +93,11 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     private GarOrderMatchDisposalService garOrderMatchDisposalService;
     @Autowired
     private DisposalSiteService disposalSiteService;
+    private String contentType = "application/json";
+    @Value("${trash.token}")
+    private String authorization;
+    @Value("${trash.remotePath}")
+    private String remotePath;
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -225,7 +242,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             }
             DisposalSiteVo vo = new DisposalSiteVo();
             BeanUtils.copyProperties(en, vo);
-           // vo.setLongitude(en.getLongitude());
+            // vo.setLongitude(en.getLongitude());
             return vo;
         }).filter(obj -> Objects.nonNull(obj)).collect(Collectors.toList());
     }
@@ -334,14 +351,14 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                             .eq(GarOrder::getGarTimeOutFlag, GlobalStatus.GarOrderStatus.ORDER_TIME_OUT_FLAG_NO.getValue());
                 }
                 List<GarOrder> orderList = list(qw);
-                orderList=queryHaveEvaluateOfClient(orderList,GlobalStatus.GarOrderStatus.EVALUATE_TYPE_COMPANY.getValue());
+                orderList = queryHaveEvaluateOfClient(orderList, GlobalStatus.GarOrderStatus.EVALUATE_TYPE_COMPANY.getValue());
                 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
                 return pageInfo;
             }
             // 全部
             if (GlobalStatus.GarOrderStatus.ALL_ORDER.getValue().equals(type)) {
                 List<GarOrder> orderList = baseMapper.selectList(qw);
-                orderList =queryHaveEvaluateOfClient(orderList,GlobalStatus.GarOrderStatus.EVALUATE_TYPE_COMPANY.getValue());
+                orderList = queryHaveEvaluateOfClient(orderList, GlobalStatus.GarOrderStatus.EVALUATE_TYPE_COMPANY.getValue());
                 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
                 return pageInfo;
             }
@@ -377,10 +394,10 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         }
         return orders.stream().map(o -> {
-            if(Objects.nonNull(o)){
-                Optional<GarOrderEvaluate>  optional = garOrderEvaluates.stream().filter(go->Objects.equals(go.getGarOrderId(),o.getGarOrderId())).findFirst();
-                if(optional.isPresent()){
-                    o.setHaveEvaluateOfClient(optional.get().getCountTheNumber()>0?1:0);
+            if (Objects.nonNull(o)) {
+                Optional<GarOrderEvaluate> optional = garOrderEvaluates.stream().filter(go -> Objects.equals(go.getGarOrderId(), o.getGarOrderId())).findFirst();
+                if (optional.isPresent()) {
+                    o.setHaveEvaluateOfClient(optional.get().getCountTheNumber() > 0 ? 1 : 0);
                 }
             }
             return o;
@@ -671,7 +688,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
             comparator = Comparator.comparing(TransportationEnterpriseVo::getDistance);
         }
         // 企业id为空说明没有公司
-        List<Long> enterpriseIds = list.stream().map(TransportationEnterprise::getId).collect(Collectors.toList());
+        List<String> enterpriseIds = list.stream().map(TransportationEnterprise::getId).collect(Collectors.toList());
         List<GarOrder> orderList = baseMapper.queryCleanNumberByEnterpriseIds(enterpriseIds, GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue());
         List<GarOrderEvaluate> evaluateList = garOrderEvaluateService.queryEvaluateByEnterpriseIds(enterpriseIds, GlobalStatus.GarOrderStatus.EVALUATE_TYPE_COMPANY.getValue());
         Map<String, List<GarOrderEvaluate>> evaluateMap = new HashMap<>();
@@ -717,9 +734,180 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         return pageInfo;
     }
+    @Override
+    public PageInfo dockingUpEnterpriseList(TransportationEnterprise dto) {
+        // 1）支持选择企业“所属区域”（长沙市内的）展示区域内所有企业
+        // 2）支持选择车辆“车辆类型”展示有该车辆类型的企业
+        // TODO 车辆类型暂时不考虑
+
+        Map<String, String> headers = new HashMap<>();
+        headers.put("Authorization", authorization);
+        headers.put("Content-Type", contentType);
+
+        Map<String, Object> params = new HashMap<>();
+        if (StringUtils.isNotEmpty(dto.getServicePhone())) {
+            params.put("principalPhoneNo", dto.getServicePhone());
+        }
+
+//        if (StringUtils.isNotEmpty(dto.getRegistrationArea())) {
+//            params.put("officeAddress", dto.getRegistrationArea());
+//        }
+
+        if (StringUtils.isNotEmpty(dto.getRegistrationArea())) {
+            try {
+                String json = HttpUtil.doGet(remotePath + "/api/gpsservice/cs/area", headers, null);
+                if (StringUtils.isNotEmpty(json)) {
+                    Map<String, Object> hash = JSON.parseObject(json, HashMap.class);
+                    if (Objects.nonNull(hash.get("code")) && StringUtils.equals(hash.get("code").toString(), "200")) {
+                        if (Objects.nonNull(hash.get("result")) && hash.get("result") instanceof JSONArray) {
+                            JSONArray jsonArray = (JSONArray) hash.get("result");
+                            Optional<Object> opt = jsonArray.stream().filter(jo -> {
+                                JSONObject jsonObject = (JSONObject) jo;
+                                return StringUtils.equals(jsonObject.getString("name"), dto.getRegistrationArea());
+                            }).findFirst();
+                            if (opt.isPresent()) {
+                                JSONObject jsonObject = (JSONObject) opt.get();
+                                params.put("adCodes", jsonObject.getString("code"));
+                            }
+                        }
+                    }
+                }
+            } catch (Exception e) {
+                log.error("请求的确信息异常", e);
+            }
+        }
+        String json = null;
+        List<TransportationEnterprise> list = new ArrayList<>();
+        try {
+            json = com.trash.garbage.utils.HttpUtil.doGet(remotePath + "/api/gpsservice/cs/companies/simple/list?tag=1&valid=0", headers, params);
+            log.debug("/api/gpsservice/cs/companies/simple/list?tag=1&valid=0;params:" + JSON.toJSONString(params) + ";json:" + json);
+        } catch (Exception e) {
+            log.error("请求公司信息异常[{}]", e);
+        }
+
+        if (StringUtils.isNotEmpty(json)) {
+            Map<String, Object> hash = JSON.parseObject(json, HashMap.class);
+            if (Objects.nonNull(hash)) {
+                if (Objects.nonNull(hash.get("code")) && StringUtils.equals(hash.get("code").toString(), "200")) {
+                    if (Objects.nonNull(hash.get("result")) && hash.get("result") instanceof JSONArray) {
+                        JSONArray jsonArray = (JSONArray) hash.get("result");
+                        for (Object object : jsonArray) {
+                            JSONObject jsonObject = (JSONObject) object;
+                            TransportationEnterprise transportationEnterprise = new TransportationEnterprise();
+                            transportationEnterprise.setId(StringUtils.replace(jsonObject.get("id").toString(), "zxljqy", ""));
+                            //transportationEnterprise.setId(jsonObject.get("id").toString());
+                            transportationEnterprise.setName(jsonObject.getString("name"));
+                            transportationEnterprise.setAbbreviation(jsonObject.getString("abbreviation"));
+                            transportationEnterprise.setOfficeAddress(jsonObject.getString("officeAddress"));
+                            transportationEnterprise.setServicePhone(jsonObject.getString("principalPhoneNo"));
+                            transportationEnterprise.setLegalRepresentative(jsonObject.getString("principal"));
+                            transportationEnterprise.setLegalRepresentativePhone(jsonObject.getString("principalPhoneNo"));
+                            list.add(transportationEnterprise);
+                        }
+                    }
+                }
+            }
+        }
+
+        saveOrUpdate(list);
+        Integer pageNum = ServletUtils.getParameterToInt("pageNum");
+        Integer pageSize = ServletUtils.getParameterToInt("pageSize");
+        Integer orderByColumn = ServletUtils.getParameterToInt("orderByColumn");
+        Comparator<TransportationEnterpriseVo> comparator;
+        if (1 == orderByColumn) {
+            comparator = Comparator.comparing(TransportationEnterpriseVo::getCleanNumber);
+        } else if (2 == orderByColumn) {
+            comparator = Comparator.comparing(TransportationEnterpriseVo::getScore);
+        } else {
+            comparator = Comparator.comparing(TransportationEnterpriseVo::getDistance);
+        }
+        // 企业id为空说明没有公司
+        List<String> enterpriseIds = list.stream().map(TransportationEnterprise::getId).collect(Collectors.toList());
+        List<GarOrder> orderList = baseMapper.queryCleanNumberByEnterpriseIds(enterpriseIds, GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue());
+        List<GarOrderEvaluate> evaluateList = garOrderEvaluateService.queryEvaluateByEnterpriseIds(enterpriseIds, GlobalStatus.GarOrderStatus.EVALUATE_TYPE_COMPANY.getValue());
+        Map<String, List<GarOrderEvaluate>> evaluateMap = new HashMap<>();
+        for (GarOrderEvaluate garOrderEvaluate : evaluateList) {
+            List<GarOrderEvaluate> evaluate = evaluateMap.get(garOrderEvaluate.getGarCompanyId());
+            if (CollectionUtil.isEmpty(evaluate)) {
+                evaluateMap.put(garOrderEvaluate.getGarCompanyId(), new ArrayList<>(Arrays.asList(garOrderEvaluate)));
+            } else {
+                evaluate.add(garOrderEvaluate);
+            }
+        }
+        // 获取当前选中地址计算距离
+        LambdaQueryWrapper<GarAddress> qw = new LambdaQueryWrapper<>();
+        qw.eq(GarAddress::getGarUserId, SecurityUtils.getLoginUser().getUser().getUserId())
+                .eq(GarAddress::getGarUserDefault, GlobalStatus.GarAddressStatus.CURRENT_ADDRESS.getValue());
+        GarAddress address = garAddressService.getOne(qw);
+
+        Stream<TransportationEnterpriseVo> stream = list.stream().map(item -> {
+            TransportationEnterpriseVo vo = new TransportationEnterpriseVo();
+            BeanUtils.copyProperties(item, vo);
+            List<GarOrderEvaluate> evaluate = evaluateMap.get(String.valueOf(item.getId()));
+            handleCleanNumber(vo, orderList);
+            handleScore(vo, evaluate);
+            handleDistance(vo, address);
+            return vo;
+        });
+        List<TransportationEnterpriseVo> voList;
+        if (orderByColumn != 0) {
+            // 降序
+            voList = stream.sorted(comparator.reversed()).collect(Collectors.toList());
+        } else {
+            voList = stream.sorted(comparator).collect(Collectors.toList());
+        }
+        int total = voList.size();
+        int remainder = total % pageSize;
+        int currentPage = pageNum > 0 ? (pageNum - 1) * pageSize : pageNum * pageSize;
+        // 怕页码超出界限了 超出界限就通过currenPage (3 * 10) > total (25) ? currentPage (20) - (pageSize (10) - remainder (3)) : currentPage
+        int startPage = currentPage > total ? currentPage - (pageSize - remainder) : currentPage;
+        int endPage = Math.min(startPage + pageSize, total);
+        PageInfo<TransportationEnterpriseVo> pageInfo = new PageInfo<>();
+        pageInfo.setList(voList.subList(startPage, endPage));
+        pageInfo.setTotal(total);
+        return pageInfo;
+    }
+
+    private void saveOrUpdate(List<TransportationEnterprise> list) {
+        if (CollectionUtils.isNotEmpty(list)) {
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    for (TransportationEnterprise transportationEnterprise : list) {
+                        try {
+                            transportationEnterprise.setCarNumber(0);
+                            TransportationEnterprise source = transportationEnterpriseService.selectTransportationEnterpriseByIdStr(transportationEnterprise.getId());
+                            if (Objects.isNull(source)) {
+                                transportationEnterpriseService.save(transportationEnterprise);
+                            } else {
+                                TransportationEnterprise source1 = new TransportationEnterprise();
+                                source1.setId(source.getId());
+                                //transportationEnterprise.setId(jsonObject.get("id").toString());
+                                source1.setName(source.getName());
+                                source1.setAbbreviation(source.getAbbreviation());
+                                source1.setOfficeAddress(source.getOfficeAddress());
+                                source1.setServicePhone(source.getServicePhone());
+                                source1.setLegalRepresentative(source.getLegalRepresentative());
+                                source1.setLegalRepresentativePhone(source.getLegalRepresentativePhone());
+                                source1.setCarNumber(0);
+                                if (Objects.equals(JSON.toJSONString(source1), JSON.toJSONString(transportationEnterprise))) {
+                                    continue;
+                                } else {
+                                    transportationEnterpriseService.updateById(transportationEnterprise);
+                                }
+                            }
+                        } catch (Exception e) {
+                            log.error(e.getMessage(), e);
+                        }
+                    }
+                }
+            }).start();
+        }
+    }
+
     private void handleDistance(TransportationEnterpriseVo vo, GarAddress address) {
-        if(Objects.isNull(vo) || StringUtils.isEmpty(vo.getOfficeAddressGps()) || StringUtils.indexOf(vo.getOfficeAddressGps(),",")==-1 || Objects.isNull(address)){
+        if (Objects.isNull(vo) || StringUtils.isEmpty(vo.getOfficeAddressGps()) || StringUtils.indexOf(vo.getOfficeAddressGps(), ",") == -1 || Objects.isNull(address)) {
             vo.setDistance(9999999);
             return;
         }
@@ -823,21 +1011,204 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         TransportationEnterprise enterprise = new TransportationEnterprise();
         enterprise.setServicePhone(tel);
         List<TransportationEnterprise> enterprises = transportationEnterpriseService.selectTransportationEnterpriseList(enterprise);
-        if(CollectionUtils.isEmpty(enterprises)){
+        if (CollectionUtils.isEmpty(enterprises)) {
             return Collections.emptyList();
         }
-       List<GarOrderCar> garOrderCars = garOrderCarService.queryByOrderId(orderId);
-        if(CollectionUtils.isEmpty(garOrderCars)){
+        List<GarOrderMatchHandler> garOrderCars = garOrderCarService.queryGarOrderMatchHandler(orderId);
+        int garOrderCarsLength = CollectionUtils.size(garOrderCars);
+
+        String json = requestCarAndDriver(enterprises.get(0).getId());
+        List<DispatchDriverVo> voList = new ArrayList<>();
+        if (StringUtils.isNotEmpty(json)) {
+            if (StringUtils.isNotEmpty(json)) {
+                Map<String, Object> hash = JSON.parseObject(json, HashMap.class);
+                if (Objects.nonNull(hash)) {
+                    if (Objects.nonNull(hash.get("code")) && StringUtils.equals(hash.get("code").toString(), "200")) {
+                        if (Objects.nonNull(hash.get("result")) && hash.get("result") instanceof JSONObject) {
+                            JSONObject resultObj = (JSONObject) hash.get("result");
+                            if (Objects.nonNull(resultObj) && Objects.nonNull(resultObj.get("list")) && resultObj.get("list") instanceof JSONArray) {
+                                JSONArray jsonArray = (JSONArray) resultObj.get("list");
+                                for (Object object : jsonArray) {
+                                    JSONObject jsonObject = (JSONObject) object;
+
+                                    DispatchDriverVo vo = new DispatchDriverVo();
+                                    vo.setContainerVolume(jsonObject.getString("energyTypeName"));
+                                    vo.setLicensePlateNumber(jsonObject.getString("licenseplateNo"));
+
+                                    if (Objects.nonNull(jsonObject.get("drivers")) && jsonObject.get("drivers") instanceof JSONArray) {
+                                        JSONArray das = (JSONArray) jsonObject.get("drivers");
+                                        int length = CollectionUtils.size(das);
+                                        if (length > 0) {
+                                            Set<DispatchDriverVo.Personnel> personnelInfos = new LinkedHashSet<>();
+
+                                            for (Object da : das) {
+                                                JSONObject dro = (JSONObject) da;
+                                                DispatchDriverVo.Personnel personnel = new DispatchDriverVo.Personnel();
+                                                personnel.setName(dro.getString("driverName"));
+                                                personnel.setTel(dro.getString("driverPhone"));
+
+                                                personnel.setChecked(false);
+                                                if (garOrderCarsLength > 0) {
+                                                    Optional<GarOrderMatchHandler> optional = garOrderCars.stream().filter(ga -> Objects.equals(ga.getGarOrderHandlerTel(), personnel.getTel()) && Objects.equals(ga.getGarHandlerCarCode(), vo.getLicensePlateNumber())).findFirst();
+                                                    personnel.setChecked(optional.isPresent());
+
+                                                }
+
+                                                personnelInfos.add(personnel);
+                                            }
+                                            vo.setPersonnelInfo(personnelInfos);
+                                        }
+                                    }
+                                    voList.add(vo);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        if (CollectionUtils.isEmpty(voList)) {
             return Collections.emptyList();
         }
+        LambdaQueryWrapper<GarOrderCar> qwc = new LambdaQueryWrapper<>();
+        qwc.eq(GarOrderCar::getGarOrderId, orderId);
+
+        List<GarOrderCar> carList = garOrderCarService.list(qwc);
+        if (CollectionUtils.isNotEmpty(carList)) {
+            Set<String> carTypes = carList.stream().map(GarOrderCar::getGarOrderCarType).collect(Collectors.toSet());
+            voList = voList.stream().filter(v -> carTypes.contains(v.getContainerVolume())).collect(Collectors.toList());
+        }
-        Set<String> containerVolumees = garOrderCars.stream().map(GarOrderCar::getContainerVolume).collect(Collectors.toSet());
-        // 选中的司机
-        List<DispatchDriverVo> voList = handlerService.queryDriverListWithDispatchStatus(orderId, enterprises.get(0).getId(),containerVolumees);
         return voList;
     }
+    private String requestCarAndDriver(String companyID) {
+        Map<String, String> headers = new HashMap<>();
+        headers.put("Authorization", authorization);
+        headers.put("Content-Type", contentType);
+
+        Map<String, Object> params = new HashMap<>();
+        if (Objects.nonNull(companyID)) {
+            if (StringUtils.length(companyID) < 5) {
+                params.put("companyID", "zxljqy" + companyID);
+            } else {
+                params.put("companyID", companyID);
+            }
+        }
+
+        params.put("valid", 0);
+        params.put("tag", 1);
+        params.put("page", 1);
+        params.put("size", 100);
+
+        String json = null;
+        List<CarInfoVo> list = new ArrayList<>();
+        try {
+            String paramStr = JSON.toJSONString(params);
+            json = HttpRequest.get(remotePath + "/api/gpsservice/cs/basevehicle/ledger/list").header("Authorization", authorization).header("Content-Type", contentType)
+                    .timeout(15000).body(paramStr).execute().body();
+            log.debug("/api/gpsservice/cs/basevehicle/ledger/list;params:[" + paramStr + "],returnJson:[" + json + "]");
+        } catch (Exception e) {
+            log.error("请求公司车辆信息异常", e);
+        }
+
+        return json;
+    }
+
+//    private List<DispatchDisposalVo> comDis(){
+//        Map<String, String> headers = new HashMap<>();
+//        headers.put("Authorization", authorization);
+//        headers.put("Content-Type", contentType);
+//
+//        Map<String, Object> params = new HashMap<>();
+//        if (Objects.nonNull(carInfo.getCompanyId())) {
+//            try {
+//                Long companyId = Convert.toLong( carInfo.getCompanyId());
+//                if(companyId< 10000){
+//                    params.put("companyID", "zxljqy" + carInfo.getCompanyId());
+//                }else{
+//                    params.put("companyID",  carInfo.getCompanyId());
+//                }
+//            }catch (Exception e){
+//                log.error(e.getMessage());
+//                params.put("companyID",  carInfo.getCompanyId());
+//            }
+//        }
+//
+//        params.put("valid", 0);
+//        params.put("tag", 1);
+//        params.put("page", 1);
+//        params.put("size", 100);
+//
+//        String json = null;
+//        List<CarInfoVo> list = new ArrayList<>();
+//        try {
+//            String paramStr = JSON.toJSONString(params);
+//            json = HttpRequest.get(remotePath+"/api/gpsservice/cs/basevehicle/ledger/list").header("Authorization", authorization).header("Content-Type", contentType)
+//                    .timeout(15000).body(paramStr).execute().body();
+//            log.info("/api/gpsservice/cs/basevehicle/ledger/list;params:[{}],returnJson:[{}]",paramStr,json);
+//        } catch (Exception e) {
+//            log.error("请求公司车辆信息异常", e);
+//        }
+//
+//        if (StringUtils.isNotEmpty(json)) {
+//            Map<String, Object> hash = JSON.parseObject(json, HashMap.class);
+//            if (Objects.nonNull(hash)) {
+//                if (Objects.nonNull(hash.get("code")) && StringUtils.equals(hash.get("code").toString(), "200")) {
+//                    if (Objects.nonNull(hash.get("result")) && hash.get("result") instanceof JSONObject) {
+//                        JSONObject resultObj = (JSONObject) hash.get("result");
+//                        if (Objects.nonNull(resultObj) && Objects.nonNull(resultObj.get("list")) && resultObj.get("list") instanceof JSONArray) {
+//                            JSONArray jsonArray = (JSONArray)  resultObj.get("list");
+//                            for (Object object : jsonArray) {
+//                                JSONObject jsonObject = (JSONObject) object;
+//
+//                                CarInfoVo vo = new CarInfoVo();
+//                                vo.setCarBrank(jsonObject.getString("brandName"));
+//                                vo.setCarCode(jsonObject.getString("licenseplateNo"));
+//                                vo.setCarColor(jsonObject.getString(""));
+//                                vo.setCarIdentification(jsonObject.getString("licenseplateNo"));
+//                                vo.setCarType(jsonObject.getString("energyTypeName"));
+//                                if (Objects.nonNull(jsonObject.getString("companyID"))) {
+//                                    vo.setCompanyId(Convert.toLong(StringUtils.replace(jsonObject.getString("companyID").toString(), "zxljqy", "")));
+//                                }
+//                                vo.setCompanyName(jsonObject.getString("companyName"));
+//                                vo.setContainerVolume(jsonObject.getString("containerVolume"));
+//                                vo.setEmissionStandard(jsonObject.getString("emissionStanName"));
+//                                vo.setFarmeNumber(jsonObject.getString("frmaeNo"));
+//                                vo.setId(Convert.toLong(StringUtils.replace(jsonObject.getString("id"), "zxljcl", "")));
+//                                vo.setStatus(jsonObject.getInteger("auditStatus"));
+//                                if (StringUtils.isNotEmpty(jsonObject.getString("transportCertValid"))) {
+//                                    vo.setRoadTransportDate(FAST_DATE_FORMAT.parse(jsonObject.getString("transportCertValid")));
+//                                }
+//                                if (StringUtils.isNotEmpty(jsonObject.getString("registerAt"))) {
+//                                    vo.setEnterDate(FAST_DATE_FORMAT.parse(jsonObject.getString("registerAt")));
+//                                }
+//
+//                                if (Objects.nonNull(jsonObject.get("drivers")) && jsonObject.get("drivers") instanceof JSONArray) {
+//                                    JSONArray das = (JSONArray) jsonObject.get("drivers");
+//                                    int length = CollectionUtils.size(das);
+//                                    if (length > 0) {
+//                                        if (Objects.nonNull(das.get(0)) && das.get(0) instanceof JSONObject) {
+//                                            JSONObject dro = (JSONObject) das.get(0);
+//                                            vo.setDrivers(StringUtils.replace(dro.getString("driverId").toString(), "zxljjsy", ""));
+//                                            vo.setDriversName(dro.getString("driverName"));
+//                                        }
+//
+//                                    }
+//                                }
+//                                if(StringUtils.isNotEmpty(vo.getCarType())) {
+//                                    list.add(vo);
+//                                }
+//                            }
+//                        }
+//                    }
+//                }
+//            }
+//        }
+//    }
+
     @Override
     public List<GarOrderMatchHandler> queryOrderHandlerStatus(String orderId) {
         List<GarOrderMatchHandler> list =
@@ -1139,10 +1510,14 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     }
     @Override
-    public Long queryCarIdOfDriver(String  phone) {
-        return  baseMapper.queryCompanyIdByPhone(phone);
+    public String queryCarIdOfDriver(String phone) {
+        return baseMapper.queryCompanyIdByPhone(phone);
     }
+    @Override
+    public List<DockingQRCodeEntity> queryReportByCarCode(String carCode) {
+        return baseMapper.queryReportByCarCode(carCode);
+    }
     private void handleCleanNumber(TransportationEnterpriseVo vo, List<GarOrder> orderList) {
+package com.trash.garbage.utils;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.Objects;
+
+@Slf4j
+public class HttpUtil {
+    public static String doPost(String url, Map<String, String> headers, String body) throws IOException {
+        HttpPost post = new HttpPost(url);
+        CloseableHttpClient client = HttpClients.createDefault();
+        if (MapUtils.isNotEmpty(headers)) {
+            for (Map.Entry<String, String> entry : headers.entrySet()) {
+                post.addHeader(entry.getKey(), entry.getValue());
+            }
+        }
+
+        if (StringUtils.isNotEmpty(body)) {
+            post.setEntity(new StringEntity(body));
+        }
+        CloseableHttpResponse response = client.execute(post);
+        if (response.getStatusLine().getStatusCode() == 200) {
+            String content = EntityUtils.toString(response.getEntity());
+
+            System.out.println(content);
+            return content;
+        }
+        return null;
+    }
+
+    public static String doGet(String url, Map<String, String> headers, Map<String,Object> paramMap) throws IOException {
+        if(MapUtils.isNotEmpty(paramMap)){
+            StringBuilder builder = new StringBuilder();
+            builder.append(url);
+            for (Map.Entry<String, Object> entry : paramMap.entrySet()) {
+                if(StringUtils.indexOf(url,"?") == -1){
+                    builder.append("?");
+                }else{
+                    builder.append("&");
+                }
+                builder.append(entry.getKey());
+                builder.append("=");
+                builder.append(entry.getValue());
+            }
+            url = builder.toString();
+        }
+        HttpGet httpGet = new HttpGet(url);
+        CloseableHttpClient client = HttpClients.createDefault();
+        if (MapUtils.isNotEmpty(headers)) {
+            for (Map.Entry<String, String> entry : headers.entrySet()) {
+                httpGet.addHeader(entry.getKey(), entry.getValue());
+            }
+        }
+
+
+        CloseableHttpResponse response = client.execute(httpGet);
+        if (response.getStatusLine().getStatusCode() == 200) {
+            String content = EntityUtils.toString(response.getEntity());
+            log.info("[{}],[{}]",url,content);
+            return content;
+        } else if (Objects.nonNull(response) && Objects.nonNull(response.getStatusLine())) {
+            log.info("[{}],[{}]",url,response.getStatusLine().getStatusCode());
+        }
+
+        return null;
+    }
+}
@@ -255,7 +255,19 @@
         order by `disposal`.gar_create_time desc
     </select>
-    <select id="queryCompanyIdByPhone" parameterType="java.lang.String" resultType="java.lang.Long">
+    <select id="queryCompanyIdByPhone" parameterType="java.lang.String" resultType="java.lang.String">
         select company_id from driver d where phoneNo=#{phone}
     </select>
+    <select id="queryReportByCarCode" resultType="com.trash.garbage.pojo.domain.DockingQRCodeEntity">
+        select  go2.gar_order_address garOrderAddress ,go2.gar_order_address_details garOrderAddressDetails ,go2.gar_order_agreement_time garOrderAgreementTime,
+        gu.gar_user_name garUserName,gu.gar_user_tel garUserTel,goc.container_volume containerVolume,ds.address dsAddress,ds.local_area dsLocalArea ,ds.name dsName
+        from gar_order go2
+        left join gar_user gu  on gu.gar_user_id =go2.gar_order_user_id
+        left join gar_order_car goc on goc.gar_order_id =go2.gar_order_id
+        left join gar_order_match_disposal gomd on  gomd.gar_order_id=go2.gar_order_id
+        left join disposal_site ds on ds.id = gomd.gar_order_disposal_company_id
+        left join gar_order_match_handler gomh on gomh.gar_order_id =go2.gar_order_id
+        where gomh.gar_handler_car_code=#{carCode}
+        and gomh.gar_order_handler_status = 1 AND gomh.gar_cancel_flag = 0
+    </select>
 </mapper>
@@ -63,4 +63,9 @@
                 #{item}
             </foreach>
     </select>
+
+
+    <select id="queryGarOrderMatchHandler" resultType="com.trash.garbage.pojo.domain.GarOrderMatchHandler">
+        select * from gar_order_match_handler where gar_order_id = #{orderId}
+    </select>
 </mapper>
 package com.trash.carInfo.controller;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.trash.carInfo.domain.CarInfo;
 import com.trash.carInfo.domain.vo.CarInfoVo;
 import com.trash.carInfo.service.ICarInfoService;
@@ -8,15 +10,26 @@ import com.trash.common.core.controller.BaseController;
 import com.trash.common.core.domain.AjaxResult;
 import com.trash.common.core.page.TableDataInfo;
 import com.trash.common.enums.BusinessType;
+import com.trash.common.utils.RemoteServerUtils;
 import com.trash.common.utils.poi.ExcelUtil;
+import com.trash.enterprise.domain.TransportationEnterprise;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.HttpClient;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 /**
@@ -61,44 +74,23 @@ public class CarInfoController extends BaseController {
     }
     @GetMapping("/list/group/by/carType")
-    public TableDataInfo listGroupByCarType(CarInfoVo carInfo) {
-
-        carInfo.setIsDel(1);
-        List<CarInfoVo> list = carInfoService.selectCarInfoListFront(carInfo);
-        TableDataInfo data = getDataTable(list);
-        if (CollectionUtils.isNotEmpty(list)) {
-            Map<String, List<CarInfoVo>> carMap = list.stream().map(car -> {
-                if (Objects.equals(car.getCarType(), "轻型货车")) {
-                    car.setCarLeft("car_1.png");
-                    car.setRemark("箱体长2.6m,宽1.7m,高1.5m；最多可容纳约90袋装修垃圾（75cm*5cm每袋）");
-                } else if (Objects.equals(car.getCarType(), "中型货车")) {
-                    car.setCarLeft("car_2.png");
-                    car.setRemark("箱体长3.2m,宽1.5m,高1.5m；最多可容纳约110袋装修垃圾（75cm*45cm每袋）");
-                } else if (Objects.equals(car.getCarType(), "大中型货车")) {
-                    car.setCarLeft("car_3.png");
-                    car.setRemark("箱体长3.2m,宽1.9m,高1.9m；最多可容纳约150袋装修垃圾（75cm*45cm每袋）");
-                }
-                return car;
-            }).collect(Collectors.groupingBy(CarInfoVo::getCarType));
-
-            List<CarInfoVo> carList = new ArrayList<>();
-            for (Map.Entry<String, List<CarInfoVo>> entry : carMap.entrySet()) {
-                if (CollectionUtils.isNotEmpty(entry.getValue())) {
-                    Optional<CarInfoVo> opt = entry.getValue().stream().filter(car -> Objects.equals(car.getCarEquipment(), "4") || Objects.equals(car.getCarEquipment(), "6") || Objects.equals(car.getCarEquipment(), "8")).findFirst();
-                    if (opt.isPresent()) {
-                        carList.add(opt.get());
-                    } else {
-                        carList.add(entry.getValue().get(0));
-                    }
-
-                }
-            }
-            carList = carList.stream().sorted(Comparator.comparing(CarInfoVo::convertContainerVolumeDefaultMaxValue)).collect(Collectors.toList());
-
-            data.setRows(carList);
+    public String listGroupByCarType(CarInfoVo carInfo, HttpServletRequest request) {
+        String authorization = request.getHeader("Authorization");
+        OkHttpClient okHttpClient = RemoteServerUtils.getOkClient();
+        String param = JSON.toJSON(carInfo).toString();
+
+        okhttp3.RequestBody body = RequestBody.create(MediaType.parse("application/json"), param);
+        String url = request.getRequestURL().toString();
+        url = StringUtils.replace(url,"/unit/carInfo/list/group/by/carType","/gar/car/list/group/by/carType");
+
+        Request request1 = new Request.Builder().url(url).addHeader("Authorization", authorization).post(body).build();
+        try {
+            okhttp3.Response response = okHttpClient.newCall(request1).execute();
+            return response.body().string();
+        } catch (Exception e) {
+            logger.error(e.getMessage(),e);
+            return null;
         }
-
-        return data;
     }
     /**
@@ -4,10 +4,10 @@ public class CarDriverRelation {
     private Long id;
-    private Long carId;
+    private String carId;
-    private Long driverId;
+    private String driverId;
     public Long getId() {
         return id;
@@ -17,19 +17,19 @@ public class CarDriverRelation {
         this.id = id;
     }
-    public Long getCarId() {
+    public String getCarId() {
         return carId;
     }
-    public void setCarId(Long carId) {
+    public void setCarId(String carId) {
         this.carId = carId;
     }
-    public Long getDriverId() {
+    public String getDriverId() {
         return driverId;
     }
-    public void setDriverId(Long driverId) {
+    public void setDriverId(String driverId) {
         this.driverId = driverId;
     }
 }
@@ -18,11 +18,11 @@ public class CarInfo extends BaseEntity
     private static final long serialVersionUID = 1L;
     /** $column.columnComment */
-    private Long id;
+    private String id;
     /** 所属公司 */
     @Excel(name = "所属公司")
-    private Long companyId;
+    private String companyId;
     /** 车辆类型 */
     @Excel(name = "车辆类型")
@@ -137,21 +137,21 @@ public class CarInfo extends BaseEntity
         this.lengthWidthHeight = lengthWidthHeight;
     }
-    public void setId(Long id)
+    public void setId(String id)
     {
         this.id = id;
     }
-    public Long getId() 
+    public String getId()
     {
         return id;
     }
-    public void setCompanyId(Long companyId) 
+    public void setCompanyId(String companyId)
     {
         this.companyId = companyId;
     }
-    public Long getCompanyId() 
+    public String getCompanyId()
     {
         return companyId;
     }
@@ -11,6 +11,7 @@ public class CarInfoVo extends CarInfo {
     private String driversName;
+
     public String getCompanyName() {
         return companyName;
     }
@@ -22,6 +22,7 @@ public interface CarInfoMapper
      * @return 运输车辆管理
      */
         CarInfo selectCarInfoById(Long id);
+        CarInfo selectCarInfoByIdStr(String id);
     /**
      * 查询运输车辆管理列表
@@ -43,6 +44,8 @@ public interface CarInfoMapper
      */
     int insertCarInfo(CarInfo carInfo);
+    int saveCarInfo(CarInfo carInfo);
+
     /**
      * 修改运输车辆管理
      * 
@@ -78,7 +81,7 @@ public interface CarInfoMapper
      * @param carId 车辆id
      * @return 结果
      */
-    int deleteCarDriverRelationByCarId(Long carId);
+    int deleteCarDriverRelationByCarId(String carId);
 }
@@ -9,19 +9,20 @@ import java.util.List;
 /**
  * 运输车辆管理Service接口
- * 
+ *
  * @author trash
  * @date 2023-11-21
  */
-public interface ICarInfoService 
-{
+public interface ICarInfoService {
     /**
      * 查询运输车辆管理
-     * 
+     *
      * @param id 运输车辆管理ID
      * @return 运输车辆管理
      */
-        CarInfo selectCarInfoById(Long id);
+    CarInfo selectCarInfoById(Long id);
+
+    CarInfo selectCarInfoByIdStr(String id);
     /**
      * 查询运输车辆管理列表
@@ -55,6 +56,8 @@ public interface ICarInfoService
                       MultipartFile[] carRightFiles,
                       CarInfo carInfo) throws IOException;
+    int save(CarInfo carInfo);
+
     /**
      * 修改运输车辆管理
      *
@@ -77,7 +80,7 @@ public interface ICarInfoService
     /**
      * 批量删除运输车辆管理
-     * 
+     *
      * @param ids 需要删除的运输车辆管理ID
      * @return 结果
      */
@@ -85,9 +88,11 @@ public interface ICarInfoService
     /**
      * 删除运输车辆管理信息
-     * 
+     *
      * @param id 运输车辆管理ID
      * @return 结果
      */
     int deleteCarInfoById(Long id);
+
+    int updateById(CarInfo carInfo);
 }
@@ -21,13 +21,12 @@ import static com.trash.common.utils.file.FileUploadUtils.upload;
 /**
  * 运输车辆管理Service业务层处理
- * 
+ *
  * @author trash
  * @date 2023-11-21
  */
 @Service
-public class CarInfoServiceImpl implements ICarInfoService 
-{
+public class CarInfoServiceImpl implements ICarInfoService {
     @Autowired
     private CarInfoMapper carInfoMapper;
@@ -36,16 +35,20 @@ public class CarInfoServiceImpl implements ICarInfoService
     /**
      * 查询运输车辆管理
-     * 
+     *
      * @param id 运输车辆管理ID
      * @return 运输车辆管理
      */
     @Override
-    public CarInfo selectCarInfoById(Long id)
-    {
+    public CarInfo selectCarInfoById(Long id) {
         return carInfoMapper.selectCarInfoById(id);
     }
+    @Override
+    public CarInfo selectCarInfoByIdStr(String id) {
+        return carInfoMapper.selectCarInfoByIdStr(id);
+    }
+
     /**
      * 查询运输车辆管理列表
      *
@@ -53,14 +56,12 @@ public class CarInfoServiceImpl implements ICarInfoService
      * @return 运输车辆管理
      */
     @Override
-    public List<CarInfoVo> selectCarInfoList(CarInfoVo carInfo)
-    {
+    public List<CarInfoVo> selectCarInfoList(CarInfoVo carInfo) {
         return carInfoMapper.selectCarInfoList(carInfo);
     }
     @Override
-    public List<CarInfoVo> selectCarInfoListFront(CarInfoVo carInfo)
-    {
+    public List<CarInfoVo> selectCarInfoListFront(CarInfoVo carInfo) {
         return carInfoMapper.selectCarInfoListFront(carInfo);
     }
@@ -90,22 +91,22 @@ public class CarInfoServiceImpl implements ICarInfoService
         carInfo.setStatus(0);
         carInfo.setIsDel(1);
         for (MultipartFile file : roadTransportFiles) {
-            carInfo.setRoadTransport(carInfo.getRoadTransport()!=null?carInfo.getRoadTransport()+";"+uploadFile(file):uploadFile(file));
+            carInfo.setRoadTransport(carInfo.getRoadTransport() != null ? carInfo.getRoadTransport() + ";" + uploadFile(file) : uploadFile(file));
         }
         for (MultipartFile file : drivingLicenseFiles) {
-            carInfo.setDrivingLicense(carInfo.getDrivingLicense()!=null?carInfo.getDrivingLicense()+";"+uploadFile(file):uploadFile(file));
+            carInfo.setDrivingLicense(carInfo.getDrivingLicense() != null ? carInfo.getDrivingLicense() + ";" + uploadFile(file) : uploadFile(file));
         }
         for (MultipartFile file : carFrontFiles) {
-            carInfo.setCarFront(carInfo.getCarFront()!=null?carInfo.getCarFront()+";"+uploadFile(file):uploadFile(file));
+            carInfo.setCarFront(carInfo.getCarFront() != null ? carInfo.getCarFront() + ";" + uploadFile(file) : uploadFile(file));
         }
         for (MultipartFile file : carLeftFiles) {
-            carInfo.setCarLeft(carInfo.getCarLeft()!=null?carInfo.getCarLeft()+";"+uploadFile(file):uploadFile(file));
+            carInfo.setCarLeft(carInfo.getCarLeft() != null ? carInfo.getCarLeft() + ";" + uploadFile(file) : uploadFile(file));
         }
         for (MultipartFile file : carBehindFiles) {
-            carInfo.setCarBehind(carInfo.getCarBehind()!=null?carInfo.getCarBehind()+";"+uploadFile(file):uploadFile(file));
+            carInfo.setCarBehind(carInfo.getCarBehind() != null ? carInfo.getCarBehind() + ";" + uploadFile(file) : uploadFile(file));
         }
         for (MultipartFile file : carRightFiles) {
-            carInfo.setCarRight(carInfo.getCarRight()!=null?carInfo.getCarRight()+";"+uploadFile(file):uploadFile(file));
+            carInfo.setCarRight(carInfo.getCarRight() != null ? carInfo.getCarRight() + ";" + uploadFile(file) : uploadFile(file));
         }
         carInfo.setRoadTransport(removeSemicolon(carInfo.getRoadTransport()));
         carInfo.setDrivingLicense(removeSemicolon(carInfo.getDrivingLicense()));
@@ -113,20 +114,28 @@ public class CarInfoServiceImpl implements ICarInfoService
         carInfo.setCarLeft(removeSemicolon(carInfo.getCarLeft()));
         carInfo.setCarBehind(removeSemicolon(carInfo.getCarBehind()));
         carInfo.setCarRight(removeSemicolon(carInfo.getCarRight()));
-        int result =  carInfoMapper.insertCarInfo(carInfo);
+        int result = carInfoMapper.insertCarInfo(carInfo);
         String[] Drivers = carInfo.getDrivers().split(",");
         int carCount = 0;
         for (String driver : Drivers) {
             CarDriverRelation carDriverRelation = new CarDriverRelation();
             carDriverRelation.setCarId(carInfo.getId());
-            carDriverRelation.setDriverId(Long.parseLong(driver));
-            carCount = carCount+carInfoMapper.addCarDriverRelation(carDriverRelation);
+            carDriverRelation.setDriverId((driver));
+            carCount = carCount + carInfoMapper.addCarDriverRelation(carDriverRelation);
         }
         return result;
     }
+    public int save(CarInfo carInfo) {
+        return carInfoMapper.saveCarInfo(carInfo);
+    }
+
+    public int updateById(CarInfo carInfo) {
+        return carInfoMapper.updateCarInfo(carInfo);
+    }
+
     /**
      * 修改运输车辆管理
      *
@@ -144,22 +153,22 @@ public class CarInfoServiceImpl implements ICarInfoService
         carInfo.setUpdateTime(DateUtils.getNowDate());
         carInfo.setUpdateBy(SecurityUtils.getUsername());
         for (MultipartFile file : roadTransportFiles) {
-            carInfo.setRoadTransport(carInfo.getRoadTransport()!=null?carInfo.getRoadTransport()+";"+uploadFile(file):uploadFile(file));
+            carInfo.setRoadTransport(carInfo.getRoadTransport() != null ? carInfo.getRoadTransport() + ";" + uploadFile(file) : uploadFile(file));
         }
         for (MultipartFile file : drivingLicenseFiles) {
-            carInfo.setDrivingLicense(carInfo.getDrivingLicense()!=null?carInfo.getDrivingLicense()+";"+uploadFile(file):uploadFile(file));
+            carInfo.setDrivingLicense(carInfo.getDrivingLicense() != null ? carInfo.getDrivingLicense() + ";" + uploadFile(file) : uploadFile(file));
         }
         for (MultipartFile file : carFrontFiles) {
-            carInfo.setCarFront(carInfo.getCarFront()!=null?carInfo.getCarFront()+";"+uploadFile(file):uploadFile(file));
+            carInfo.setCarFront(carInfo.getCarFront() != null ? carInfo.getCarFront() + ";" + uploadFile(file) : uploadFile(file));
         }
         for (MultipartFile file : carLeftFiles) {
-            carInfo.setCarLeft(carInfo.getCarLeft()!=null?carInfo.getCarLeft()+";"+uploadFile(file):uploadFile(file));
+            carInfo.setCarLeft(carInfo.getCarLeft() != null ? carInfo.getCarLeft() + ";" + uploadFile(file) : uploadFile(file));
         }
         for (MultipartFile file : carBehindFiles) {
-            carInfo.setCarBehind(carInfo.getCarBehind()!=null?carInfo.getCarBehind()+";"+uploadFile(file):uploadFile(file));
+            carInfo.setCarBehind(carInfo.getCarBehind() != null ? carInfo.getCarBehind() + ";" + uploadFile(file) : uploadFile(file));
         }
         for (MultipartFile file : carRightFiles) {
-            carInfo.setCarRight(carInfo.getCarRight()!=null?carInfo.getCarRight()+";"+uploadFile(file):uploadFile(file));
+            carInfo.setCarRight(carInfo.getCarRight() != null ? carInfo.getCarRight() + ";" + uploadFile(file) : uploadFile(file));
         }
         carInfo.setRoadTransport(removeSemicolon(carInfo.getRoadTransport()));
         carInfo.setDrivingLicense(removeSemicolon(carInfo.getDrivingLicense()));
@@ -175,7 +184,7 @@ public class CarInfoServiceImpl implements ICarInfoService
         for (String driver : Drivers) {
             CarDriverRelation carDriverRelation = new CarDriverRelation();
             carDriverRelation.setCarId(carInfo.getId());
-            carDriverRelation.setDriverId(Long.parseLong(driver));
+            carDriverRelation.setDriverId((driver));
             carInfoMapper.addCarDriverRelation(carDriverRelation);
         }
         return carInfoMapper.updateCarInfo(carInfo);
@@ -183,25 +192,23 @@ public class CarInfoServiceImpl implements ICarInfoService
     /**
      * 批量删除运输车辆管理
-     * 
+     *
      * @param ids 需要删除的运输车辆管理ID
      * @return 结果
      */
     @Override
-    public int deleteCarInfoByIds(Long[] ids)
-    {
+    public int deleteCarInfoByIds(Long[] ids) {
         return carInfoMapper.deleteCarInfoByIds(ids);
     }
     /**
      * 删除运输车辆管理信息
-     * 
+     *
      * @param id 运输车辆管理ID
      * @return 结果
      */
     @Override
-    public int deleteCarInfoById(Long id)
-    {
+    public int deleteCarInfoById(Long id) {
         return carInfoMapper.deleteCarInfoById(id);
     }
@@ -220,7 +227,7 @@ public class CarInfoServiceImpl implements ICarInfoService
     }
     //去掉第一个分号,如果有的话
-    public String removeSemicolon(String str){
+    public String removeSemicolon(String str) {
         if (str.startsWith(";"))
             str = str.substring(1);
         if (str.equals(""))
@@ -68,7 +68,7 @@ public class DriverController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('unit:driver:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
+    public AjaxResult getInfo(@PathVariable("id") String id)
     {
         return AjaxResult.success(driverService.selectDriverById(id));
     }
@@ -18,7 +18,7 @@ public class Driver extends BaseEntity
     private static final long serialVersionUID = 1L;
     /** $column.columnComment */
-    private Long id;
+    private String id;
     /** 驾驶员名称 */
     @Excel(name = "驾驶员名称")
@@ -30,7 +30,7 @@ public class Driver extends BaseEntity
     /** 所属公司 */
     @Excel(name = "所属公司")
-    private Long companyId;
+    private String companyId;
     /** 从业资格证有效期起 */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -95,12 +95,12 @@ public class Driver extends BaseEntity
         this.phoneNo = phoneNo;
     }
-    public void setId(Long id)
+    public void setId(String id)
     {
         this.id = id;
     }
-    public Long getId()
+    public String getId()
     {
         return id;
     }
@@ -122,12 +122,12 @@ public class Driver extends BaseEntity
     {
         return identityCard;
     }
-    public void setCompanyId(Long companyId)
+    public void setCompanyId(String companyId)
     {
         this.companyId = companyId;
     }
-    public Long getCompanyId()
+    public String getCompanyId()
     {
         return companyId;
     }
@@ -3,6 +3,7 @@ package com.trash.driver.mapper;
 import java.util.List;
 import java.util.Map;
+import com.trash.carInfo.domain.CarDriverRelation;
 import com.trash.driver.domain.Driver;
 import com.trash.driver.domain.vo.DriverVo;
@@ -20,7 +21,7 @@ public interface DriverMapper
      * @param id 驾驶员管理ID
      * @return 驾驶员管理
      */
-        Driver selectDriverById(Long id);
+        Driver selectDriverById(String id);
     /**
      * 查询驾驶员管理列表
@@ -37,6 +38,8 @@ public interface DriverMapper
      */
     List<Map<Object,Object>> selectDriverListByCompanyId(String companyId);
+    int carDriverRelationCount(CarDriverRelation carDriverRelation);
+
     /**
      * 新增驾驶员管理
      * 
@@ -44,6 +47,9 @@ public interface DriverMapper
      * @return 结果
      */
     int insertDriver(Driver driver);
+    int saveDriver(Driver driver);
+
+    int insertCarDriverRelation(CarDriverRelation carDriverRelation);
     /**
      * 修改驾驶员管理
@@ -22,7 +22,7 @@ public interface IDriverService
      * @param id 驾驶员管理ID
      * @return 驾驶员管理
      */
-        Driver selectDriverById(Long id);
+        Driver selectDriverById(String id);
     /**
      * 查询驾驶员管理列表
@@ -57,6 +57,10 @@ public interface IDriverService
                      MultipartFile[] photographTwoFiles,
                      Driver driver) throws IOException;
+    int save(Driver driver,String carId);
+
+    int updateById(Driver driver,String carId);
+
     /**
      * 修改驾驶员管理
      *
@@ -4,10 +4,13 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Map;
+import com.trash.carInfo.domain.CarDriverRelation;
 import com.trash.common.config.trashConfig;
 import com.trash.common.utils.DateUtils;
 import com.trash.common.utils.SecurityUtils;
 import com.trash.driver.domain.vo.DriverVo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.trash.driver.mapper.DriverMapper;
@@ -19,37 +22,35 @@ import static com.trash.common.utils.file.FileUploadUtils.upload;
 /**
  * 驾驶员管理Service业务层处理
- * 
+ *
  * @author trash
  * @date 2023-11-21
  */
 @Service
-public class DriverServiceImpl implements IDriverService 
-{
+public class DriverServiceImpl implements IDriverService {
+    private static final Logger log = LoggerFactory.getLogger(DriverServiceImpl.class);
     @Autowired
     private DriverMapper driverMapper;
     /**
      * 查询驾驶员管理
-     * 
+     *
      * @param id 驾驶员管理ID
      * @return 驾驶员管理
      */
     @Override
-    public Driver selectDriverById(Long id)
-    {
+    public Driver selectDriverById(String id) {
         return driverMapper.selectDriverById(id);
     }
     /**
      * 查询驾驶员管理列表
-     * 
+     *
      * @param driver 驾驶员管理
      * @return 驾驶员管理
      */
     @Override
-    public List<DriverVo> selectDriverList(DriverVo driver)
-    {
+    public List<DriverVo> selectDriverList(DriverVo driver) {
         return driverMapper.selectDriverList(driver);
     }
@@ -75,19 +76,19 @@ public class DriverServiceImpl implements IDriverService
         driver.setCreateBy(SecurityUtils.getUsername());
         driver.setStatus(0);
         for (MultipartFile file : drivingLicenceFiles) {
-            driver.setDrivingLicence(driver.getDrivingLicence()!=null?driver.getDrivingLicence()+";"+uploadFile(file):uploadFile(file));
+            driver.setDrivingLicence(driver.getDrivingLicence() != null ? driver.getDrivingLicence() + ";" + uploadFile(file) : uploadFile(file));
         }
         for (MultipartFile file : professionalQualificationFiles) {
-            driver.setProfessionalQualification(driver.getProfessionalQualification()!=null?driver.getProfessionalQualification()+";"+uploadFile(file):uploadFile(file));
+            driver.setProfessionalQualification(driver.getProfessionalQualification() != null ? driver.getProfessionalQualification() + ";" + uploadFile(file) : uploadFile(file));
         }
         for (MultipartFile file : safetyTrainingFiles) {
-            driver.setSafetyTraining(driver.getSafetyTraining()!=null?driver.getSafetyTraining()+";"+uploadFile(file):uploadFile(file));
+            driver.setSafetyTraining(driver.getSafetyTraining() != null ? driver.getSafetyTraining() + ";" + uploadFile(file) : uploadFile(file));
         }
         for (MultipartFile file : photographOneFiles) {
-            driver.setPhotographOne(driver.getPhotographOne()!=null?driver.getPhotographOne()+";"+uploadFile(file):uploadFile(file));
+            driver.setPhotographOne(driver.getPhotographOne() != null ? driver.getPhotographOne() + ";" + uploadFile(file) : uploadFile(file));
         }
         for (MultipartFile file : photographTwoFiles) {
-            driver.setPhotographTwo(driver.getPhotographTwo()!=null?driver.getPhotographTwo()+";"+uploadFile(file):uploadFile(file));
+            driver.setPhotographTwo(driver.getPhotographTwo() != null ? driver.getPhotographTwo() + ";" + uploadFile(file) : uploadFile(file));
         }
         driver.setDrivingLicence(removeSemicolon(driver.getDrivingLicence()));
         driver.setProfessionalQualification(removeSemicolon(driver.getProfessionalQualification()));
@@ -97,6 +98,35 @@ public class DriverServiceImpl implements IDriverService
         return driverMapper.insertDriver(driver);
     }
+    @Override
+    public int save(Driver driver, String carId) {
+        saveCarDriver(driver.getId(), carId);
+        return driverMapper.saveDriver(driver);
+    }
+
+    @Override
+    public int updateById(Driver driver, String carId) {
+        saveCarDriver(driver.getId(), carId);
+        int count = driverMapper.updateDriver(driver);
+        return count;
+    }
+
+
+    private void saveCarDriver(String drvierId, String carId) {
+        CarDriverRelation carDriverRelation = new CarDriverRelation();
+        carDriverRelation.setDriverId(drvierId);
+        carDriverRelation.setCarId(carId);
+
+        Integer count = driverMapper.carDriverRelationCount(carDriverRelation);
+        try {
+            if (count == 0) {
+                driverMapper.insertCarDriverRelation(carDriverRelation);
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+    }
+
     /**
      * 修改驾驶员管理
      *
@@ -113,19 +143,19 @@ public class DriverServiceImpl implements IDriverService
         driver.setUpdateTime(DateUtils.getNowDate());
         driver.setUpdateBy(SecurityUtils.getUsername());
         for (MultipartFile file : drivingLicenceFiles) {
-            driver.setDrivingLicence(driver.getDrivingLicence()!=null?driver.getDrivingLicence()+";"+uploadFile(file):uploadFile(file));
+            driver.setDrivingLicence(driver.getDrivingLicence() != null ? driver.getDrivingLicence() + ";" + uploadFile(file) : uploadFile(file));
         }
         for (MultipartFile file : professionalQualificationFiles) {
-            driver.setProfessionalQualification(driver.getProfessionalQualification()!=null?driver.getProfessionalQualification()+";"+uploadFile(file):uploadFile(file));
+            driver.setProfessionalQualification(driver.getProfessionalQualification() != null ? driver.getProfessionalQualification() + ";" + uploadFile(file) : uploadFile(file));
         }
         for (MultipartFile file : safetyTrainingFiles) {
-            driver.setSafetyTraining(driver.getSafetyTraining()!=null?driver.getSafetyTraining()+";"+uploadFile(file):uploadFile(file));
+            driver.setSafetyTraining(driver.getSafetyTraining() != null ? driver.getSafetyTraining() + ";" + uploadFile(file) : uploadFile(file));
         }
         for (MultipartFile file : photographOneFiles) {
-            driver.setPhotographOne(driver.getPhotographOne()!=null?driver.getPhotographOne()+";"+uploadFile(file):uploadFile(file));
+            driver.setPhotographOne(driver.getPhotographOne() != null ? driver.getPhotographOne() + ";" + uploadFile(file) : uploadFile(file));
         }
         for (MultipartFile file : photographTwoFiles) {
-            driver.setPhotographTwo(driver.getPhotographTwo()!=null?driver.getPhotographTwo()+";"+uploadFile(file):uploadFile(file));
+            driver.setPhotographTwo(driver.getPhotographTwo() != null ? driver.getPhotographTwo() + ";" + uploadFile(file) : uploadFile(file));
         }
         driver.setDrivingLicence(removeSemicolon(driver.getDrivingLicence()));
         driver.setProfessionalQualification(removeSemicolon(driver.getProfessionalQualification()));
@@ -137,25 +167,23 @@ public class DriverServiceImpl implements IDriverService
     /**
      * 批量删除驾驶员管理
-     * 
+     *
      * @param ids 需要删除的驾驶员管理ID
      * @return 结果
      */
     @Override
-    public int deleteDriverByIds(Long[] ids)
-    {
+    public int deleteDriverByIds(Long[] ids) {
         return driverMapper.deleteDriverByIds(ids);
     }
     /**
      * 删除驾驶员管理信息
-     * 
+     *
      * @param id 驾驶员管理ID
      * @return 结果
      */
     @Override
-    public int deleteDriverById(Long id)
-    {
+    public int deleteDriverById(Long id) {
         return driverMapper.deleteDriverById(id);
     }
@@ -174,7 +202,7 @@ public class DriverServiceImpl implements IDriverService
     }
     //去掉第一个分号,如果有的话
-    public String removeSemicolon(String str){
+    public String removeSemicolon(String str) {
         if (str.startsWith(";"))
             str = str.substring(1);
         if (str.equals(""))
@@ -58,7 +58,7 @@ public class TransportationEnterpriseController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('unit:enterprise:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
+    public AjaxResult getInfo(@PathVariable("id") String id)
     {
         return AjaxResult.success(transportationEnterpriseService.selectTransportationEnterpriseById(id));
     }
@@ -20,7 +20,7 @@ public class TransportationEnterprise extends BaseEntity
     private static final long serialVersionUID = 1L;
     /** $column.columnComment */
-    private Long id;
+    private String id;
     /** 企业名称 */
     @Excel(name = "企业名称")
@@ -179,12 +179,12 @@ public class TransportationEnterprise extends BaseEntity
         this.servicePhone = servicePhone;
     }
-    public void setId(Long id)
+    public void setId(String id)
     {
         this.id = id;
     }
-    public Long getId() 
+    public String getId()
     {
         return id;
     }
@@ -18,7 +18,9 @@ public interface TransportationEnterpriseMapper
      * @param id 运输企业管理ID
      * @return 运输企业管理
      */
-        TransportationEnterprise selectTransportationEnterpriseById(Long id);
+        TransportationEnterprise selectTransportationEnterpriseById(String id);
+
+        TransportationEnterprise selectTransportationEnterpriseByIdStr(String id);
     /**
      * 查询运输企业管理列表
@@ -37,6 +39,15 @@ public interface TransportationEnterpriseMapper
     int insertTransportationEnterprise(TransportationEnterprise transportationEnterprise);
     /**
+     * 新增运输企业管理
+     *
+     * @param transportationEnterprise 运输企业管理
+     * @return 结果
+     */
+    int saveTransportationEnterprise(TransportationEnterprise transportationEnterprise);
+
+
+    /**
      * 修改运输企业管理
      * 
      * @param transportationEnterprise 运输企业管理
@@ -19,7 +19,9 @@ public interface ITransportationEnterpriseService
      * @param id 运输企业管理ID
      * @return 运输企业管理
      */
-        TransportationEnterprise selectTransportationEnterpriseById(Long id);
+        TransportationEnterprise selectTransportationEnterpriseById(String id);
+
+        TransportationEnterprise selectTransportationEnterpriseByIdStr(String id);
     /**
      * 查询运输企业管理列表
@@ -48,6 +50,8 @@ public interface ITransportationEnterpriseService
                                        MultipartFile[] companyLogoFiles,
                                        TransportationEnterprise transportationEnterprise) throws IOException;
+    int save(TransportationEnterprise transportationEnterprise);
+
     /**
      * 修改运输企业管理
      *
@@ -67,6 +71,8 @@ public interface ITransportationEnterpriseService
                                        MultipartFile[] companyLogoFiles,
                                        TransportationEnterprise transportationEnterprise) throws IOException;
+    int updateById(TransportationEnterprise transportationEnterprise);
+
     /**
      * 批量删除运输企业管理
      * 
@@ -17,37 +17,39 @@ import static com.trash.common.utils.file.FileUploadUtils.upload;
 /**
  * 运输企业管理Service业务层处理
- * 
+ *
  * @author trash
  * @date 2023-11-21
  */
 @Service
-public class TransportationEnterpriseServiceImpl implements ITransportationEnterpriseService 
-{
+public class TransportationEnterpriseServiceImpl implements ITransportationEnterpriseService {
     @Autowired
     private TransportationEnterpriseMapper transportationEnterpriseMapper;
     /**
      * 查询运输企业管理
-     * 
+     *
      * @param id 运输企业管理ID
      * @return 运输企业管理
      */
     @Override
-    public TransportationEnterprise selectTransportationEnterpriseById(Long id)
-    {
+    public TransportationEnterprise selectTransportationEnterpriseById(String id) {
         return transportationEnterpriseMapper.selectTransportationEnterpriseById(id);
     }
+    @Override
+    public TransportationEnterprise selectTransportationEnterpriseByIdStr(String id) {
+        return transportationEnterpriseMapper.selectTransportationEnterpriseByIdStr(id);
+    }
+
     /**
      * 查询运输企业管理列表
-     * 
+     *
      * @param transportationEnterprise 运输企业管理
      * @return 运输企业管理
      */
     @Override
-    public List<TransportationEnterprise> selectTransportationEnterpriseList(TransportationEnterprise transportationEnterprise)
-    {
+    public List<TransportationEnterprise> selectTransportationEnterpriseList(TransportationEnterprise transportationEnterprise) {
         return transportationEnterpriseMapper.selectTransportationEnterpriseList(transportationEnterprise);
     }
@@ -69,22 +71,22 @@ public class TransportationEnterpriseServiceImpl implements ITransportationEnter
         transportationEnterprise.setStatus(0);
         transportationEnterprise.setCreditStatus("正常");
         for (MultipartFile file : transportPermissionFiles) {
-            transportationEnterprise.setTransportPermission(transportationEnterprise.getTransportPermission()!=null?transportationEnterprise.getTransportPermission()+";"+upload(file):upload(file));
+            transportationEnterprise.setTransportPermission(transportationEnterprise.getTransportPermission() != null ? transportationEnterprise.getTransportPermission() + ";" + upload(file) : upload(file));
         }
         for (MultipartFile file : enterpriseBusinessLicenseFiles) {
-            transportationEnterprise.setEnterpriseBusinessLicense(transportationEnterprise.getEnterpriseBusinessLicense()!=null?transportationEnterprise.getEnterpriseBusinessLicense()+";"+upload(file):upload(file));
+            transportationEnterprise.setEnterpriseBusinessLicense(transportationEnterprise.getEnterpriseBusinessLicense() != null ? transportationEnterprise.getEnterpriseBusinessLicense() + ";" + upload(file) : upload(file));
         }
         for (MultipartFile file : safetyOfficerQualificationCertificateFiles) {
-            transportationEnterprise.setSafetyOfficerQualificationCertificate(transportationEnterprise.getSafetyOfficerQualificationCertificate()!=null?transportationEnterprise.getSafetyOfficerQualificationCertificate()+";"+upload(file):upload(file));
+            transportationEnterprise.setSafetyOfficerQualificationCertificate(transportationEnterprise.getSafetyOfficerQualificationCertificate() != null ? transportationEnterprise.getSafetyOfficerQualificationCertificate() + ";" + upload(file) : upload(file));
         }
         for (MultipartFile file : safetyCertificateFiles) {
-            transportationEnterprise.setSafetyCertificate(transportationEnterprise.getSafetyCertificate()!=null?transportationEnterprise.getSafetyCertificate()+";"+upload(file):upload(file));
+            transportationEnterprise.setSafetyCertificate(transportationEnterprise.getSafetyCertificate() != null ? transportationEnterprise.getSafetyCertificate() + ";" + upload(file) : upload(file));
         }
         for (MultipartFile file : carParkPanoramaFiles) {
-            transportationEnterprise.setCarParkPanorama(transportationEnterprise.getCarParkPanorama()!=null?transportationEnterprise.getCarParkPanorama()+";"+upload(file):upload(file));
+            transportationEnterprise.setCarParkPanorama(transportationEnterprise.getCarParkPanorama() != null ? transportationEnterprise.getCarParkPanorama() + ";" + upload(file) : upload(file));
         }
         for (MultipartFile file : companyLogoFiles) {
-            transportationEnterprise.setCompanyLogo(transportationEnterprise.getCompanyLogo()!=null?transportationEnterprise.getCompanyLogo()+";"+upload(file):upload(file));
+            transportationEnterprise.setCompanyLogo(transportationEnterprise.getCompanyLogo() != null ? transportationEnterprise.getCompanyLogo() + ";" + upload(file) : upload(file));
         }
         //去掉第一个分号,如果有的话
         transportationEnterprise.setTransportPermission(removeSemicolon(transportationEnterprise.getTransportPermission()));
@@ -96,6 +98,11 @@ public class TransportationEnterpriseServiceImpl implements ITransportationEnter
         return transportationEnterpriseMapper.insertTransportationEnterprise(transportationEnterprise);
     }
+    @Override
+    public int save(TransportationEnterprise transportationEnterprise) {
+        return transportationEnterpriseMapper.saveTransportationEnterprise(transportationEnterprise);
+    }
+
     /**
      * 修改运输企业管理
      *
@@ -112,22 +119,22 @@ public class TransportationEnterpriseServiceImpl implements ITransportationEnter
         transportationEnterprise.setUpdateTime(DateUtils.getNowDate());
         transportationEnterprise.setUpdateBy(SecurityUtils.getUsername());
         for (MultipartFile file : transportPermissionFiles) {
-            transportationEnterprise.setTransportPermission(transportationEnterprise.getTransportPermission()!=null?transportationEnterprise.getTransportPermission()+";"+upload(file):upload(file));
+            transportationEnterprise.setTransportPermission(transportationEnterprise.getTransportPermission() != null ? transportationEnterprise.getTransportPermission() + ";" + upload(file) : upload(file));
         }
         for (MultipartFile file : enterpriseBusinessLicenseFiles) {
-            transportationEnterprise.setEnterpriseBusinessLicense(transportationEnterprise.getEnterpriseBusinessLicense()!=null?transportationEnterprise.getEnterpriseBusinessLicense()+";"+upload(file):upload(file));
+            transportationEnterprise.setEnterpriseBusinessLicense(transportationEnterprise.getEnterpriseBusinessLicense() != null ? transportationEnterprise.getEnterpriseBusinessLicense() + ";" + upload(file) : upload(file));
         }
         for (MultipartFile file : safetyOfficerQualificationCertificateFiles) {
-            transportationEnterprise.setSafetyOfficerQualificationCertificate(transportationEnterprise.getSafetyOfficerQualificationCertificate()!=null?transportationEnterprise.getSafetyOfficerQualificationCertificate()+";"+upload(file):upload(file));
+            transportationEnterprise.setSafetyOfficerQualificationCertificate(transportationEnterprise.getSafetyOfficerQualificationCertificate() != null ? transportationEnterprise.getSafetyOfficerQualificationCertificate() + ";" + upload(file) : upload(file));
         }
         for (MultipartFile file : safetyCertificateFiles) {
-            transportationEnterprise.setSafetyCertificate(transportationEnterprise.getSafetyCertificate()!=null?transportationEnterprise.getSafetyCertificate()+";"+upload(file):upload(file));
+            transportationEnterprise.setSafetyCertificate(transportationEnterprise.getSafetyCertificate() != null ? transportationEnterprise.getSafetyCertificate() + ";" + upload(file) : upload(file));
         }
         for (MultipartFile file : carParkPanoramaFiles) {
-            transportationEnterprise.setCarParkPanorama(transportationEnterprise.getCarParkPanorama()!=null?transportationEnterprise.getCarParkPanorama()+";"+upload(file):upload(file));
+            transportationEnterprise.setCarParkPanorama(transportationEnterprise.getCarParkPanorama() != null ? transportationEnterprise.getCarParkPanorama() + ";" + upload(file) : upload(file));
         }
         for (MultipartFile file : companyLogoFiles) {
-            transportationEnterprise.setCompanyLogo(transportationEnterprise.getCompanyLogo()!=null?transportationEnterprise.getCompanyLogo()+";"+upload(file):upload(file));
+            transportationEnterprise.setCompanyLogo(transportationEnterprise.getCompanyLogo() != null ? transportationEnterprise.getCompanyLogo() + ";" + upload(file) : upload(file));
         }
         transportationEnterprise.setTransportPermission(removeSemicolon(transportationEnterprise.getTransportPermission()));
         transportationEnterprise.setEnterpriseBusinessLicense(removeSemicolon(transportationEnterprise.getEnterpriseBusinessLicense()));
@@ -138,27 +145,31 @@ public class TransportationEnterpriseServiceImpl implements ITransportationEnter
         return transportationEnterpriseMapper.updateTransportationEnterprise(transportationEnterprise);
     }
+
+    @Override
+    public int updateById(TransportationEnterprise transportationEnterprise) {
+        return transportationEnterpriseMapper.updateTransportationEnterprise(transportationEnterprise);
+    }
+
     /**
      * 批量删除运输企业管理
-     * 
+     *
      * @param ids 需要删除的运输企业管理ID
      * @return 结果
      */
     @Override
-    public int deleteTransportationEnterpriseByIds(Long[] ids)
-    {
+    public int deleteTransportationEnterpriseByIds(Long[] ids) {
         return transportationEnterpriseMapper.deleteTransportationEnterpriseByIds(ids);
     }
     /**
      * 删除运输企业管理信息
-     * 
+     *
      * @param id 运输企业管理ID
      * @return 结果
      */
     @Override
-    public int deleteTransportationEnterpriseById(Long id)
-    {
+    public int deleteTransportationEnterpriseById(Long id) {
         return transportationEnterpriseMapper.deleteTransportationEnterpriseById(id);
     }
@@ -177,7 +188,7 @@ public class TransportationEnterpriseServiceImpl implements ITransportationEnter
     }
     //去掉第一个分号,如果有的话
-    public String removeSemicolon(String str){
+    public String removeSemicolon(String str) {
         if (str.startsWith(";"))
             str = str.substring(1);
         if (str.equals(""))
@@ -181,6 +181,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <include refid="selectCarInfoVo"/>
         where id = #{id} and is_del = 1
     </select>
+
+    <select id="selectCarInfoByIdStr" parameterType="String" resultMap="CarInfoResult">
+        <include refid="selectCarInfoVo"/>
+        where id = #{id}
+    </select>
     <select id="selectByCompanyId" parameterType="Long" resultMap="CarInfoVoResult">
@@ -257,6 +262,77 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
          </trim>
     </insert>
+
+    <insert id="saveCarInfo" parameterType="CarInfo" useGeneratedKeys="true" keyProperty="id">
+        insert into car_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="companyId != null">company_id,</if>
+            <if test="carType != null">car_type,</if>
+            <if test="carCode != null">car_code,</if>
+            <if test="carBrank != null">car_brank,</if>
+            <if test="emissionStandard != null">emission_standard,</if>
+            <if test="roadTransportDate != null">road_transport_date,</if>
+            <if test="drivingLicenseDate != null">driving_license_date,</if>
+            <if test="enterDate != null">enter_date,</if>
+            <if test="farmeNumber != null">farme_number,</if>
+            <if test="carIdentification != null">car_identification,</if>
+            <if test="containerVolume != null">container_volume,</if>
+            <if test="carColor != null">car_color,</if>
+            <if test="carEquipment != null">car_equipment,</if>
+            <if test="remark != null">remark,</if>
+            <if test="roadTransport != null">road_transport,</if>
+            <if test="drivingLicense != null">driving_license,</if>
+            <if test="carFront != null">car_front,</if>
+            <if test="carLeft != null">car_left,</if>
+            <if test="carBehind != null">car_behind,</if>
+            <if test="carRight != null">car_right,</if>
+            <if test="drivers != null">drivers,</if>
+            <if test="status != null">status,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="creditStatus != null">credit_status,</if>
+            <if test="qrCode != null">qr_code,</if>
+            <if test="lengthWidthHeight != null">length_width_height,</if>
+            <if test="isDel != null">is_del,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="companyId != null">#{companyId},</if>
+            <if test="carType != null">#{carType},</if>
+            <if test="carCode != null">#{carCode},</if>
+            <if test="carBrank != null">#{carBrank},</if>
+            <if test="emissionStandard != null">#{emissionStandard},</if>
+            <if test="roadTransportDate != null">#{roadTransportDate},</if>
+            <if test="drivingLicenseDate != null">#{drivingLicenseDate},</if>
+            <if test="enterDate != null">#{enterDate},</if>
+            <if test="farmeNumber != null">#{farmeNumber},</if>
+            <if test="carIdentification != null">#{carIdentification},</if>
+            <if test="containerVolume != null">#{containerVolume},</if>
+            <if test="carColor != null">#{carColor},</if>
+            <if test="carEquipment != null">#{carEquipment},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="roadTransport != null">#{roadTransport},</if>
+            <if test="drivingLicense != null">#{drivingLicense},</if>
+            <if test="carFront != null">#{carFront},</if>
+            <if test="carLeft != null">#{carLeft},</if>
+            <if test="carBehind != null">#{carBehind},</if>
+            <if test="carRight != null">#{carRight},</if>
+            <if test="drivers != null">#{drivers},</if>
+            <if test="status != null">#{status},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="creditStatus != null">#{creditStatus},</if>
+            <if test="qrCode != null">#{qrCode},</if>
+            <if test="lengthWidthHeight != null">#{lengthWidthHeight},</if>
+            <if test="isDel != null">#{isDel},</if>
+        </trim>
+    </insert>
+
     <update id="updateCarInfo" parameterType="CarInfo">
         update car_info
         <trim prefix="SET" suffixOverrides=",">
@@ -311,7 +387,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         values(#{carId},#{driverId})
     </insert>
-    <delete id="deleteCarDriverRelationByCarId" parameterType="Long">
+    <delete id="deleteCarDriverRelationByCarId" parameterType="String">
         delete from car_driver_relation where car_id = #{carId}
     </delete>
 </mapper>
 \ No newline at end of file
@@ -68,10 +68,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         select id,name as label from driver where company_id = #{companyId}
     </select>
-    <select id="selectDriverById" parameterType="Long" resultMap="DriverResult">
+    <select id="selectDriverById" parameterType="String" resultMap="DriverResult">
         <include refid="selectDriverVo"/>
         where id = #{id}
     </select>
+    <select id="carDriverRelationCount" resultType="java.lang.Integer">
+        select count(1) from car_driver_relation where car_id=#{carId} and driver_id=#{driverId}
+    </select>
     <insert id="insertDriver" parameterType="Driver" useGeneratedKeys="true" keyProperty="id">
         insert into driver
@@ -123,6 +126,59 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         </trim>
     </insert>
+    <insert id="saveDriver" parameterType="Driver" useGeneratedKeys="true" keyProperty="id">
+        insert into driver
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="name != null">name,</if>
+            <if test="identityCard != null">identity_card,</if>
+            <if test="companyId != null">company_id,</if>
+            <if test="professionalQualificationBeginDate != null">professional_qualification_begin_date,</if>
+            <if test="professionalQualificationEndDate != null">professional_qualification_end_date,</if>
+            <if test="drivingLicenceBeginDate != null">driving_licence_begin_date,</if>
+            <if test="drivingLicenceEndDate != null">driving_licence_end_date,</if>
+            <if test="safetyTrainingDate != null">safety_training_date,</if>
+            <if test="safetyTrainingContent != null">safety_training_content,</if>
+            <if test="remark != null">remark,</if>
+            <if test="drivingLicence != null">driving_licence,</if>
+            <if test="professionalQualification != null">professional_qualification,</if>
+            <if test="safetyTraining != null">safety_training,</if>
+            <if test="status != null">status,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="photographOne != null">photograph_one,</if>
+            <if test="photographTwo != null">photograph_two,</if>
+            <if test="phoneNo != null">phoneNo,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="name != null">#{name},</if>
+            <if test="identityCard != null">#{identityCard},</if>
+            <if test="companyId != null">#{companyId},</if>
+            <if test="professionalQualificationBeginDate != null">#{professionalQualificationBeginDate},</if>
+            <if test="professionalQualificationEndDate != null">#{professionalQualificationEndDate},</if>
+            <if test="drivingLicenceBeginDate != null">#{drivingLicenceBeginDate},</if>
+            <if test="drivingLicenceEndDate != null">#{drivingLicenceEndDate},</if>
+            <if test="safetyTrainingDate != null">#{safetyTrainingDate},</if>
+            <if test="safetyTrainingContent != null">#{safetyTrainingContent},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="drivingLicence != null">#{drivingLicence},</if>
+            <if test="professionalQualification != null">#{professionalQualification},</if>
+            <if test="safetyTraining != null">#{safetyTraining},</if>
+            <if test="status != null">#{status},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="photographOne != null">#{photographOne},</if>
+            <if test="photographTwo != null">#{photographTwo},</if>
+            <if test="phoneNo != null">#{phoneNo},</if>
+        </trim>
+    </insert>
+    <insert id="insertCarDriverRelation">
+        insert into car_driver_relation(car_id,driver_id) values(#{carId},#{driverId})
+    </insert>
+
     <update id="updateDriver" parameterType="Driver">
         update driver
         <trim prefix="SET" suffixOverrides=",">
@@ -83,7 +83,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         </where>
     </select>
-    <select id="selectTransportationEnterpriseById" parameterType="Long" resultMap="TransportationEnterpriseResult">
+    <select id="selectTransportationEnterpriseById" parameterType="String" resultMap="TransportationEnterpriseResult">
+        <include refid="selectTransportationEnterpriseVo"/>
+        where id = #{id}
+    </select>
+
+    <select id="selectTransportationEnterpriseByIdStr" parameterType="String" resultMap="TransportationEnterpriseResult">
         <include refid="selectTransportationEnterpriseVo"/>
         where id = #{id}
     </select>
@@ -167,6 +172,87 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="companyLogo != null">#{companyLogo},</if>
          </trim>
     </insert>
+    <insert id="saveTransportationEnterprise">
+        insert into transportation_enterprise
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="name != null">name,</if>
+            <if test="abbreviation != null">abbreviation,</if>
+            <if test="registrationArea != null">registration_area,</if>
+            <if test="transportPermissionDate != null">transport_permission_date,</if>
+            <if test="enterDate != null">enter_date,</if>
+            <if test="businessLicenseDate != null">business_license_date,</if>
+            <if test="officeAddress != null">office_address,</if>
+            <if test="parkingLotLocation != null">parking_lot_location,</if>
+            <if test="parkingArea != null">parking_area,</if>
+            <if test="carNumber != null">car_number,</if>
+            <if test="safetyManagerName != null">safety_manager_name,</if>
+            <if test="safetyManagerPhone != null">safety_manager_phone,</if>
+            <if test="socialUniformCreditCodeNumber != null">social_uniform_credit_code_number,</if>
+            <if test="legalRepresentative != null">legal_representative,</if>
+            <if test="legalRepresentativePhone != null">legal_representative_phone,</if>
+            <if test="safetyPeopleName != null">safety_people_name,</if>
+            <if test="remark != null">remark,</if>
+            <if test="transportPermission != null">transport_permission,</if>
+            <if test="enterpriseBusinessLicense != null">enterprise_business_license,</if>
+            <if test="safetyOfficerQualificationCertificate != null">safety_officer_qualification_certificate,</if>
+            <if test="safetyCertificate != null">safety_certificate,</if>
+            <if test="carParkPanorama != null">car_park_panorama,</if>
+            <if test="businessUnit != null">business_unit,</if>
+            <if test="status != null">status,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="parentId != null">parent_id,</if>
+            <if test="companyType != null">company_type,</if>
+            <if test="creditStatus != null">credit_status,</if>
+            <if test="qrCode != null">qr_code,</if>
+            <if test="servicePhone != null">service_phone,</if>
+            <if test="officeAddressGps != null">office_address_gps,</if>
+            <if test="offer != null">offer,</if>
+            <if test="companyLogo != null">company_logo,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="name != null">#{name},</if>
+            <if test="abbreviation != null">#{abbreviation},</if>
+            <if test="registrationArea != null">#{registrationArea},</if>
+            <if test="transportPermissionDate != null">#{transportPermissionDate},</if>
+            <if test="enterDate != null">#{enterDate},</if>
+            <if test="businessLicenseDate != null">#{businessLicenseDate},</if>
+            <if test="officeAddress != null">#{officeAddress},</if>
+            <if test="parkingLotLocation != null">#{parkingLotLocation},</if>
+            <if test="parkingArea != null">#{parkingArea},</if>
+            <if test="carNumber != null">#{carNumber},</if>
+            <if test="safetyManagerName != null">#{safetyManagerName},</if>
+            <if test="safetyManagerPhone != null">#{safetyManagerPhone},</if>
+            <if test="socialUniformCreditCodeNumber != null">#{socialUniformCreditCodeNumber},</if>
+            <if test="legalRepresentative != null">#{legalRepresentative},</if>
+            <if test="legalRepresentativePhone != null">#{legalRepresentativePhone},</if>
+            <if test="safetyPeopleName != null">#{safetyPeopleName},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="transportPermission != null">#{transportPermission},</if>
+            <if test="enterpriseBusinessLicense != null">#{enterpriseBusinessLicense},</if>
+            <if test="safetyOfficerQualificationCertificate != null">#{safetyOfficerQualificationCertificate},</if>
+            <if test="safetyCertificate != null">#{safetyCertificate},</if>
+            <if test="carParkPanorama != null">#{carParkPanorama},</if>
+            <if test="businessUnit != null">#{businessUnit},</if>
+            <if test="status != null">#{status},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="parentId != null">#{parentId},</if>
+            <if test="companyType != null">#{companyType},</if>
+            <if test="creditStatus != null">#{creditStatus},</if>
+            <if test="qrCode != null">#{qrCode},</if>
+            <if test="servicePhone != null">#{servicePhone},</if>
+            <if test="officeAddressGps != null">#{officeAddressGps},</if>
+            <if test="offer != null">#{offer},</if>
+            <if test="companyLogo != null">#{companyLogo},</if>
+        </trim>
+    </insert>
     <update id="updateTransportationEnterprise" parameterType="TransportationEnterprise">
         update transportation_enterprise