同步司机信息

liujun001
1 parent bdc1a9f1
Showing 9 changed files with 105 additions and 5 deletions
Bsth-admin/pom.xml
Bsth-admin/src/main/java/com/ruoyi/controller/TestController.java
Bsth-admin/src/main/java/com/ruoyi/controller/dss/KeyBoxController.java
Bsth-admin/src/main/java/com/ruoyi/domain/driver/NewDriver.java
Bsth-admin/src/main/java/com/ruoyi/domain/equipment/self/check/LingangEquimentSelfCheck.java
Bsth-admin/src/main/java/com/ruoyi/domain/sign/in/resource/LinggangSignInResource.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/libs/arcsoft-sdk-face-3.0.0.0.jar
@@ -21,6 +21,8 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -119,6 +121,36 @@
             <version>3.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.kingdee.shr</groupId>
+            <artifactId>shr_sso_client</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>4.4.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            <version>3.1</version>
+        </dependency>
+
     </dependencies>
     <build>
@@ -2,6 +2,7 @@ package com.ruoyi.controller;
 import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.job.DriverJob;
+import com.ruoyi.service.driver.NewDriverService;
 import com.ruoyi.service.key.location.LinggangKeyWorkLocationService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +21,8 @@ public class TestController {
     private DriverJob driverJob;
     @Autowired
     private LinggangKeyWorkLocationService keyWorkLocationService;
+    @Autowired
+    private NewDriverService newDriverService;
     @GetMapping(value = "/test")
     @ApiOperation("test")
@@ -34,4 +37,10 @@ public class TestController {
         keyWorkLocationService.insertJob("2024-07-30");
         return ResponseResult.success();
     }
+
+    @GetMapping(value = "/driver")
+    public  ResponseResult<Boolean> insertDriver(){
+        newDriverService.insertJob();
+        return ResponseResult.success();
+    }
 }
@@ -522,7 +522,7 @@ public class KeyBoxController extends BaseController {
                         }
                         Optional<CarInfo> carInfoOptional = carInfos.stream().filter(c -> Objects.equals(c.getNbbm(), sc.getNbbm())).findFirst();
-                        if (!optional.isPresent()) {
+                        if (!carInfoOptional.isPresent()) {
                             return null;
                         }
@@ -140,7 +140,7 @@ public class NewDriver {
     /***同步结果状态;0成功，1失败*/
     @Excel(name = "同步结果状态;0成功，1失败")
     @TableField(value = "driver_integer")
-    private java.lang.Integer integer;
+    private java.lang.Integer integer1;
     /***同步内容*/
@@ -160,6 +160,13 @@ public class NewDriver {
     @TableField(exist = false)
     private float imageScore;
+    public Integer getInteger() {
+        return integer1;
+    }
+
+    public void setInteger(Integer integer) {
+        this.integer1 = integer1;
+    }
     @Override
     public String toString() {
@@ -12,6 +12,8 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import lombok.extern.slf4j.Slf4j;
+import java.util.Date;
+
 @Data
 @Slf4j
@@ -69,13 +71,13 @@ public class LingangEquimentSelfCheck {
     /***锁控状态   1正常，2故障，null/3未检测到*/
     @Excel(name = "锁控状态   1正常，2故障，null/3未检测到")
     @TableField(value = "equiment_self_lock")
-    private java.lang.Integer lock;
+    private java.lang.Integer lock1;
     /***设备传过来的时间*/
     @Excel(name = "设备传过来的时间")
     @TableField(value = "equiment_self_time")
-    private java.util.Date time;
+    private java.util.Date time1;
     /***设备类型*/
@@ -112,6 +114,21 @@ public class LingangEquimentSelfCheck {
     @Excel(name = "修改时间")
     private java.util.Date updateTime;
+    public Integer getLock() {
+        return lock1;
+    }
+
+    public void setLock(Integer lock) {
+        this.lock1 = lock;
+    }
+
+    public Date getTime() {
+        return time1;
+    }
+
+    public void setTime(Date time1) {
+        this.time1 = time1;
+    }
     @Override
     public String toString() {
@@ -36,7 +36,7 @@ public class LinggangSignInResource {
     /***顺序*/
     @Excel(name = "顺序")
     @TableField(value = "sign_in_resource_index")
-    private Integer index;
+    private Integer index1;
     /***资源类型：1是图片；2是视频*/
@@ -78,6 +78,13 @@ public class LinggangSignInResource {
     @TableField(exist = false)
     private String content;
+    public Integer getIndex() {
+        return index1;
+    }
+
+    public void setIndex(Integer index1) {
+        this.index1 = index1;
+    }
     @Override
     public String toString() {
@@ -60,6 +60,8 @@ public interface NewDriverService extends IService&lt;NewDriver&gt; {
     /***插入数据*/
     boolean insert(NewDriver entity);
+    boolean insertJob();
+
     /**
      * 根据主键修改数据
      */
@@ -6,6 +6,8 @@ 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.kingdee.shr.api.Response;
+import com.kingdee.shr.api.SHRClient;
 import com.ruoyi.common.TipEnum;
 import com.ruoyi.common.core.domain.ResponseResult;
 import com.ruoyi.common.utils.StringUtils;
@@ -21,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import java.io.File;
+import java.io.IOException;
 import java.util.*;
 @Service
@@ -169,6 +172,29 @@ public class NewDriverServiceImpl extends ServiceImpl&lt;NewDriverMapper, NewDriver
         return save(entity);
     }
+    @Override
+    public boolean insertJob() {
+        String SHR_LOCAL = "http://dsh.bdo2o.com:6280/shr";
+        //OSF���ƣ�ע�������Ʋ��Ǳ���
+        String serviceName = "getPersonByListService";
+        SHRClient client = new SHRClient();
+        //����OSF����Ҫ�Ĳ���
+        Map<String,Object>  param = new HashMap<String,Object>();
+
+        ArrayList<String> dataList = new ArrayList<String>();
+        dataList.add("05-008018");
+        param.put("personlist", dataList);
+        Response res = null;
+        try {
+            res = client.executeService(SHR_LOCAL ,serviceName,param);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        System.out.println(res.getData());
+
+        return false;
+    }
+
     /**
      * 根据主键修改数据
      */