From 342b6590ee28cc1a7b501287ce57eec1d6d166b8 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期三, 26 七月 2023 09:16:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java | 18 +++++++++++++++++-
ard-work/src/main/java/com/ruoyi/app/task/mapper/ArdAppTaskMapper.java | 1 +
ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml | 15 +++++++++++++++
ard-work/src/main/java/com/ruoyi/app/task/service/IArdAppTaskService.java | 8 +++++++-
ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java | 10 ++++++++++
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 3 +++
6 files changed, 53 insertions(+), 2 deletions(-)
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 0d953c3..195c448 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
@@ -117,4 +117,14 @@
public AjaxResult editDetail(@RequestBody ArdAppTaskDetail ardAppTaskDetail) {
return toAjax(ardAppTaskService.updateArdAppTaskDetail(ardAppTaskDetail));
}
+ /**
+ * 鑾峰彇app浠诲姟璇︽儏鐨勮缁嗕俊鎭�
+ */
+ @ApiOperation("鑾峰彇app浠诲姟璇︽儏鐨勮缁嗕俊鎭�")
+ @PreAuthorize("@ss.hasPermi('app:task:query')")
+ @GetMapping(value = "/detail/{id}")
+ public AjaxResult getTaskDetailInfo(@PathVariable("id") String id) {
+ return success(ardAppTaskService.selectArdAppTaskDetailById(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 46390fe..dc6def6 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
@@ -23,6 +23,7 @@
public ArdAppTask selectArdAppTaskById(String id);
public ArdAppTask selectArdAppTaskByIdWithPic(String id);
public ArdAppTask selectArdAppTaskByIdWithDetail(String id);
+ public ArdAppTaskDetail selectArdAppTaskDetailById(String id);
/**
* 鏌ヨapp浠诲姟绠＄悊鍒楄〃
*
diff --git a/ard-work/src/main/java/com/ruoyi/app/task/service/IArdAppTaskService.java b/ard-work/src/main/java/com/ruoyi/app/task/service/IArdAppTaskService.java
index 514de43..dabba9d 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/service/IArdAppTaskService.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/service/IArdAppTaskService.java
@@ -19,7 +19,13 @@
* @return app浠诲姟绠＄悊
*/
public ArdAppTask selectArdAppTaskById(String id);
-
+ /**
+ * 鏌ヨapp浠诲姟璇︽儏鐨勮缁嗕俊鎭�
+ *
+ * @param id app浠诲姟璇︽儏涓婚敭
+ * @return app浠诲姟璇︽儏
+ */
+ public ArdAppTaskDetail selectArdAppTaskDetailById(String id);
/**
* 鏌ヨapp浠诲姟绠＄悊鍒楄〃
*
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 b084327..ea832a0 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
@@ -5,6 +5,7 @@
import com.github.pagehelper.PageHelper;
import com.ruoyi.app.task.domain.ArdAppTaskDetail;
import com.ruoyi.app.taskdetail.domain.ArdAppTaskDetailPic;
+import com.ruoyi.app.taskdetail.mapper.ArdAppTaskDetailPicMapper;
import com.ruoyi.app.tasktext.domain.ArdAppTaskText;
import com.ruoyi.app.tasktext.mapper.ArdAppTaskTextMapper;
import com.ruoyi.common.annotation.DataScope;
@@ -33,6 +34,8 @@
@Service
public class ArdAppTaskServiceImpl implements IArdAppTaskService {
@Resource
+ ArdAppTaskDetailPicMapper ardAppTaskDetailPicMapper;
+ @Resource
private ArdAppTaskMapper ardAppTaskMapper;
@Resource
private ArdAppTaskTextMapper ardAppTaskTextMapper;
@@ -46,6 +49,19 @@
@Override
public ArdAppTask selectArdAppTaskById(String id) {
return ardAppTaskMapper.selectArdAppTaskById(id);
+ }
+
+ @Override
+ public ArdAppTaskDetail selectArdAppTaskDetailById(String id) {
+ ArdAppTaskDetail appTaskDetail = ardAppTaskMapper.selectArdAppTaskDetailById(id);
+ ArdAppTaskDetailPic ardAppTaskDetailPic = new ArdAppTaskDetailPic();
+ ardAppTaskDetailPic.setTaskDetailId(id);
+ List<ArdAppTaskDetailPic> ardAppTaskDetailPicList = ardAppTaskDetailPicMapper.selectArdAppTaskDetailPicList(ardAppTaskDetailPic);
+ if(ardAppTaskDetailPicList.size()>0)
+ {
+ appTaskDetail.setArdAppTaskDetailPic(ardAppTaskDetailPicList);
+ }
+ return appTaskDetail;
}
/**
@@ -70,7 +86,7 @@
public List<ArdAppTask> selectArdAppTaskListWithDetail(ArdAppTask ardAppTask) {
ardAppTask.setUserId(SecurityUtils.getUserId());
List<ArdAppTask> list1 = ardAppTaskMapper.selectArdAppTaskListWithDetail(ardAppTask);
- List<ArdAppTask>list=new ArrayList<>();
+ List<ArdAppTask> list = new ArrayList<>();
list.addAll(list1);
return list;
// boolean flag=false;
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 50a72bc..27a9858 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
@@ -366,6 +366,9 @@
public void sendArdSyCarPosition() {
for(String key : ONLINE_USER_SESSIONS.keySet()){
SysUser sysUser = userMapper.selectUserById(key);
+ if(sysUser == null){
+ return;
+ }
String deptId = String.valueOf(sysUser.getDeptId());
Map<String,Map<String,Object>> map = PositionContainer.getDeptPositionMap().get(deptId);
if(map != null){
diff --git a/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
index 69fbce4..b12a14b 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
@@ -307,4 +307,19 @@
from ard_app_task_detail_pic
where task_detail_id = #{taskDetailId}
</delete>
+ <select id="selectArdAppTaskDetailById" parameterType="String" resultType="ArdAppTaskDetail">
+ select
+ c.id,
+ c.name,
+ c.longitude,
+ c.latitude,
+ c.altitude,
+ c.user_id,
+ c.text,
+ c.voice,
+ c.status,
+ c.clock_in_pic_url
+ from ard_app_task_detail c
+ where c.id = #{id}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3