From 2a035bdefe34a17192a37839014e86c104bcfaa0 Mon Sep 17 00:00:00 2001
From: xiebin <123456>
Date: Mon, 19 Sep 2022 17:49:54 +0800
Subject: [PATCH] 任务添加地图绘制地图
---
src/main/java/org/springblade/modules/taskinfo/service/impl/TaskInfoServiceImpl.java | 15 +++++++
src/main/java/org/springblade/modules/taskinfo/mapper/TaskInfoMapper.java | 4 ++
src/main/java/org/springblade/modules/taskinfo/mapper/TaskInfoMapper.xml | 46 ++++++++++++++++++++++
3 files changed, 64 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/taskinfo/mapper/TaskInfoMapper.java b/src/main/java/org/springblade/modules/taskinfo/mapper/TaskInfoMapper.java
index 5775990..43f8b91 100644
--- a/src/main/java/org/springblade/modules/taskinfo/mapper/TaskInfoMapper.java
+++ b/src/main/java/org/springblade/modules/taskinfo/mapper/TaskInfoMapper.java
@@ -16,6 +16,7 @@
*/
package org.springblade.modules.taskinfo.mapper;
+import org.apache.ibatis.annotations.Param;
import org.springblade.modules.taskinfo.entity.TaskInfoEntity;
import org.springblade.modules.taskinfo.vo.TaskInfoVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -38,6 +39,9 @@
* @return
*/
List<TaskInfoVO> selectTaskInfoPage(IPage page, TaskInfoVO taskinfo);
+ TaskInfoEntity getTaskInfoOne(@Param("id") Long id);
+ int saveTask(@Param("taskInfo") TaskInfoEntity taskInfoEntity);
+ int updateTask(@Param("taskInfo") TaskInfoEntity taskInfoEntity);
}
diff --git a/src/main/java/org/springblade/modules/taskinfo/mapper/TaskInfoMapper.xml b/src/main/java/org/springblade/modules/taskinfo/mapper/TaskInfoMapper.xml
index 6b674b4..d152c01 100644
--- a/src/main/java/org/springblade/modules/taskinfo/mapper/TaskInfoMapper.xml
+++ b/src/main/java/org/springblade/modules/taskinfo/mapper/TaskInfoMapper.xml
@@ -21,9 +21,14 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>
+ <select id="getTaskInfoOne" resultMap="taskinfoResultMap">
+ select id,title,start_time,end_time,content,to_user_id,ST_ASTEXT(route_range) as route_range,
+ state,source,create_user,create_time,update_user,update_time,status,is_deleted from ins_taskinfo
+ where id = #{id} and is_deleted = 0
+ </select>
<select id="selectTaskInfoPage" resultMap="taskinfoResultMap">
- select * from ins_taskinfo where is_deleted = 0
+ select id,title,start_time,end_time,content,to_user_id,ST_ASTEXT(route_range) as route_range,state,source,create_user,create_time,update_user,update_time,status,is_deleted from ins_taskinfo where is_deleted = 0
<if test="taskinfo.title != null and taskinfo.title != '' ">
and title like concat('%',#{taskinfo.title},'%')
</if>
@@ -35,5 +40,44 @@
</if>
</select>
+ <!--自定义新增农场围栏数据-->
+ <insert id="saveTask">
+ INSERT INTO ins_taskinfo (id, title, start_time, end_time, content,to_user_id
+ <if test="taskInfo.routeRange!=null and taskInfo.routeRange!=''">
+ route_range,
+ </if>
+ state, source, create_user, create_dept, create_time,
+ update_user, update_time, status, is_deleted, tenant_id)
+ VALUES
+ (#{taskInfo.id},#{taskInfo.title},#{taskInfo.startTime},#{taskInfo.endTime},#{taskInfo.content},#{taskInfo.toUserId},
+ <if test="taskInfo.routeRange!=null and taskInfo.routeRange!=''">
+ ST_GeomFromText(${taskInfo.routeRange}),
+ </if>
+ #{taskInfo.state},#{taskInfo.source},#{taskInfo.createUser},#{taskInfo.createDept},#{taskInfo.createTime},
+ #{taskInfo.updataUser},#{taskInfo.updateTime},#{taskInfo.status},#{taskInfo.isDeleted},#{taskInfo.tenantId})
+ </insert>
+
+ <update id="updateTask">
+ UPDATE ins_taskinfo SET
+ title = #{taskInfo.title},
+ start_time = #{taskInfo.startTime},
+ end_time = #{taskInfo.endTime},
+ content = #{taskInfo.content},
+ to_user_id = #{taskInfo.toUserId},
+ <if test="taskInfo.routeRange!=null and taskInfo.routeRange!=''">
+ route_range = ST_GeomFromText(${taskInfo.routeRange}),
+ </if>
+ state = #{taskInfo.state},
+ source = #{taskInfo.source},
+ tenant_id = #{taskInfo.tenantId},
+ create_user = #{taskInfo.createUser},
+ create_dept = #{taskInfo.createDept},
+ create_time = #{taskInfo.createTime},
+ update_user = #{taskInfo.updateUser},
+ update_time = #{taskInfo.updateTime},
+ status = #{taskInfo.status}
+ WHERE id = #{taskInfo.id} AND is_deleted = 0
+ </update>
+
</mapper>
diff --git a/src/main/java/org/springblade/modules/taskinfo/service/impl/TaskInfoServiceImpl.java b/src/main/java/org/springblade/modules/taskinfo/service/impl/TaskInfoServiceImpl.java
index 941a9d3..dce45b2 100644
--- a/src/main/java/org/springblade/modules/taskinfo/service/impl/TaskInfoServiceImpl.java
+++ b/src/main/java/org/springblade/modules/taskinfo/service/impl/TaskInfoServiceImpl.java
@@ -16,6 +16,8 @@
*/
package org.springblade.modules.taskinfo.service.impl;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import org.springblade.modules.taskinfo.entity.TaskInfoEntity;
import org.springblade.modules.taskinfo.vo.TaskInfoVO;
import org.springblade.modules.taskinfo.mapper.TaskInfoMapper;
@@ -38,5 +40,18 @@
return page.setRecords(baseMapper.selectTaskInfoPage(page, taskinfo));
}
+ @Override
+ public boolean save(TaskInfoEntity entity) {
+ return SqlHelper.retBool(baseMapper.saveTask(entity));
+ }
+ @Override
+ public TaskInfoEntity getOne(Wrapper<TaskInfoEntity> queryWrapper, boolean throwEx) {
+ return baseMapper.getTaskInfoOne(queryWrapper.getEntity().getId());
+ }
+
+ @Override
+ public boolean updateById(TaskInfoEntity entity) {
+ return SqlHelper.retBool(baseMapper.updateTask(entity));
+ }
}
--
Gitblit v1.9.3