From c15261d6d6e3f15ad2a5332b8587c9d53fcf1561 Mon Sep 17 00:00:00 2001 From: chenxudong Date: Tue, 7 Jan 2025 16:03:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=BC=BA=E6=A0=A1=E9=AA=8C=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; - } -}