From 43f760eb9dff0d983d58dc801772877f9cb1865f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 05 一月 2023 18:16:33 +0800
Subject: [PATCH] 1.5.3
---
/dev/null | 78 -------------------
src/main/java/com/lf/server/controller/all/BaseUploadController.java | 6 -
src/main/java/com/lf/server/controller/data/MetaController.java | 7 -
src/main/java/com/lf/server/service/data/DataLoaderService.java | 27 +-----
src/main/java/com/lf/server/service/data/MetaService.java | 14 +--
src/main/java/com/lf/server/service/data/DataUploadService.java | 30 +------
src/main/java/com/lf/server/mapper/data/MetaMapper.java | 16 ++--
src/main/resources/mapper/data/MetaMapper.xml | 17 +--
8 files changed, 32 insertions(+), 163 deletions(-)
diff --git a/src/main/java/com/lf/server/controller/all/BaseUploadController.java b/src/main/java/com/lf/server/controller/all/BaseUploadController.java
index 378eae1..82949b5 100644
--- a/src/main/java/com/lf/server/controller/all/BaseUploadController.java
+++ b/src/main/java/com/lf/server/controller/all/BaseUploadController.java
@@ -137,7 +137,7 @@
@SysLog()
@ApiOperation(value = "鍒犻櫎鏂囦欢")
@ApiImplicitParams({
- @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "MetaFileEntity", paramType = "body")
+ @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "MetaEntity", paramType = "body")
})
@ResponseBody
@PostMapping(value = "/deleteFiles")
@@ -171,9 +171,7 @@
return fail("id鏁扮粍涓嶈兘涓虹┖", -1);
}
- // int count = metaService.deletes(ids)
- String idStr = StringHelper.join(ids, ",");
- int count = metaService.deleteCascade(idStr);
+ int count = metaService.deletes(ids);
return success(count);
} catch (Exception ex) {
diff --git a/src/main/java/com/lf/server/controller/data/MetaController.java b/src/main/java/com/lf/server/controller/data/MetaController.java
index cdd3493..00e6a61 100644
--- a/src/main/java/com/lf/server/controller/data/MetaController.java
+++ b/src/main/java/com/lf/server/controller/data/MetaController.java
@@ -233,8 +233,7 @@
@GetMapping(value = "/delete")
public ResponseMsg<Integer> delete(int id) {
try {
- // int count = metaService.delete(id)
- int count = metaService.deleteCascade(String.valueOf(id));
+ int count = metaService.delete(id);
return success(count);
} catch (Exception ex) {
@@ -254,9 +253,7 @@
return fail("id鏁扮粍涓嶈兘涓虹┖", -1);
}
- // int count = metaService.deletes(ids)
- String idStr = StringHelper.join(ids, ",");
- int count = metaService.deleteCascade(idStr);
+ int count = metaService.deletes(ids);
return success(count);
} catch (Exception ex) {
diff --git a/src/main/java/com/lf/server/mapper/data/MetaMapper.java b/src/main/java/com/lf/server/mapper/data/MetaMapper.java
index d35db88..ce295f6 100644
--- a/src/main/java/com/lf/server/mapper/data/MetaMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/MetaMapper.java
@@ -73,6 +73,14 @@
public MetaEntity selectById(int id);
/**
+ * 鏍规嵁GUID鏌ヨ
+ *
+ * @param guid 鏂囦欢GUID
+ * @return
+ */
+ public MetaEntity selectByGuid(String guid);
+
+ /**
* 鏌ヨ鍏冩暟鎹枃浠�
*
* @param ids 鍏冩暟鎹甀D闆嗗悎
@@ -111,14 +119,6 @@
* @return
*/
public Integer deletes(List<Integer> ids);
-
- /**
- * 绾ц仈鍒犻櫎
- *
- * @param ids
- * @return
- */
- public Integer deleteCascade(String ids);
/**
* 鏇存柊涓�鏉�
diff --git a/src/main/java/com/lf/server/service/data/DataLoaderService.java b/src/main/java/com/lf/server/service/data/DataLoaderService.java
index 8ced799..73b69bf 100644
--- a/src/main/java/com/lf/server/service/data/DataLoaderService.java
+++ b/src/main/java/com/lf/server/service/data/DataLoaderService.java
@@ -249,16 +249,11 @@
continue;
}
- MetaEntity me = createMetaEntity(entity, mf, tab.getTab(), tab.getRows());
+ MetaEntity me = createMetaEntity(entity, mf, tab.getTab(), tab.getRows(), filePath);
if (metaService.insert(me) == 0) {
continue;
}
- MetaEntity mfe = createMetaFileEntity(me, mf, filePath);
- if (metaService.insert(mfe) == 0) {
- metaService.delete(me.getId());
- continue;
- }
count += tab.getRows();
}
@@ -312,13 +307,15 @@
/**
* 鍒涘缓鍏冩暟鎹疄浣�
*/
- private MetaEntity createMetaEntity(MetaEntity entity, MetaEntity mf, String tab, int rows) {
+ private MetaEntity createMetaEntity(MetaEntity entity, MetaEntity mf, String tab, int rows, String filePath) {
MetaEntity me = new MetaEntity();
me.setDepid(entity.getDepid());
me.setDirid(entity.getDirid());
me.setVerid(entity.getVerid());
me.setType(getType(mf.getName().toLowerCase()));
me.setName(mf.getName());
+ me.setGuid(entity.getGuid());
+ me.setPath(FileHelper.getRelativePath(filePath));
me.setSizes(mf.getSizes());
me.setBstab(tab);
me.setBsrows(rows);
@@ -326,22 +323,6 @@
me.setCreateUser(entity.getCreateUser());
return me;
- }
-
- /**
- * 鍒涘缓鍏冩暟鎹枃浠跺疄浣�
- */
- private MetaEntity createMetaFileEntity(MetaEntity me, MetaEntity entity, String filePath) {
- MetaEntity mfe = new MetaEntity();
- mfe.setName(entity.getName());
- mfe.setMetaid(me.getId());
- mfe.setGuid(entity.getGuid());
- mfe.setSizes(entity.getSizes());
- mfe.setPath(FileHelper.getRelativePath(filePath));
- mfe.setCreateUser(me.getCreateUser());
- mfe.setCreateTime(me.getCreateTime());
-
- return mfe;
}
/**
diff --git a/src/main/java/com/lf/server/service/data/DataUploadService.java b/src/main/java/com/lf/server/service/data/DataUploadService.java
index 4db0fa7..6fab4f5 100644
--- a/src/main/java/com/lf/server/service/data/DataUploadService.java
+++ b/src/main/java/com/lf/server/service/data/DataUploadService.java
@@ -31,14 +31,8 @@
String filePath = getFilePath(temp, root, mf);
// 鍏冩暟鎹�
- MetaEntity me = createMetaEntity(entity, mf);
- if (metaService.insert(me) < 1) {
- continue;
- }
-
- // 鍏冩暟鎹枃浠�
- MetaEntity mfe = createMetaFileEntity(me, mf, filePath);
- if (metaService.insert(mfe) > 0) {
+ MetaEntity me = createMetaEntity(entity, mf, filePath);
+ if (metaService.insert(me) > 0) {
count++;
}
}
@@ -74,33 +68,19 @@
/**
* 鍒涘缓鍏冩暟鎹疄浣�
*/
- private MetaEntity createMetaEntity(MetaEntity entity, MetaEntity mf) {
+ private MetaEntity createMetaEntity(MetaEntity entity, MetaEntity mf, String filePath) {
MetaEntity me = new MetaEntity();
me.setDepid(entity.getDepid());
me.setDirid(entity.getDirid());
me.setVerid(entity.getVerid());
me.setType("file");
+ me.setGuid(entity.getGuid());
+ me.setPath(FileHelper.getRelativePath(filePath));
me.setName(mf.getName());
me.setSizes(mf.getSizes());
me.setCreateTime(entity.getCreateTime());
me.setCreateUser(entity.getCreateUser());
return me;
- }
-
- /**
- * 鍒涘缓鍏冩暟鎹枃浠跺疄浣�
- */
- private MetaEntity createMetaFileEntity(MetaEntity me, MetaEntity entity, String filePath) {
- MetaEntity mfe = new MetaEntity();
- mfe.setName(entity.getName());
- mfe.setMetaid(me.getId());
- mfe.setGuid(entity.getGuid());
- mfe.setSizes(entity.getSizes());
- mfe.setPath(FileHelper.getRelativePath(filePath));
- mfe.setCreateUser(me.getCreateUser());
- mfe.setCreateTime(me.getCreateTime());
-
- return mfe;
}
}
diff --git a/src/main/java/com/lf/server/service/data/MetaService.java b/src/main/java/com/lf/server/service/data/MetaService.java
index e7b0bbd..567e079 100644
--- a/src/main/java/com/lf/server/service/data/MetaService.java
+++ b/src/main/java/com/lf/server/service/data/MetaService.java
@@ -56,6 +56,11 @@
}
@Override
+ public MetaEntity selectByGuid(String guid) {
+ return metaMapper.selectByGuid(guid);
+ }
+
+ @Override
public List<MetaEntity> selectMetaFiles(List<Integer> ids) {
return metaMapper.selectMetaFiles(ids);
}
@@ -81,11 +86,6 @@
}
@Override
- public Integer deleteCascade(String ids) {
- return metaMapper.deleteCascade(ids);
- }
-
- @Override
public Integer update(MetaEntity entity) {
return metaMapper.update(entity);
}
@@ -93,9 +93,5 @@
@Override
public Integer updates(List<MetaEntity> list) {
return metaMapper.updates(list);
- }
-
- public MetaEntity selectByGuid(String guid){
- return null;
}
}
diff --git a/src/main/resources/mapper/data/MetaFileMapper.xml b/src/main/resources/mapper/data/MetaFileMapper.xml
deleted file mode 100644
index a00647d..0000000
--- a/src/main/resources/mapper/data/MetaFileMapper.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?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.MetaFileMapper">
- <select id="selectCount" resultType="java.lang.Integer">
- select count(*) from lf.sys_meta_file
- <where>
- <if test="name != null">
- name like #{name}
- </if>
- </where>
- </select>
-
- <select id="selectByPage" resultType="com.lf.server.entity.data.MetaFileEntity">
- select * from lf.sys_meta_file
- <where>
- <if test="name != null">
- name like #{name}
- </if>
- </where>
- order by id
- limit #{limit} offset #{offset}
- </select>
-
- <select id="selectAll" resultType="com.lf.server.entity.data.MetaFileEntity">
- select * from lf.sys_meta_file order by id;
- </select>
-
- <select id="selectById" resultType="com.lf.server.entity.data.MetaFileEntity">
- select * from lf.sys_meta_file where id = #{id}
- </select>
-
- <select id="selectByGuid" resultType="com.lf.server.entity.data.MetaFileEntity">
- select * from lf.sys_meta_file where guid = #{guid} limit 1
- </select>
-
- <insert id="insert" parameterType="com.lf.server.entity.data.MetaFileEntity">
- insert into lf.sys_meta_file
- (name,metaid,fileid,guid,path,sizes,create_user,create_time)
- values
- (#{name},#{metaid},#{fileid},#{guid},#{path},#{sizes},#{createUser},#{createTime})
- </insert>
-
- <insert id="inserts">
- insert into lf.sys_meta_file
- (name,metaid,fileid,guid,path,sizes,create_user,create_time)
- values
- <foreach collection="list" item="item" index="index" separator=",">
- (#{item.name},#{item.metaid},#{item.fileid},#{item.guid},#{item.path},#{item.sizes},#{item.createUser},now())
- </foreach>
- </insert>
-
- <delete id="delete">
- delete from lf.sys_meta_file where id = #{id}
- </delete>
-
- <delete id="deletes">
- delete from lf.sys_meta_file where id in
- <foreach item="id" collection="ids" index="index" open="(" separator="," close=")">
- #{id}
- </foreach>
- </delete>
-
- <update id="update">
- update lf.sys_meta_file
- set name=#{name},metaid=#{metaid},fileid=#{fileid},guid=#{guid},path=#{path},sizes=#{sizes},update_user=#{updateUser},update_time=now()
- where id=#{id}
- </update>
-
- <update id="updates">
- <foreach collection="list" item="item" index="index" separator=";">
- update lf.sys_meta_file
- <set>
- name=#{item.name},metaid=#{item.metaid},fileid=#{item.fileid},guid=#{item.guid},path=#{item.path},sizes=#{item.sizes},update_user=#{item.updateUser},update_time=now()
- </set>
- where id = #{item.id}
- </foreach>
- </update>
-</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/data/MetaMapper.xml b/src/main/resources/mapper/data/MetaMapper.xml
index 8b70eaf..76ffd72 100644
--- a/src/main/resources/mapper/data/MetaMapper.xml
+++ b/src/main/resources/mapper/data/MetaMapper.xml
@@ -82,17 +82,17 @@
</selectKey>
insert into lf.sys_meta
- (name,dirid,depid,verid,type,sizes,tab,rows,cs,scale,resolution,gather,batch,descr,create_user,create_time,geom)
+ (eventid,metaid,dirid,depid,verid,name,type,guid,path,sizes,bstab,bsrows,mdtab,mdrows,create_user,create_time,bak,geom)
values
- (#{name},#{dirid},#{depid},#{verid},#{type},#{sizes},#{tab},#{rows},#{cs},#{scale},#{resolution},#{createTime},#{batch},#{descr},#{createUser},#{createTime},#{geom})
+ (#{eventid},#{metaid},#{dirid},#{depid},#{verid},#{name},#{type},#{guid},#{path},#{sizes},#{bstab},#{bsrows},#{mdtab},#{mdrows},#{createUser},now(),#{bak},#{geom})
</insert>
<insert id="inserts">
insert into lf.sys_meta
- (name,dirid,depid,verid,type,sizes,tab,rows,cs,scale,resolution,gather,batch,descr,create_user,create_time,geom)
+ (eventid,metaid,dirid,depid,verid,name,type,guid,path,sizes,bstab,bsrows,mdtab,mdrows,create_user,create_time,bak,geom)
values
<foreach collection="list" item="item" index="index" separator=",">
- (#{item.name},#{item.dirid},#{item.depid},#{item.verid},#{item.type},#{item.sizes},#{item.tab},#{item.rows},#{item.cs},#{item.scale},#{item.resolution},now(),#{item.batch},#{item.descr},#{item.createUser},now(),#{item.geom})
+ (#{item.eventid},#{item.metaid},#{item.dirid},#{item.depid},#{item.verid},#{item.name},#{item.type},#{item.guid},#{item.path},#{item.sizes},#{item.bstab},#{item.bsrows},#{item.mdtab},#{item.mdrows},#{item.createUser},now(),#{item.bak},#{item.geom})
</foreach>
</insert>
@@ -107,14 +107,9 @@
</foreach>
</delete>
- <delete id="deleteCascade">
- delete from lf.sys_meta_file where metaid in (${ids});
- delete from lf.sys_meta where id in (${ids});
- </delete>
-
<update id="update">
update lf.sys_meta
- set name=#{name},dirid=#{dirid},depid=#{depid},verid=#{verid},type=#{type},sizes=#{sizes},tab=#{tab},rows=#{rows},cs=#{cs},scale=#{scale},resolution=#{resolution},gather=now(),batch=#{batch},descr=#{descr},update_user=#{updateUser},update_time=now(),geom=#{geom}
+ set eventid=#{eventid},metaid=#{metaid},dirid=#{dirid},depid=#{depid},verid=#{verid},name=#{name},type=#{type},guid=#{guid},path=#{path},sizes=#{sizes},bstab=#{bstab},bsrows=#{bsrows},mdtab=#{mdtab},mdrows=#{mdrows},update_user=#{updateUser},update_time=now(),bak=#{bak},geom=#{geom}
where id=#{id}
</update>
@@ -122,7 +117,7 @@
<foreach collection="list" item="item" index="index" separator=";">
update lf.sys_meta
<set>
- name=#{item.name},dirid=#{item.dirid},depid=#{item.depid},verid=#{item.verid},type=#{item.type},sizes=#{item.sizes},tab=#{item.tab},rows=#{item.rows},cs=#{item.cs},scale=#{item.scale},resolution=#{item.resolution},gather=now(),batch=#{item.batch},descr=#{item.descr},update_user=#{item.updateUser},update_time=now(),geom=#{item.geom}
+ eventid=#{item.eventid},metaid=#{item.metaid},dirid=#{item.dirid},depid=#{item.depid},verid=#{item.verid},name=#{item.name},type=#{item.type},guid=#{item.guid},path=#{item.path},sizes=#{item.sizes},bstab=#{item.bstab},bsrows=#{item.bsrows},mdtab=#{item.mdtab},mdrows=#{item.mdrows},update_user=#{item.updateUser},update_time=now(),bak=#{item.bak},geom=#{item.geom}
</set>
where id = #{item.id}
</foreach>
--
Gitblit v1.9.3