同步司机信息

liujun001
1 parent 4cac73f9
Showing 3 changed files with 92 additions and 14 deletions
Bsth-admin/src/main/java/com/ruoyi/config/BsthSystemConfig.java
Bsth-admin/src/main/java/com/ruoyi/service/impl/driver/NewDriverServiceImpl.java
Bsth-admin/src/main/resources/application-druid-dev.yml
@@ -24,4 +24,7 @@ public class BsthSystemConfig {
     @Value("${bsth.face.lib.path}")
     private String faceLibPath;
+    @Value("${api.url.getDriverInfo}")
+    private String getDriverInfoURL;
+
 }
 package com.ruoyi.service.impl.driver;
+import cn.hutool.core.convert.Convert;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -17,6 +21,7 @@ import com.ruoyi.domain.OrderEntity;
 import com.ruoyi.domain.driver.NewDriver;
 import com.ruoyi.mapper.driver.NewDriverMapper;
 import com.ruoyi.service.driver.NewDriverService;
+import com.ruoyi.utils.UploadUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +30,7 @@ import org.springframework.stereotype.Service;
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
+import java.util.stream.Collectors;
 @Service
 @Slf4j
@@ -33,6 +39,9 @@ public class NewDriverServiceImpl extends ServiceImpl&lt;NewDriverMapper, NewDriver
     private NewDriverMapper newDriverMapper;
     @Autowired
     private BsthSystemConfig bsthSystemConfig;
+    @Autowired
+    private UploadUtil uploadUtil;
+
     /**
      * 分页查询
@@ -144,7 +153,7 @@ public class NewDriverServiceImpl extends ServiceImpl&lt;NewDriverMapper, NewDriver
     @Override
     public NewDriver getOne(String jobCode) {
         LambdaQueryWrapper<NewDriver> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(NewDriver::getJobCode,jobCode);
+        wrapper.eq(NewDriver::getJobCode, jobCode);
         return getOne(wrapper);
     }
@@ -174,25 +183,91 @@ public class NewDriverServiceImpl extends ServiceImpl&lt;NewDriverMapper, NewDriver
     @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>();
+        Map<String, Object> param = new HashMap<String, Object>();
         ArrayList<String> dataList = new ArrayList<String>();
         dataList.add("05-008018");
         param.put("personlist", dataList);
+        List<NewDriver> drivers = requestDrivers(client, bsthSystemConfig.getGetDriverInfoURL(), serviceName, param);
+        if (CollectionUtils.isEmpty(drivers)) {
+            return false;
+        }
+
+        return saveBatch(drivers);
+    }
+
+    private List<NewDriver> requestDrivers(SHRClient client, String SHR_LOCAL, String serviceName, Map<String, Object> param) {
         Response res = null;
+        String resDataStr = null;
         try {
-            res = client.executeService(SHR_LOCAL ,serviceName,param);
+            res = client.executeService(SHR_LOCAL, serviceName, param);
+            if (Objects.nonNull(res)) {
+                resDataStr = Convert.toStr(res.getData());
+                JSONObject jsonObject = JSON.parseObject(resDataStr);
+                if (!Objects.equals(Convert.toInt(jsonObject.get("code")), 200)) {
+                    log.info("同步用户数据返回错误代码，代码为：[{}],返回的 结果为:[{}]", jsonObject.get("code"), resDataStr);
+                    return null;
+                }
+
+                JSONArray jsonArray = (JSONArray) jsonObject.get("data");
+
+                if (CollectionUtils.isEmpty(jsonArray)) {
+                    log.info("同步用户数据返回空,返回的 结果为:[{}]", resDataStr);
+                    return null;
+                }
+
+                return jsonArray.stream().map(jo -> {
+                    if (jo instanceof JSONObject) {
+                        JSONObject obj = (JSONObject) jo;
+                        NewDriver driver = new NewDriver();
+                        driver.setJobCode(Convert.toStr(obj.get("personNumber")));
+                        driver.setCompanyCode(Convert.toStr(obj.get("companyNumner")));
+                        driver.setBrancheCompanyCode(Convert.toStr(obj.get("companyNumner")));
+                        driver.setPersonnelName(Convert.toStr(obj.get("personName")));
+//                        driver.setPapersCode(Convert.toStr(obj.get("personNumber")));
+//                        driver.setIcCardCode(Convert.toStr(obj.get("personNumber")));
+                        driver.setPersonnelType(Convert.toStr(obj.get("gender")));
+                        driver.setPosts(Convert.toStr(obj.get("position")));
+                        driver.setCard(Convert.toStr(obj.get("IDcardNo")));
+                        driver.setTelphone(Convert.toStr(obj.get("cell")));
+//                        driver.setIcRfid(Convert.toStr(obj.get("personNumber")));
+//                        driver.setIdRfid(Convert.toStr(obj.get("personNumber")));
+//                        driver.setTagRfid(Convert.toStr(obj.get("personNumber")));
+//                        driver.setRemark(Convert.toStr(obj.get("personNumber")));
+                        driver.setLineName(Convert.toStr(obj.get("deptLineName")));
+                        driver.setLineCode(Convert.toStr(obj.get("deptLineNumber")));
+
+                        String photo = Convert.toStr("photo");
+                        if (StringUtils.isNotEmpty(photo)) {
+                            StringBuilder builder = new StringBuilder();
+                            builder.append(obj.get("personID"));
+                            builder.append("/image/");
+                            builder.append(UUID.randomUUID().toString().replaceAll("-", ""));
+                            builder.append(".png");
+
+                            uploadUtil.uploadImageOfBase64(photo, builder.toString(), "png");
+                            driver.setImage(builder.toString());
+                        }
+
+                        driver.setFleetName(Convert.toStr(obj.get("deptCarName")));
+                        driver.setImageVersion("0.0.1");
+                        return driver;
+                    }
+
+                    return null;
+                }).filter(obj -> Objects.nonNull(obj)).collect(Collectors.toList());
+            }
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            log.error("同步用户数据异常,返回的结果为:[{}]", resDataStr, e);
+        } catch (Exception e) {
+            log.error("同步用户数据异常,返回的结果为:[{}]", resDataStr, e);
         }
-        System.out.println(res.getData());
-
-        return false;
+        return null;
     }
     /**
@@ -206,7 +281,7 @@ public class NewDriverServiceImpl extends ServiceImpl&lt;NewDriverMapper, NewDriver
     @Override
     public TipEnum updateClient(NewDriver entity) {
         NewDriver driver = new NewDriver();
-        if(StringUtils.isNotEmpty(entity.getJobCode())) {
+        if (StringUtils.isNotEmpty(entity.getJobCode())) {
             driver.setJobCode(entity.getJobCode());
         }
         driver.setId(entity.getId());
@@ -221,7 +296,7 @@ public class NewDriverServiceImpl extends ServiceImpl&lt;NewDriverMapper, NewDriver
         wrapper.set(NewDriver::getImage, entity.getImage()).set(NewDriver::getFaceFeature, entity.getFaceFeature())
                 .set(NewDriver::getBlueTooth, entity.getBlueTooth()).set(NewDriver::getInteger, entity.getInteger())
                 .set(NewDriver::getSyncontent, entity.getSyncontent()).set(NewDriver::getCsn, entity.getCsn())
-                .set(NewDriver::getIcCardCode,entity.getIcCardCode()).set(NewDriver::getImageVersion,entity.getImageVersion())
+                .set(NewDriver::getIcCardCode, entity.getIcCardCode()).set(NewDriver::getImageVersion, entity.getImageVersion())
                 .eq(NewDriver::getId, entity.getId());
         boolean flag = update(wrapper);
         return flag ? TipEnum.TIP_200 : TipEnum.TIP_500;
@@ -160,12 +160,12 @@ api:
     template: 车队与线路匹配模板
     url:
         # all 为获取所有驾驶员信息
-        getDriverInfo: http://101.95.136.206:9089/webservice/rest/person/%s
+        getDriverInfo: http://dsh.bdo2o.com:6280/shr
         # 获取公司编码下的员工信息 暂时没用
-        getCompanyInfo: http://101.95.136.206:9089/webservice/rest/person/company/%d?timestamp=%&nonce=%s&password=%s&sign=%s
+        getCompanyInfo:
         # 获取排班信息
-        getSchedulingInfo: http://101.95.136.206:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
-        getSchedulingInfoNew: http://101.95.136.206:9089/webservice/rest/schedule_real/sch_jk_db/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
+        getSchedulingInfo: http://58.34.47.74:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
+        getSchedulingInfoNew: http://58.34.47.74:9089/webservice/rest/schedule_real/sch_jk/%s/%s?timestamp=%d&nonce=%s&password=%s&sign=%s
     config:
         password: c4dd3d8cb9a82f6d6a625818618b28ca7bebb464
         # 随机字符串