From 18b0beec7bf9b755e5d2cc0116bccb0ee2403996 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 25 九月 2023 10:17:57 +0800
Subject: [PATCH] 修改标绘接口
---
src/main/resources/mapper/show/MarkMapper.xml | 62 +++++++++++++++-----
src/main/java/com/moon/server/mapper/show/MarkMapper.java | 22 ++++--
src/main/java/com/moon/server/controller/show/MarkController.java | 43 +++++++++-----
src/main/java/com/moon/server/service/show/MarkService.java | 36 ++++++-----
4 files changed, 109 insertions(+), 54 deletions(-)
diff --git a/src/main/java/com/moon/server/controller/show/MarkController.java b/src/main/java/com/moon/server/controller/show/MarkController.java
index cbec4b1..94b3167 100644
--- a/src/main/java/com/moon/server/controller/show/MarkController.java
+++ b/src/main/java/com/moon/server/controller/show/MarkController.java
@@ -14,9 +14,9 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
@@ -28,29 +28,30 @@
@RestController
@RequestMapping("/mark")
public class MarkController extends BaseController {
- @Autowired
+ @Resource
MarkService markService;
- @Autowired
+ @Resource
TokenService tokenService;
- @Autowired
+ @Resource
BaseUploadService baseUploadService;
- @Autowired
+ @Resource
DownlogService downlogService;
- @Autowired
+ @Resource
DownloadService downloadService;
@SysLog()
@ApiOperation(value = "鍒嗛〉鏌ヨ骞惰繑鍥炶褰曟暟")
@ApiImplicitParams({
+ @ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = ""),
@ApiImplicitParam(name = "pageSize", value = "姣忛〉鏉℃暟", dataType = "Integer", paramType = "query", example = "10"),
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectByPageAndCount")
- public ResponseMsg<List<MarkEntity>> selectByPageAndCount(Integer pageSize, Integer pageIndex, HttpServletRequest req) {
+ public ResponseMsg<List<MarkEntity>> selectByPageAndCount(String name, Integer pageSize, Integer pageIndex, HttpServletRequest req) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
@@ -60,12 +61,12 @@
return fail("鐢ㄦ埛鏈櫥褰�", null);
}
- int count = markService.selectCount(ue.getId());
+ int count = markService.selectCount(name, ue.getId());
if (count == 0) {
return success(0, null);
}
- List<MarkEntity> rs = markService.selectByPage(ue.getId(), pageSize, pageSize * (pageIndex - 1));
+ List<MarkEntity> rs = markService.selectByPage(name, ue.getId(), pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
@@ -79,9 +80,13 @@
@ApiImplicitParam(name = "id", value = "ID", dataType = "int", paramType = "query", example = "1")
})
@GetMapping(value = "/selectById")
- public ResponseMsg<MarkEntity> selectById(int id) {
+ public ResponseMsg<MarkEntity> selectById(int id, HttpServletRequest req) {
try {
- MarkEntity entity = markService.selectById(id);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue == null) {
+ return fail("鐢ㄦ埛鏈櫥褰�", null);
+ }
+ MarkEntity entity = markService.selectById(id, ue.getId());
return success(entity);
} catch (Exception ex) {
@@ -139,9 +144,13 @@
@ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/delete")
- public ResponseMsg<Integer> delete(int id) {
+ public ResponseMsg<Integer> delete(int id, HttpServletRequest req) {
try {
- int count = markService.delete(id);
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue == null) {
+ return fail("鐢ㄦ埛鏈櫥褰�", null);
+ }
+ int count = markService.delete(id, ue.getId());
return success(count);
} catch (Exception ex) {
@@ -155,13 +164,17 @@
@ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "Integer", paramType = "query", example = "1,2")
})
@GetMapping(value = "/deletes")
- public ResponseMsg<Integer> deletes(@RequestParam List<Integer> ids) {
+ public ResponseMsg<Integer> deletes(@RequestParam List<Integer> ids, HttpServletRequest req) {
try {
if (ids == null || ids.isEmpty()) {
return fail("id鏁扮粍涓嶈兘涓虹┖", -1);
}
+ UserEntity ue = tokenService.getCurrentUser(req);
+ if (ue == null) {
+ return fail("鐢ㄦ埛鏈櫥褰�", null);
+ }
- int count = markService.deletes(ids);
+ int count = markService.deletes(ids, ue.getId());
return success(count);
} catch (Exception ex) {
diff --git a/src/main/java/com/moon/server/mapper/show/MarkMapper.java b/src/main/java/com/moon/server/mapper/show/MarkMapper.java
index e7ee489..f8fbdb3 100644
--- a/src/main/java/com/moon/server/mapper/show/MarkMapper.java
+++ b/src/main/java/com/moon/server/mapper/show/MarkMapper.java
@@ -16,35 +16,39 @@
/**
* 鏌ヨ璁板綍鏁�
*
- * @param uid 鐢ㄦ埛ID
+ * @param name 鍚嶇О
+ * @param userid 鐢ㄦ埛ID
* @return 璁板綍鏁�
*/
- public Integer selectCount(Integer uid);
+ public Integer selectCount(String name, Integer userid);
/**
* 鍒嗛〉鏌ヨ
*
- * @param uid 鐢ㄦ埛ID
+ * @param name 鍚嶇О
+ * @param userid 鐢ㄦ埛ID
* @param limit 璁板綍鏁�
* @param offset 鍋忕Щ閲�
* @return 鍒楄〃
*/
- public List<MarkEntity> selectByPage(Integer uid, Integer limit, Integer offset);
+ public List<MarkEntity> selectByPage(String name, Integer userid, Integer limit, Integer offset);
/**
* 鏌ヨ鎵�鏈�
*
+ * @param userid
* @return
*/
- public List<MarkEntity> selectAll();
+ public List<MarkEntity> selectAll(Integer userid);
/**
* 鏍规嵁ID鏌ヨ
*
* @param id
+ * @param userid
* @return
*/
- public MarkEntity selectById(int id);
+ public MarkEntity selectById(int id, Integer userid);
/**
* 鎻掑叆涓�鏉�
@@ -66,17 +70,19 @@
* 鍒犻櫎涓�鏉�
*
* @param id
+ * @param userid
* @return
*/
- public Integer delete(int id);
+ public Integer delete(int id, Integer userid);
/**
* 鍒犻櫎澶氭潯
*
* @param ids
+ * @param userid
* @return
*/
- public Integer deletes(List<Integer> ids);
+ public Integer deletes(List<Integer> ids, Integer userid);
/**
* 鏇存柊涓�鏉�
diff --git a/src/main/java/com/moon/server/service/show/MarkService.java b/src/main/java/com/moon/server/service/show/MarkService.java
index d20e573..3f9f5e7 100644
--- a/src/main/java/com/moon/server/service/show/MarkService.java
+++ b/src/main/java/com/moon/server/service/show/MarkService.java
@@ -9,9 +9,9 @@
import com.moon.server.mapper.show.MarkMapper;
import com.moon.server.service.data.DownloadService;
import com.moon.server.helper.*;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.io.File;
import java.util.ArrayList;
import java.util.Date;
@@ -23,33 +23,37 @@
*/
@Service
public class MarkService implements MarkMapper {
- @Autowired
+ @Resource
MarkMapper markMapper;
- @Autowired
+ @Resource
PathHelper pathHelper;
- @Autowired
+ @Resource
DownloadService downloadService;
@Override
- public Integer selectCount(Integer uid) {
- return markMapper.selectCount(uid);
+ public Integer selectCount(String name, Integer userid) {
+ name = StringHelper.getLikeUpperStr(name);
+
+ return markMapper.selectCount(name, userid);
}
@Override
- public List<MarkEntity> selectByPage(Integer uid, Integer limit, Integer offset) {
- return markMapper.selectByPage(uid, limit, offset);
+ public List<MarkEntity> selectByPage(String name, Integer userid, Integer limit, Integer offset) {
+ name = StringHelper.getLikeUpperStr(name);
+
+ return markMapper.selectByPage(name, userid, limit, offset);
}
@Override
- public List<MarkEntity> selectAll() {
- return markMapper.selectAll();
+ public List<MarkEntity> selectAll(Integer userid) {
+ return markMapper.selectAll(userid);
}
@Override
- public MarkEntity selectById(int id) {
- return markMapper.selectById(id);
+ public MarkEntity selectById(int id, Integer userid) {
+ return markMapper.selectById(id, userid);
}
@Override
@@ -63,13 +67,13 @@
}
@Override
- public Integer delete(int id) {
- return markMapper.delete(id);
+ public Integer delete(int id, Integer userid) {
+ return markMapper.delete(id, userid);
}
@Override
- public Integer deletes(List<Integer> ids) {
- return markMapper.deletes(ids);
+ public Integer deletes(List<Integer> ids, Integer userid) {
+ return markMapper.deletes(ids, userid);
}
@Override
diff --git a/src/main/resources/mapper/show/MarkMapper.xml b/src/main/resources/mapper/show/MarkMapper.xml
index 989ac27..4042f5b 100644
--- a/src/main/resources/mapper/show/MarkMapper.xml
+++ b/src/main/resources/mapper/show/MarkMapper.xml
@@ -4,8 +4,12 @@
<select id="selectCount" resultType="java.lang.Integer">
select count(*) from lf.sys_mark
<where>
+ 1 = 1
+ <if test="name != null">
+ and upper(name) like #{name}
+ </if>
<if test="userid != null">
- create_user = #{userid}
+ and create_user = #{userid}
</if>
</where>
</select>
@@ -13,20 +17,36 @@
<select id="selectByPage" resultType="com.moon.server.entity.show.MarkEntity">
select * from lf.sys_mark
<where>
+ 1 = 1
+ <if test="name != null">
+ and upper(name) like #{name}
+ </if>
+ <if test="userid != null">
+ and create_user = #{userid}
+ </if>
+ </where>
+ order by id desc
+ limit #{limit} offset #{offset};
+ </select>
+
+ <select id="selectAll" resultType="com.moon.server.entity.show.MarkEntity">
+ select * from lf.sys_mark
+ <where>
<if test="userid != null">
create_user = #{userid}
</if>
</where>
- order by id desc
- limit #{limit} offset #{offset}
- </select>
-
- <select id="selectAll" resultType="com.moon.server.entity.show.MarkEntity">
- select * from lf.sys_mark order by id desc
+ order by id desc;
</select>
<select id="selectById" resultType="com.moon.server.entity.show.MarkEntity">
- select * from lf.sys_mark where id = #{id}
+ select * from lf.sys_mark
+ <where>
+ id = #{id}
+ <if test="userid != null">
+ and create_user = #{userid}
+ </if>
+ </where>
</select>
<insert id="insert" parameterType="com.moon.server.entity.show.MarkEntity">
@@ -46,20 +66,32 @@
</insert>
<delete id="delete">
- delete from lf.sys_mark where id = #{id}
+ delete from lf.sys_mark
+ <where>
+ id = #{id}
+ <if test="userid != null">
+ and create_user = #{userid}
+ </if>
+ </where>
</delete>
<delete id="deletes">
- delete from lf.sys_mark where id in
- <foreach item="id" collection="ids" index="index" open="(" separator="," close=")">
- #{id}
- </foreach>
+ delete from lf.sys_mark
+ <where>
+ id in
+ <foreach item="id" collection="ids" index="index" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ <if test="userid != null">
+ and create_user = #{userid}
+ </if>
+ </where>
</delete>
<update id="update">
update lf.sys_mark
set name=#{name},wkt=#{wkt},update_user=#{updateUser},update_time=now()
- where id=#{id}
+ where create_user = #{createUser} and id = #{id};
</update>
<update id="updates">
@@ -68,7 +100,7 @@
<set>
name=#{item.name},wkt=#{item.wkt},update_user=#{item.updateUser},update_time=now()
</set>
- where id = #{item.id}
+ where create_user = #{createUser} and id = #{item.id};
</foreach>
</update>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3