From 219908b0bafdbcad82824e4c476b01652aeaaa8d Mon Sep 17 00:00:00 2001 From: chenxudong Date: Tue, 7 Jan 2025 15:13:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8F=91=E7=8E=B0?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/service/serviceimpl/EdFileInfoServiceImpl.java | 3 ++- .../manage/service/serviceimpl/EdPrjServiceImpl.java | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java index 83f7257..5a341ea 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java @@ -921,7 +921,8 @@ public class EdFileInfoServiceImpl extends ServiceImpl qr.likeRight(EdFileInfo::getFilePath, prjId + MYSQL_FILE_PATH_SPLIT)); } Page edFileInfoPage = this.baseMapper.selectPage(new Page<>(pageNum, pageSize), lambdaQuery); long total = edFileInfoPage.getTotal(); diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java index 5be0df9..8225e9f 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java @@ -436,7 +436,10 @@ public class EdPrjServiceImpl extends ServiceImpl List edFileInfos = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class).select(EdFileInfo::getFilePath) .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code) .eq(EdFileInfo::getPrjDir, true) - .eq(EdFileInfo::getDataStatus, EleDataStatusEnum.NOT_PUBLISHED.code).or().eq(EdFileInfo::getDataStatus, EleDataStatusEnum.DELETED.code)); + .and(qr -> qr + .eq(EdFileInfo::getDataStatus, EleDataStatusEnum.NOT_PUBLISHED.code) + .or() + .eq(EdFileInfo::getDataStatus, EleDataStatusEnum.DELETED.code))); Set unpublishFiles = new HashSet<>(); for (EdFileInfo edFileInfo : edFileInfos) { String filePath = edFileInfo.getFilePath(); From c15261d6d6e3f15ad2a5332b8587c9d53fcf1561 Mon Sep 17 00:00:00 2001 From: chenxudong Date: Tue, 7 Jan 2025 16:03:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=BC=BA=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/serviceimpl/EdPrjServiceImpl.java | 8 +++++- .../service/serviceimpl/TokenServiceImpl.java | 27 ------------------- 2 files changed, 7 insertions(+), 28 deletions(-) delete mode 100644 electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/TokenServiceImpl.java diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java index 8225e9f..deb7189 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java @@ -184,7 +184,7 @@ public class EdPrjServiceImpl extends ServiceImpl .likeRight(EdFileInfo::getFilePath, prjId + MYSQL_FILE_PATH_SPLIT); List edFileInfos = this.baseMapper.selectList(queryWrapper); edFileInfos.forEach(e -> ids.add(e.getId())); - Wrappers.lambdaUpdate(EdFileInfo.class).set(EdFileInfo::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code).in(EdFileInfo::getId, ids); + this.baseMapper.update(null, Wrappers.lambdaUpdate(EdFileInfo.class).set(EdFileInfo::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code).in(EdFileInfo::getId, ids)); return ElectromagneticResultUtil.success(true); } catch (Exception e) { String info = "删除项目失败"; @@ -204,6 +204,12 @@ public class EdPrjServiceImpl extends ServiceImpl @Transactional(rollbackFor = Exception.class) public ElectromagneticResult addFolder(String parentId, String folderName) { Assert.isTrue(EleCommonUtil.isFileNameValid(folderName), NAME_VALID_MSG); + // 检查当前目录下有没文件，如果有则不允许添加 + long count = this.baseMapper.selectCount(Wrappers.lambdaQuery(EdFileInfo.class) + .eq(EdFileInfo::getDataStatus, EleDataTypeEnum.FILE.code) + .eq(EdFileInfo::getParentId, parentId) + .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)); + Assert.isTrue(count == 0, "该层级目录下存在文件，不允许再定义层级目录"); int id = Integer.parseInt(this.baseMapper.maxPrjId()); String folderId = String.valueOf(id + 1); return commonService.addFolder(parentId, folderName, true, true, folderId, null); diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/TokenServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/TokenServiceImpl.java deleted file mode 100644 index 89df594..0000000 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/TokenServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.electromagnetic.industry.software.manage.service.serviceimpl; - -import com.electromagnetic.industry.software.common.pojo.UserLoginInfo; -import com.electromagnetic.industry.software.manage.pojo.models.User; -import com.electromagnetic.industry.software.manage.service.TokenService; - -public class TokenServiceImpl implements TokenService { - @Override - public String createToken(UserLoginInfo loginInfo) { - return ""; - } - - @Override - public Boolean createUserToken(User user, String tokenStr) { - return null; - } - - @Override - public Boolean isTokenValid(String tokenStr) { - return null; - } - - @Override - public int deleteToken(String tokenStr) { - return 0; - } -} From b492520470036700f9017d2c7964cc2dea381889 Mon Sep 17 00:00:00 2001 From: chenxudong Date: Tue, 7 Jan 2025 16:18:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/mapper/CategoryMapper.java | 48 ------- .../software/manage/mapper/EDDataMapper.java | 36 ----- .../software/manage/mapper/EDDataMappers.java | 40 ------ .../software/manage/pojo/models/Category.java | 84 ----------- .../manage/pojo/models/EDDataInfo.java | 99 ------------- .../manage/pojo/other/EDDataPage.java | 24 ---- .../service/serviceimpl/EdPrjServiceImpl.java | 2 +- .../resources/sqlmapper/CategoryMapper.xml | 77 ---------- .../resources/sqlmapper/EdDataInfoMapper.xml | 134 ------------------ .../resources/sqlmapper/EdFileInfoMapper.xml | 2 +- 10 files changed, 2 insertions(+), 544 deletions(-) delete mode 100644 electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/CategoryMapper.java delete mode 100644 electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/EDDataMapper.java delete mode 100644 electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/EDDataMappers.java delete mode 100644 electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/Category.java delete mode 100644 electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EDDataInfo.java delete mode 100644 electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/EDDataPage.java delete mode 100644 electrmangnetic/src/main/resources/sqlmapper/CategoryMapper.xml delete mode 100644 electrmangnetic/src/main/resources/sqlmapper/EdDataInfoMapper.xml diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/CategoryMapper.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/CategoryMapper.java deleted file mode 100644 index 58c318d..0000000 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/CategoryMapper.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.electromagnetic.industry.software.manage.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.electromagnetic.industry.software.manage.pojo.models.Category; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface CategoryMapper extends BaseMapper { - - /** - * 获取顶级节点 - * - * @return - */ - List selectTopCategories(); - - /** - * 获取所有节点 - * - * @return - */ - List selectAllCategories(); - - /** - * 获取节点通过编码ID - * - * @return - */ - List selectCategories(Category category); - - /** - * 获取子节点通过父ID - * - * @return - */ - List selectChildCategories(Category category); - - /** - * 创建目录树节点数据 - * - * @return - */ - Boolean createCategory(Category category); - - -} diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/EDDataMapper.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/EDDataMapper.java deleted file mode 100644 index c9fb5b4..0000000 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/EDDataMapper.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.electromagnetic.industry.software.manage.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.electromagnetic.industry.software.manage.pojo.models.EDDataInfo; -import com.electromagnetic.industry.software.manage.pojo.other.EDDataParams; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - - -@Mapper -public interface EDDataMapper extends BaseMapper { - /** - * 创建文件/文件夹数据信息 - * - * @param edDataInfo - * @return - */ - Boolean createDataInfo(EDDataInfo edDataInfo); - - /** - * 获取文件信息列表 - * - * @param parames - * @return - */ - List getDataInfoList(EDDataParams parames); - - /** - * 更新文件信息 - * - * @param parames - * @return - */ - Boolean updateFileInfo(EDDataParams parames); -} diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/EDDataMappers.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/EDDataMappers.java deleted file mode 100644 index 6db729d..0000000 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/mapper/EDDataMappers.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.electromagnetic.industry.software.manage.mapper; - -import com.electromagnetic.industry.software.manage.pojo.models.EDDataInfo; -import com.electromagnetic.industry.software.manage.pojo.other.EDDataPage; -import com.electromagnetic.industry.software.manage.pojo.other.EDDataParams; -import com.electromagnetic.industry.software.manage.pojo.req.EDDataRequest; -import com.electromagnetic.industry.software.manage.pojo.resp.EDDataPageResponse; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -@Mapper -public interface EDDataMappers { - - EDDataMappers INSTANCE = Mappers.getMapper(EDDataMappers.class); - - /** - * 文件数据扩展模型入参转换 - * - * @param request - * @return - */ - EDDataParams getEDDataParames(EDDataRequest request); - - /** - * 文件数据扩展模型入参转换 - * - * @param request - * @return - */ - EDDataInfo getEDDataInfo(EDDataRequest request); - - /** - * 指标卡扩展模型返回 - * - * @param edDataPage - * @return - */ - EDDataPageResponse getEDDataInfoToModel(EDDataPage edDataPage); - -} diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/Category.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/Category.java deleted file mode 100644 index 2fc142a..0000000 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/Category.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.electromagnetic.industry.software.manage.pojo.models; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -@Data -@TableName("ed_category") -public class Category { - /** - * 主键ID - */ - private Long id; - - /** - * 目录类型ID - */ - private String categoryTypeId; - - /** - * 上级编码，为空则为一级 - */ - private String parentId; - - /** - * 目录编码 - */ - private String categoryId; - - /** - * 目录名称 - */ - private String categoryName; - - /** - * 目录状态 - */ - private String categoryStatus; - - /** - * 创建人 - */ - private String creator; - - /** - * 创建人姓名 - */ - private String creatorName; - - /** - * 创建时间 - */ - private Date gmtCreate; - - /** - * 编辑人 - */ - private String modifier; - - /** - * 编辑人姓名 - */ - private String modifierName; - - /** - * 编辑时间 - */ - private Date gmtModified; - - /** - * 是否有效：0-无效 1-有效 - */ - private int effectFlag; - - /** - * 子目录 - */ - @TableField(exist = false) - private List children = new ArrayList<>(); -} diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EDDataInfo.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EDDataInfo.java deleted file mode 100644 index 7aed008..0000000 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EDDataInfo.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.electromagnetic.industry.software.manage.pojo.models; - -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; - -import java.util.Date; - -@TableName("ed_data_info") -@Data -public class EDDataInfo { - /** - * 主键ID - */ - private Long id; - /** - * 目录编码 - */ - private String categoryId; - /** - * 数据编码 - */ - private String dataId; - /** - * 数据可视化码 - */ - private String dataNo; - /** - * 数据名称 - */ - private String dataName; - /** - * 数据类型：folder文件夹；file文件 - */ - private String dataType; - /** - * 文件类型 - */ - private String fileType; - /** - * 当前版本 - */ - private String version; - /** - * 富文本内容 - */ - private String content; - /** - * 文件地址JSON - */ - private String implantJson; - /** - * 状态：publish:发布，occupy:占用 - */ - private String dataStatus; - /** - * 备注 - */ - private String note; - /** - * 编辑人 - */ - private String editor; - /** - * 批量上传时间 - */ - private Date gmtBatchUpload; - /** - * 保存状态 - */ - private String saveStatus; - /** - * 创建人 - */ - private String creator; - /** - * 创建人姓名 - */ - private String creatorName; - /** - * 创建时间 - */ - private Date gmtCreate; - /** - * 更新人 - */ - private String modifier; - /** - * 更新人姓名 - */ - private String modifierName; - /** - * 更新时间 - */ - private Date gmtModified; - /** - * 是否有效:0-无效 1-有效 - */ - private Integer effectFlag; -} diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/EDDataPage.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/EDDataPage.java deleted file mode 100644 index 5e232a2..0000000 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/EDDataPage.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.electromagnetic.industry.software.manage.pojo.other; - -import com.electromagnetic.industry.software.manage.pojo.models.EDDataInfo; -import com.github.pagehelper.PageInfo; -import lombok.Data; - -import java.io.Serializable; - -/** - * 分页综合返回 - * - * @author - * @version $Id: IndicatorCardPage.java, v 0.1 2024-08-14 17:30 - */ -@Data -public class EDDataPage implements Serializable { - - private static final long serialVersionUID = -6207631048120337133L; - /** - * 电磁数据-文件数据列表 - */ - private PageInfo edDataInfo; - -} \ No newline at end of file diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java index deb7189..6d8b03a 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java @@ -204,7 +204,7 @@ public class EdPrjServiceImpl extends ServiceImpl @Transactional(rollbackFor = Exception.class) public ElectromagneticResult addFolder(String parentId, String folderName) { Assert.isTrue(EleCommonUtil.isFileNameValid(folderName), NAME_VALID_MSG); - // 检查当前目录下有没文件，如果有则不允许添加 + // 检查当前目录下有文件，如果有则不允许添加 long count = this.baseMapper.selectCount(Wrappers.lambdaQuery(EdFileInfo.class) .eq(EdFileInfo::getDataStatus, EleDataTypeEnum.FILE.code) .eq(EdFileInfo::getParentId, parentId) diff --git a/electrmangnetic/src/main/resources/sqlmapper/CategoryMapper.xml b/electrmangnetic/src/main/resources/sqlmapper/CategoryMapper.xml deleted file mode 100644 index 3d6e53a..0000000 --- a/electrmangnetic/src/main/resources/sqlmapper/CategoryMapper.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - select category_type_id, - parent_id, - category_id, - category_name, - category_status, - creator, - creator_name, - gmt_create, - modifier, - modifier_name, - gmt_modified, - effect_flag - from ed_category - - - - - - - - - - - - - SELECT LAST_INSERT_ID() - - replace into ed_data_info (id, - category_type_id, parent_id, category_id, - category_name, category_status, - creator, creator_name, gmt_create, - modifier, modifier_name, gmt_modified, - effect_flag - ) - values (#{id,jdbcType=VARCHAR}, #{categoryTypeId,jdbcType=VARCHAR}, - #{parentId,jdbcType=VARCHAR}, #{categoryId,jdbcType=VARCHAR}, - #{categoryName,jdbcType=VARCHAR}, #{categoryStatus,jdbcType=VARCHAR}, - #{creator,jdbcType=VARCHAR}, #{creatorName,jdbcType=VARCHAR}, now(), #{modifier,jdbcType=VARCHAR}, - #{modifierName,jdbcType=VARCHAR},now(),1 - ) - - - \ No newline at end of file diff --git a/electrmangnetic/src/main/resources/sqlmapper/EdDataInfoMapper.xml b/electrmangnetic/src/main/resources/sqlmapper/EdDataInfoMapper.xml deleted file mode 100644 index b3ec40d..0000000 --- a/electrmangnetic/src/main/resources/sqlmapper/EdDataInfoMapper.xml +++ /dev/null @@ -1,134 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - id - ,category_id,data_id,data_no,data_name,data_type,file_type,version,content, - implant_json,data_status,note,editor,gmt_batch_upload,save_status,creator,creator_name,gmt_create,modifier,modifier_name, - gmt_modified,effect_flag - - - - - - SELECT LAST_INSERT_ID() - - replace into ed_data_info (category_id, - data_id, data_no, data_name, - data_type, file_type, version, - content, implant_json, data_status, - note, editor, gmt_batch_upload, save_status, - creator, creator_name, gmt_create, - modifier, modifier_name, gmt_modified, - effect_flag - ) - values (#{categoryId,jdbcType=VARCHAR}, - #{dataId,jdbcType=VARCHAR}, #{dataNo,jdbcType=VARCHAR}, #{dataName,jdbcType=VARCHAR}, - #{dataType,jdbcType=VARCHAR}, #{fileType,jdbcType=VARCHAR},#{version,jdbcType=VARCHAR}, - #{content,jdbcType=VARCHAR}, #{implantJson,jdbcType=VARCHAR}, #{dataStatus,jdbcType=VARCHAR}, - #{note,jdbcType=VARCHAR}, #{editor,jdbcType=VARCHAR}, #{gmtBatchUpload,jdbcType=TIMESTAMP}, - #{saveStatus,jdbcType=VARCHAR}, - #{creator,jdbcType=VARCHAR}, #{creatorName,jdbcType=VARCHAR}, now(), #{modifier,jdbcType=VARCHAR}, - #{modifierName,jdbcType=VARCHAR},now(),1 - ) - - - - - - update ed_data_info - - - data_name = #{name,jdbcType=VARCHAR}, - - - data_status = #{dataStatus,jdbcType=VARCHAR}, - - - note = #{note,jdbcType=VARCHAR}, - - - save_status = #{saveStatus,jdbcType=VARCHAR}, - - - effect_flag = #{effectFlag,jdbcType=VARCHAR}, - - - modifier = #{userId,jdbcType=VARCHAR}, - - - modifier_name = #{userName,jdbcType=VARCHAR}, - - gmt_modified = now() - - - - - data_id = #{dataId,jdbcType=VARCHAR} - - - - category_id = #{parentId,jdbcType=VARCHAR} - - - - - - - diff --git a/electrmangnetic/src/main/resources/sqlmapper/EdFileInfoMapper.xml b/electrmangnetic/src/main/resources/sqlmapper/EdFileInfoMapper.xml index d1200a4..be5b7f2 100644 --- a/electrmangnetic/src/main/resources/sqlmapper/EdFileInfoMapper.xml +++ b/electrmangnetic/src/main/resources/sqlmapper/EdFileInfoMapper.xml @@ -6,6 +6,6 @@ \ No newline at end of file