对接统一登录平台和优化

liujun001
1 parent f246d844
Showing 9 changed files with 186 additions and 13 deletions
Bsth-admin/pom.xml
Bsth-admin/src/main/java/com/ruoyi/config/MinioConfig.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/NewDriver.java
Bsth-admin/src/main/java/com/ruoyi/service/ThreadJobService.java
Bsth-admin/src/main/java/com/ruoyi/service/driver/NewDriverService.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/driver/NewDriverServiceImpl.java
Bsth-admin/src/main/resources/application-druid-dev.yml
Bsth-admin/src/main/resources/application-druid-lingangPrd.yml
Bsth-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
@@ -22,6 +22,12 @@
             <scope>test</scope>
         </dependency>
  
+        <dependency>
+            <groupId>io.minio</groupId>
+            <artifactId>minio</artifactId>
+            <version>8.2.1</version>
+        </dependency>
+
  
         <dependency>
             <groupId>junit</groupId>
@@ -136,7 +142,6 @@
         </dependency>
  
  
-
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>commons-httpclient</artifactId>
+package com.ruoyi.config;
+
+import io.minio.errors.*;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+import org.springframework.beans.factory.annotation.Value;
+import io.minio.MinioClient;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.util.UriUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+
+import io.minio.PutObjectArgs;
+
+import javax.annotation.Resource;
+
+@Component
+public class MinioConfig implements InitializingBean {
+    @Value(value = "${minio.bucket}")
+    private String bucket;
+
+    @Value(value = "${minio.host}")
+    private String host;
+
+    @Value(value = "${minio.url}")
+    private String url;
+
+    @Value(value = "${minio.access-key}")
+    private String accessKey;
+
+    @Value(value = "${minio.secret-key}")
+    private String secretKey;
+
+    private MinioClient minioClient;
+
+    /**
+     * 初始化 MinIO 客户端
+     */
+    @Bean
+    public MinioClient minioClient() {
+        minioClient = MinioClient.builder()
+                .endpoint(host)
+                .credentials(accessKey, secretKey)
+                .build();
+        return minioClient;
+    }
+
+    /**
+     * 文件上传
+     *
+     * @param file 文件
+     * @return Boolean
+     */
+    public Boolean upload(MultipartFile file) {
+        // 修饰过的文件名 非源文件名
+        String fileName = "2021-07/21/";
+        fileName = fileName + file.getOriginalFilename();
+        try {
+            PutObjectArgs objectArgs = PutObjectArgs.builder().bucket(bucket).object(fileName)
+                    .stream(file.getInputStream(), file.getSize(), -1).contentType(file.getContentType()).build();
+            //文件名称相同会覆盖
+            minioClient.putObject(objectArgs);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+        return true;
+    }
+
+
+    /**
+     * 文件上传
+     *
+     * @param inputStream 文件
+     * @return Boolean
+     */
+    public Boolean upload(InputStream inputStream, String fileName, String contentType) {
+        // 修饰过的文件名 非源文件名
+
+        try {
+            PutObjectArgs objectArgs = PutObjectArgs.builder().bucket(bucket).object(fileName)
+                    .stream(inputStream, inputStream.available(), -1).contentType(contentType).build();
+            //文件名称相同会覆盖
+            minioClient.putObject(objectArgs);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+        return true;
+    }
+
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+
+    }
+}
@@ -168,10 +168,17 @@ public class NewDriver {
     @ApiModelProperty("审计岗，0不是审计岗，1是酒驾审计岗")
     private Integer audit;
  
+    private String auditZname;
+
     @TableField(exist = false)
     private float imageScore;
     @TableField(exist = false)
     private Collection<String> lineNames;
+    @TableField(exist = false)
+    private Collection<String> jobCodes;
+
+    @TableField(exist = false)
+    private Collection<String> zNames;
  
     public Integer getInteger() {
         return integer1;
@@ -142,6 +142,8 @@ public class ThreadJobService {
  
     @Value("${bsth.process.sign.url}")
     private String processSignExceptionURL;
+    @Value("${bsth.audit-jobs}")
+    private String auditJobs;
  
  
     /**
@@ -335,16 +337,34 @@ public class ThreadJobService {
             linggangScheduling.setSchedulingType(1);
             List<LinggangScheduling> linggangSchedulings = linggangSchedulingService.list(linggangScheduling);
  
-            Set<String> lineNames = null;
+            Set<String> qdznames = new HashSet<>();
+
             List<NewDriver> newDrivers = null;
             if (CollectionUtils.isNotEmpty(linggangSchedulings)) {
-                lineNames = linggangSchedulings.stream().map(LinggangScheduling::getLineName).filter(org.apache.commons.lang3.StringUtils::isNotEmpty).collect(Collectors.toSet());
+                qdznames = linggangSchedulings.stream().map(LinggangScheduling::getQdzname).filter(org.apache.commons.lang3.StringUtils::isNotEmpty).collect(Collectors.toSet());
+                qdznames.add("鸿音路临时停车点");
+
+                newDrivers = newDriverService.listByQdzName(qdznames);
             }
-            if (CollectionUtils.isNotEmpty(lineNames)) {
-                NewDriver newDriver = new NewDriver();
-                newDriver.setAudit(1);
-                newDriver.setLineNames(lineNames);
-                newDrivers = newDriverService.list(newDriver);
+
+            if (StringUtils.isNotEmpty(auditJobs)) {
+                String[] jobCodes1 = auditJobs.split(";");
+                Set<String> jobCodes = new HashSet<>();
+                for (String code : jobCodes1) {
+                    if (org.apache.commons.lang3.StringUtils.isNotEmpty(code)) {
+                        jobCodes.add(code);
+                    }
+                }
+                if (CollectionUtils.isNotEmpty(jobCodes)) {
+                    NewDriver newDriver = new NewDriver();
+                    newDriver.setJobCodes(jobCodes);
+                    List<NewDriver> newDrivers1 = newDriverService.list(qdznames);
+                    if (Objects.isNull(newDrivers) && CollectionUtils.isNotEmpty(newDrivers1)) {
+                        newDrivers = newDrivers1;
+                    } else if (CollectionUtils.isNotEmpty(newDrivers) && CollectionUtils.isNotEmpty(newDrivers1)) {
+                        newDrivers.addAll(newDrivers1);
+                    }
+                }
             }
  
             if (CollectionUtils.isNotEmpty(newDrivers)) {
@@ -43,6 +43,9 @@ public interface NewDriverService extends IService&lt;NewDriver&gt; {
      */
     List<NewDriver> listOfSelect(NewDriver entity);
  
+    List<NewDriver> listByQdzName(String qdzName);
+    List<NewDriver> listByQdzName(Collection<String> qdzNames);
+
     Collection<String> listOfJobs(NewDriver entity);
  
     /**
@@ -75,6 +75,7 @@ public class NewDriverServiceImpl extends ServiceImpl&lt;NewDriverMapper, NewDriver
     public List<NewDriver> list(NewDriver entity) {
         LambdaQueryWrapper<NewDriver> wrapper = new LambdaQueryWrapper<>(entity);
         chooseLineNames(entity, wrapper);
+        chooseJobCodes(entity, wrapper);
         return list(wrapper);
     }
  
@@ -149,6 +150,23 @@ public class NewDriverServiceImpl extends ServiceImpl&lt;NewDriverMapper, NewDriver
     }
  
     @Override
+    public List<NewDriver> listByQdzName(String qdzName) {
+        LambdaQueryWrapper<NewDriver> wrapper = new LambdaQueryWrapper<>();
+        wrapper.like(NewDriver::getAuditZname, qdzName + ";");
+
+        return list(wrapper);
+    }
+
+    @Override
+    public List<NewDriver> listByQdzName(Collection<String> qdzNames) {
+        LambdaQueryWrapper<NewDriver> wrapper = new LambdaQueryWrapper<>();
+        for (String qdzName : qdzNames) {
+            wrapper.or().like(NewDriver::getAuditZname, qdzName + ";");
+        }
+        return list(wrapper);
+    }
+
+    @Override
     public Collection<String> listOfJobs(NewDriver entity) {
         LambdaQueryWrapper<NewDriver> wrapper = new LambdaQueryWrapper<>(entity);
         wrapper.select(NewDriver::getJobCode, NewDriver::getTelphone);
@@ -578,5 +596,11 @@ public class NewDriverServiceImpl extends ServiceImpl&lt;NewDriverMapper, NewDriver
         }
     }
  
+    private void chooseJobCodes(NewDriver driver, LambdaQueryWrapper<NewDriver> wrapper) {
+        if (Objects.nonNull(driver) && CollectionUtils.isNotEmpty(driver.getJobCodes())) {
+            wrapper.in(NewDriver::getJobCode, driver.getJobCodes());
+        }
+    }
+
  
 }
 \ No newline at end of file
@@ -212,6 +212,12 @@ management:
     endpoint:
         shutdown:
             enabled: true
+minio:
+    host: http://192.168.168.167:9000
+    url: ${minio.host}/${minio.bucket}/
+    access-key: alcohol_0D2GVpdJ3
+    secret-key: ZF4M3dFk1SjmKDuCphTRfh2MZ5T84r25w6YVDSsA
+    bucket: alchohol
 bsth:
     face:
         app:
@@ -225,4 +231,6 @@ bsth:
     process:
         sign:
             url: http://127.0.0.1:9103/commonOpenDataApi/sendAppAndSmsNotice
+    audit-jobs:
+
  
@@ -219,6 +219,12 @@ netty:
             image: device/image
             speech: device/speech
         port: 8989
+minio:
+    host: http://10.10.200.172:9009
+    url: ${minio.host}/${minio.bucket}/
+    access-key: alcohol_0D2GVpdJ3
+    secret-key: ZF4M3dFk1SjmKDuCphTRfh2MZ5T84r25w6YVDSsA
+    bucket: alchohol
 bsth:
     face:
         app:
@@ -233,5 +239,6 @@ bsth:
             url: http://222.76.217.238:8880/fcgi-bin/entry.fcgi/system
     process:
         sign:
-            url: http://127.0.0.1:9103/commonOpenDataApi/sendAppAndSmsNotice
+            url: http://10.10.200.171:9103/commonOpenDataApi/sendAppAndSmsNotice
+    audit-jobs:
  
@@ -138,10 +138,7 @@ public class FileUploadUtils {
             }
  
             uploadContent = choosePrictureContent(uploadContent);
-            File file = new File(filePath);
-            if (!file.isDirectory()) {
-                FileUtils.forceMkdir(file);
-            }
+
  
             byte[] content = Base64.decode(uploadContent);
             if (ArrayUtils.getLength(content) > DEFAULT_MAX_SIZE) {