Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

提交

Browse Source
This commit is contained in:
huangzj
2023-06-16 10:12:05 +08:00
parent 80ce037a22
commit 6eb5bf4029
7 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/AppProjectMapper.java
View File

@@ -60,5 +60,5 @@ public interface AppProjectMapper extends BaseMapper<AppProjectPO> {
// " order by a.create_time desc",
// "</script>"}
// )
Page<AppProjectVO> getPageVo(Page<AppProjectVO> returnpage, @Param("temp")AppProjectQueryParm appProjectQueryParm);
Page<AppProjectVO> getPageVo(Page<AppProjectVO> returnpage, @Param("temp")AppProjectQueryParm appProjectQueryParm, @Param("userId") String userId);
}

3
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/AppProjectMapper.xml
View File

@@ -25,6 +25,9 @@
<select id="getPageVo" resultType="com.njcn.csdevice.pojo.vo.AppProjectVO">
select a.*,b.pid as engineering_id,(select name from cs_ledger c where c.id=b.pid) as engineering_name from cs_project a LEFT JOIN cs_ledger b on a.id = b.id where 1=1
and a.status ="1"
<if test="userId != null and userId !=''">
and exists (select 1 from cs_engineering_user d where d.engineering_id=b.pid and d.user_id=#{userId})
</if>
<if test="temp!=null and temp.projectId != null and temp.projectId !=''">
AND a.id = #{temp.projectId}
</if>

7
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java
View File

@@ -18,6 +18,7 @@ import com.njcn.csdevice.pojo.vo.AppTopologyDiagramVO;
import com.njcn.csdevice.service.AppProjectService;
import com.njcn.csdevice.service.AppTopologyDiagramService;
import com.njcn.oss.utils.FileStorageUtil;
import com.njcn.web.utils.RequestUtil;
import kotlin.jvm.Throws;
import lombok.RequiredArgsConstructor;
import net.bytebuddy.implementation.bytecode.Throw;
@@ -142,7 +143,11 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
public IPage<AppProjectVO> queryProject(AppProjectQueryParm appProjectQueryParm) {
Page<AppProjectVO> returnpage = new Page<> (appProjectQueryParm.getPageNum ( ), appProjectQueryParm.getPageSize ( ));
returnpage = appProjectMapper.getPageVo (returnpage, appProjectQueryParm);
String userId = RequestUtil.getUserIndex();
if(Objects.equals(RequestUtil.getUsername(),"root")){
userId = null;
}
returnpage = appProjectMapper.getPageVo (returnpage, appProjectQueryParm, userId);
List<AppProjectVO> collect = returnpage.getRecords().stream().map(temp -> {
AppTopologyDiagramQueryParm appTopologyDiagramQueryParm = new AppTopologyDiagramQueryParm();
appTopologyDiagramQueryParm.setProjectId(temp.getId());

6
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppTopologyDiagramServiceImpl.java
View File

@@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.base.Objects;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.csdevice.constant.DataParam;
import com.njcn.csdevice.enums.AlgorithmResponseEnum;
import com.njcn.csdevice.mapper.AppProjectMapper;
import com.njcn.csdevice.mapper.AppTopologyDiagramMapper;
import com.njcn.csdevice.pojo.param.AppTopologyDiagramAddParm;
@@ -52,6 +55,9 @@ public class AppTopologyDiagramServiceImpl extends ServiceImpl<AppTopologyDiagra
AppTopologyDiagramPO appTopologyDiagramPO = new AppTopologyDiagramPO();
MultipartFile file = appTopologyDiagramAddParm.getFile ( );
if(file.getSize()> DataParam.FILE_SIZE){
throw new BusinessException(AlgorithmResponseEnum.FILE_SIZE_ERROR);
}
String filePath = fileStorageUtil.uploadMultipart (file, OssPath.TOPOLOGY);
appTopologyDiagramPO.setFilePath (filePath);
appTopologyDiagramPO.setProjectId (appTopologyDiagramAddParm.getProjectId ()==null?"":appTopologyDiagramAddParm.getProjectId ());

4
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEngineeringServiceImpl.java
View File

@@ -111,7 +111,7 @@ public class CsEngineeringServiceImpl extends ServiceImpl<CsEngineeringMapper, C
QueryWrapper<CsEngineeringUserPO> csEngineeringUserPOQueryWrapper = new QueryWrapper<> ();
//todo 后期修改
String userIndex = RequestUtil.getUserIndex();
if(RequestUtil.getUsername()!="root"){
if(!Objects.equals(RequestUtil.getUsername(),"root")){
csEngineeringUserPOQueryWrapper.lambda().eq(CsEngineeringUserPO::getUserId,userIndex);
List<CsEngineeringUserPO> csEngineeringUserPOS = csEngineeringUserMapper.selectList(csEngineeringUserPOQueryWrapper);
List<String> collect = csEngineeringUserPOS.stream().map(CsEngineeringUserPO::getEngineeringId).collect(Collectors.toList());
@@ -147,7 +147,7 @@ public class CsEngineeringServiceImpl extends ServiceImpl<CsEngineeringMapper, C
QueryWrapper<CsEngineeringUserPO> csEngineeringUserPOQueryWrapper = new QueryWrapper<> ();
//todo 后期修改
String userIndex = RequestUtil.getUserIndex();
if(RequestUtil.getUsername()!="root"){
if(!Objects.equals(RequestUtil.getUsername(),"root")){
csEngineeringUserPOQueryWrapper.lambda().eq(CsEngineeringUserPO::getUserId,userIndex);
List<CsEngineeringUserPO> csEngineeringUserPOS = csEngineeringUserMapper.selectList(csEngineeringUserPOQueryWrapper);
List<String> collect = csEngineeringUserPOS.stream().map(CsEngineeringUserPO::getEngineeringId).collect(Collectors.toList());