三一车辆接口改為forest提交

zhangnaisong

2023-07-24 1744329b3f9c3726936a1e1542620dd2780111b6

三一车辆接口改為forest提交

 ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java

@@ -4,6 +4,7 @@
import java.util.*;
import java.util.*;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

@@ -20,10 +21,13 @@
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.utils.forest.RongCloudClient;
import com.ruoyi.utils.forest.SYClient;
import com.ruoyi.utils.httpclient.SYCarClient;
import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -62,6 +66,8 @@
    @Autowired
    private IArdSyUserService iArdSyUserService;

    @Resource
    private SYClient sYClient;

    private ArdSyCarController ardSyCarController;

@@ -194,7 +200,9 @@
            return error("涓変竴杞﹁締url娌℃湁褰曞叆");
        }else{
            syURL = sysConfigResult.get(0).getConfigValue();
            Map<String,Object> result = SYCarClient.logIn(syURL,userId, password);
            //Map<String,Object> result = SYCarClient.logIn(syURL,userId, password);
            String passwordMd5 = DigestUtils.md5Hex(password);
            Map<String,Object> result = sYClient.logIn(syURL,passwordMd5,userId);
            return success(result);
        }
    }

 ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java

@@ -20,6 +20,7 @@
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.system.mapper.SysUserMapper;
import com.ruoyi.utils.forest.SYClient;
import com.ruoyi.utils.httpclient.SYCarClient;
import com.ruoyi.utils.result.Constants;
import com.ruoyi.utils.result.Results;
@@ -30,6 +31,7 @@
import io.minio.http.Method;
import io.minio.messages.Contents;
import io.minio.messages.Item;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.stereotype.Service;
import com.ruoyi.sy.mapper.ArdSyCarMapper;
import com.ruoyi.sy.domain.ArdSyCar;
@@ -60,6 +62,8 @@
    @Resource
    private SysUserMapper userMapper;

    @Resource
    private SYClient sYClient;

    /**
     * 鏌ヨ涓変竴杞﹁締
@@ -160,9 +164,12 @@
                return result;
            }else{
                ArdSyUser ardSyUser = ardSyUserList.get(0);
                Map<String,Object> LogInResult = SYCarClient.logIn(syURL,ardSyUser.getUserId(), ardSyUser.getPassword());
                //Map<String,Object> LogInResult = SYCarClient.logIn(syURL,ardSyUser.getUserId(), ardSyUser.getPassword());
                String passwordMd5 = DigestUtils.md5Hex(ardSyUser.getPassword());
                Map<String,Object> LogInResult = sYClient.logIn(syURL,passwordMd5,ardSyUser.getUserId());
                String sessionId = (String) LogInResult.get("sessionId");
                Map<String,Object> carListMap = SYCarClient.getCarList(syURL,sessionId);
                //Map<String,Object> carListMap = SYCarClient.getCarList(syURL,sessionId);
                Map<String,Object> carListMap = sYClient.getCarList(syURL,sessionId);
                if(((String)carListMap.get("rspCode")).equals("1")){
                    List<Map<String,Object>> list = (List<Map<String,Object>>) carListMap.get("list");
                    ArdSyCar ardSyCar = new ArdSyCar();
@@ -212,25 +219,14 @@
                return result;
            }else{
                ArdSyUser ardSyUser = ardSyUserList.get(0);
                Map<String,Object> LogInResult = SYCarClient.logIn(syURL,ardSyUser.getUserId(), ardSyUser.getPassword());
                //Map<String,Object> LogInResult = SYCarClient.logIn(syURL,ardSyUser.getUserId(), ardSyUser.getPassword());
                String passwordMd5 = DigestUtils.md5Hex(ardSyUser.getPassword());
                Map<String,Object> LogInResult = sYClient.logIn(syURL,passwordMd5,ardSyUser.getUserId());
                String sessionId = (String) LogInResult.get("sessionId");
                Map<String,Object> carListMap = SYCarClient.getCarList(syURL,sessionId);
                //Map<String,Object> carListMap = SYCarClient.getCarList(syURL,sessionId);
                Map<String,Object> carListMap = sYClient.getCarList(syURL,sessionId);
                if(((String)carListMap.get("rspCode")).equals("1")){
                    List<Map<String,Object>> list = (List<Map<String,Object>>) carListMap.get("list");
                    /*ArdSyCar ardSyCar = new ArdSyCar();
                    List<ArdSyCar> ardSyCarList = ardSyCarMapper.selectArdSyCarList(ardSyCar);
                    List<String> carIdList = new ArrayList();
                    for(ArdSyCar innerArdSyCar : ardSyCarList){
                        carIdList.add(innerArdSyCar.getCarId());
                    }

                    List<Map<String,Object>> carList = list.stream().filter(new Predicate<Map<String,Object>>(){
                        @Override
                        public boolean test(Map<String,Object> map) {
                            return !carIdList.contains((String)map.get("carId"));
                        }
                    }).collect(Collectors.toList());
                    result.put("data",carList);*/
                    result.put("data",list);
                    result.put("code","200");
                    return result;

 ard-work/src/main/java/com/ruoyi/utils/forest/SYClient.java

对比新文件
@@ -0,0 +1,14 @@
package com.ruoyi.utils.forest;

import com.dtflys.forest.annotation.Get;
import com.dtflys.forest.annotation.Var;

import java.util.Map;

public interface SYClient {
    @Get(url = "${syURL}/gps-web/api/login.jsp?password=${password}&userId=${userId}&loginType=user&loginWay=interface&loginLang=zh_CN")
    Map<String,Object> logIn(@Var("syURL") String syURL, @Var("password") String password, @Var("userId") String userId);

    @Get(url = "${syURL}/gps-web/api/get_car_list.jsp?teamId=&detail=false&sessionId=${sessionId}")
    Map<String,Object> getCarList(@Var("syURL") String syURL, @Var("sessionId") String sessionId);
}