Skip to content

Administrator / framework-tools

Go to a project
Commit 10b40879 by henry
Options

添加知识库新增列表

1 parent 60e61c0f
Inline Side-by-side
Showing with 485 additions and 51 deletions
framework-asset/src/main/java/org/arch/overall/controller/AppInfoController.java
...@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiOperation; ...@@ -6,7 +6,7 @@ import io.swagger.annotations.ApiOperation;
import org.arch.base.Result; import org.arch.base.Result;
import org.arch.common.modules.archoverall.dto.AppInfoDTO; import org.arch.common.modules.archoverall.dto.AppInfoDTO;
import org.arch.common.modules.archoverall.dto.BatchRemoveDTO; import org.arch.common.modules.archoverall.dto.BatchRemoveDTO;
import org.arch.common.modules.archsysytem.eneiity.AppInfo; import org.arch.common.modules.archsystem.eneiity.AppInfo;
import org.arch.log.annotation.OperLog; import org.arch.log.annotation.OperLog;
import org.arch.log.logenum.LogOperTypeEnum; import org.arch.log.logenum.LogOperTypeEnum;
import org.arch.log.logenum.LogTypeEnum; import org.arch.log.logenum.LogTypeEnum;
......
framework-asset/src/main/java/org/arch/overall/controller/KlDocPoolController.java 0 → 100644
package org.arch.overall.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.arch.base.Result;
import org.arch.common.modules.archoverall.dto.asset.KlDocPoolDTO;
import org.arch.common.modules.archsystem.vo.KlDocPoolVO;
import org.arch.log.annotation.OperLog;
import org.arch.log.logenum.LogOperTypeEnum;
import org.arch.log.logenum.LogTypeEnum;
import org.arch.overall.service.KlDocPoolService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* <p>
* 架构知识库-典型案例库-总体架构资产文档库 前端控制器
* </p>
*
* @author makejava
* @since 2023-12-14
*/
@Api(value = "/kl-doc-pool", tags = {"架构知识库-典型案例库-总体架构资产文档库"})
@RestController
@RequestMapping("/kl-doc-pool")
public class KlDocPoolController {
@Autowired
private KlDocPoolService klDocPoolService;
/**
* 分页列表
*
* @param params 参数
*/
@ApiOperation(value = "分页列表", notes = "分页列表", httpMethod = "POST")
@PostMapping(value = "/")
@OperLog(value = LogOperTypeEnum.UPDATE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "分页列表", moduleName = "架构知识库")
public Result iPage(@RequestBody KlDocPoolDTO params) {
IPage<KlDocPoolVO> aPage = klDocPoolService.iPage(params,
PageDTO.of(params.getCurrent(), params.getPageSize()));
return Result.success(aPage);
}
/**
* 新增
*
* @param params 参数
* @return {@link Result}<{@link Boolean}>
*/
@ApiOperation(value = "新增", notes = "新增", httpMethod = "POST")
@PostMapping(value = "/cDocPool")
@OperLog(value = LogOperTypeEnum.ADD, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "新增", moduleName = "架构知识库")
public Result create(@RequestBody @Validated KlDocPoolDTO params) {
return Result.success(klDocPoolService.insert(params));
}
}
framework-asset/src/main/java/org/arch/overall/controller/PrjInfoController.java
...@@ -6,8 +6,8 @@ import io.swagger.annotations.Api; ...@@ -6,8 +6,8 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.arch.base.Result; import org.arch.base.Result;
import org.arch.common.modules.archoverall.dto.BatchRemoveDTO; import org.arch.common.modules.archoverall.dto.BatchRemoveDTO;
import org.arch.common.modules.archsysytem.dto.PrjInfoDTO; import org.arch.common.modules.archsystem.dto.PrjInfoDTO;
import org.arch.common.modules.archsysytem.eneiity.PrjInfo; import org.arch.common.modules.archsystem.eneiity.PrjInfo;
import org.arch.log.annotation.OperLog; import org.arch.log.annotation.OperLog;
import org.arch.log.entity.DescContent; import org.arch.log.entity.DescContent;
import org.arch.log.logenum.LogOperTypeEnum; import org.arch.log.logenum.LogOperTypeEnum;
......
framework-asset/src/main/java/org/arch/overall/mapper/AppInfoMapper.java
...@@ -2,8 +2,8 @@ package org.arch.overall.mapper; ...@@ -2,8 +2,8 @@ package org.arch.overall.mapper;
import com.github.yulichang.base.MPJBaseMapper; import com.github.yulichang.base.MPJBaseMapper;
import org.arch.common.modules.archoverall.dto.AppInfoDTO; import org.arch.common.modules.archoverall.dto.AppInfoDTO;
import org.arch.common.modules.archsysytem.eneiity.AppInfo; import org.arch.common.modules.archsystem.eneiity.AppInfo;
import org.arch.common.modules.archsysytem.vo.AppInfoVO; import org.arch.common.modules.archsystem.vo.AppInfoVO;
/** /**
* <p> * <p>
......
framework-asset/src/main/java/org/arch/overall/mapper/KlDocPoolMapper.java 0 → 100644
package org.arch.overall.mapper;
import com.github.yulichang.base.MPJBaseMapper;
import org.arch.common.modules.archoverall.entity.KlDocPool;
/**
* <p>
* 架构知识库-典型案例库-总体架构资产文档库 Mapper 接口
* </p>
*
* @author makejava
* @since 2023-12-14
*/
public interface KlDocPoolMapper extends MPJBaseMapper<KlDocPool> {
}
framework-asset/src/main/java/org/arch/overall/mapper/KlTechPolicyMapper.java
package org.arch.overall.mapper; package org.arch.overall.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.arch.common.modules.archoverall.dto.KlTechPolicyDTO;
import org.arch.common.modules.archoverall.entity.KlTechPolicy; import org.arch.common.modules.archoverall.entity.KlTechPolicy;
/** /**
......
framework-asset/src/main/java/org/arch/overall/mapper/OrgMapper.java
...@@ -3,8 +3,8 @@ package org.arch.overall.mapper; ...@@ -3,8 +3,8 @@ package org.arch.overall.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.arch.common.modules.archsysytem.dto.OrgDTO; import org.arch.common.modules.archsystem.dto.OrgDTO;
import org.arch.common.modules.archsysytem.vo.CockpitOrgVO; import org.arch.common.modules.archsystem.vo.CockpitOrgVO;
import org.arch.common.modules.sysmange.entity.Org; import org.arch.common.modules.sysmange.entity.Org;
import java.util.List; import java.util.List;
......
framework-asset/src/main/java/org/arch/overall/mapper/PrjInfoMapper.java
...@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.base.MPJBaseMapper; import com.github.yulichang.base.MPJBaseMapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.arch.common.modules.archsysytem.dto.ProjectQueryDTO; import org.arch.common.modules.archsystem.dto.ProjectQueryDTO;
import org.arch.common.modules.archsysytem.eneiity.PrjInfo; import org.arch.common.modules.archsystem.eneiity.PrjInfo;
import org.arch.common.modules.archsysytem.vo.CockpitProjectInfoVO; import org.arch.common.modules.archsystem.vo.CockpitProjectInfoVO;
/** /**
* <p> * <p>
......
framework-asset/src/main/java/org/arch/overall/mapper/PrjNeedFileMapper.java
...@@ -3,8 +3,8 @@ package org.arch.overall.mapper; ...@@ -3,8 +3,8 @@ package org.arch.overall.mapper;
import com.github.yulichang.base.MPJBaseMapper; import com.github.yulichang.base.MPJBaseMapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.arch.common.modules.archoverall.dto.design.ArchiViewDTO; import org.arch.common.modules.archoverall.dto.design.ArchiViewDTO;
import org.arch.common.modules.archsysytem.eneiity.PrjNeedFile; import org.arch.common.modules.archsystem.eneiity.PrjNeedFile;
import org.arch.common.modules.archsysytem.vo.PrjNeedFileVO; import org.arch.common.modules.archsystem.vo.PrjNeedFileVO;
import java.util.List; import java.util.List;
......
framework-asset/src/main/java/org/arch/overall/service/AppInfoService.java
...@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import org.arch.common.modules.archoverall.dto.AppInfoDTO; import org.arch.common.modules.archoverall.dto.AppInfoDTO;
import org.arch.common.modules.archoverall.dto.BatchRemoveDTO; import org.arch.common.modules.archoverall.dto.BatchRemoveDTO;
import org.arch.common.modules.archsysytem.eneiity.AppInfo; import org.arch.common.modules.archsystem.eneiity.AppInfo;
import org.arch.common.modules.archsysytem.vo.AppInfoVO; import org.arch.common.modules.archsystem.vo.AppInfoVO;
import java.util.List; import java.util.List;
......
framework-asset/src/main/java/org/arch/overall/service/KlDocPoolService.java 0 → 100644
package org.arch.overall.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.arch.common.modules.archoverall.dto.asset.KlDocPoolDTO;
import org.arch.common.modules.archoverall.entity.KlDocPool;
import org.arch.common.modules.archsystem.vo.KlDocPoolExcelVO;
import org.arch.common.modules.archsystem.vo.KlDocPoolVO;
import java.util.List;
/**
* <p>
* 架构知识库-典型案例库-总体架构资产文档库 服务类
* </p>
*
* @author makejava
* @since 2023-12-14
*/
public interface KlDocPoolService extends IService<KlDocPool> {
/**
* 查询列表
*
* @param model 参数
* @param page 页
* @return {@link IPage}<{@link KlDocPoolVO}>
*/
IPage<KlDocPoolVO> iPage(KlDocPoolDTO model, Page<KlDocPool> page);
/**
* 查询列表
*
* @param model 参数
* @return {@link IPage}<{@link KlDocPoolVO}>
*/
List<KlDocPoolExcelVO> listExcel(KlDocPoolDTO model);
/**
* 插入
*
* @param model 典型案例
* @return {@link Boolean}
*/
Boolean insert(KlDocPoolDTO model);
}
framework-asset/src/main/java/org/arch/overall/service/PrjInfoService.java
...@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import org.arch.common.modules.archoverall.dto.BatchRemoveDTO; import org.arch.common.modules.archoverall.dto.BatchRemoveDTO;
import org.arch.common.modules.archsysytem.dto.PrjInfoDTO; import org.arch.common.modules.archsystem.dto.PrjInfoDTO;
import org.arch.common.modules.archsysytem.eneiity.PrjInfo; import org.arch.common.modules.archsystem.eneiity.PrjInfo;
import java.util.List; import java.util.List;
......
framework-asset/src/main/java/org/arch/overall/service/PrjNeedFileService.java
package org.arch.overall.service; package org.arch.overall.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import org.arch.common.modules.archsysytem.eneiity.PrjNeedFile; import org.arch.common.modules.archsystem.eneiity.PrjNeedFile;
import java.util.List; import java.util.List;
......
framework-asset/src/main/java/org/arch/overall/service/impl/AppInfoServiceImpl.java
...@@ -11,9 +11,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; ...@@ -11,9 +11,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.arch.common.modules.archoverall.dto.AppInfoDTO; import org.arch.common.modules.archoverall.dto.AppInfoDTO;
import org.arch.common.modules.archoverall.dto.BatchRemoveDTO; import org.arch.common.modules.archoverall.dto.BatchRemoveDTO;
import org.arch.common.modules.archsysytem.eneiity.AppInfo; import org.arch.common.modules.archsystem.eneiity.AppInfo;
import org.arch.common.modules.archsysytem.eneiity.PrjInfo; import org.arch.common.modules.archsystem.eneiity.PrjInfo;
import org.arch.common.modules.archsysytem.vo.AppInfoVO; import org.arch.common.modules.archsystem.vo.AppInfoVO;
import org.arch.overall.mapper.AppInfoMapper; import org.arch.overall.mapper.AppInfoMapper;
import org.arch.overall.mapper.PrjInfoMapper; import org.arch.overall.mapper.PrjInfoMapper;
import org.arch.overall.service.AppInfoService; import org.arch.overall.service.AppInfoService;
......
framework-asset/src/main/java/org/arch/overall/service/impl/ArchiAssetSysServiceImpl.java
...@@ -232,8 +232,8 @@ public class ArchiAssetSysServiceImpl extends ServiceImpl<ArchiAssetInfoMapper, ...@@ -232,8 +232,8 @@ public class ArchiAssetSysServiceImpl extends ServiceImpl<ArchiAssetInfoMapper,
ArchiAssetInfoDTO newParamsCopy = new ArchiAssetInfoDTO(); ArchiAssetInfoDTO newParamsCopy = new ArchiAssetInfoDTO();
// 将字符串转换为JSON对象 // 将字符串转换为JSON对象
// 20240416改造注释 // 20240416改造注释
// String fieldsValueStr = asset.getFieldsValue(); // String fieldsValueStr = archoverall.getFieldsValue();
// String targetAssetStr = asset.getTargetAsset(); // String targetAssetStr = archoverall.getTargetAsset();
// 创建ObjectMapper对象 // 创建ObjectMapper对象
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
......
framework-asset/src/main/java/org/arch/overall/service/impl/ArchiMetaModelImpl.java
...@@ -176,7 +176,7 @@ public class ArchiMetaModelImpl extends ServiceImpl<ArchiMetaModelMapper, ArchiM ...@@ -176,7 +176,7 @@ public class ArchiMetaModelImpl extends ServiceImpl<ArchiMetaModelMapper, ArchiM
// assets = archiAssetSysService.iPage(params,new Page<>(current, pageSize)); // assets = archiAssetSysService.iPage(params,new Page<>(current, pageSize));
} }
// log.info("打印出来看看资产:"); // log.info("打印出来看看资产:");
// assets.getRecords().forEach(asset -> log.info(asset.toString())); // assets.getRecords().forEach(archoverall -> log.info(archoverall.toString()));
Map<Long, List<AssetInfo>> assetMap = new HashMap<>(); Map<Long, List<AssetInfo>> assetMap = new HashMap<>();
Map<Long, List<AssetInfo>> assetListMap = new HashMap<>(); Map<Long, List<AssetInfo>> assetListMap = new HashMap<>();
...@@ -189,7 +189,7 @@ public class ArchiMetaModelImpl extends ServiceImpl<ArchiMetaModelMapper, ArchiM ...@@ -189,7 +189,7 @@ public class ArchiMetaModelImpl extends ServiceImpl<ArchiMetaModelMapper, ArchiM
assetsList.stream().forEach(asset -> { assetsList.stream().forEach(asset -> {
// 20240419分页改造注释 // 20240419分页改造注释
// assets.getRecords().forEach(asset -> { // assets.getRecords().forEach(archoverall -> {
List<AssetInfo> archis = assetMap.get(asset.getArchiEleId()); List<AssetInfo> archis = assetMap.get(asset.getArchiEleId());
if (archis == null) { if (archis == null) {
archis = new ArrayList<>(); archis = new ArrayList<>();
......
framework-asset/src/main/java/org/arch/overall/service/impl/KlDocPoolServiceImpl.java 0 → 100644
package org.arch.overall.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.arch.common.modules.archoverall.dto.asset.KlDocPoolDTO;
import org.arch.common.modules.archoverall.entity.KlDocPool;
import org.arch.common.modules.archsystem.vo.KlDocPoolExcelVO;
import org.arch.common.modules.archsystem.vo.KlDocPoolVO;
import org.arch.common.modules.base.dict.Constant;
import org.arch.common.modules.base.entity.Dict;
import org.arch.common.modules.base.entity.DictDetail;
import org.arch.common.modules.base.entity.File;
import org.arch.overall.mapper.KlDocPoolMapper;
import org.arch.overall.service.KlDocPoolService;
import org.arch.storage.mapper.FileMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
/**
* <p>
* 架构知识库-典型案例库-总体架构资产文档库 服务实现类
* </p>
*
* @author makejava
* @since 2023-12-14
*/
@Service
public class KlDocPoolServiceImpl extends ServiceImpl<KlDocPoolMapper, KlDocPool> implements KlDocPoolService {
@Autowired
private FileMapper fileMapper;
@Override
public IPage<KlDocPoolVO> iPage(KlDocPoolDTO model, Page<KlDocPool> page) {
LambdaQueryWrapper<KlDocPool> wrapper = Wrappers.lambdaQuery(KlDocPool.class)
.select()
.like(StrUtil.isNotBlank(model.getFileName()), KlDocPool::getFileName, model.getFileName())
.eq(Objects.nonNull(model.getFileType()), KlDocPool::getFileType, model.getFileType())
.ge(Objects.nonNull(model.getBeginTime()), KlDocPool::getCreateTime, DateUtil.format(model.getBeginTime(), "yyyy-MM-dd 00:00:00"))
.le(Objects.nonNull(model.getEndTime()), KlDocPool::getCreateTime, DateUtil.format(model.getEndTime(), "yyyy-MM-dd 23:59:59"))
.eq(KlDocPool::getDelFlag, 0)
.orderByDesc(KlDocPool::getCreateTime);
Page<KlDocPool> casePage = baseMapper.selectPage(page, wrapper);
return casePage.convert(it -> {
KlDocPoolVO vo = new KlDocPoolVO();
BeanUtil.copyProperties(it, vo);
return vo;
});
}
@Override
public List<KlDocPoolExcelVO> listExcel(KlDocPoolDTO model) {
return baseMapper.selectJoinList(KlDocPoolExcelVO.class, new MPJLambdaWrapper<KlDocPool>()
.selectAsClass(KlDocPool.class, KlDocPoolExcelVO.class)
.select("dd1.label as file_type_name")
.innerJoin(DictDetail.class, "dd1", on -> on.eq(DictDetail::getValue, KlDocPool::getFileType))
.innerJoin(Dict.class, "d1", on -> on.eq("d1", Dict::getId, "dd1", DictDetail::getDictId).eq(Dict::getTypeValue, Constant.KL_FILE_TYPE))
.like(StrUtil.isNotBlank(model.getFileName()), KlDocPool::getFileName, model.getFileName())
.eq(Objects.nonNull(model.getFileType()), KlDocPool::getFileType, model.getFileType())
.ge(Objects.nonNull(model.getBeginTime()), KlDocPool::getCreateTime, DateUtil.format(model.getBeginTime(), "yyyy-MM-dd 00:00:00"))
.le(Objects.nonNull(model.getEndTime()), KlDocPool::getCreateTime, DateUtil.format(model.getEndTime(), "yyyy-MM-dd 23:59:59"))
.in(CollUtil.isNotEmpty(model.getIds()), KlDocPool::getDocId, model.getIds())
.eq(KlDocPool::getDelFlag, 0));
}
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean insert(KlDocPoolDTO model) {
// 文档名称不可重复
Long i = baseMapper.selectCount(
Wrappers.lambdaQuery(KlDocPool.class)
.select()
.eq(KlDocPool::getFileName, model.getFileName())
.eq(KlDocPool::getDelFlag, 0));
Assert.isTrue(i == 0, "文档名称不可重复");
KlDocPool klDocPool = new KlDocPool();
BeanUtil.copyProperties(model, klDocPool);
Date time = Calendar.getInstance().getTime();
klDocPool.setCreateTime(time);
klDocPool.setLastUpdateTime(time);
klDocPool.setDocCode(UUID.randomUUID().toString());
File file = fileMapper.selectById(model.getFileId());
Assert.notNull(file, "文件不存在");
return baseMapper.insert(klDocPool) > 0;
}
}
framework-asset/src/main/java/org/arch/overall/service/impl/PrjInfoServiceImpl.java
...@@ -13,10 +13,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -13,10 +13,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.arch.common.modules.archoverall.dto.BatchRemoveDTO; import org.arch.common.modules.archoverall.dto.BatchRemoveDTO;
import org.arch.common.modules.archsysytem.dto.PrjInfoDTO; import org.arch.common.modules.archsystem.dto.PrjInfoDTO;
import org.arch.common.modules.archsysytem.eneiity.AppInfo; import org.arch.common.modules.archsystem.eneiity.AppInfo;
import org.arch.common.modules.archsysytem.eneiity.PrjInfo; import org.arch.common.modules.archsystem.eneiity.PrjInfo;
import org.arch.common.modules.archsysytem.eneiity.PrjNeedFile; import org.arch.common.modules.archsystem.eneiity.PrjNeedFile;
import org.arch.common.modules.sysmange.entity.Org; import org.arch.common.modules.sysmange.entity.Org;
import org.arch.overall.mapper.AppInfoMapper; import org.arch.overall.mapper.AppInfoMapper;
import org.arch.overall.mapper.OrgMapper; import org.arch.overall.mapper.OrgMapper;
......
framework-asset/src/main/java/org/arch/overall/service/impl/PrjNeedFileServiceImpl.java
...@@ -6,7 +6,7 @@ import cn.hutool.core.util.StrUtil; ...@@ -6,7 +6,7 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.arch.common.modules.archsysytem.eneiity.PrjNeedFile; import org.arch.common.modules.archsystem.eneiity.PrjNeedFile;
import org.arch.overall.mapper.PrjNeedFileMapper; import org.arch.overall.mapper.PrjNeedFileMapper;
import org.arch.overall.service.PrjNeedFileService; import org.arch.overall.service.PrjNeedFileService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
......
framework-asset/src/main/resources/mapper/AppInfo.xml
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.arch.overall.mapper.AppInfoMapper"> <mapper namespace="org.arch.overall.mapper.AppInfoMapper">
<resultMap id="BaseResultMap" type="org.arch.common.modules.archsysytem.vo.AppInfoVO"> <resultMap id="BaseResultMap" type="org.arch.common.modules.archsystem.vo.AppInfoVO">
<!--@mbg.generated--> <!--@mbg.generated-->
<!--@Table app_info--> <!--@Table app_info-->
<id column="app_id" jdbcType="BIGINT" property="appId"/> <id column="app_id" jdbcType="BIGINT" property="appId"/>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<result column="del_flag" jdbcType="TINYINT" property="delFlag"/> <result column="del_flag" jdbcType="TINYINT" property="delFlag"/>
<result column="last_update_time" jdbcType="TIMESTAMP" property="lastUpdateTime"/> <result column="last_update_time" jdbcType="TIMESTAMP" property="lastUpdateTime"/>
<result column="last_update_man" jdbcType="BIGINT" property="lastUpdateMan"/> <result column="last_update_man" jdbcType="BIGINT" property="lastUpdateMan"/>
<collection property="linkPrjList" ofType="org.arch.common.modules.archsysytem.vo.PrjInfoVO"> <collection property="linkPrjList" ofType="org.arch.common.modules.archsystem.vo.PrjInfoVO">
<id column="prj_id" property="prjId"/> <id column="prj_id" property="prjId"/>
<result column="prj_name" property="prjName"/> <result column="prj_name" property="prjName"/>
<result column="link_date" property="linkDate"/> <result column="link_date" property="linkDate"/>
......
framework-asset/src/main/resources/mapper/OrgMapper.xml
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
</select> </select>
<!--查询所有组织架构--> <!--查询所有组织架构-->
<select id="queryOrgList" resultType="org.arch.common.modules.archsysytem.vo.CockpitOrgVO"> <select id="queryOrgList" resultType="org.arch.common.modules.archsystem.vo.CockpitOrgVO">
select so.org_id, select so.org_id,
so.parent_org_id, so.parent_org_id,
so.org_name so.org_name
......
framework-asset/src/main/resources/mapper/PrjMapper.xml
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.arch.overall.mapper.PrjInfoMapper"> <mapper namespace="org.arch.overall.mapper.PrjInfoMapper">
<resultMap id="BaseResultMap" type="org.arch.common.modules.archsysytem.eneiity.PrjInfo"> <resultMap id="BaseResultMap" type="org.arch.common.modules.archsystem.eneiity.PrjInfo">
<!--@mbg.generated--> <!--@mbg.generated-->
<!--@Table prj_info--> <!--@Table prj_info-->
<id column="prj_id" jdbcType="BIGINT" property="prjId"/> <id column="prj_id" jdbcType="BIGINT" property="prjId"/>
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
</select> </select>
<!--根据ID查询项目详情--> <!--根据ID查询项目详情-->
<select id="queryProjectInfo" resultType="org.arch.common.modules.archsysytem.vo.CockpitProjectInfoVO"> <select id="queryProjectInfo" resultType="org.arch.common.modules.archsystem.vo.CockpitProjectInfoVO">
select pi.prj_id, select pi.prj_id,
pi.prj_code, pi.prj_code,
pi.prj_name, pi.prj_name,
......
framework-asset/src/main/resources/mapper/PrjNeedFileMapper.xml
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.arch.overall.mapper.PrjNeedFileMapper"> <mapper namespace="org.arch.overall.mapper.PrjNeedFileMapper">
<resultMap id="BaseResultMap" type="org.arch.common.modules.archsysytem.eneiity.PrjNeedFile"> <resultMap id="BaseResultMap" type="org.arch.common.modules.archsystem.eneiity.PrjNeedFile">
<!--@mbg.generated--> <!--@mbg.generated-->
<!--@Table prj_need_file--> <!--@Table prj_need_file-->
<id column="prj_need_file_id" jdbcType="BIGINT" property="prjNeedFileId"/> <id column="prj_need_file_id" jdbcType="BIGINT" property="prjNeedFileId"/>
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</select> </select>
<!--查询项目附件--> <!--查询项目附件-->
<select id="queryByPriAndType" resultType="org.arch.common.modules.archsysytem.vo.PrjNeedFileVO"> <select id="queryByPriAndType" resultType="org.arch.common.modules.archsystem.vo.PrjNeedFileVO">
select sf.id as file_id, select sf.id as file_id,
sf.url as file_url, sf.url as file_url,
sf.file_name as file_name, sf.file_name as file_name,
......
framework-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/asset/KlDocPoolDTO.java 0 → 100644
package org.arch.common.modules.archoverall.dto.asset;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.arch.common.modules.archoverall.dto.BasePageEntity;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.List;
/**
* 架构知识库-典型案例库-总体架构资产文档库
*
* @author makejava
* @since 2023-12-14
*/
@EqualsAndHashCode(callSuper = true)
@Data
@ApiModel(value = "KlDocPool对象DTO", description = "架构知识库-典型案例库-总体架构资产文档库")
public class KlDocPoolDTO extends BasePageEntity {
@ApiModelProperty(value = "文档ID")
@NotNull(message = "文档ID不能为空")
private Long fileId;
@ApiModelProperty(value = "文档名称")
@NotBlank(message = "文档名称不能为空")
private String fileName;
@ApiModelProperty(value = "文档类型;字典值：kl_file_type")
@NotNull(message = "文档类型不能为空")
private Integer fileType;
@ApiModelProperty(value = "文档版本")
@NotBlank(message = "文档版本不能为空")
private String fileVersion;
@ApiModelProperty(value = "启用时间:2023-12-12")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
@NotNull(message = "启用时间不能为空")
private Date startTime;
@ApiModelProperty(value = "开始时间")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date beginTime;
@ApiModelProperty(value = "结束时间")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date endTime;
@ApiModelProperty(value = "多选序号集合")
private List<Long> ids;
}
framework-clouds/common/src/main/java/org/arch/common/modules/archoverall/entity/KlDocPool.java 0 → 100644
package org.arch.common.modules.archoverall.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.Accessors;
import java.io.Serializable;
import java.util.Date;
/**
* <p>
* 架构知识库-典型案例库-总体架构资产文档库
* </p>
*
* @author makejava
* @since 2023-12-14
*/
@Getter
@Setter
@Accessors(chain = true)
@TableName("kl_doc_pool")
@ApiModel(value = "KlDocPool对象", description = "架构知识库-典型案例库-总体架构资产文档库")
public class KlDocPool extends Model<KlDocPool> {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "主键")
@TableId(value = "doc_id", type = IdType.AUTO)
private Long docId;
@ApiModelProperty(value = "编码")
private String docCode;
@ApiModelProperty(value = "文档名称")
private String fileName;
@ApiModelProperty(value = "文档ID")
private Long fileId;
@ApiModelProperty(value = "文档类型")
private Byte fileType;
@ApiModelProperty(value = "文档版本")
private String fileVersion;
@ApiModelProperty(value = "启用时间")
private Date startTime;
@ApiModelProperty(value = "创建人")
private Long createMan;
@ApiModelProperty(value = "创建时间")
private Date createTime;
@ApiModelProperty(value = "最后一次修改时间")
private Date lastUpdateTime;
@ApiModelProperty(value = "最后一次修改人")
private Long lastUpdateMan;
@ApiModelProperty(value = "是否删除 1:已删除 0:未删除")
private Byte delFlag;
@Override
public Serializable pkVal() {
return this.docId;
}
}
framework-clouds/common/src/main/java/org/arch/common/modules/archsysytem/dto/OrgDTO.java → framework-clouds/common/src/main/java/org/arch/common/modules/archsystem/dto/OrgDTO.java
package org.arch.common.modules.archsysytem.dto; package org.arch.common.modules.archsystem.dto;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
......
framework-clouds/common/src/main/java/org/arch/common/modules/archsysytem/dto/PrjInfoDTO.java → framework-clouds/common/src/main/java/org/arch/common/modules/archsystem/dto/PrjInfoDTO.java
package org.arch.common.modules.archsysytem.dto; package org.arch.common.modules.archsystem.dto;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
...@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty; ...@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.arch.common.modules.archoverall.dto.BasePageEntity; import org.arch.common.modules.archoverall.dto.BasePageEntity;
import org.arch.common.modules.archsysytem.eneiity.PrjNeedFile; import org.arch.common.modules.archsystem.eneiity.PrjNeedFile;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal; import java.math.BigDecimal;
......
framework-clouds/common/src/main/java/org/arch/common/modules/archsysytem/dto/ProjectQueryDTO.java → framework-clouds/common/src/main/java/org/arch/common/modules/archsystem/dto/ProjectQueryDTO.java
package org.arch.common.modules.archsysytem.dto; package org.arch.common.modules.archsystem.dto;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
......
framework-clouds/common/src/main/java/org/arch/common/modules/archsysytem/eneiity/AppInfo.java → framework-clouds/common/src/main/java/org/arch/common/modules/archsystem/eneiity/AppInfo.java
package org.arch.common.modules.archsysytem.eneiity; package org.arch.common.modules.archsystem.eneiity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
......
framework-clouds/common/src/main/java/org/arch/common/modules/archsysytem/eneiity/PrjInfo.java → framework-clouds/common/src/main/java/org/arch/common/modules/archsystem/eneiity/PrjInfo.java
package org.arch.common.modules.archsysytem.eneiity; package org.arch.common.modules.archsystem.eneiity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
......
framework-clouds/common/src/main/java/org/arch/common/modules/archsysytem/eneiity/PrjNeedFile.java → framework-clouds/common/src/main/java/org/arch/common/modules/archsystem/eneiity/PrjNeedFile.java
package org.arch.common.modules.archsysytem.eneiity; package org.arch.common.modules.archsystem.eneiity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
......
framework-clouds/common/src/main/java/org/arch/common/modules/archsysytem/vo/AppInfoVO.java → framework-clouds/common/src/main/java/org/arch/common/modules/archsystem/vo/AppInfoVO.java
package org.arch.common.modules.archsysytem.vo; package org.arch.common.modules.archsystem.vo;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
......
framework-clouds/common/src/main/java/org/arch/common/modules/archsysytem/vo/CockpitOrgVO.java → framework-clouds/common/src/main/java/org/arch/common/modules/archsystem/vo/CockpitOrgVO.java
package org.arch.common.modules.archsysytem.vo; package org.arch.common.modules.archsystem.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
framework-clouds/common/src/main/java/org/arch/common/modules/archsysytem/vo/CockpitProjectInfoVO.java → framework-clouds/common/src/main/java/org/arch/common/modules/archsystem/vo/CockpitProjectInfoVO.java
package org.arch.common.modules.archsysytem.vo; package org.arch.common.modules.archsystem.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
......
framework-clouds/common/src/main/java/org/arch/common/modules/archsystem/vo/KlDocPoolExcelVO.java 0 → 100644
package org.arch.common.modules.archsystem.vo;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.alibaba.excel.converters.date.DateStringConverter;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import java.util.Date;
/**
* 架构知识库-典型案例库-总体架构资产文档库
*
* @author makejava
* @since 2023-12-14
*/
@Data
@ApiModel(value = "KlDocPool对象ExcelVO", description = "架构知识库-典型案例库-总体架构资产文档库")
public class KlDocPoolExcelVO {
@ExcelProperty(value = "文档名称")
private String fileName;
@ExcelProperty(value = "文档类型")
private String fileTypeName;
@ExcelProperty(value = "文档版本")
private String fileVersion;
@ExcelProperty(value = "创建时间", converter = DateStringConverter.class)
@DateTimeFormat("yyyy-MM-dd")
private Date createTime;
}
framework-clouds/common/src/main/java/org/arch/common/modules/archsystem/vo/KlDocPoolVO.java 0 → 100644
package org.arch.common.modules.archsystem.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
* 架构知识库-典型案例库-总体架构资产文档库
*
* @author makejava
* @since 2023-12-14
*/
@Data
@ApiModel(value = "KlDocPool对象VO", description = "架构知识库-典型案例库-总体架构资产文档库")
public class KlDocPoolVO {
@ApiModelProperty(value = "文档ID")
private Long fileId;
@ApiModelProperty(value = "文档名称")
private String fileName;
@ApiModelProperty(value = "文档类型")
private Integer fileType;
@ApiModelProperty(value = "文档版本")
private String fileVersion;
@ApiModelProperty(value = "创建时间")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime;
@ApiModelProperty(value = "文档地址")
private String fileUrl;
}
framework-clouds/common/src/main/java/org/arch/common/modules/archsysytem/vo/PrjInfoVO.java → framework-clouds/common/src/main/java/org/arch/common/modules/archsystem/vo/PrjInfoVO.java
package org.arch.common.modules.archsysytem.vo; package org.arch.common.modules.archsystem.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
......
framework-clouds/common/src/main/java/org/arch/common/modules/archsysytem/vo/PrjNeedFileVO.java → framework-clouds/common/src/main/java/org/arch/common/modules/archsystem/vo/PrjNeedFileVO.java
package org.arch.common.modules.archsysytem.vo; package org.arch.common.modules.archsystem.vo;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!