From 3b541e81611079a5a1c214440eed704cbb6b38af Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 24 七月 2023 11:40:17 +0800
Subject: [PATCH] 优化
---
ard-work/pom.xml | 8 ----
ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java | 6 +--
ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java | 1
ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml | 75 +++++++++++++++++++++++++++----------
ard-work/src/main/java/com/ruoyi/client/ARDCarGPSLogInClient.java | 7 ++-
ard-work/src/main/java/com/ruoyi/utils/forest/UavClient.java | 1
ard-work/src/main/java/com/ruoyi/utils/forest/UavAuthLifeCircle.java | 1
ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java | 14 ++----
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 2 +
9 files changed, 68 insertions(+), 47 deletions(-)
diff --git a/ard-work/pom.xml b/ard-work/pom.xml
index 6cf0bd8..403665f 100644
--- a/ard-work/pom.xml
+++ b/ard-work/pom.xml
@@ -41,15 +41,11 @@
<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>
@@ -101,10 +97,6 @@
<groupId>com.dtflys.forest</groupId>
<artifactId>forest-spring-boot-starter</artifactId>
<version>1.5.28</version>
- </dependency>
- <dependency>
- <groupId>com.ruoyi</groupId>
- <artifactId>ruoyi-common</artifactId>
</dependency>
<!--lombok渚濊禆-->
<dependency>
diff --git a/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java b/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
index 0adc204..dba3030 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
@@ -3,18 +3,13 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.alibaba.fastjson2.JSONObject;
+import com.ruoyi.alarm.steal.domain.ArdAlarmStealelec;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -23,6 +18,7 @@
import com.ruoyi.app.task.service.IArdAppTaskService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
/**
* app浠诲姟绠＄悊Controller
@@ -67,7 +63,7 @@
/**
* 鑾峰彇app浠诲姟绠＄悊璇︾粏淇℃伅
*/
- @ApiOperation("鑾峰彇app浠诲姟绠＄悊璇︾粏淇℃伅(鍥剧墖)")
+ @ApiOperation("鑾峰彇app浠诲姟绠＄悊璇︾粏淇℃伅")
@PreAuthorize("@ss.hasPermi('app:task:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfoWithPic(@PathVariable("id") String id)
diff --git a/ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java b/ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java
index 8d48079..e341813 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java
@@ -19,6 +19,7 @@
* @param id app浠诲姟绠＄悊涓婚敭
* @return app浠诲姟绠＄悊
*/
+ public ArdAppTask selectArdAppTaskById(String id);
public ArdAppTask selectArdAppTaskByIdWithPic(String id);
public ArdAppTask selectArdAppTaskByIdWithDetail(String id);
/**
diff --git a/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java b/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java
index 0a3fc0c..b5cd85b 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java
@@ -46,10 +46,7 @@
*/
@Override
public ArdAppTask selectArdAppTaskById(String id) {
- ArdAppTask task = ardAppTaskMapper.selectArdAppTaskByIdWithPic(id);
- ArdAppTask temp = ardAppTaskMapper.selectArdAppTaskByIdWithDetail(id);
- task.setArdAppTaskDetailList(temp.getArdAppTaskDetailList());
- return task;
+ return ardAppTaskMapper.selectArdAppTaskById(id);
}
/**
@@ -112,6 +109,7 @@
@Override
public int deleteArdAppTaskByIds(String[] ids) {
ardAppTaskMapper.deleteArdAppTaskPicByTaskIds(ids);
+ ardAppTaskMapper.deleteArdAppTaskDetailByTaskIds(ids);
return ardAppTaskMapper.deleteArdAppTaskByIds(ids);
}
diff --git a/ard-work/src/main/java/com/ruoyi/client/ARDCarGPSLogInClient.java b/ard-work/src/main/java/com/ruoyi/client/ARDCarGPSLogInClient.java
index afe65a5..0eaf286 100644
--- a/ard-work/src/main/java/com/ruoyi/client/ARDCarGPSLogInClient.java
+++ b/ard-work/src/main/java/com/ruoyi/client/ARDCarGPSLogInClient.java
@@ -6,13 +6,14 @@
import okhttp3.Response;
import okhttp3.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){
+ public static Map<String, Object> loginIn(String syURL, String userId, String password) {
OkHttpClient okHttpClient = new OkHttpClient();
String passwordMd5 = DigestUtils.md5Hex(password);
@@ -21,7 +22,7 @@
.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")
+ .url(syURL + "/gps-web/api/login.jsp?" + "password=" + passwordMd5 + "&userId=" + userId + "&loginType=user&loginWay=interface&loginLang=zh_CN")
.build();
Response response = null;
try {
@@ -37,7 +38,7 @@
try {
String message = responseBody.string();// 鍝嶅簲浣�
- Map<String,Object> map = (Map<String, Object>) JSON.parse(message);
+ Map<String, Object> map = (Map<String, Object>) JSON.parse(message);
map.put("passwordMd5", passwordMd5);
//System.out.println(message);
return map;
diff --git a/ard-work/src/main/java/com/ruoyi/utils/forest/UavAuthLifeCircle.java b/ard-work/src/main/java/com/ruoyi/utils/forest/UavAuthLifeCircle.java
index f010584..db6338f 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/forest/UavAuthLifeCircle.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/forest/UavAuthLifeCircle.java
@@ -7,7 +7,6 @@
public class UavAuthLifeCircle implements MethodAnnotationLifeCycle<UavAuth, Object> {
-
/**
* 鍙戦�佽姹傚墠鎵ц姝ゆ柟娉�
*/
diff --git a/ard-work/src/main/java/com/ruoyi/utils/forest/UavClient.java b/ard-work/src/main/java/com/ruoyi/utils/forest/UavClient.java
index c90ce14..67558fe 100644
--- a/ard-work/src/main/java/com/ruoyi/utils/forest/UavClient.java
+++ b/ard-work/src/main/java/com/ruoyi/utils/forest/UavClient.java
@@ -14,7 +14,6 @@
public static String IP = "http://112.98.126.2:6100/";
-
@UavAuth(token = "${token}")
@Get(IP + "${url}")
String GET(@DataVariable("url") String url, @DataVariable("token") String token, @JSONBody String body);
diff --git a/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
index c4a8f50..b3c7423 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
@@ -16,7 +16,28 @@
<result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
</resultMap>
-
+ <resultMap id="ArdAppTaskSubResult" type="ArdAppTask" extends="ArdAppTaskResult">
+ <collection property="ardAppTaskPicList" notNullColumn="sub2_id" javaType="java.util.List"
+ resultMap="ArdAppTaskPicResult"/>
+ <collection property="ardAppTaskDetailList" notNullColumn="sub1_id" javaType="java.util.List"
+ resultMap="ArdAppTaskDetailResult"/>
+ </resultMap>
+ <resultMap type="ArdAppTaskDetail" id="ArdAppTaskDetailResult">
+ <result property="id" column="sub1_id"/>
+ <result property="name" column="sub1_name"/>
+ <result property="longitude" column="sub1_longitude"/>
+ <result property="latitude" column="sub1_latitude"/>
+ <result property="altitude" column="sub1_altitude"/>
+ <result property="userId" column="sub1_user_id"/>
+ <result property="text" column="sub1_text"/>
+ <result property="voice" column="sub1_voice"/>
+ <result property="taskId" column="sub1_task_id"/>
+ </resultMap>
+ <resultMap type="ArdAppTaskPic" id="ArdAppTaskPicResult">
+ <result property="id" column="sub2_id"/>
+ <result property="taskId" column="sub2_task_id"/>
+ <result property="picUrl" column="sub2_pic_url"/>
+ </resultMap>
<resultMap id="ArdAppTaskArdAppTaskPicResult" type="ArdAppTask" extends="ArdAppTaskResult">
<collection property="ardAppTaskPicList" notNullColumn="sub_id" javaType="java.util.List"
resultMap="ArdAppTaskPicResult"/>
@@ -24,23 +45,6 @@
<resultMap id="ArdAppTaskArdAppTaskDetailResult" type="ArdAppTask" extends="ArdAppTaskResult">
<collection property="ardAppTaskDetailList" notNullColumn="sub_id" javaType="java.util.List"
resultMap="ArdAppTaskDetailResult"/>
- </resultMap>
-
- <resultMap type="ArdAppTaskDetail" id="ArdAppTaskDetailResult">
- <result property="id" column="sub_id"/>
- <result property="name" column="sub_name"/>
- <result property="longitude" column="sub_longitude"/>
- <result property="latitude" column="sub_latitude"/>
- <result property="altitude" column="sub_altitude"/>
- <result property="userId" column="sub_user_id"/>
- <result property="text" column="sub_text"/>
- <result property="voice" column="sub_voice"/>
- <result property="taskId" column="sub_task_id"/>
- </resultMap>
- <resultMap type="ArdAppTaskPic" id="ArdAppTaskPicResult">
- <result property="id" column="sub_id"/>
- <result property="taskId" column="sub_task_id"/>
- <result property="picUrl" column="sub_pic_url"/>
</resultMap>
<sql id="selectArdAppTaskVo">
@@ -65,15 +69,43 @@
<if test="name != null and name != ''">and name like '%'||#{name}||'%'</if>
<if test="text != null and text != ''">and text = #{text}</if>
<if test="voice != null and voice != ''">and voice = #{voice}</if>
- <if test="deptId != null ">and (c.dept_id = #{deptId} OR c.dept_id IN ( SELECT t.dept_id FROM sys_dept t
+ <if test="deptId != null and deptId != 0 ">
+ and (c.dept_id = #{deptId} OR c.dept_id IN ( SELECT t.dept_id FROM sys_dept t
WHERE cast(#{deptId} as varchar) = any(string_to_array(ancestors,',')) ))
</if>
<if test="userId != null and userId != ''">and user_id = #{userId}</if>
- <!-- 鏁版嵁鑼冨洿杩囨护 -->
- ${params.dataScope}
</where>
+ <!-- 鏁版嵁鑼冨洿杩囨护 -->
+ ${params.dataScope}
</select>
+ <select id="selectArdAppTaskById" parameterType="String" resultMap="ArdAppTaskSubResult">
+ select a.id,
+ a.name,
+ a.text,
+ a.voice,
+ a.dept_id,
+ a.user_id,
+ a.create_by,
+ a.create_time,
+ a.update_by,
+ a.update_time,
+ b.id as sub2_id,
+ b.task_id as sub2_task_id,
+ b.pic_url as sub2_pic_url,
+ c.id as sub1_id,
+ c.name as sub1_name,
+ c.longitude as sub1_longitude,
+ c.latitude as sub1_latitde,
+ c.altitude as sub1_altitude,
+ c.user_id as sub1_user_id,
+ c.text as sub1_text,
+ c.voice as sub1_voice
+ from ard_app_task a
+ left join ard_app_task_pic b on b.task_id = a.id
+ left join ard_app_task_detail c on c.task_id = a.id
+ where a.id = #{id}
+ </select>
<select id="selectArdAppTaskByIdWithPic" parameterType="String" resultMap="ArdAppTaskArdAppTaskPicResult">
select a.id,
a.name,
@@ -115,6 +147,7 @@
left join ard_app_task_detail c on c.task_id = a.id
where a.id = #{id}
</select>
+
<insert id="insertArdAppTask" parameterType="ArdAppTask">
insert into ard_app_task
<trim prefix="(" suffix=")" suffixOverrides=",">
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 0e20c09..b0bbc08 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -61,6 +61,7 @@
/**
* 鑾峰彇鐢ㄦ埛鍒楄〃
*/
+ @ApiOperation("鑾峰彇鐢ㄦ埛鍒楄〃")
@PreAuthorize("@ss.hasPermi('system:user:list')")
@GetMapping("/list")
public TableDataInfo list(SysUser user) {
@@ -98,6 +99,7 @@
/**
* 鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇璇︾粏淇℃伅
*/
+ @ApiOperation("鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇璇︾粏淇℃伅")
@PreAuthorize("@ss.hasPermi('system:user:query')")
@GetMapping(value = {"/", "/{userId}"})
public AjaxResult getInfo(@PathVariable(value = "userId", required = false) String userId) {
--
Gitblit v1.9.3