对接文件系统和蓝斯设备日志上传

liujun001
1 parent fa9ea695
Showing 16 changed files with 356 additions and 67 deletions
Bsth-admin/src/main/java/com/ruoyi/config/BsthSystemConfig.java
Bsth-admin/src/main/java/com/ruoyi/config/FaceEngineConfig.java
Bsth-admin/src/main/java/com/ruoyi/controller/RefreshController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/DssFaceController.java
Bsth-admin/src/main/java/com/ruoyi/controller/venue/info/LinggangVenueInfoController.java
Bsth-admin/src/main/java/com/ruoyi/driver/controller/DriverController.java
Bsth-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/mapper/venue/info/LinggangVenueInfoMapper.java
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
Bsth-admin/src/main/java/com/ruoyi/service/dss/FaceService.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/dss/FaceServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/venue/info/LinggangVenueInfoServiceImpl.java
Bsth-admin/src/main/java/com/ruoyi/service/venue/info/LinggangVenueInfoService.java
Bsth-admin/src/main/resources/mapper/venue/inf/LinggangVenueInfoMapper.xml
Bsth-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
Bsth-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
 package com.ruoyi.config;
-import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.system.service.ISysDictDataService;
+import com.ruoyi.utils.SpringApplicationUtil;
 import lombok.Data;
 import org.apache.commons.lang3.ArrayUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -30,22 +30,25 @@ public class BsthSystemConfig {
     @Value("${api.url.getDriverInfo}")
     private String getDriverInfoURL;
-    @Autowired
-    private RuoYiConfig ruoYiConfig;
+//    @Autowired
+//    private RuoYiConfig ruoYiConfig;
     @Value("${bsth.face.faceFeature.url}")
     private String faceFeatureURL;
-    public String getImageBasePath(){
-       return combationChar(ruoYiConfig.getUploadPath(),imageBasePath1);
+    public String getImageBasePath() {
+        ISysDictDataService service = SpringApplicationUtil.getBean(ISysDictDataService.class);
+        return service.combationValue("");
+//       return combationChar(ruoYiConfig.getUploadPath(),imageBasePath1);
     }
-    public String getVideoBasePath(){
-        return combationChar(ruoYiConfig.getUploadPath(),videoBasePath1);
+    public String getVideoBasePath() {
+        ISysDictDataService service = SpringApplicationUtil.getBean(ISysDictDataService.class);
+        return service.combationValue("");
     }
-    public static String combationChar(String...strs){
+    public static String combationChar(String... strs) {
         StringBuilder builder = new StringBuilder();
         int length = ArrayUtils.getLength(strs);
         for (int i = 0; i < length; i++) {
@@ -31,10 +31,8 @@ public class FaceEngineConfig {
     @Bean
     public FaceEngine createFaceEngine(BsthSystemConfig bsthSystemConfig) {
-        if(isDev()){
-            return null;
-        }
         FaceEngine faceEngine = new FaceEngine(bsthSystemConfig.getFaceLibPath());
+
 //        FaceEngine faceEngine = new FaceEngine("D:\\\\arcsoft_lib");
         //激活引擎
         int errorCode = faceEngine.activeOnline(bsthSystemConfig.getFaceAppId(), bsthSystemConfig.getFaceSdkKey());
 package com.ruoyi.controller;
 import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.common.utils.sign.Base64;
 import com.ruoyi.controller.dss.DssFaceController;
@@ -8,6 +10,7 @@ import com.ruoyi.domain.driver.NewDriver;
 import com.ruoyi.domain.driver.dss.syn.res.dto.FaceRegisterDTO;
 import com.ruoyi.domain.dss.app.vo.SignReportGroupByVo;
 import com.ruoyi.domain.scheduling.LinggangScheduling;
+import com.ruoyi.domain.sign.in.resource.LinggangSignInResource;
 import com.ruoyi.domain.sign.in.summary.SignReportDaySummary;
 import com.ruoyi.equipment.domain.Equipment;
 import com.ruoyi.equipment.service.IEquipmentService;
@@ -17,12 +20,15 @@ import com.ruoyi.service.SignReportServer;
 import com.ruoyi.service.driver.NewDriverService;
 import com.ruoyi.service.key.location.LinggangKeyWorkLocationService;
 import com.ruoyi.service.scheduling.LinggangSchedulingService;
+import com.ruoyi.service.sign.in.resource.LinggangSignInResourceService;
 import com.ruoyi.service.sign.in.summary.SignReportDaySummaryService;
 import com.ruoyi.utils.DateUtil;
+import com.ruoyi.utils.HttpClientUtil;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
@@ -31,8 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import java.io.File;
-import java.io.IOException;
+import java.io.*;
 import java.text.ParseException;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -63,6 +68,10 @@ public class RefreshController {
     private SignReportServer signReportServer;
     @Autowired
     private SignReportSummerJob signReportSummerJob;
+    @Autowired
+    private HttpClientUtil httpClientUtil;
+    @Autowired
+    private LinggangSignInResourceService signInResourceService;
     @GetMapping(value = "/scheduling")
@@ -292,7 +301,7 @@ public class RefreshController {
         boolean flag = false;
         while (true) {
             index++;
-            Date startDate1 = DateUtils.addMonths(startDate,index);
+            Date startDate1 = DateUtils.addMonths(startDate, index);
             dateStr = DateUtil.YYYY_MM_LINK.format(startDate1);
             List<SignReportGroupByVo> signReportGroupByVos = signReportServer.querySignReportGroupByDateStrVo(dateStr);
@@ -302,7 +311,7 @@ public class RefreshController {
                     if (DateUtils.isSameDay(now, date)) {
                         flag = true;
                         break;
-                    }else if(date.getTime()>=now.getTime()){
+                    } else if (date.getTime() >= now.getTime()) {
                         flag = true;
                         break;
                     }
@@ -342,4 +351,159 @@ public class RefreshController {
         return ResponseResult.success();
     }
+    @GetMapping("/init/driver/data")
+    public ResponseResult<Boolean> initDriverData() {
+        LambdaQueryWrapper<NewDriver> ndWrapper = new LambdaQueryWrapper<>();
+        ndWrapper.isNotNull(NewDriver::getFaceFeature);
+
+        List<NewDriver> drivers = newDriverService.list(ndWrapper);
+        if (CollectionUtils.isEmpty(drivers)) {
+            return ResponseResult.success(Boolean.TRUE);
+        }
+
+        String basePath = "C:\\Users\\密码：0000\\Desktop\\fsdownload\\uploadPath\\upload\\image\\";
+        String basePath1 = "C:\\Users\\密码：0000\\Desktop\\fsdownload\\uploadPath\\upload\\image\\";
+        String token = getToken();
+        Map<String, Object> headMap = new HashMap<>();
+        headMap.put("Content-Type", "application/json");
+        headMap.put("Authorization", token);
+
+        for (NewDriver driver : drivers) {
+            StringBuilder path = new StringBuilder();
+            path.append(basePath);
+            path.append(driver.getImage());
+
+
+            InputStream inputStream = null;
+            try {
+                File file = new File(path.toString());
+                inputStream = new FileInputStream(file);
+                String content = cn.hutool.core.codec.Base64.encode(inputStream);
+                Map<String, Object> pms = new HashMap<>();
+                pms.put("device", "10001");
+                pms.put("regTime", DateUtil.YYYY_MM_DD_LINK_HH_MM_SS.format(new Date()));
+                pms.put("staffCode", driver.getJobCode());
+                pms.put("faceValue", content);
+
+                String json = httpClientUtil.doPost("http://10.10.150.173:8102/dss/Face/FaceRegister", pms, headMap);
+                log.info("[{}],[{}]", json, JSON.toJSONString(pms));
+            } catch (Exception e) {
+                log.error("读取图片异常", e);
+            } finally {
+                IOUtils.closeQuietly(inputStream);
+            }
+        }
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    @GetMapping("/init/driver/sign/resource/{dateStr}")
+    public ResponseResult<Boolean> initDriverSignResource(@PathVariable String dateStr) {
+        LambdaQueryWrapper<LinggangSignInResource> wrapper = new LambdaQueryWrapper<>();
+        wrapper.ge(LinggangSignInResource::getTime, dateStr);
+
+        List<LinggangSignInResource> sources = signInResourceService.list(wrapper);
+        if (CollectionUtils.isEmpty(sources)) {
+            return ResponseResult.success(Boolean.TRUE);
+        }
+
+        String token = getToken();
+        String basePath = "C:\\Users\\密码：0000\\Desktop\\fsdownload\\uploadPath\\upload\\image\\";
+        for (LinggangSignInResource source : sources) {
+            if (Objects.equals(source.getResourceType(), 2)) {
+                uploadSignResource2(source, token, basePath);
+            } else {
+                uploadSignResource(source, token, basePath);
+            }
+        }
+
+
+        return ResponseResult.success(Boolean.TRUE);
+    }
+
+    private String uploadSignResource(LinggangSignInResource source, String token, String basePath) {
+        Map<String, Object> headMap = new HashMap<>();
+        headMap.put("Content-Type", "application/json");
+        headMap.put("Authorization", token);
+
+
+        Map<String, Object> pms = new HashMap<>();
+        pms.put("device", "10001");
+        pms.put("driverCode", "10001");
+        pms.put("testId", source.getSignId());
+        pms.put("time", DateUtil.YYYY_MM_DD_LINK_HH_MM_SS.format(source.getTime()));
+
+        List<Map<String, Object>> lists = new ArrayList<>();
+        Map<String, Object> pms1 = new HashMap<>();
+        pms1.put("index", source.getIndex1());
+        pms1.put("time", DateUtil.YYYY_MM_DD_LINK_HH_MM_SS.format(source.getTime()));
+
+        InputStream inputStream = null;
+        try {
+            StringBuilder path = new StringBuilder();
+            path.append(basePath);
+            path.append(source.getPath());
+
+            inputStream = new FileInputStream(new File(path.toString()));
+            String content = cn.hutool.core.codec.Base64.encode(inputStream);
+            pms1.put("pic", content);
+
+            lists.add(pms1);
+            pms.put("picData", lists);
+
+            String json = httpClientUtil.doPost("http://10.10.150.173:8102/dss/Driver/UpLoadPicture", pms, headMap);
+            log.info("[{}],[{}]", json, JSON.toJSONString(pms));
+            return json;
+        } catch (Exception e) {
+            log.error("读取图片异常", e);
+        } finally {
+            IOUtils.closeQuietly(inputStream);
+        }
+        return null;
+    }
+
+    private String uploadSignResource2(LinggangSignInResource source, String token, String basePath) {
+        Map<String, Object> headMap = new HashMap<>();
+        headMap.put("Content-Type", "application/json");
+        headMap.put("Authorization", token);
+
+
+        Map<String, Object> pms = new HashMap<>();
+        pms.put("device", "10001");
+        pms.put("driverCode", "10001");
+        pms.put("testId", source.getSignId());
+        pms.put("time", DateUtil.YYYY_MM_DD_LINK_HH_MM_SS.format(source.getTime()));
+
+
+        InputStream inputStream = null;
+        try {
+            StringBuilder path = new StringBuilder();
+            path.append(basePath);
+            path.append(source.getPath());
+
+            inputStream = new FileInputStream(new File(path.toString()));
+            String content = cn.hutool.core.codec.Base64.encode(inputStream);
+            pms.put("video", content);
+
+            String json = httpClientUtil.doPost("http://10.10.150.173:8102/dss/Driver/UpLoadVideo", pms, headMap);
+            log.info("[{}],[{}]", json, JSON.toJSONString(pms));
+            return json;
+        } catch (Exception e) {
+            log.error("读取图片异常", e);
+        } finally {
+            IOUtils.closeQuietly(inputStream);
+        }
+        return null;
+    }
+
+
+    private String getToken() {
+        Map<String, Object> pms = new HashMap<>();
+        pms.put("authTime", DateUtil.YYYY_MM_DD_LINK_HH_MM_SS.format(new Date()));
+        pms.put("device", "10001");
+
+        String json = httpClientUtil.doPost("http://10.10.150.173:8102/dss/Driver/Auth", pms, null);
+        JSONObject jsonObject = JSON.parseObject(json);
+        JSONObject jsonObject1 = jsonObject.getJSONObject("data");
+        return jsonObject1.getString("access_token");
+    }
 }
@@ -264,7 +264,7 @@ public class DssFaceController extends BaseController {
     private FaceCheckVo convertFaceCheckVo(NewDriver driver) {
         FaceCheckVo faceCheckVo = new FaceCheckVo();
-        faceCheckVo.setDriverCode(driver.getIcRfid());
+        faceCheckVo.setDriverCode(driver.getJobCode());
         return faceCheckVo;
     }
@@ -56,7 +56,17 @@ public class LinggangVenueInfoController extends BaseController {
     public com.ruoyi.common.core.domain.ResponseResult<List<LinggangVenueInfoVO>> listSelect(LinggangVenueInfoQueryDTO request) {
         LinggangVenueInfo entity = convert(request);
         List<LinggangVenueInfo> selectList = linggangVenueInfoService.listOfSelect(entity);
-        return com.ruoyi.common.core.domain.ResponseResult.success(convert(selectList));
+
+        return com.ruoyi.common.core.domain.ResponseResult.success(
+                java.util.Optional.ofNullable(selectList).map(scs -> {
+                    return scs.stream().map(source -> {
+                        LinggangVenueInfoVO target = new LinggangVenueInfoVO();
+                        BeanUtils.copyProperties(source, target);
+                        target.setName(target.getName() + "-" + target.getParkCode());
+                        return target;
+                    }).collect(java.util.stream.Collectors.toList());
+                }).orElseGet(null)
+        );
     }
     @PreAuthorize("@ss.hasPermi('linggang:venue:info:export')")
@@ -18,7 +18,6 @@ import com.ruoyi.system.service.ISysDictDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -156,9 +155,7 @@ public class DriverController extends BaseController {
     @PutMapping("/edit")
     @ApiOperation("修改驾驶员信息")
     public AjaxResult edit(@ApiParam("driver") @RequestBody Driver driver) {
-        if (StringUtils.isNotEmpty(driver.getImage())) {
-            driver.setImage(sysDictDataService.splitURL(driver.getImage()));
-        }
+
         return toAjax(driverService.updateDriver(driver) + 1);
     }
@@ -51,7 +51,6 @@ import com.ruoyi.utils.ListUtils;
 import com.ruoyi.utils.SpringApplicationUtil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.RandomUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -60,17 +59,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
-import sun.misc.BASE64Encoder;
 import javax.annotation.Resource;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.file.Paths;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
@@ -313,7 +309,7 @@ public class DriverServiceImpl extends ServiceImpl&lt;DriverMapper, Driver&gt; impleme
                 driver.setImageVersion(imageVersion.toString());
                 log.info("[{}]", JSON.toJSONString(driver));
             }
-
+            driver.setImage(sysDictDataService.splitURL(driver.getImage()));
         }
         return driverMapper.updateDriver(driver);
@@ -398,14 +394,11 @@ public class DriverServiceImpl extends ServiceImpl&lt;DriverMapper, Driver&gt; impleme
     }
     @Override
-    public AjaxResult uploadImage(MultipartFile file, Integer id) throws InvalidExtensionException, IOException {
-        // 上传并返回新文件名称
-        // 上传文件路径
-        String baseUrl = RuoYiConfig.getUploadPath() + headImagePre;
+    public AjaxResult uploadImage(MultipartFile file, Integer id) throws InvalidExtensionException {
         // 校验文件格式
         FileUploadUtils.assertAllowed(file, MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION);
         // 后期可以通过请求头拿到对应的工号
-        String fileName = FilenameUtils.getBaseName(file.getOriginalFilename()) + "." + FileUploadUtils.getExtension(file);
+        String fileName = FilenameUtils.getBaseName(file.getOriginalFilename()) +"_"+UUID.randomUUID().toString().replaceAll("-","")+ "." + FileUploadUtils.getExtension(file);
         if (Objects.nonNull(id)) {
             fileName = StringUtils.join(id, "/", fileName);
         } else {
@@ -823,14 +816,10 @@ public class DriverServiceImpl extends ServiceImpl&lt;DriverMapper, Driver&gt; impleme
     }
     private String calimageContentFaceFeature(String imagePath) {
-        String baseUrl = RuoYiConfig.getUploadPath() + headImagePre;
-        try {
-            String path = FileUploadUtils.getAbsoluteFile(baseUrl, imagePath).getAbsolutePath();
-            ResponseResult<String> responseResult = SpringApplicationUtil.getBean(FaceService.class).getFaceFeatureImagePath(path);
-            return Objects.nonNull(responseResult) && responseResult.isSuccess() ? responseResult.getData() : null;
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
+        String baseUrl = sysDictDataService.combationValue(imagePath);
+        ResponseResult<String> result = SpringApplicationUtil.getBean(FaceService.class).getFaceFeatureImageURL(baseUrl);
+        return Objects.isNull(result) ? null : result.isSuccess() ? result.getData() : null;
+
     }
 package com.ruoyi.mapper.venue.info;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.domain.venue.info.LinggangVenueInfo;
 import org.apache.ibatis.annotations.Mapper;
+import java.util.List;
+
 @Mapper
 /**场地Info Mapper接口*/
@@ -11,5 +14,7 @@ public interface LinggangVenueInfoMapper extends BaseMapper&lt;LinggangVenueInfo&gt; {
     /**
      * 插入有值的列
      */
-    int insertSelective(LinggangVenueInfo name);
+    int insertSelective(LinggangVenueInfo entity);
+
+    boolean insertNotExit(LinggangVenueInfo entity);
 }
 \ No newline at end of file
@@ -40,6 +40,7 @@ import com.ruoyi.service.driver.NewDriverService;
 import com.ruoyi.service.key.location.LinggangKeyWorkLocationService;
 import com.ruoyi.service.scheduling.LinggangSchedulingService;
 import com.ruoyi.service.sign.in.exception.report.EquipmentExceptionReportService;
+import com.ruoyi.service.venue.info.LinggangVenueInfoService;
 import com.ruoyi.system.domain.SysNotice;
 import com.ruoyi.system.service.ISysNoticeService;
 import com.ruoyi.utils.ConstDateUtil;
@@ -139,6 +140,8 @@ public class ThreadJobService {
     private NewDriverService newDriverService;
     @Autowired
     private LingangCarInfoService lingangCarInfoService;
+    @Autowired
+    private LinggangVenueInfoService venueInfoService;
     @Value("${bsth.process.sign.url}")
     private String processSignExceptionURL;
@@ -342,8 +345,6 @@ public class ThreadJobService {
             List<NewDriver> newDrivers = null;
             if (CollectionUtils.isNotEmpty(linggangSchedulings)) {
                 qdznames = linggangSchedulings.stream().map(LinggangScheduling::getQdzname).filter(org.apache.commons.lang3.StringUtils::isNotEmpty).collect(Collectors.toSet());
-                qdznames.add("鸿音路临时停车点");
-
                 newDrivers = newDriverService.listByQdzName(qdznames);
             }
@@ -373,7 +374,7 @@ public class ThreadJobService {
                     map.put("noticeIssuer", "运控中心");
                     map.put("noticeRecipient", "05-" + newDriver.getJobCode());
                     map.put("noticeTitle", "异常通知");
-                    map.put("noticeSubtitle", "");
+//                    map.put("noticeSubtitle", "");
                     StringBuilder builder = new StringBuilder();
                     builder
@@ -387,13 +388,6 @@ public class ThreadJobService {
                     map.put("phone", newDriver.getTelphone());
                     map.put("smscontent", builder.toString());
                     map.put("noticeType", "岗前检查");
-                    map.put("remark", "schedulingId=" + item.getId() + "&signId=" + signIn.getId());
-                    map.put("signId", signIn.getId());
-                    map.put("associatedId", item.getId());
-
-                    Map<String, Object> paramMap = new HashMap<>();
-                    paramMap.put("schedulingId", item.getId());
-                    map.put("params", paramMap);
                     String key = SignatureUtils.generateSignature(map, "your_secret_key_here");
                     map.put("signature", key);
@@ -411,6 +405,28 @@ public class ThreadJobService {
         }
     }
+    public static void main(String[] args) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("noticeIssuer", "运控中心");
+        map.put("noticeRecipient", "05-006154");
+        map.put("noticeTitle", "异常通知");
+
+
+        map.put("noticeContent", "工号：1700003,姓名：测试,工种：驾驶员,排班：有排班,打卡时间：2025-01-07 03:29:20,酒精测试超标，当前测试值达到50mg/100ml。属于饮酒后驾驶机动车");
+        map.put("phone", "13681905733");
+        map.put("smscontent", "工号：1700003,姓名：测试,工种：驾驶员,排班：有排班,打卡时间：2025-01-07 03:29:20,酒精测试超标，当前测试值达到50mg/100ml。属于饮酒后驾驶机动车");
+        map.put("noticeType", "岗前检查");
+
+        String key = SignatureUtils.generateSignature(map, "your_secret_key_here");
+        System.out.println(key);
+    }
+
+    private static String[] comStrs(String str) {
+        String[] values = new String[1];
+        values[0] = str;
+        return values;
+    }
+
     private String getResultString(BigDecimal alcoholIntake) {
         if (alcoholIntake.compareTo(new BigDecimal(20)) >= 0 && alcoholIntake.compareTo(new BigDecimal(80)) < 0) {
             return "饮酒后驾驶机动车";
@@ -628,7 +644,7 @@ public class ThreadJobService {
             TempCache.resetMapStatus();
         }
         List<DriverScheduling> bcList = getBcList(originSchedulingMap, type);
-
+        insertThread(bcList);
         lingangCarInfoService.insert(bcList);
         // 处理非司售人员的排班明细
@@ -1160,5 +1176,17 @@ public class ThreadJobService {
         return recoveryList;
     }
+    private void insertThread(List<DriverScheduling> entities) {
+        String userId = JwtAuthenticationTokenFilter.getRequestIdOfMDCValue();
+        String traceId = JwtAuthenticationTokenFilter.getRequestIdOfMDCValue();
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                JwtAuthenticationTokenFilter.putMDC(userId, traceId + "_002");
+                venueInfoService.insertNotExit(entities);
+            }
+        }).start();
+    }
+
 }
@@ -23,5 +23,6 @@ public interface FaceService {
     ResponseResult<String> getFaceFeatureImageContent(String content);
     ResponseResult<String> getFaceFeatureImagePath(String path);
+    ResponseResult<String> getFaceFeatureImageURL(String url);
 }
 package com.ruoyi.service.impl.dss;
 import cn.hutool.core.convert.Convert;
+import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson2.JSON;
 import com.arcsoft.face.FaceEngine;
 import com.arcsoft.face.FaceFeature;
@@ -9,6 +10,7 @@ import com.arcsoft.face.FaceSimilar;
 import com.arcsoft.face.enums.ErrorInfo;
 import com.arcsoft.face.toolkit.ImageFactory;
 import com.arcsoft.face.toolkit.ImageInfo;
+import com.ruoyi.common.config.RuoYiConfig;
 import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.sign.Base64;
@@ -16,15 +18,16 @@ import com.ruoyi.config.BsthSystemConfig;
 import com.ruoyi.domain.driver.NewDriver;
 import com.ruoyi.service.driver.NewDriverService;
 import com.ruoyi.service.dss.FaceService;
+import com.ruoyi.system.service.ISysDictDataService;
 import com.ruoyi.utils.HttpClientUtil;
 import com.ruoyi.utils.SpringApplicationUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import sun.misc.BASE64Encoder;
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
@@ -47,6 +50,10 @@ public class FaceServiceImpl implements FaceService {
     private BsthSystemConfig bsthSystemConfig;
     @Autowired
     private HttpClientUtil httpClientUtil;
+    @Autowired
+    private ISysDictDataService sysDictDataService;
+    @Autowired
+    private RuoYiConfig ruoYiConfig;
     @Override
@@ -82,7 +89,7 @@ public class FaceServiceImpl implements FaceService {
             json = httpClientUtil.doPost(bsthSystemConfig.getFaceFeatureURL(), parentMap, null);
             if (StringUtils.isEmpty(json)) {
-                log.warn("获取面部特征失败，请检查数据:[{}],[{}],[{}]", json,bsthSystemConfig.getFaceFeatureURL(), JSON.toJSONString(parentMap));
+                log.warn("获取面部特征失败，请检查数据:[{}],[{}],[{}]", json, bsthSystemConfig.getFaceFeatureURL(), JSON.toJSONString(parentMap));
                 return ResponseResult.error("获取面部特征失败，请稍后再试");
             }
             json = StringUtils.substringAfter(json, "{");
@@ -98,15 +105,15 @@ public class FaceServiceImpl implements FaceService {
             if (!StringUtils.equalsIgnoreCase(resultMap.get("result"), "ok")) {
-                log.warn("获取面部特征不成功,，请检查数据:[{}],[{}],[{}]", json,bsthSystemConfig.getFaceFeatureURL(), JSON.toJSONString(parentMap));
+                log.warn("获取面部特征不成功,，请检查数据:[{}],[{}],[{}]", json, bsthSystemConfig.getFaceFeatureURL(), JSON.toJSONString(parentMap));
                 return ResponseResult.error("获取面部特征失败，请稍后再试");
             }
             String faceFeature = Convert.toStr(resultMap.get("strlitefeature"));
-           ResponseResult<String> responseResult =ResponseResult.success();
+            ResponseResult<String> responseResult = ResponseResult.success();
             responseResult.setData(faceFeature);
             return responseResult;
         } catch (Exception e) {
-            log.error("获取面部特征异常,返回的结果是：[{}],[{}],[{}]", json,bsthSystemConfig.getFaceFeatureURL(), JSON.toJSONString(parentMap), e);
+            log.error("获取面部特征异常,返回的结果是：[{}],[{}],[{}]", json, bsthSystemConfig.getFaceFeatureURL(), JSON.toJSONString(parentMap), e);
             return ResponseResult.error("获取面部特征异常，请稍后再试");
         }
     }
@@ -117,6 +124,27 @@ public class FaceServiceImpl implements FaceService {
         return getFaceFeatureImageContent(content);
     }
+    @Override
+    public ResponseResult<String> getFaceFeatureImageURL(String urlString) {
+        String path = null;
+        try {
+//            String fileName = sysDictDataService.splitURL(urlString);
+//             path = RuoYiConfig.getDownloadPath() + fileName+"/";
+            byte[] bytes = HttpUtil.downloadBytes(urlString);
+            String content = convertBase64(bytes);
+            return getFaceFeatureImageContent(content);
+        } finally {
+//            if(StringUtils.isNotEmpty(path)) {
+//                File file = new File()
+//            }
+        }
+    }
+
+    public static void main(String[] args) {
+        FaceServiceImpl faceService = new FaceServiceImpl();
+        faceService.getFaceFeatureImageURL("http://192.168.168.167:9000/alchohol/head/76408/driver.png");
+    }
+
     private NewDriver checkFace(List<NewDriver> drivers, NewDriver sourceDriver) {
         if (CollectionUtils.isEmpty(drivers)) {
             return null;
@@ -173,14 +201,28 @@ public class FaceServiceImpl implements FaceService {
             return -1;
         }
         StringBuilder builder = new StringBuilder();
-        builder.append(bsthSystemConfig.getImageBasePath());
-        builder.append("/");
+        builder.append(RuoYiConfig.getDownloadPath1());
+        if (!StringUtils.startsWith(dr.getImage(), "/")) {
+           dr.setImage("/"+dr.getImage()) ;
+        }
+        if(!StringUtils.startsWith(dr.getImage(),"/head")){
+            dr.setImage("/head"+dr.getImage()) ;
+        }
         builder.append(dr.getImage());
         File targetFile = new File(builder.toString());
         if (!targetFile.exists() || !targetFile.isFile()) {
-            log.error("没有比对的图片;[{}]", dr);
-            return -1;
+            String url = sysDictDataService.combationValue(dr.getImage());
+            try {
+                FileUtils.forceMkdirParent(targetFile);
+                HttpUtil.downloadFileFromUrl(url, targetFile);
+            } catch (Exception e) {
+                log.error("[{}] error", url, e);
+            }
+
+            if (!targetFile.isFile()) {
+                return -1;
+            }
         }
         ImageInfo target = getRGBData(targetFile);
@@ -243,7 +285,7 @@ public class FaceServiceImpl implements FaceService {
     private String convertBase64(byte[] data) {
         // 对字节数组进行Base64编码，得到Base64编码的字符串
-       return Base64.encode(data);
+        return Base64.encode(data);
     }
 }
@@ -5,17 +5,19 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
+import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.domain.OrderEntity;
 import com.ruoyi.domain.venue.info.LinggangVenueInfo;
 import com.ruoyi.mapper.venue.info.LinggangVenueInfoMapper;
 import com.ruoyi.service.venue.info.LinggangVenueInfoService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 @Slf4j
 @Service
@@ -59,7 +61,8 @@ public class LinggangVenueInfoServiceImpl extends ServiceImpl&lt;LinggangVenueInfoM
     @Override
     public List<LinggangVenueInfo> listOfSelect(LinggangVenueInfo entity) {
         LambdaQueryWrapper<LinggangVenueInfo> wrapper = new LambdaQueryWrapper<>(entity);
-        wrapper.select(LinggangVenueInfo::getId, LinggangVenueInfo::getName);
+        wrapper.select(LinggangVenueInfo::getId, LinggangVenueInfo::getName, LinggangVenueInfo::getParkCode);
+        wrapper.orderByAsc(LinggangVenueInfo::getName);
         return list(wrapper);
     }
@@ -120,6 +123,36 @@ public class LinggangVenueInfoServiceImpl extends ServiceImpl&lt;LinggangVenueInfoM
         return save(entity);
     }
+    @Override
+    public boolean insertNotExit(List<DriverScheduling> entities) {
+        if (CollectionUtils.isEmpty(entities)) {
+            return Boolean.TRUE;
+        }
+
+        Set<LinggangVenueInfo> venueInfos = new HashSet<>();
+        entities.stream().forEach(entity -> {
+            LinggangVenueInfo venueInfo = new LinggangVenueInfo();
+            venueInfo.setParkCode(entity.getQdzCode());
+            venueInfo.setName(entity.getQdzName());
+            venueInfo.setDelFlag(Boolean.FALSE);
+            venueInfos.add(venueInfo);
+
+            venueInfo = new LinggangVenueInfo();
+            venueInfo.setParkCode(entity.getZdzCode());
+            venueInfo.setName(entity.getZdzName());
+            venueInfo.setDelFlag(Boolean.FALSE);
+            venueInfos.add(venueInfo);
+        });
+
+        for (LinggangVenueInfo venueInfo : venueInfos) {
+            if (StringUtils.isNotEmpty(venueInfo.getParkCode()) && StringUtils.isNotEmpty(venueInfo.getName())) {
+                linggangVenueInfoMapper.insertNotExit(venueInfo);
+            }
+        }
+
+        return Boolean.TRUE;
+    }
+
     /**
      * 根据主键修改数据
      */
@@ -196,4 +229,5 @@ public class LinggangVenueInfoServiceImpl extends ServiceImpl&lt;LinggangVenueInfoM
             wrapper.orderByDesc(LinggangVenueInfo::getId);
         }
     }
+
 }
 \ No newline at end of file
@@ -2,6 +2,7 @@ package com.ruoyi.service.venue.info;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.domain.DriverScheduling;
 import com.ruoyi.domain.OrderEntity;
 import com.ruoyi.domain.venue.info.LinggangVenueInfo;
@@ -45,6 +46,7 @@ public interface LinggangVenueInfoService extends IService&lt;LinggangVenueInfo&gt; {
     /***插入数据*/
     boolean insert(LinggangVenueInfo entity);
+    boolean insertNotExit(List<DriverScheduling> entities);
     /**
      * 根据主键修改数据
@@ -19,6 +19,13 @@
         <include refid="insertSelectiveColumn"></include>
         <include refid="insertSelectiveValue"></include>
     </insert>
+    <insert id="insertNotExit" keyColumn="ID" keyProperty="id" useGeneratedKeys="true"
+            parameterType="com.ruoyi.domain.venue.info.LinggangVenueInfo">
+        INSERT INTO venue_info (park_Code,del_flag,name)
+        select #{parkCode} park_Code,#{delFlag} del_flag,#{name} name  from(
+                                                                          select count(park_Code) c from venue_info vi where vi.park_Code =#{parkCode}
+                                                                      )t where t.c=0
+    </insert>
     <sql id="columns">
         ID
@@ -5,7 +5,7 @@ import org.springframework.stereotype.Component;
 /**
  * 读取项目相关配置
- * 
+ *
  * @author ruoyi
  */
 @Component
@@ -125,6 +125,11 @@ public class RuoYiConfig
         return getProfile() + "/download/";
     }
+    public static String getDownloadPath1()
+    {
+        return getProfile() + "/download";
+    }
+
     /**
      * 获取上传路径
      */
@@ -117,6 +117,10 @@ public class SysDictDataServiceImpl extends ServiceImpl&lt;SysDictDataMapper, SysDi
             return url;
         }
+        if(StringUtils.startsWith(url,dictData.getDictValueStr())){
+            return url;
+        }
+
         if (dictData.isCombationVal()) {
             String fil = "/";