From 3e52d8536178f29f9efbe2513fd00bb3e4b17ff7 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期六, 18 三月 2023 09:54:42 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/data/PublishService.java | 8 ++--
src/main/java/com/lf/server/controller/data/PublishController.java | 10 ++--
src/main/java/com/lf/server/mapper/data/PublishMapper.java | 8 ++--
src/main/resources/mapper/show/PublishMapper.xml | 41 ++++++++++++++++++++
4 files changed, 54 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/data/PublishController.java b/src/main/java/com/lf/server/controller/data/PublishController.java
index 52a7cfd..dcc2d7b 100644
--- a/src/main/java/com/lf/server/controller/data/PublishController.java
+++ b/src/main/java/com/lf/server/controller/data/PublishController.java
@@ -37,7 +37,7 @@
@ApiOperation(value = "鍒嗛〉鏌ヨ鍏冩暟鎹�")
@ApiImplicitParams({
@ApiImplicitParam(name = "depcode", value = "鍗曚綅缂栫爜", dataType = "String", paramType = "query", example = "00"),
- @ApiImplicitParam(name = "dircode", value = "鐩綍缂栫爜", dataType = "String", paramType = "query", example = "00"),
+ @ApiImplicitParam(name = "dircode", value = "鐩綍缂栫爜", dataType = "String", paramType = "query", example = "01"),
@ApiImplicitParam(name = "verid", value = "鐗堟湰ID", dataType = "Integer", paramType = "query", example = "0"),
@ApiImplicitParam(name = "type", value = "绫诲埆", dataType = "String", paramType = "query", example = "DOM"),
@ApiImplicitParam(name = "name", value = "鍚嶇О", dataType = "String", paramType = "query", example = ""),
@@ -74,13 +74,13 @@
private String getType(String type) throws Exception {
switch (type) {
case "DOM":
- return "and type in ('tif', 'tiff', 'img')";
+ return "type in ('tif', 'tiff', 'img')";
case "MPT":
- return "and type = 'mpt'";
+ return "type = 'mpt'";
case "3DML":
- return "and type = '3dml'";
+ return "type = '3dml'";
case "BIM":
- return "and type in ('ifc', 'fbx', 'rvt')";
+ return "type in ('ifc', 'fbx', 'rvt')";
default:
throw new Exception("鏁版嵁绫诲瀷涓嶅尮閰�");
}
diff --git a/src/main/java/com/lf/server/mapper/data/PublishMapper.java b/src/main/java/com/lf/server/mapper/data/PublishMapper.java
index a81afa4..29500b5 100644
--- a/src/main/java/com/lf/server/mapper/data/PublishMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/PublishMapper.java
@@ -101,11 +101,11 @@
* @param depcode 鍗曚綅缂栫爜
* @param dircode 鐩綍缂栫爜
* @param verid 鐗堟湰ID
- * @param type 绫诲埆
+ * @param types 绫诲埆
* @param name 鍚嶇О
* @return 璁板綍鏁�
*/
- public Integer selectMetasByCount(String depcode, String dircode, Integer verid, String type, String name);
+ public Integer selectMetasByCount(String depcode, String dircode, Integer verid, String types, String name);
/**
* 鍒嗛〉鏌ヨ
@@ -113,11 +113,11 @@
* @param depcode 鍗曚綅缂栫爜
* @param dircode 鐩綍缂栫爜
* @param verid 鐗堟湰ID
- * @param type 绫诲埆
+ * @param types 绫诲埆
* @param name 鍚嶇О
* @param limit 璁板綍鏁�
* @param offset 鍋忕Щ閲�
* @return 鍒楄〃
*/
- public List<MetaEntity> selectMetasByPage(String depcode, String dircode, Integer verid, String type, String name, Integer limit, Integer offset);
+ public List<MetaEntity> selectMetasByPage(String depcode, String dircode, Integer verid, String types, String name, Integer limit, Integer offset);
}
diff --git a/src/main/java/com/lf/server/service/data/PublishService.java b/src/main/java/com/lf/server/service/data/PublishService.java
index a53fd03..f9dcbaa 100644
--- a/src/main/java/com/lf/server/service/data/PublishService.java
+++ b/src/main/java/com/lf/server/service/data/PublishService.java
@@ -73,20 +73,20 @@
}
@Override
- public Integer selectMetasByCount(String depcode, String dircode, Integer verid, String type, String name) {
+ public Integer selectMetasByCount(String depcode, String dircode, Integer verid, String types, String name) {
depcode = StringHelper.getRightLike(depcode);
dircode = StringHelper.getRightLike(dircode);
name = StringHelper.getLikeStr(name);
- return publishMapper.selectMetasByCount(depcode, dircode, verid, type, name);
+ return publishMapper.selectMetasByCount(depcode, dircode, verid, types, name);
}
@Override
- public List<MetaEntity> selectMetasByPage(String depcode, String dircode, Integer verid, String type, String name, Integer limit, Integer offset) {
+ public List<MetaEntity> selectMetasByPage(String depcode, String dircode, Integer verid, String types, String name, Integer limit, Integer offset) {
depcode = StringHelper.getRightLike(depcode);
dircode = StringHelper.getRightLike(dircode);
name = StringHelper.getLikeStr(name);
- return publishMapper.selectMetasByPage(depcode, dircode, verid, type, name, limit, offset);
+ return publishMapper.selectMetasByPage(depcode, dircode, verid, types, name, limit, offset);
}
}
diff --git a/src/main/resources/mapper/show/PublishMapper.xml b/src/main/resources/mapper/show/PublishMapper.xml
index b025e33..8066f89 100644
--- a/src/main/resources/mapper/show/PublishMapper.xml
+++ b/src/main/resources/mapper/show/PublishMapper.xml
@@ -1,6 +1,47 @@
<?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.lf.server.mapper.data.PublishMapper">
+ <select id="selectMetasByCount" resultType="java.lang.Integer">
+ select count(*) from lf.sys_meta
+ <where>
+ ${types}
+ <if test="depcode != null">
+ and depcode like #{depcode}
+ </if>
+ <if test="dircode != null">
+ and dircode like #{dircode}
+ </if>
+ <if test="verid != null">
+ and verid = #{verid}
+ </if>
+ <if test="name != null">
+ and name like #{name}
+ </if>
+ </where>
+ </select>
+
+ <select id="selectMetasByPage" resultType="com.lf.server.entity.data.MetaEntity">
+ select a.*, fn_uname(a.create_user) uname, fn_get_fullname(a.depcode, 1) depName, fn_get_fullname(a.dircode, 2) dirName, fn_ver(a.verid) verName
+ from lf.sys_meta a
+ <where>
+ ${types}
+ <if test="depcode != null">
+ and depcode like #{depcode}
+ </if>
+ <if test="dircode != null">
+ and dircode like #{dircode}
+ </if>
+ <if test="verid != null">
+ and verid = #{verid}
+ </if>
+ <if test="name != null">
+ and name like #{name}
+ </if>
+ </where>
+ order by id desc
+ limit #{limit} offset #{offset}
+ </select>
+
<select id="selectCount" resultType="java.lang.Integer">
select count(*) from lf.sys_publish
<where>
--
Gitblit v1.9.3