chenxudong
/
electromagnetic-data-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: chenxudong:75443f2d78596d17eea5f9dce5cee4b786ea18d9
Branches Tags
chenxudong:master
chenxudong:release3.0.8
chenxudong:develop
chenxudong:test
chenxudong:release3.0.7
chenxudong:release3.0.6
chenxudong:release3.0.5
chenxudong:release3.0.4
chenxudong:release3.0.3
chenxudong:release3.0.2
chenxudong:release3.0.1
chenxudong:release3
chenxudong:release2
..
compare: chenxudong:39e8afee9cec7be53ad2110a5846aca3acbaa05b
Branches Tags
chenxudong:release3.0.8
chenxudong:develop
chenxudong:test
chenxudong:release3.0.7
chenxudong:release3.0.6
chenxudong:release3.0.5
chenxudong:release3.0.4
chenxudong:release3.0.3
chenxudong:release3.0.2
chenxudong:release3.0.1
chenxudong:release3
chenxudong:release2
chenxudong:master

No commits in common. "75443f2d78596d17eea5f9dce5cee4b786ea18d9" and "39e8afee9cec7be53ad2110a5846aca3acbaa05b" have entirely different histories.
75443f2d78 ... 39e8afee9c

4 changed files with 4 additions and 56 deletions
Show Stats Expand all files Collapse all files

6
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/ProjectController.java
View File

@ -2,7 +2,6 @@ package com.electromagnetic.industry.software.manage.controller;
import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
import com.electromagnetic.industry.software.manage.pojo.req.FolderResortDTO;
import com.electromagnetic.industry.software.manage.pojo.req.QueryPublishStatus;
import com.electromagnetic.industry.software.manage.service.EdPrjService;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@ -69,9 +68,4 @@ public class ProjectController {
public ElectromagneticResult<?> follow(@RequestParam String sourceId, @RequestParam String targetId) {
return edPrjService.follow(sourceId, targetId);
}
@RequestMapping("publishStatus")
public ElectromagneticResult<?> publishStatus(@RequestBody QueryPublishStatus queryPublishStatus) {
return edPrjService.publishStatus(queryPublishStatus);
}
}

10
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/QueryPublishStatus.java
View File

@ -1,10 +0,0 @@
package com.electromagnetic.industry.software.manage.pojo.req;
import lombok.Data;
import java.util.List;
@Data
public class QueryPublishStatus {
private List<String> prjIds;
}

8
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdPrjService.java
View File

@ -2,7 +2,6 @@ package com.electromagnetic.industry.software.manage.service;
import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
import com.electromagnetic.industry.software.manage.pojo.req.FolderResortDTO;
import com.electromagnetic.industry.software.manage.pojo.req.QueryPublishStatus;
import java.util.List;
@ -89,11 +88,4 @@ public interface EdPrjService {
* @return
*/
ElectromagneticResult<?> modifyFolder(String id, String newFolderName);
/**
* 获取项目的发布状态
* @param queryPublishStatus
* @return
*/
ElectromagneticResult<?> publishStatus(QueryPublishStatus queryPublishStatus);
}

36
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
View File

@ -8,7 +8,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.electromagnetic.industry.software.common.enums.*;
import com.electromagnetic.industry.software.common.enums.EffectFlagEnum;
import com.electromagnetic.industry.software.common.enums.EleDataSaveStatusEnum;
import com.electromagnetic.industry.software.common.enums.EleDataStatusEnum;
import com.electromagnetic.industry.software.common.enums.EleDataTypeEnum;
import com.electromagnetic.industry.software.common.exception.BizException;
import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
import com.electromagnetic.industry.software.common.util.EleCommonUtil;
@ -18,7 +21,6 @@ import com.electromagnetic.industry.software.common.util.UserThreadLocal;
import com.electromagnetic.industry.software.manage.mapper.EdFileInfoMapper;
import com.electromagnetic.industry.software.manage.pojo.models.EdFileInfo;
import com.electromagnetic.industry.software.manage.pojo.req.FolderResortDTO;
import com.electromagnetic.industry.software.manage.pojo.req.QueryPublishStatus;
import com.electromagnetic.industry.software.manage.pojo.resp.ProjectVO;
import com.electromagnetic.industry.software.manage.service.EdPrjService;
import com.electromagnetic.industry.software.manage.service.FileSystemService;
@ -420,34 +422,4 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
}
}
/**
* 获取项目的发布状态
*
* @param queryPublishStatus
* @return
*/
@Override
public ElectromagneticResult<?> publishStatus(QueryPublishStatus queryPublishStatus) {
Map<String, Integer> res = new HashMap<>();
List<String> prjIds = queryPublishStatus.getPrjIds();
List<EdFileInfo> edFileInfos = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class).select(EdFileInfo::getFilePath)
.in(EdFileInfo::getId, prjIds)
.eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)
.eq(EdFileInfo::getPrjDir, true)
.eq(EdFileInfo::getDataStatus, EleDataStatusEnum.NOT_PUBLISHED.code));
Set<String> unpublishFiles = new HashSet<>();
for (EdFileInfo edFileInfo : edFileInfos) {
String filePath = edFileInfo.getFilePath();
String prjId = filePath.split(MYSQL_FILE_PATH_SPLIT)[0];
unpublishFiles.add(prjId);
}
for (String prjId : prjIds) {
res.put(prjId, EleDataStatusEnum.PUBLISHED.code);
if (unpublishFiles.contains(prjId)) {
res.put(prjId, EleDataStatusEnum.NOT_PUBLISHED.code);
}
}
return ElectromagneticResultUtil.success(res);
}
}