From ba55564739a18a8c2fe385d95fc4f0480e91f39f Mon Sep 17 00:00:00 2001
From: HuangXin <huangxin@cmhi.chinamobile.com>
Date: Mon, 29 Jun 2020 10:21:57 +0800
Subject: [PATCH] =?UTF-8?q?OCT=20REM:=201.=20=E5=A2=9E=E5=8A=A0taskinfo=20?=
=?UTF-8?q?mapper=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81=202.=20=E4=BF=AE?=
=?UTF-8?q?=E6=AD=A3task=5Finfo=E6=95=B0=E6=8D=AE=E5=BA=93=E6=97=A0?=
=?UTF-8?q?=E6=B3=95=E6=8F=92=E5=85=A5=E4=BB=BB=E5=8A=A1=E8=AE=B0=E5=BD=95?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/dispose/mapper/TaskInfoMapper.java | 17 +++++++--
src/main/resources/mappers/TaskInfoMapper.xml | 2 +-
.../test/manager/TaskInfoMapperTest.java | 37 +++++++++++++++++++
3 files changed, 51 insertions(+), 5 deletions(-)
create mode 100644 src/test/java/com/dispose/test/manager/TaskInfoMapperTest.java
diff --git a/src/main/java/com/dispose/mapper/TaskInfoMapper.java b/src/main/java/com/dispose/mapper/TaskInfoMapper.java
index a2ca8035..8ba8ccdc 100644
--- a/src/main/java/com/dispose/mapper/TaskInfoMapper.java
+++ b/src/main/java/com/dispose/mapper/TaskInfoMapper.java
@@ -2,21 +2,30 @@ package com.dispose.mapper;
import com.dispose.pojo.vo.common.TaskInfo;
+import org.apache.ibatis.annotations.Param;
+import tk.mybatis.mapper.common.Mapper;
+import tk.mybatis.mapper.common.MySqlMapper;
+
+import java.util.List;
/**
* The interface Task info mapper.
*
* @author <huangxin@cmhi.chinamoblie.com>
*/
-public interface TaskInfoMapper {
+public interface TaskInfoMapper extends Mapper<TaskInfo>, MySqlMapper<TaskInfo> {
/**
* Add new task info.
*
* @param taskId the task id
* @param deviceId the device id
* @param externId the extern id
+ * @param status the status
*/
- void addNewTaskInfo(Long taskId, Long deviceId, Long externId, Long status);
+ void addNewTaskInfo(@Param("taskId") Long taskId,
+ @Param("deviceId") Long deviceId,
+ @Param("externId") Long externId,
+ @Param("status") Long status);
/**
* Gets task info.
@@ -25,7 +34,7 @@ public interface TaskInfoMapper {
* @param deviceId the device id
* @return the task info
*/
- TaskInfo getTaskInfo(Long taskId, Long deviceId);
+ List<TaskInfo> getTaskInfo(Long taskId, Long deviceId);
/**
* Gets task info by task id.
@@ -33,7 +42,7 @@ public interface TaskInfoMapper {
* @param taskId the task id
* @return the task info by task id
*/
- TaskInfo getTaskInfoByTaskId(Long taskId);
+ List<TaskInfo> getTaskInfoByTaskId(Long taskId);
/**
* Change task info status.
diff --git a/src/main/resources/mappers/TaskInfoMapper.xml b/src/main/resources/mappers/TaskInfoMapper.xml
index e6c82365..12302227 100644
--- a/src/main/resources/mappers/TaskInfoMapper.xml
+++ b/src/main/resources/mappers/TaskInfoMapper.xml
@@ -1,7 +1,7 @@
<?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.dispose.mapper.TaskInfoMapper">
- <insert id="addNewTaskInfo" useGeneratedKeys="true" keyProperty="id">
+ <insert id="addNewTaskInfo">
INSERT IGNORE INTO task_info(taskId, deviceId, externId, status)
VALUES (#{taskId}, #{deviceId}, #{externId}, #{status})
</insert>
diff --git a/src/test/java/com/dispose/test/manager/TaskInfoMapperTest.java b/src/test/java/com/dispose/test/manager/TaskInfoMapperTest.java
new file mode 100644
index 00000000..28023b59
--- /dev/null
+++ b/src/test/java/com/dispose/test/manager/TaskInfoMapperTest.java
@@ -0,0 +1,37 @@
+package com.dispose.test.manager;
+
+import com.dispose.common.ErrorCode;
+import com.dispose.mapper.TaskInfoMapper;
+import com.dispose.test.Global.InitTestEnvironment;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.Rollback;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+
+@RunWith(SpringRunner.class)
+@Slf4j
+@SpringBootTest
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+@Transactional
+@Rollback
+public class TaskInfoMapperTest extends InitTestEnvironment {
+ @Resource
+ private TaskInfoMapper taskInfoMapper;
+
+ @Override
+ public void userLogin() {
+ }
+
+ @Test
+ public void a1_addNewTaskInfoTest() {
+ taskInfoMapper.addNewTaskInfo(152L, 1L, null, (long) ErrorCode.ERR_OK.getCode());
+ taskInfoMapper.addNewTaskInfo(152L, 2L, 12L, (long) ErrorCode.ERR_OK.getCode());
+ }
+}