From 90edbd96c576947debb7cdc7739c05a0c74b2748 Mon Sep 17 00:00:00 2001
From: 艾金辉 <1144154118@qq.com>
Date: 星期六, 22 七月 2023 16:17:06 +0800
Subject: [PATCH] 根据carId获取车辆及车辆用户调整
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 111 +++++++++++++++++++--
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java | 6 +
/dev/null | 49 ---------
ard-work/src/main/resources/mapper/sy/ArdSyCarMapper.xml | 1
ard-work/src/main/java/com/ruoyi/utils/result/Results.java | 2
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyCarMapper.java | 5
ruoyi-admin/src/main/resources/application-druid.yml | 9 +
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java | 7 +
ard-work/src/main/java/com/ruoyi/utils/result/Constants.java | 8
ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java | 2
ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml | 4
ard-work/src/main/java/com/ruoyi/client/ARDCarSYGPSClient.java | 76 +++++++++++++++
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 6 +
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java | 11 ++
14 files changed, 229 insertions(+), 68 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/client/ARDCarSYGPSClient.java b/ard-work/src/main/java/com/ruoyi/client/ARDCarSYGPSClient.java
index c8d6f9a..8afb9c8 100644
--- a/ard-work/src/main/java/com/ruoyi/client/ARDCarSYGPSClient.java
+++ b/ard-work/src/main/java/com/ruoyi/client/ARDCarSYGPSClient.java
@@ -93,4 +93,80 @@
return new HashMap();
}
}
+
+ //鏍规嵁杞﹂槦id鑾峰緱涓嬪睘鍏ㄩ儴杞﹁締 --杞﹁締鍒楄〃
+ public static Map<String,Object> getCarListByTeamId(String syURL,String teamId,String userId,String sessionId){
+ OkHttpClient okHttpClient = new OkHttpClient();
+
+ /*Request request = new Request.Builder()
+ .url("http://106.14.186.44:9999/gps-web/api/get_car_list.jsp?teamId="+teamId+"&detail=true&userId="+userId+"&loginType=user&loginWay=interface&loginLang=zh_CN&appDevId=&appId=android&sessionId="+sessionId)
+ .build();*/
+ /*Request request = new Request.Builder()
+ .url("http://116.182.15.14:9999/gps-web/api/get_car_list.jsp?teamId="+teamId+"&detail=true&userId="+userId+"&loginType=user&loginWay=interface&loginLang=zh_CN&appDevId=&appId=android&sessionId="+sessionId)
+ .build();*/
+ Request request = new Request.Builder()
+ .url(syURL + "/gps-web/api/get_car_list.jsp?teamId="+teamId+"&detail=true&userId="+userId+"&loginType=user&loginWay=interface&loginLang=zh_CN&appDevId=&appId=android&sessionId="+sessionId)
+ .build();
+
+ Response response = null;
+ try {
+ response = okHttpClient.newCall(request).execute();
+ } catch (IOException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+
+ response.headers(); //鍝嶅簲澶�
+
+ ResponseBody responseBody = response.body();
+
+ try {
+ String message = responseBody.string();// 鍝嶅簲浣�
+ Map<String,Object> map = (Map<String, Object>) JSON.parse(message);
+ //System.out.println(message);
+ return map;
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ return new HashMap();
+ }
+ }
+
+ //鏍规嵁杞﹂槦id鑾峰緱涓嬪睘鍏ㄩ儴杞﹁締 --杞﹁締鍒楄〃(杞﹂槦涓嬫墍鏈夊眰绾ц溅杈�)
+ public static Map<String,Object> getCarListSubByTeamId(String syURL,String teamId,String userId,String sessionId){
+ OkHttpClient okHttpClient = new OkHttpClient();
+
+ /*Request request = new Request.Builder()
+ .url("http://106.14.186.44:9999/gps-web/api/get_car_list_recur.jsp?teamId="+teamId+"&userId="+userId+"&loginType=user&loginWay=android&loginLang=zh_CN&appDevId=&sessionId="+sessionId)
+ .build();*/
+ /*Request request = new Request.Builder()
+ .url("http://116.182.15.14:9999/gps-web/api/get_car_list_recur.jsp?teamId="+teamId+"&userId="+userId+"&loginType=user&loginWay=android&loginLang=zh_CN&appDevId=&sessionId="+sessionId)
+ .build();*/
+ Request request = new Request.Builder()
+ .url(syURL + "/gps-web/api/get_car_list_recur.jsp?teamId="+teamId+"&userId="+userId+"&loginType=user&loginWay=android&loginLang=zh_CN&appDevId=&sessionId="+sessionId)
+ .build();
+
+ Response response = null;
+ try {
+ response = okHttpClient.newCall(request).execute();
+ } catch (IOException e1) {
+ // TODO Auto-generated catch block
+ e1.printStackTrace();
+ }
+
+ response.headers(); //鍝嶅簲澶�
+
+ ResponseBody responseBody = response.body();
+
+ try {
+ String message = responseBody.string();// 鍝嶅簲浣�
+ Map<String,Object> map = (Map<String, Object>) JSON.parse(message);
+ //System.out.println(message);
+ return map;
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ return new HashMap();
+ }
+ }
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
index d431ac7..b598ce0 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
@@ -1,26 +1,22 @@
package com.ruoyi.sy.controller;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
+import java.text.Collator;
+import java.util.*;
import javax.servlet.http.HttpServletResponse;
+import com.alibaba.fastjson2.JSON;
import com.ruoyi.client.ARDCarGPSLogInClient;
import com.ruoyi.client.ARDCarSYGPSClient;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.sy.domain.ArdSyUser;
import com.ruoyi.sy.service.IArdSyUserService;
-import com.ruoyi.sy.service.SysParaService;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.utils.httpclient.SYCarClient;
import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.bytedeco.javacv.CanvasFrame;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -32,8 +28,6 @@
import com.ruoyi.sy.service.IArdSyCarService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
import org.springframework.web.multipart.MultipartFile;
/**
@@ -55,11 +49,10 @@
private Map<Integer,Map<String,String>> logInMap = new HashMap();
- @Autowired
- private SysParaService sysParaService;
@Autowired
private IArdSyUserService iArdSyUserService;
+
/**
* 鏌ヨ涓変竴杞﹁締鍒楄〃
@@ -237,7 +230,7 @@
String password31 = ardSyUser.getPassword();
//鏌ヨ鍦板潃
Map<String, String> result = logInMap.get(Integer.parseInt(usersId));
- String syURL = sysParaService.getSYURL();
+ String syURL = sysConfigService.getSYURL();
Map<String, Object> result1 = ARDCarGPSLogInClient.loginIn(syURL,username31, password31);
result = new HashMap();
result.put("userId", username31);
@@ -275,6 +268,100 @@
return result0;
}
+ @PreAuthorize("@ss.hasPermi('sy:syCar:carList')")
+ @PostMapping("carList")
+ @ApiOperation("鏍规嵁teamId鑾峰彇杞﹁締鍒楄〃")
+ public Results getCarList(@RequestBody Map<String,String> map){
+ String usersId = SecurityUtils.getUserId();
+ Map<String, String> result = logInMap.get(Integer.parseInt(usersId));
+ String teamId = map.get("teamId");
+ String syURL = sysConfigService.getSYURL();
+ ArdSyUser ardSyUser = iArdSyUserService.userById(usersId);
+ //鍒ゆ柇鍏宠仈琛ㄦ槸鍚︽湁鏁版嵁
+ if(ardSyUser!=null) {
+ //31鐢ㄦ埛鍚嶅瘑鐮�
+ String username31 = ardSyUser.getUserId();
+ String password31 = ardSyUser.getPassword();
+ Map<String, Object> userMap = ARDCarGPSLogInClient.loginIn(syURL,username31, password31);
+ result = new HashMap();
+ result.put("userId", username31);
+ result.put("sessionId", (String) userMap.get("sessionId"));
+ }
+ //鏌ヨ璇eamId涓嬬殑杞﹁締鏁版嵁
+ Map<String,Object> carList31 = new HashMap();
+ try {
+ carList31 = ARDCarSYGPSClient.getCarListByTeamId(syURL,teamId, result.get("userId"),result.get("sessionId"));
+ } catch (Exception e) {
+ Map<String,Object> m = iArdSyUserService.selectArdSyUserByUsersId(Integer.parseInt(usersId));
+ if(m == null){
+ Results.error("褰撳墠鐧诲綍鐢ㄦ埛鏈寕鎺ヨ溅杈嗘潈闄�");
+ }
+ Map<String,Object> map0 = ARDCarGPSLogInClient.loginIn(syURL,(String) m.get("userId"), (String) m.get("password"));
+ carList31 = ARDCarSYGPSClient.getCarListByTeamId(syURL,teamId, (String) m.get("userId"),(String) map0.get("sessionId"));
+ }
+ //鎷垮埌杞﹁締鏁版嵁
+ List<Map<String,String>> list = (List) carList31.get("list");
+ List<String> carIdList = new ArrayList();
+ //鎵�鏈塩arId
+ for(Map<String,String> m : list){
+ carIdList.add(m.get("carId"));
+ }
+ if(carIdList.size() == 0){
+ Map<String,Object> map0 = new HashMap();
+ map0.put("list", new ArrayList());
+ map0.put("rspCode", "1");
+ return Results.succeed();
+ }
+ //娣诲姞杞﹁締灞炴��
+ for(Map<String,String> m : list){
+ switch (m.get("state")) {
+ case "1":
+ m.put("carState", "绂荤嚎-浠庢湭鎶ュ畾浣�");break;
+ case "2":
+ m.put("carState", "绂荤嚎-娆犺垂");break;
+ case "3":
+ m.put("carState", "绂荤嚎");break;
+ case "4":
+ m.put("carState", "绂荤嚎-鎶ヨ");break;
+ case "5":
+ m.put("carState", "鍦ㄧ嚎-浠庢湭鎶ュ畾浣�");break;
+ case "6":
+ m.put("carState", "鍦ㄧ嚎-娆犺垂");break;
+ case "7":
+ m.put("carState", "鍦ㄧ嚎-琛岄┒");break;
+ case "8":
+ m.put("carState", "鍦ㄧ嚎-琛岄┒-鎶ヨ");break;
+ case "9":
+ m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC鍏�");break;
+ case "10":
+ m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC寮�");break;
+ case "11":
+ m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC鍏�-鎶ヨ");break;
+ case "12":
+ m.put("carState", "鍦ㄧ嚎-鍋滆溅-ACC寮�-鎶ヨ");break;
+ case "13":
+ m.put("carState", "鍦ㄧ嚎-鏃犳晥瀹氫綅");break;
+ default:
+ break;
+ }
+ }
+// for(Map<String,String> m : list0){
+// for(Map<String,String> ma : list1){
+// if(m.get("carId").equals(ma.get("carId"))){
+// m.put("stateCn", ma.get("carState"));
+// }
+// }
+// }
+// Collections.sort((List)result0.get("list"),new Comparator<Map<String, Object>>() {
+// @Override
+// public int compare(Map<String, Object> o1, Map<String, Object> o2) {
+// Comparator<Object> com = Collator.getInstance(java.util.Locale.CHINA);
+// return com.compare(o2.get("stateCn"), o1.get("stateCn"));
+// }
+// });
+ return Results.succeed(list);
+ }
+
@PreAuthorize("@ss.hasPermi('sy:syCar:carListById')")
@GetMapping("/carListById/{id}")
@ApiOperation("鏍规嵁杞﹁締ID鑾峰彇杞﹁締鍒楄〃")
diff --git a/ard-work/src/main/java/com/ruoyi/sy/domain/SysPara.java b/ard-work/src/main/java/com/ruoyi/sy/domain/SysPara.java
deleted file mode 100644
index 4fa362e..0000000
--- a/ard-work/src/main/java/com/ruoyi/sy/domain/SysPara.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.ruoyi.sy.domain;
-
-import lombok.Data;
-
-/**
- * @author 11441
- */
-@Data
-public class SysPara {
- private String sysId;
-
- private String sysName;
-
- private String sysType;
-
- private String sysContent;
-}
\ No newline at end of file
diff --git a/ard-work/src/main/java/com/ruoyi/sy/domain/SysParaExample.java b/ard-work/src/main/java/com/ruoyi/sy/domain/SysParaExample.java
deleted file mode 100644
index bda8c90..0000000
--- a/ard-work/src/main/java/com/ruoyi/sy/domain/SysParaExample.java
+++ /dev/null
@@ -1,480 +0,0 @@
-package com.ruoyi.sy.domain;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class SysParaExample {
- protected String orderByClause;
-
- protected boolean distinct;
-
- protected List<Criteria> oredCriteria;
-
- public SysParaExample() {
- oredCriteria = new ArrayList<Criteria>();
- }
-
- public void setOrderByClause(String orderByClause) {
- this.orderByClause = orderByClause;
- }
-
- public String getOrderByClause() {
- return orderByClause;
- }
-
- public void setDistinct(boolean distinct) {
- this.distinct = distinct;
- }
-
- public boolean isDistinct() {
- return distinct;
- }
-
- public List<Criteria> getOredCriteria() {
- return oredCriteria;
- }
-
- public void or(Criteria criteria) {
- oredCriteria.add(criteria);
- }
-
- public Criteria or() {
- Criteria criteria = createCriteriaInternal();
- oredCriteria.add(criteria);
- return criteria;
- }
-
- public Criteria createCriteria() {
- Criteria criteria = createCriteriaInternal();
- if (oredCriteria.size() == 0) {
- oredCriteria.add(criteria);
- }
- return criteria;
- }
-
- protected Criteria createCriteriaInternal() {
- Criteria criteria = new Criteria();
- return criteria;
- }
-
- public void clear() {
- oredCriteria.clear();
- orderByClause = null;
- distinct = false;
- }
-
- protected abstract static class GeneratedCriteria {
- protected List<Criterion> criteria;
-
- protected GeneratedCriteria() {
- super();
- criteria = new ArrayList<Criterion>();
- }
-
- public boolean isValid() {
- return criteria.size() > 0;
- }
-
- public List<Criterion> getAllCriteria() {
- return criteria;
- }
-
- public List<Criterion> getCriteria() {
- return criteria;
- }
-
- protected void addCriterion(String condition) {
- if (condition == null) {
- throw new RuntimeException("Value for condition cannot be null");
- }
- criteria.add(new Criterion(condition));
- }
-
- protected void addCriterion(String condition, Object value, String property) {
- if (value == null) {
- throw new RuntimeException("Value for " + property + " cannot be null");
- }
- criteria.add(new Criterion(condition, value));
- }
-
- protected void addCriterion(String condition, Object value1, Object value2, String property) {
- if (value1 == null || value2 == null) {
- throw new RuntimeException("Between values for " + property + " cannot be null");
- }
- criteria.add(new Criterion(condition, value1, value2));
- }
-
- public Criteria andSysIdIsNull() {
- addCriterion("sys_id is null");
- return (Criteria) this;
- }
-
- public Criteria andSysIdIsNotNull() {
- addCriterion("sys_id is not null");
- return (Criteria) this;
- }
-
- public Criteria andSysIdEqualTo(String value) {
- addCriterion("sys_id =", value, "sysId");
- return (Criteria) this;
- }
-
- public Criteria andSysIdNotEqualTo(String value) {
- addCriterion("sys_id <>", value, "sysId");
- return (Criteria) this;
- }
-
- public Criteria andSysIdGreaterThan(String value) {
- addCriterion("sys_id >", value, "sysId");
- return (Criteria) this;
- }
-
- public Criteria andSysIdGreaterThanOrEqualTo(String value) {
- addCriterion("sys_id >=", value, "sysId");
- return (Criteria) this;
- }
-
- public Criteria andSysIdLessThan(String value) {
- addCriterion("sys_id <", value, "sysId");
- return (Criteria) this;
- }
-
- public Criteria andSysIdLessThanOrEqualTo(String value) {
- addCriterion("sys_id <=", value, "sysId");
- return (Criteria) this;
- }
-
- public Criteria andSysIdLike(String value) {
- addCriterion("sys_id like", value, "sysId");
- return (Criteria) this;
- }
-
- public Criteria andSysIdNotLike(String value) {
- addCriterion("sys_id not like", value, "sysId");
- return (Criteria) this;
- }
-
- public Criteria andSysIdIn(List<String> values) {
- addCriterion("sys_id in", values, "sysId");
- return (Criteria) this;
- }
-
- public Criteria andSysIdNotIn(List<String> values) {
- addCriterion("sys_id not in", values, "sysId");
- return (Criteria) this;
- }
-
- public Criteria andSysIdBetween(String value1, String value2) {
- addCriterion("sys_id between", value1, value2, "sysId");
- return (Criteria) this;
- }
-
- public Criteria andSysIdNotBetween(String value1, String value2) {
- addCriterion("sys_id not between", value1, value2, "sysId");
- return (Criteria) this;
- }
-
- public Criteria andSysNameIsNull() {
- addCriterion("sys_name is null");
- return (Criteria) this;
- }
-
- public Criteria andSysNameIsNotNull() {
- addCriterion("sys_name is not null");
- return (Criteria) this;
- }
-
- public Criteria andSysNameEqualTo(String value) {
- addCriterion("sys_name =", value, "sysName");
- return (Criteria) this;
- }
-
- public Criteria andSysNameNotEqualTo(String value) {
- addCriterion("sys_name <>", value, "sysName");
- return (Criteria) this;
- }
-
- public Criteria andSysNameGreaterThan(String value) {
- addCriterion("sys_name >", value, "sysName");
- return (Criteria) this;
- }
-
- public Criteria andSysNameGreaterThanOrEqualTo(String value) {
- addCriterion("sys_name >=", value, "sysName");
- return (Criteria) this;
- }
-
- public Criteria andSysNameLessThan(String value) {
- addCriterion("sys_name <", value, "sysName");
- return (Criteria) this;
- }
-
- public Criteria andSysNameLessThanOrEqualTo(String value) {
- addCriterion("sys_name <=", value, "sysName");
- return (Criteria) this;
- }
-
- public Criteria andSysNameLike(String value) {
- addCriterion("sys_name like", value, "sysName");
- return (Criteria) this;
- }
-
- public Criteria andSysNameNotLike(String value) {
- addCriterion("sys_name not like", value, "sysName");
- return (Criteria) this;
- }
-
- public Criteria andSysNameIn(List<String> values) {
- addCriterion("sys_name in", values, "sysName");
- return (Criteria) this;
- }
-
- public Criteria andSysNameNotIn(List<String> values) {
- addCriterion("sys_name not in", values, "sysName");
- return (Criteria) this;
- }
-
- public Criteria andSysNameBetween(String value1, String value2) {
- addCriterion("sys_name between", value1, value2, "sysName");
- return (Criteria) this;
- }
-
- public Criteria andSysNameNotBetween(String value1, String value2) {
- addCriterion("sys_name not between", value1, value2, "sysName");
- return (Criteria) this;
- }
-
- public Criteria andSysTypeIsNull() {
- addCriterion("sys_type is null");
- return (Criteria) this;
- }
-
- public Criteria andSysTypeIsNotNull() {
- addCriterion("sys_type is not null");
- return (Criteria) this;
- }
-
- public Criteria andSysTypeEqualTo(String value) {
- addCriterion("sys_type =", value, "sysType");
- return (Criteria) this;
- }
-
- public Criteria andSysTypeNotEqualTo(String value) {
- addCriterion("sys_type <>", value, "sysType");
- return (Criteria) this;
- }
-
- public Criteria andSysTypeGreaterThan(String value) {
- addCriterion("sys_type >", value, "sysType");
- return (Criteria) this;
- }
-
- public Criteria andSysTypeGreaterThanOrEqualTo(String value) {
- addCriterion("sys_type >=", value, "sysType");
- return (Criteria) this;
- }
-
- public Criteria andSysTypeLessThan(String value) {
- addCriterion("sys_type <", value, "sysType");
- return (Criteria) this;
- }
-
- public Criteria andSysTypeLessThanOrEqualTo(String value) {
- addCriterion("sys_type <=", value, "sysType");
- return (Criteria) this;
- }
-
- public Criteria andSysTypeLike(String value) {
- addCriterion("sys_type like", value, "sysType");
- return (Criteria) this;
- }
-
- public Criteria andSysTypeNotLike(String value) {
- addCriterion("sys_type not like", value, "sysType");
- return (Criteria) this;
- }
-
- public Criteria andSysTypeIn(List<String> values) {
- addCriterion("sys_type in", values, "sysType");
- return (Criteria) this;
- }
-
- public Criteria andSysTypeNotIn(List<String> values) {
- addCriterion("sys_type not in", values, "sysType");
- return (Criteria) this;
- }
-
- public Criteria andSysTypeBetween(String value1, String value2) {
- addCriterion("sys_type between", value1, value2, "sysType");
- return (Criteria) this;
- }
-
- public Criteria andSysTypeNotBetween(String value1, String value2) {
- addCriterion("sys_type not between", value1, value2, "sysType");
- return (Criteria) this;
- }
-
- public Criteria andSysContentIsNull() {
- addCriterion("sys_content is null");
- return (Criteria) this;
- }
-
- public Criteria andSysContentIsNotNull() {
- addCriterion("sys_content is not null");
- return (Criteria) this;
- }
-
- public Criteria andSysContentEqualTo(String value) {
- addCriterion("sys_content =", value, "sysContent");
- return (Criteria) this;
- }
-
- public Criteria andSysContentNotEqualTo(String value) {
- addCriterion("sys_content <>", value, "sysContent");
- return (Criteria) this;
- }
-
- public Criteria andSysContentGreaterThan(String value) {
- addCriterion("sys_content >", value, "sysContent");
- return (Criteria) this;
- }
-
- public Criteria andSysContentGreaterThanOrEqualTo(String value) {
- addCriterion("sys_content >=", value, "sysContent");
- return (Criteria) this;
- }
-
- public Criteria andSysContentLessThan(String value) {
- addCriterion("sys_content <", value, "sysContent");
- return (Criteria) this;
- }
-
- public Criteria andSysContentLessThanOrEqualTo(String value) {
- addCriterion("sys_content <=", value, "sysContent");
- return (Criteria) this;
- }
-
- public Criteria andSysContentLike(String value) {
- addCriterion("sys_content like", value, "sysContent");
- return (Criteria) this;
- }
-
- public Criteria andSysContentNotLike(String value) {
- addCriterion("sys_content not like", value, "sysContent");
- return (Criteria) this;
- }
-
- public Criteria andSysContentIn(List<String> values) {
- addCriterion("sys_content in", values, "sysContent");
- return (Criteria) this;
- }
-
- public Criteria andSysContentNotIn(List<String> values) {
- addCriterion("sys_content not in", values, "sysContent");
- return (Criteria) this;
- }
-
- public Criteria andSysContentBetween(String value1, String value2) {
- addCriterion("sys_content between", value1, value2, "sysContent");
- return (Criteria) this;
- }
-
- public Criteria andSysContentNotBetween(String value1, String value2) {
- addCriterion("sys_content not between", value1, value2, "sysContent");
- return (Criteria) this;
- }
- }
-
- public static class Criteria extends GeneratedCriteria {
-
- protected Criteria() {
- super();
- }
- }
-
- public static class Criterion {
- private String condition;
-
- private Object value;
-
- private Object secondValue;
-
- private boolean noValue;
-
- private boolean singleValue;
-
- private boolean betweenValue;
-
- private boolean listValue;
-
- private String typeHandler;
-
- public String getCondition() {
- return condition;
- }
-
- public Object getValue() {
- return value;
- }
-
- public Object getSecondValue() {
- return secondValue;
- }
-
- public boolean isNoValue() {
- return noValue;
- }
-
- public boolean isSingleValue() {
- return singleValue;
- }
-
- public boolean isBetweenValue() {
- return betweenValue;
- }
-
- public boolean isListValue() {
- return listValue;
- }
-
- public String getTypeHandler() {
- return typeHandler;
- }
-
- protected Criterion(String condition) {
- super();
- this.condition = condition;
- this.typeHandler = null;
- this.noValue = true;
- }
-
- protected Criterion(String condition, Object value, String typeHandler) {
- super();
- this.condition = condition;
- this.value = value;
- this.typeHandler = typeHandler;
- if (value instanceof List<?>) {
- this.listValue = true;
- } else {
- this.singleValue = true;
- }
- }
-
- protected Criterion(String condition, Object value) {
- this(condition, value, null);
- }
-
- protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
- super();
- this.condition = condition;
- this.value = value;
- this.secondValue = secondValue;
- this.typeHandler = typeHandler;
- this.betweenValue = true;
- }
-
- protected Criterion(String condition, Object value, Object secondValue) {
- this(condition, value, secondValue, null);
- }
- }
-}
\ No newline at end of file
diff --git a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyCarMapper.java b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyCarMapper.java
index d3d7138..77c169d 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyCarMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyCarMapper.java
@@ -2,6 +2,7 @@
import java.util.List;
import com.ruoyi.sy.domain.ArdSyCar;
+import org.apache.ibatis.annotations.Param;
/**
* 涓変竴杞﹁締Mapper鎺ュ彛
@@ -67,9 +68,11 @@
*/
public List<ArdSyCar> selectArdSyCarByIds(String[] ids);
+// List<ArdSyCar> getArdSyCarWithRightByCarIdList(@Param("carIdList")List<String> carIdList);
+
/**
* 鏍规嵁杞﹁締ID鏌ヨ杞﹁締鍒楄〃
- * @param carId
+ * @param id
* @return
*/
List<ArdSyCar> carListById(String id);
diff --git a/ard-work/src/main/java/com/ruoyi/sy/mapper/SysParaMapper.java b/ard-work/src/main/java/com/ruoyi/sy/mapper/SysParaMapper.java
deleted file mode 100644
index ecc4dca..0000000
--- a/ard-work/src/main/java/com/ruoyi/sy/mapper/SysParaMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.ruoyi.sy.mapper;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.ruoyi.common.annotation.DataSource;
-import com.ruoyi.common.enums.DataSourceType;
-import com.ruoyi.sy.domain.SysPara;
-import com.ruoyi.sy.domain.SysParaExample;
-import java.util.List;
-
-/**
- * @author 11441
- */
-@DataSource(value = DataSourceType.SLAVE)
-public interface SysParaMapper {
-
- List<SysPara> selectByExample(String sysType);
-
-}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java b/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java
index cc330bc..5d6d65a 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyCarService.java
@@ -83,5 +83,7 @@
*/
public String uploadCarPicture(String id, MultipartFile carPicture);
+// List<ArdSyCar> getArdSyCarWithRightByCarIdList(List<String> carIdList);
Results carListById(String id);
+
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/SysParaService.java b/ard-work/src/main/java/com/ruoyi/sy/service/SysParaService.java
deleted file mode 100644
index 6a423fb..0000000
--- a/ard-work/src/main/java/com/ruoyi/sy/service/SysParaService.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.ruoyi.sy.service;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author 11441
- */
-public interface SysParaService {
- String getSYURL();
-}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
index 599b126..b14176e 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
@@ -327,6 +327,12 @@
}
}
+// @Override
+// public List<ArdSyCar> getArdSyCarWithRightByCarIdList(List<String> carIdList) {
+// List<ArdSyCar> result = ardSyCarMapper.getArdSyCarWithRightByCarIdList(carIdList);
+// return result;
+// }
+
@Override
public Results carListById(String id) {
try {
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/SysParaServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/SysParaServiceImpl.java
deleted file mode 100644
index e96131b..0000000
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/SysParaServiceImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.ruoyi.sy.service.impl;
-
-import com.ruoyi.sy.domain.SysPara;
-import com.ruoyi.sy.domain.SysParaExample;
-import com.ruoyi.sy.mapper.SysParaMapper;
-import com.ruoyi.sy.service.SysParaService;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-
-/**
- * @author 11441
- */
-@Service
-public class SysParaServiceImpl implements SysParaService {
-
- @Resource
- private SysParaMapper sysParaMapper;
-
- @Override
- public String getSYURL() {
-// SysParaExample example = new SysParaExample();
-// example.createCriteria().andSysTypeEqualTo("syCarPT");
- List<SysPara> result = sysParaMapper.selectByExample("syCarPT");
- if(result.size() > 0){
- String SYURL = result.get(0).getSysContent();
- return SYURL;
- }else{
- return "";
- }
- }
-
-
-}
diff --git a/ard-work/src/main/java/com/ruoyi/utils/result/Constants.java b/ard-work/src/main/java/com/ruoyi/utils/result/Constants.java
index 932b53a..68b3b4e 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/result/Constants.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/result/Constants.java
@@ -5,9 +5,9 @@
* 杩斿洖鐘舵�佺爜
*/
public interface Constants {
- String CODE_200 = "200"; // 鎴愬姛
- String CODE_400 = "400"; // 鍙傛暟閿欒
- String CODE_500 = "500"; // 绯荤粺閿欒
- String CODE_401 = "401"; // 鏉冮檺涓嶈冻
+ Integer CODE_200 = 200; // 鎴愬姛
+ Integer CODE_400 = 400; // 鍙傛暟閿欒
+ Integer CODE_500 = 500; // 绯荤粺閿欒
+ Integer CODE_401 = 401; // 鏉冮檺涓嶈冻
}
diff --git a/ard-work/src/main/java/com/ruoyi/utils/result/Results.java b/ard-work/src/main/java/com/ruoyi/utils/result/Results.java
index b6c861e..1f0dfd5 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/result/Results.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/result/Results.java
@@ -12,7 +12,7 @@
@AllArgsConstructor
@NoArgsConstructor
public class Results {
- private String code;
+ private Integer code;
private String msg;
private Object data;
diff --git a/ard-work/src/main/resources/mapper/sy/ArdSyCarMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdSyCarMapper.xml
index 35d3c4b..441a04f 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdSyCarMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdSyCarMapper.xml
@@ -102,6 +102,7 @@
</foreach>
</select>
+
<select id="carListById" parameterType="String" resultMap="ArdSyCarResult">
select * from ard_sy_car where id = #{id}
</select>
diff --git a/ard-work/src/main/resources/mapper/sy/SysParaMapper.xml b/ard-work/src/main/resources/mapper/sy/SysParaMapper.xml
deleted file mode 100644
index 3da8fbb..0000000
--- a/ard-work/src/main/resources/mapper/sy/SysParaMapper.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.sy.mapper.SysParaMapper" >
- <resultMap id="BaseResultMap" type="com.ruoyi.sy.domain.SysPara" >
- <id column="sys_id" property="sysId" jdbcType="VARCHAR" />
- <result column="sys_name" property="sysName" jdbcType="VARCHAR" />
- <result column="sys_type" property="sysType" jdbcType="VARCHAR" />
- <result column="sys_content" property="sysContent" jdbcType="VARCHAR" />
- </resultMap>
- <sql id="Example_Where_Clause" >
- <where >
- <foreach collection="oredCriteria" item="criteria" separator="or" >
- <if test="criteria.valid" >
- <trim prefix="(" suffix=")" prefixOverrides="and" >
- <foreach collection="criteria.criteria" item="criterion" >
- <choose >
- <when test="criterion.noValue" >
- and ${criterion.condition}
- </when>
- <when test="criterion.singleValue" >
- and ${criterion.condition} #{criterion.value}
- </when>
- <when test="criterion.betweenValue" >
- and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
- </when>
- <when test="criterion.listValue" >
- and ${criterion.condition}
- <foreach collection="criterion.value" item="listItem" open="(" close=")" separator="," >
- #{listItem}
- </foreach>
- </when>
- </choose>
- </foreach>
- </trim>
- </if>
- </foreach>
- </where>
- </sql>
- <sql id="Base_Column_List" >
- sys_id, sys_name, sys_type, sys_content
- </sql>
- <select id="selectByExample" parameterType="String" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List" />
- from sys_para
- where sys_type = #{sys_type}
- </select>
-
-</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 103ba5c..7657c4b 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -2,10 +2,10 @@
spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: org.postgresql.Driver
druid:
# 涓诲簱鏁版嵁婧�
master:
+ driverClassName: org.postgresql.Driver
url: jdbc:postgresql://111.40.46.199:15432/ry-vue?stringtype=unspecified
username: postgres
password: Yykj.2021
@@ -16,9 +16,16 @@
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
enabled: true
+ driverClassName: org.postgresql.Driver
url: jdbc:postgresql://112.98.126.2:35432/ard732
username: postgres
password: Yykj.2017
+ slave2012:
+ enabled: true
+ driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+ url: jdbc:sqlserver://59.110.226.79:1433;DatabaseName=gps2012
+ username: car
+ password: gps2017
# 鍒濆杩炴帴鏁�
initialSize: 5
# 鏈�灏忚繛鎺ユ睜鏁伴噺
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java
index 13d49d6..6bf1ca5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java
@@ -73,4 +73,11 @@
* @return 缁撴灉
*/
public int deleteConfigByIds(Long[] configIds);
+
+ /**
+ * 涓変竴杞﹁締鍦板潃
+ * @param sysType
+ * @return
+ */
+ List<SysConfig> selectByType(String sysType);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
index 15d2351..50cdf83 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
@@ -87,4 +87,10 @@
*/
public String checkConfigKeyUnique(SysConfig config);
+ /**
+ * 涓変竴杞﹁締鍦板潃
+ * @return
+ */
+ String getSYURL();
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
index 7f67c4b..dd79ede 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
@@ -230,4 +230,15 @@
{
return CacheConstants.SYS_CONFIG_KEY + configKey;
}
+
+ @Override
+ public String getSYURL() {
+ List<SysConfig> result = configMapper.selectByType("syCarPT");
+ if(result.size() > 0){
+ String SYURL = result.get(0).getConfigValue();
+ return SYURL;
+ }else{
+ return "";
+ }
+ }
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
index 102ad7f..b40ff8b 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
@@ -113,5 +113,9 @@
#{configId}
</foreach>
</delete>
+
+ <select id="selectByType" parameterType="String" resultMap="SysConfigResult">
+ select * from sys_config where config_key = #{sysType}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3