From 417459b4f36b090097323f0f7d3c8469e9687f66 Mon Sep 17 00:00:00 2001
From: 艾金辉 <1144154118@qq.com>
Date: 星期五, 21 七月 2023 15:09:08 +0800
Subject: [PATCH] 根据用户名获取三一列表
---
ard-work/src/main/resources/lib/jna.jar | 0
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyUserMapper.java | 2
ard-work/src/main/java/com/ruoyi/sy/service/impl/SysParaServiceImpl.java | 36 ++
ard-work/src/main/java/com/ruoyi/sy/domain/SysPara.java | 20 +
ruoyi-admin/pom.xml | 4
ard-work/src/main/resources/mapper/sy/SysParaMapper.xml | 57 +++
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 63 +++
ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml | 8
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyUserServiceImpl.java | 6
ruoyi-admin/src/main/resources/application.yml | 2
ruoyi-common/pom.xml | 12
ard-work/pom.xml | 31 +
ard-work/src/main/java/com/ruoyi/sy/domain/SysParaExample.java | 480 ++++++++++++++++++++++++++++++
ruoyi-admin/src/main/resources/application-druid.yml | 8
ard-work/src/main/java/com/ruoyi/client/ARDCarGPSLogInClient.java | 50 +++
ard-work/src/main/java/com/ruoyi/sy/service/IArdSyUserService.java | 2
ard-work/src/main/java/com/ruoyi/sy/service/SysParaService.java | 11
ard-work/src/main/resources/lib/examples.jar | 0
ard-work/src/main/java/com/ruoyi/sy/mapper/SysParaMapper.java | 16 +
ruoyi-admin/src/main/resources/application-ard.yml | 4
ard-work/src/main/java/com/ruoyi/client/ARDCarSYGPSClient.java | 96 ++++++
21 files changed, 903 insertions(+), 5 deletions(-)
diff --git a/ard-work/pom.xml b/ard-work/pom.xml
index c13dd0a..5279ea4 100644
--- a/ard-work/pom.xml
+++ b/ard-work/pom.xml
@@ -35,11 +35,15 @@
<groupId>net.java.jna</groupId>
<artifactId>jna</artifactId>
<version>1.0.0</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/src/main/resources/lib/jna.jar</systemPath>
</dependency>
<dependency>
<groupId>net.java.examples</groupId>
<artifactId>examples</artifactId>
<version>1.0.0</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/src/main/resources/lib/examples.jar</systemPath>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -103,6 +107,33 @@
<artifactId>forest-spring-boot-starter</artifactId>
<version>1.5.28</version>
</dependency>
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-common</artifactId>
+ </dependency>
+ <!--mybatis-plus渚濊禆-->
+ <dependency>
+ <groupId>com.baomidou</groupId>
+ <artifactId>mybatis-plus-boot-starter</artifactId>
+ <version>3.4.2</version>
+ </dependency>
+ <!--lombok渚濊禆-->
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <configuration>
+ <includeSystemScope>true</includeSystemScope>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
diff --git a/ard-work/src/main/java/com/ruoyi/client/ARDCarGPSLogInClient.java b/ard-work/src/main/java/com/ruoyi/client/ARDCarGPSLogInClient.java
new file mode 100644
index 0000000..6c53444
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/client/ARDCarGPSLogInClient.java
@@ -0,0 +1,50 @@
+package com.ruoyi.client;
+
+import com.alibaba.fastjson.JSON;
+import com.squareup.okhttp.OkHttpClient;
+import com.squareup.okhttp.Request;
+import com.squareup.okhttp.Response;
+import com.squareup.okhttp.ResponseBody;
+import org.apache.commons.codec.digest.DigestUtils;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ARDCarGPSLogInClient {
+
+ public static Map<String,Object> loginIn(String syURL,String userId,String password){
+ OkHttpClient okHttpClient = new OkHttpClient();
+
+ String passwordMd5 = DigestUtils.md5Hex(password);
+
+ /*Request request = new Request.Builder()
+ .url("http://116.182.15.14:9999/gps-web/api/login.jsp?"+"password="+passwordMd5+"&userId="+userId+"&loginType=user&loginWay=interface&loginLang=zh_CN")
+ .build();*/
+ Request request = new Request.Builder()
+ .url(syURL + "/gps-web/api/login.jsp?"+"password="+passwordMd5+"&userId="+userId+"&loginType=user&loginWay=interface&loginLang=zh_CN")
+ .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);
+ map.put("passwordMd5", passwordMd5);
+ //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/client/ARDCarSYGPSClient.java b/ard-work/src/main/java/com/ruoyi/client/ARDCarSYGPSClient.java
new file mode 100644
index 0000000..d2dff2e
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/client/ARDCarSYGPSClient.java
@@ -0,0 +1,96 @@
+package com.ruoyi.client;
+
+import com.alibaba.fastjson.JSON;
+import com.squareup.okhttp.OkHttpClient;
+import com.squareup.okhttp.Request;
+import com.squareup.okhttp.Response;
+import com.squareup.okhttp.ResponseBody;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ARDCarSYGPSClient {
+
+ /*private static String syURL;
+
+ public static String getSyURL() {
+ return syURL;
+ }
+
+ public static void setSyURL(String syURL) {
+ syURL = syURL;
+ }*/
+
+ //鏌ヨ鏉冮檺鍐呭叏閮ㄨ溅闃� --杞﹂槦鍒楄〃
+ public static Map<String,Object> getCarGPSTeamList(String syURL,String userId,String sessionId){
+ OkHttpClient okHttpClient = new OkHttpClient();
+
+ /*Request request = new Request.Builder()
+ .url("http://106.14.186.44:9999/gps-web/api/get_team_list.jsp?teamId=&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_team_list.jsp?teamId=&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_team_list.jsp?teamId=&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> getCarListByTeamId(String syURL,String teamId,String sessionId){
+ OkHttpClient okHttpClient = new OkHttpClient();
+
+ /*Request request = new Request.Builder()
+ .url("http://116.182.15.14:9999/gps-web/api/get_team_car_list.jsp?teamId="+teamId+"&video=false&sessionId="+sessionId)
+ .build();*/
+ Request request = new Request.Builder()
+ .url(syURL + "/gps-web/api/get_team_car_list.jsp?teamId="+teamId+"&video=false&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);
+ 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 fe33285..9ddd55b 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,13 +1,18 @@
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 javax.servlet.http.HttpServletResponse;
+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.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;
@@ -45,6 +50,14 @@
@Autowired
private ISysConfigService sysConfigService;
+
+ private Map<Integer,Map<String,String>> logInMap = new HashMap();
+
+ @Autowired
+ private SysParaService sysParaService;
+
+ @Autowired
+ private IArdSyUserService iArdSyUserService;
/**
* 鏌ヨ涓変竴杞﹁締鍒楄〃
@@ -208,4 +221,54 @@
}
}
+ @PreAuthorize("@ss.hasPermi('sy:syCar:allListByUser')")
+ @PostMapping("allListByUser")
+ @ApiOperation("鏍规嵁鐢ㄦ埛鑾峰彇涓変竴鍒楄〃")
+ public Map<String,Object> allListByUser(){
+ String usersId = SecurityUtils.getUserId();
+ Map<String, String> result = logInMap.get(Integer.parseInt(usersId));
+ String syURL = sysParaService.getSYURL();
+ if(result == null){
+ Map<String,Object> m = iArdSyUserService.selectArdSyUserByUsersId(Integer.parseInt(usersId));
+ if(m == null){
+ Map<String,Object> map0 = new HashMap();
+ map0.put("rspDesc", "褰撳墠鐧诲綍鐢ㄦ埛鏈寕鎺ヨ溅杈嗘潈闄�");
+ map0.put("rspCode", "0");
+ return map0;
+ }
+ Map<String, Object> result0 = ARDCarGPSLogInClient.loginIn(syURL,(String) m.get("userId"), (String) m.get("password"));
+ result = new HashMap();
+ result.put("userId", (String) m.get("userId"));
+ result.put("sessionId", (String) result0.get("sessionId"));
+ }
+ Map<String,Object> result0 = new HashMap();
+ try {
+ result0 = ARDCarSYGPSClient.getCarGPSTeamList(syURL,result.get("userId"),result.get("sessionId"));//
+ } catch (Exception e) {
+ Map<String,Object> map = new HashMap();
+ map.put("rspCode", 0);
+ map.put("list", new ArrayList());
+ return map;
+ }
+ int online = 0;
+ for(Map<String,Object> map : (List<Map<String,Object>>) result0.get("list")){
+ Map<String,Object> resultMap = (Map<String, Object>) ARDCarSYGPSClient.getCarListByTeamId(syURL,(String)map.get("teamId"),result.get("sessionId"));
+ List<Map<String,Object>> carList = (List<Map<String, Object>>) resultMap.get("carList");
+ for(Map<String,Object> m : carList){
+ if(((String) m.get("stateCn")).contains("鍦ㄧ嚎")){
+ online = online + 1;
+ }else{
+ continue;
+ }
+ }
+ for(Map<String,Object> m : (List<Map<String,Object>>) result0.get("list")){
+ if(((String) m.get("teamId")).equals(((String) map.get("teamId")))){
+ map.put("count", Integer.parseInt((String) m.get("carNum")));
+ }
+ }
+ map.put("online", online);
+ online = 0;
+ }
+ return result0;
+ }
}
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
new file mode 100644
index 0000000..be2ea81
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/sy/domain/SysPara.java
@@ -0,0 +1,20 @@
+package com.ruoyi.sy.domain;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * @author 11441
+ */
+@Data
+@TableName("sys_para")
+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
new file mode 100644
index 0000000..bda8c90
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/sy/domain/SysParaExample.java
@@ -0,0 +1,480 @@
+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/ArdSyUserMapper.java b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyUserMapper.java
index b918d80..51ba900 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyUserMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyUserMapper.java
@@ -75,4 +75,6 @@
* 鏌ヨ鏈寕鎺ヤ笁涓�杞﹁締鐨�4.0鐢ㄦ埛
*/
public List<SysUser> getSysUserNoSY();
+
+ Map<String,Object> selectArdSyUserByUsersId(Integer usersId);
}
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
new file mode 100644
index 0000000..1c85d44
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/sy/mapper/SysParaMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.sy.mapper;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.ruoyi.sy.domain.SysPara;
+import com.ruoyi.sy.domain.SysParaExample;
+import java.util.List;
+
+/**
+ * @author 11441
+ */
+@DS("slave")
+public interface SysParaMapper {
+
+ public List<SysPara> selectByExample(SysParaExample example);
+
+}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyUserService.java b/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyUserService.java
index 8e26ab8..289dd7f 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyUserService.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/IArdSyUserService.java
@@ -73,4 +73,6 @@
* 鏌ヨ鏈寕鎺ヤ笁涓�杞﹁締鐨�4.0鐢ㄦ埛
*/
public List<SysUser> getSysUserNoSY();
+
+ Map<String,Object> selectArdSyUserByUsersId(Integer usersId);
}
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
new file mode 100644
index 0000000..6a423fb
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/SysParaService.java
@@ -0,0 +1,11 @@
+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/ArdSyUserServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyUserServiceImpl.java
index 3b9999f..924fb9a 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyUserServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyUserServiceImpl.java
@@ -115,4 +115,10 @@
List<SysUser> result = ardSyUserMapper.getSysUserNoSY();
return result;
}
+
+ @Override
+ public Map<String,Object> selectArdSyUserByUsersId(Integer usersId) {
+ Map<String,Object> result = ardSyUserMapper.selectArdSyUserByUsersId(usersId);
+ return result;
+ }
}
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
new file mode 100644
index 0000000..ee91c6b
--- /dev/null
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/SysParaServiceImpl.java
@@ -0,0 +1,36 @@
+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(example);
+ if(result.size() > 0){
+ String SYURL = result.get(0).getSysContent();
+ return SYURL;
+ }else{
+ return "";
+ }
+ }
+
+
+}
diff --git a/ard-work/src/main/resources/lib/examples.jar b/ard-work/src/main/resources/lib/examples.jar
new file mode 100644
index 0000000..8f0b457
--- /dev/null
+++ b/ard-work/src/main/resources/lib/examples.jar
Binary files differ
diff --git a/ard-work/src/main/resources/lib/jna.jar b/ard-work/src/main/resources/lib/jna.jar
new file mode 100644
index 0000000..33461ec
--- /dev/null
+++ b/ard-work/src/main/resources/lib/jna.jar
Binary files differ
diff --git a/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml
index f248c3e..ff96ba8 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdSyUserMapper.xml
@@ -124,4 +124,12 @@
select * from sys_user su where su.del_flag = '0'
and su.user_id not in (select asu.sys_user_id from ard_sy_user asu)
</select>
+
+ <select id="selectArdSyUserByUsersId" resultType="java.util.Map" parameterType="java.lang.Integer" >
+ select asu.id,asu.user_id as userId,asu.password,
+ aus.users_id as usersId,au.name from ard_sy_user asu
+ inner join ard_users_sy aus on asu.id = aus.sy_user_id
+ inner join ard_users au on aus.users_id = au.id
+ where aus.users_id = #{usersId}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/ard-work/src/main/resources/mapper/sy/SysParaMapper.xml b/ard-work/src/main/resources/mapper/sy/SysParaMapper.xml
new file mode 100644
index 0000000..4c7618b
--- /dev/null
+++ b/ard-work/src/main/resources/mapper/sy/SysParaMapper.xml
@@ -0,0 +1,57 @@
+<?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" resultMap="BaseResultMap" parameterType="com.ruoyi.sy.domain.SysParaExample" >
+ select
+ <if test="distinct" >
+ distinct
+ </if>
+ <include refid="Base_Column_List" />
+ from sys_para
+ <if test="_parameter != null" >
+ <include refid="Example_Where_Clause" />
+ </if>
+ <if test="orderByClause != null" >
+ order by ${orderByClause}
+ </if>
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 3c953da..d5d3012 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -75,6 +75,10 @@
<artifactId>ard-work</artifactId>
<version>3.8.5</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-autoconfigure</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/ruoyi-admin/src/main/resources/application-ard.yml b/ruoyi-admin/src/main/resources/application-ard.yml
index aa1d61b..8ded130 100644
--- a/ruoyi-admin/src/main/resources/application-ard.yml
+++ b/ruoyi-admin/src/main/resources/application-ard.yml
@@ -17,10 +17,12 @@
#mqtt
mqtt:
host: tcp://192.168.1.15:1883
- clientId: m3
+ clientId: m241
username: admin
password: xzx12345
topic: tube,stealelec,radar
timeout: 100
keepalive: 60
enabled: true
+mediamtx:
+ host: 127.0.0.1
\ 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 fdcc11b..916b601 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -15,10 +15,10 @@
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
- enabled: false
- url:
- username:
- password:
+# enabled: true
+ url: jdbc:postgresql://112.98.126.2:35432/ard732
+ username: postgres
+ password: Yykj.2017
# 鍒濆杩炴帴鏁�
initialSize: 5
# 鏈�灏忚繛鎺ユ睜鏁伴噺
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 7341f19..f0684e6 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -109,6 +109,8 @@
mapperLocations: classpath*:mapper/**/*Mapper.xml
# 鍔犺浇鍏ㄥ眬鐨勯厤缃枃浠�
configLocation: classpath:mybatis/mybatis-config.xml
+mybatis-plus:
+ mapper-locations: classpath:mapper/*.xml #鎵弿mapper涓嬬殑鎵�鏈墄ml鏂囦欢
# PageHelper鍒嗛〉鎻掍欢
pagehelper:
diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index 8a465c4..ba00573 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -14,6 +14,18 @@
<description>
common閫氱敤宸ュ叿
</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>8</source>
+ <target>8</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
--
Gitblit v1.9.3