[add]国能项目代码提交

framework-asset/pom.xml

@@ -44,6 +44,11 @@
         </dependency>
         <dependency>
             <groupId>org.arch</groupId>
+            <artifactId>framework-base</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.arch</groupId>
             <artifactId>nacos</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>

framework-asset/src/main/java/org/arch/overall/controller/ArchiFileManageController.java

+package org.arch.overall.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.arch.base.Result;
+import org.arch.common.modules.archoverall.dto.ArchiFileManageDto;
+import org.arch.common.modules.archoverall.entity.ArchiFileManage;
+import org.arch.common.modules.archoverall.entity.ArchiFileManageRelation;
+import org.arch.common.modules.archoverall.vo.ArchiFileManageRelationVo;
+import org.arch.common.modules.archoverall.vo.ArchiFileManageVO;
+import org.arch.log.annotation.OperLog;
+import org.arch.log.logenum.LogOperTypeEnum;
+import org.arch.log.logenum.LogTypeEnum;
+import org.arch.overall.service.ArchiFileManageService;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.List;
+
+/**
+ *  架构文档管理
+ * 
+ * @date 2024/7/15 15:45
+ * @author renrui
+ */
+@Slf4j
+@RestController
+@RequestMapping("archiFileManage")
+@Api(tags = {"架构文档管理"})
+public class ArchiFileManageController {
+
+    @Autowired
+    private ArchiFileManageService service;
+
+    @PostMapping("/")
+    @ApiOperation(value = "查询")
+    @OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, moduleName = "架构文档管理", operDes = "查询")
+    public Result<IPage<ArchiFileManage>> page(@RequestBody ArchiFileManageDto dto) {
+        return Result.success(service.page(dto));
+    }
+
+    @PostMapping("/selectById")
+    @ApiOperation(value = "根据id查询")
+    @OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, moduleName = "架构文档管理", operDes = "根据id查询")
+    public Result selectById(@RequestBody ArchiFileManageDto dto) {
+        return service.selectById(dto);
+    }
+
+    @PostMapping("/deleteById")
+    @ApiOperation(value = "根据id删除")
+    @OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, moduleName = "架构文档管理", operDes = "根据id删除")
+    public Result deleteById(@RequestBody ArchiFileManageDto dto) {
+        return service.deleteById(dto);
+    }
+
+    @PostMapping("/saveData")
+    @ApiOperation(value = "保存")
+    @OperLog(value = LogOperTypeEnum.UPDATE, logTypeValue = LogTypeEnum.BUSI_LOG, moduleName = "架构文档管理", operDes = "保存")
+    public Result saveData(@RequestBody ArchiFileManage archiFileManage) {
+        return service.saveData(archiFileManage);
+    }
+
+
+    @PostMapping("/export")
+    @ApiOperation(value = "导出")
+    @OperLog(value = LogOperTypeEnum.EXPORT, logTypeValue = LogTypeEnum.BUSI_LOG, moduleName = "架构文档管理", operDes = "导出")
+    public void export(HttpServletResponse response)  throws IOException {
+        log.info("开始导出架构文档管理");
+        // 设置文件导出的路径
+        String realPath = "/Users/renrui/Downloads/";
+        File folder = new File(realPath);
+        if (!folder.isDirectory()){
+            folder.mkdirs();
+        }
+        String fileName =realPath + "架构文档管理" + System.currentTimeMillis() + ".xlsx";
+        setExcelRespProp(response, "架构文档管理");
+        List<ArchiFileManageVO> memberList = service.listExcel();
+        log.info("这里是什么："+memberList);
+    }
+
+    /**
+     * 设置excel下载响应头属性
+     *
+     * @param response    响应
+     * @param rawFileName 原始文件名
+     * @throws UnsupportedEncodingException 不支持编码异常
+     */
+    private void setExcelRespProp(HttpServletResponse response, String rawFileName) throws UnsupportedEncodingException {
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+        response.setCharacterEncoding("utf-8");
+        String fileName = URLEncoder.encode(rawFileName, "UTF-8").replaceAll("\\+", "%20");
+        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
+    }
+
+
+    @PostMapping("/filePage")
+    @ApiOperation(value = "文档目录")
+    @OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, moduleName = "架构文档管理", operDes = "文档目录")
+    public Result<IPage<ArchiFileManageRelationVo>> filePage(@RequestBody ArchiFileManageDto dto) {
+        return service.filePage(dto);
+    }
+
+    @PostMapping("/fileImport")
+    @ApiOperation(value = "文档导入")
+    @OperLog(value = LogOperTypeEnum.IMPORT, logTypeValue = LogTypeEnum.BUSI_LOG, moduleName = "架构文档管理", operDes = "文档导入")
+    public Result fileImport(@RequestBody ArchiFileManageRelation manageRelation) {
+        return service.fileImport(manageRelation);
+    }
+
+
+}

framework-asset/src/main/java/org/arch/overall/exception/GlobalExceptionTranslator.java

+package org.arch.overall.exception;
+
+import org.apache.shiro.authc.AuthenticationException;
+import org.arch.base.Result;
+import org.arch.base.exception.BDException;
+import org.arch.base.exception.BaseException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.converter.HttpMessageNotReadableException;
+import org.springframework.validation.BindException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import java.util.stream.Collectors;
+
+/**
+ * 全局错误处理
+ */
+@RestControllerAdvice
+public class GlobalExceptionTranslator {
+
+    private Logger log = LoggerFactory.getLogger(GlobalExceptionTranslator.class);
+
+    @ExceptionHandler(value = BaseException.class)
+    @ResponseBody
+    public Result baseExceptionHandler(HttpServletRequest req, BaseException be) {
+        be.printStackTrace();
+        log.error(be.getMessage(), be);
+        return Result.error(be.getCode(), be.getMessage());
+    }
+
+    @ExceptionHandler(value = BDException.class)
+    @ResponseBody
+    public Result baseExceptionHandler(HttpServletRequest req, BDException be) {
+        be.printStackTrace();
+        log.error(be.getMessage(), be);
+        return Result.error(be.getCode(), be.getMessage());
+    }
+
+    @ExceptionHandler(value = IllegalArgumentException.class)
+    @ResponseBody
+    public Result baseExceptionHandler(HttpServletRequest req, IllegalArgumentException be) {
+        be.printStackTrace();
+        log.error(be.getMessage(), be);
+        return Result.error(be.getMessage());
+    }
+
+    @ExceptionHandler(value = AuthenticationException.class)
+    @ResponseBody
+    public Result baseExceptionHandler(HttpServletRequest req, AuthenticationException ae) {
+        ae.printStackTrace();
+        log.error(ae.getMessage(), ae);
+        return Result.error(401, "登录失效或者登录验证失败！");
+    }
+
+    /**
+     * 统一处理请求参数校验(实体对象传参)
+     *
+     * @param e HttpMessageNotReadableException异常信息
+     * @return 响应数据
+     */
+    @ExceptionHandler(HttpMessageNotReadableException.class)
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    public Result handleBindException(HttpMessageNotReadableException e) {
+        return Result.error("请求参数错误");
+    }
+
+    /**
+     * MethodArgumentNotValidException-Spring封装的参数验证异常处理
+     * <p>MethodArgumentNotValidException：作用于 @Validated @Valid 注解，接收参数加上@RequestBody注解（json格式）才会有这种异常。</p>
+     *
+     * @param e MethodArgumentNotValidException异常信息
+     * @return 响应数据
+     */
+    @ExceptionHandler(value = MethodArgumentNotValidException.class)
+    public Result<?> methodArgumentNotValidExceptionHandler(MethodArgumentNotValidException e) {
+        String msg = e.getBindingResult().getFieldErrors()
+                .stream()
+                .map(n -> String.format("%s: %s", n.getField(), n.getDefaultMessage()))
+                .reduce((x, y) -> String.format("%s; %s", x, y))
+                .orElse("参数输入有误");
+        log.error("MethodArgumentNotValidException异常，参数校验异常：{}", msg);
+        return Result.error(msg);
+    }
+
+    /**
+     * BindException异常处理
+     * <p>BindException: 作用于@Validated @Valid 注解，仅对于表单提交有效，对于以json格式提交将会失效</p>
+     *
+     * @param e BindException异常信息
+     * @return 响应数据
+     */
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ExceptionHandler(BindException.class)
+    public Result<?> bindExceptionHandler(BindException e) {
+        String msg = e.getBindingResult().getFieldErrors()
+                .stream()
+                .map(n -> String.format("%s: %s", n.getField(), n.getDefaultMessage()))
+                .reduce((x, y) -> String.format("%s; %s", x, y))
+                .orElse("参数输入有误");
+        log.error("BindException异常，参数校验异常：{}", msg);
+        return Result.error(msg);
+    }
+
+    /**
+     * ConstraintViolationException-jsr规范中的验证异常，嵌套检验问题
+     * <p>ConstraintViolationException：作用于 @NotBlank @NotNull @NotEmpty 注解，校验单个String、Integer、Collection等参数异常处理。</p>
+     * <p>注：Controller类上必须添加@Validated注解，否则接口单个参数校验无效</p>
+     *
+     * @param e ConstraintViolationException异常信息
+     * @return 响应数据
+     */
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ExceptionHandler(value = ConstraintViolationException.class)
+    public Result<?> constraintViolationExceptionHandler(ConstraintViolationException e) {
+        String msg = e.getConstraintViolations()
+                .stream()
+                .map(ConstraintViolation::getMessage)
+                .collect(Collectors.joining("; "));
+
+        log.error("ConstraintViolationException，参数校验异常：{}", msg);
+        return Result.error(msg);
+    }
+
+    @ExceptionHandler(value = Exception.class)
+    @ResponseBody
+    public Result handleError(Exception e) {
+        log.info("系统错误:" + e.getMessage());
+        e.printStackTrace();
+        return Result.error();
+    }
+}

framework-asset/src/main/java/org/arch/overall/mapper/ArchiFileManageMapper.java

+package org.arch.overall.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.arch.common.modules.archoverall.entity.ArchiFileManage;
+
+/**
+ * 架构文档管理 Mapper
+ *
+ * @author renrui
+ * @date 2024/7/15 15:49
+ */
+@Mapper
+public interface ArchiFileManageMapper extends MPJBaseMapper<ArchiFileManage> {
+}

framework-asset/src/main/java/org/arch/overall/mapper/ArchiFileManageRelationMapper.java

+package org.arch.overall.mapper;
+
+import com.github.yulichang.base.MPJBaseMapper;
+import org.arch.common.modules.archoverall.entity.ArchiFileManageRelation;
+
+public interface ArchiFileManageRelationMapper extends MPJBaseMapper<ArchiFileManageRelation> {
+}

framework-asset/src/main/java/org/arch/overall/service/ArchiFileManageService.java

+package org.arch.overall.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.arch.base.Result;
+import org.arch.common.modules.archoverall.dto.ArchiFileManageDto;
+import org.arch.common.modules.archoverall.entity.ArchiFileManage;
+import org.arch.common.modules.archoverall.entity.ArchiFileManageRelation;
+import org.arch.common.modules.archoverall.vo.ArchiFileManageRelationVo;
+import org.arch.common.modules.archoverall.vo.ArchiFileManageVO;
+
+import java.util.List;
+
+public interface ArchiFileManageService {
+    IPage<ArchiFileManage> page(ArchiFileManageDto dto);
+
+    Result saveData(ArchiFileManage archiFileManage);
+
+    Result selectById(ArchiFileManageDto dto);
+
+    Result deleteById(ArchiFileManageDto dto);
+
+    List<ArchiFileManageVO> listExcel();
+
+    Result<IPage<ArchiFileManageRelationVo>> filePage(ArchiFileManageDto dto);
+
+    Result fileImport(ArchiFileManageRelation manageRelation);
+}

framework-asset/src/main/java/org/arch/overall/service/impl/ArchiFileManageServiceImpl.java

+package org.arch.overall.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+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.xiaoymin.knife4j.core.util.CollectionUtils;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.arch.base.Result;
+import org.arch.base.utils.StringUtils;
+import org.arch.common.modules.archoverall.dto.ArchiFileManageDto;
+import org.arch.common.modules.archoverall.entity.ArchiFileManage;
+import org.arch.common.modules.archoverall.entity.ArchiFileManageRelation;
+import org.arch.common.modules.archoverall.vo.ArchiFileManageRelationVo;
+import org.arch.common.modules.archoverall.vo.ArchiFileManageVO;
+import org.arch.common.modules.base.entity.File;
+import org.arch.overall.mapper.ArchiFileManageMapper;
+import org.arch.overall.mapper.ArchiFileManageRelationMapper;
+import org.arch.overall.service.ArchiFileManageService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 架构文档管理 实现类
+ *
+ * @date 2024/7/15 15:47
+ * @author renrui
+ */
+@Service
+public class ArchiFileManageServiceImpl extends ServiceImpl<ArchiFileManageMapper, ArchiFileManage> implements ArchiFileManageService {
+
+    @Autowired
+    private ArchiFileManageMapper mapper;
+    @Autowired
+    private ArchiFileManageRelationMapper relationMapper;
+
+    @Override
+    public IPage<ArchiFileManage> page(ArchiFileManageDto dto) {
+        Page<ArchiFileManage> page = new Page<>(dto.getCurrent(), dto.getPageSize());
+        LambdaQueryWrapper<ArchiFileManage> wrapper = Wrappers.lambdaQuery(ArchiFileManage.class)
+                .select()
+                .eq(ArchiFileManage::getDelFlag, 0)
+                .like(StringUtils.isNotEmpty(dto.getDeptName()), ArchiFileManage::getDeptName, dto.getDeptName())
+                .like(StringUtils.isNotEmpty(dto.getPrjName()), ArchiFileManage::getPrjName, dto.getPrjName())
+                .orderByDesc(ArchiFileManage::getCreateTime);
+        IPage<ArchiFileManage> listIPage = mapper.selectPage(page, wrapper);
+        return listIPage;
+    }
+
+    @Override
+    public Result saveData(ArchiFileManage archiFileManage) {
+        //校验数据
+        if (StringUtils.isEmpty(archiFileManage.getCompanyName())) {
+            return Result.error("单位不能为空!");
+        }
+        if (StringUtils.isEmpty(archiFileManage.getPrjName())) {
+            return Result.error("项目名称不能为空!");
+        }
+        if (archiFileManage.getId() == null) {
+            archiFileManage.setCreateTime(new Date());
+            mapper.insert(archiFileManage);
+        } else {
+            archiFileManage.setLastUpdateTime(new Date());
+            mapper.updateById(archiFileManage);
+        }
+        return Result.success("处理成功");
+    }
+
+    @Override
+    public Result selectById(ArchiFileManageDto dto) {
+        return Result.success(mapper.selectById(dto.getId()));
+    }
+
+    @Override
+    public Result deleteById(ArchiFileManageDto dto) {
+        if (dto == null || CollectionUtils.isEmpty(dto.getIds())) {
+            return Result.error("系统异常请联系管理员！");
+        }
+        UpdateWrapper<ArchiFileManage> update = Wrappers.update();
+        update.set("del_flag", 1);
+        update.in("id", dto.getIds());
+        mapper.update(update);
+        return Result.success("处理成功");
+    }
+
+    @Override
+    public List<ArchiFileManageVO> listExcel() {
+        List<ArchiFileManageVO> pageList = mapper.selectJoinList( ArchiFileManageVO.class, new MPJLambdaWrapper<ArchiFileManage>()
+                .selectAll(ArchiFileManage.class)
+                .select(File::getFileName,File::getFileType)
+                .leftJoin(ArchiFileManageRelation.class, ArchiFileManageRelation::getArchiFileManageId, ArchiFileManage::getId)
+                .leftJoin(File.class, File::getId, ArchiFileManageRelation::getFileId));
+        return pageList;
+    }
+
+    @Override
+    public Result<IPage<ArchiFileManageRelationVo>> filePage(ArchiFileManageDto dto) {
+        Page<ArchiFileManageRelationVo> page = new Page<>(dto.getCurrent(), dto.getPageSize());
+        IPage<ArchiFileManageRelationVo>  voPage = relationMapper.selectJoinPage(page, ArchiFileManageRelationVo.class, new MPJLambdaWrapper<ArchiFileManageRelation>()
+                .select(File::getFileName, File::getFileType)
+                .leftJoin(File.class,File::getId, ArchiFileManageRelation::getFileId)
+                .eq(ArchiFileManage::getDelFlag, 0)
+                .eq(ArchiFileManageRelation::getDelFlag, 0)
+                .eq(ArchiFileManageRelationVo::getArchiFileManageId,dto.getId()));
+        return Result.success(voPage);
+    }
+
+    @Override
+    public Result fileImport(ArchiFileManageRelation manageRelation) {
+        manageRelation.setCreateTime(new Date());
+        relationMapper.insert(manageRelation);
+        return Result.success("处理成功");
+    }
+}

framework-asset/src/main/java/org/arch/overall/service/impl/ArchiMetaModelImpl.java

@@ -113,6 +113,7 @@ public class ArchiMetaModelImpl extends ServiceImpl<ArchiMetaModelMapper, ArchiM
     }
 
     @Override
+    @Transactional
     public ArchiListResultDTO getArchiAssetList(ArchiAssetInfoDTO params) {
         String value = Long.toString(params.getArchiBelongId());
         List<ArchiModelDictDetailVO> archiBelongs = archiModelDictService.getDictDetails(value);

framework-asset/src/main/java/org/arch/overall/service/impl/ArchiViewDetailsServiceImpl.java

@@ -176,6 +176,8 @@ public class ArchiViewDetailsServiceImpl extends MPJBaseServiceImpl<ArchiViewDet
             viewDetails.setVersion(dto.getVersion());
             viewDetails.setViewDetailsCode(IdUtil.fastUUID());
             viewDetails.setGraphId(graphRepositoryMapper.initArchiView());
+            viewDetails.setCreateTime(new Date());
+            viewDetails.setLastUpdateTime(new Date());
             baseMapper.insert(viewDetails);
 
             // 关系

framework-asset/src/main/java/org/arch/overall/service/impl/PrjInfoServiceImpl.java

@@ -28,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -77,6 +78,7 @@ public class PrjInfoServiceImpl extends ServiceImpl<PrjInfoMapper, PrjInfo> impl
        // Org org = null;
         Assert.notNull(org, "建管单位不存在");
         model.setManageOrgCode(org.getOrgCode());
+        model.setCreateTime(new Date());
         boolean save = save(model);
 
         prjNeedFileService.insertPrjNeedFile(params.getFilesValue(), model.getPrjId(), null);
@@ -107,6 +109,7 @@ public class PrjInfoServiceImpl extends ServiceImpl<PrjInfoMapper, PrjInfo> impl
         Assert.notNull(org, "建管单位不存在");
         model.setManageOrgCode(org.getOrgCode());
         model.setProjectManager(appInfo.getProjectManager());
+        model.setLastUpdateTime(new Date());
         return updateById(model);
     }
 

framework-clouds/common/src/main/java/org/arch/common/modules/archoverall/dto/ArchiFileManageDto.java

+package org.arch.common.modules.archoverall.dto;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ArchiFileManageDto  extends BasePageEntity {
+
+    @ApiModelProperty(value = "查询条件-部门")
+    private String deptName;
+
+    @ApiModelProperty(value = "查询条件-项目名称")
+    private String prjName;
+
+
+    @ApiModelProperty(value = "查询条件-id")
+    private Long id;
+
+    @ApiModelProperty(value = "删除条件-ids")
+    private List<Long> ids;
+
+}

framework-clouds/common/src/main/java/org/arch/common/modules/archoverall/entity/ArchiFileManage.java

+package org.arch.common.modules.archoverall.entity;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.arch.common.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 架构文档管理实体
+ * 
+ * @author ren.rui
+ * @email ren.rui
+ * @date 2024-07-15 15:39:43
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@TableName("archi_file_manage")
+@ApiModel(value = "ArchiFileManage", description = "架构文档管理")
+public class ArchiFileManage extends BaseEntity implements Serializable {
+
+
+	/**
+	 * 主键
+	 */
+	@TableId(value = "id", type = IdType.INPUT)
+	@ExcelIgnore
+	private Long id;
+
+	/**
+	 * 公司名称
+	 */
+	@ApiModelProperty(value = "公司名称")
+	@ExcelProperty(value = "公司名称",index = 0)
+	private String companyName;
+	/**
+	 * 部门名称
+	 */
+	@ApiModelProperty(value = "部门名称")
+	@ExcelProperty(value = "部门名称",index = 1)
+	private String deptName;
+	/**
+	 * 公司编码
+	 */
+	@ApiModelProperty(value = "公司编码")
+	@ExcelIgnore
+	private String companyCode;
+	/**
+	 * 部门编码
+	 */
+	@ApiModelProperty(value = "部门编码")
+	@ExcelIgnore
+	private String deptCode;
+	/**
+	 * 项目名称
+	 */
+	@ApiModelProperty(value = "项目名称")
+	@ExcelProperty(value = "项目名称",index = 2)
+	private String prjName;
+	/**
+	 * 建设单位
+	 */
+	@ApiModelProperty(value = "建设单位")
+	@ExcelProperty(value = "建设单位",index = 3)
+	private String workCompany;
+	/**
+	 * 文档名称
+	 *//*
+	@ApiModelProperty(value = "文档名称")
+	@ExcelProperty(value = "单位",index = 1)
+	private String fileName;
+	*//**
+	 * 文档编码
+	 *//*
+	@ApiModelProperty(value = "文档编码")
+	private String fileCode;
+	*//**
+	 * 文档类型
+	 *//*
+	@ApiModelProperty(value = "文档类型")
+	private String fileType;*/
+	/**
+	 * 状态 未发布,已发布,审核未通过，审核通过
+	 */
+	@ApiModelProperty(value = "状态")
+	@ExcelProperty(value = "状态",index = 4)
+	private String status;
+	/**
+	 * 编织人
+	 */
+	@ApiModelProperty(value = "编织人")
+	@ExcelProperty(value = "编织人",index = 5)
+	private String prepared;
+
+	/**
+	 * 编织时间
+	 */
+	@ApiModelProperty(value = "编织时间")
+	@ExcelProperty(value = "编织时间",index = 6)
+	private String preparedTime;
+
+}

framework-clouds/common/src/main/java/org/arch/common/modules/archoverall/entity/ArchiFileManageRelation.java

+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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+import org.arch.common.BaseEntity;
+
+import java.io.Serializable;
+
+/**
+ * 架构文档管理实体
+ * 
+ * @author ren.rui
+ * @email ren.rui
+ * @date 2024-07-15 15:39:43
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+@TableName("archi_file_manage_relation")
+@ApiModel(value = "ArchiFileManageRelation", description = "架构文档管理关系表")
+public class ArchiFileManageRelation extends BaseEntity implements Serializable {
+
+
+	/**
+	 * 主键
+	 */
+	@TableId(value = "id", type = IdType.INPUT)
+	private Long id;
+
+	/**
+	 * 架构文档管理id
+	 */
+	@ApiModelProperty(value = "架构文档管理id")
+	private Long archiFileManageId;
+
+	/**
+	 * 文件id
+	 */
+	@ApiModelProperty(value = "文件id")
+	private Long fileId;
+
+
+
+}

framework-clouds/common/src/main/java/org/arch/common/modules/archoverall/vo/ArchiFileManageRelationVo.java

+package org.arch.common.modules.archoverall.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.arch.common.modules.archoverall.entity.ArchiFileManageRelation;
+
+@Data
+public class ArchiFileManageRelationVo extends ArchiFileManageRelation {
+
+    @ApiModelProperty(value = "文档名称")
+    private String fileName;
+
+    //文档类型
+    @ApiModelProperty(value = "文件类型")
+    private String fileType;
+
+}

framework-clouds/common/src/main/java/org/arch/common/modules/archoverall/vo/ArchiFileManageVO.java

+package org.arch.common.modules.archoverall.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.arch.common.modules.archoverall.entity.ArchiFileManage;
+
+@Data
+public class ArchiFileManageVO extends ArchiFileManage {
+
+    @ApiModelProperty(value = "文档名称")
+    @ExcelProperty(value = "文档名称",index = 7)
+    private String fileName;
+
+    @ApiModelProperty(value = "文档类型")
+    @ExcelProperty(value = "文档类型",index = 8)
+    private String fileType;
+}

framework-system-manage/src/main/java/org/arch/manage/mapper/OrgMapper.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.arch.common.modules.archsystem.dto.OrgDTO;
 import org.arch.common.modules.sysmange.entity.Org;
 
 import java.util.List;
@@ -22,9 +23,9 @@ import java.util.List;
 @Mapper
 public interface OrgMapper extends BaseMapper<Org> {
 
-    @Select("select a.*, b.name as createManName from sys_org a left join sys_user b on a.create_man = b.id " +
-            "${ew.customSqlSegment}")
-    Page<Org> selectForPage(Page<Object> objectPage, @Param(Constants.WRAPPER) QueryWrapper<Org> queryWrapper);
+/*    @Select("select a.*, b.name as createManName from sys_org a left join sys_user b on a.create_man = b.id " +
+            "${ew.customSqlSegment}")*/
+    Page<Org> selectForPage(Page<Object> objectPage,@Param("params") OrgDTO dto);
     /**
      * 获取组织机构下拉框
      *

framework-system-manage/src/main/java/org/arch/manage/service/OrgService.java

@@ -3,6 +3,7 @@ package org.arch.manage.service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.arch.common.modules.archsystem.dto.OrgDTO;
 import org.arch.common.modules.sysmange.entity.Org;
 
 import java.util.List;
@@ -22,7 +23,7 @@ public interface OrgService extends IService<Org> {
     List<Org> treeNew(Long parentOrgId, String deptFlag);
     List<Org> treeNewForDepet(Long parentOrgId, String deptFlag);
 
-    Page<Org> selectForPage(Page<Object> objectPage, QueryWrapper<Org> queryWrapper);
+    Page<Org> selectForPage(Page<Object> objectPage, OrgDTO dto);
 
     List<Org> getSelect();
 
@@ -41,4 +42,6 @@ public interface OrgService extends IService<Org> {
     List<Org> getDeptOption();
 
     Org selectById(Long manageOrgId);
+
+    List<Org> getOrgList();
 }

framework-system-manage/src/main/java/org/arch/manage/service/impl/OrgServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import org.apache.commons.collections.CollectionUtils;
+import org.arch.common.modules.archsystem.dto.OrgDTO;
 import org.arch.common.modules.sysmange.entity.Org;
 import org.arch.manage.mapper.OrgMapper;
 import org.arch.manage.service.OrgService;
@@ -135,8 +136,8 @@ public class OrgServiceImpl extends ServiceImpl<OrgMapper, Org> implements OrgSe
 
 
     @Override
-    public Page<Org> selectForPage(Page<Object> objectPage, QueryWrapper<Org> queryWrapper) {
-        return orgMapper.selectForPage(objectPage, queryWrapper);
+    public Page<Org> selectForPage(Page<Object> objectPage, OrgDTO dto) {
+        return orgMapper.selectForPage(objectPage, dto);
     }
 
     @Override
@@ -204,4 +205,10 @@ public class OrgServiceImpl extends ServiceImpl<OrgMapper, Org> implements OrgSe
             }
         }
     }
+    @Override
+    public List<Org> getOrgList() {
+        QueryWrapper<Org> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select("org_code,org_name,org_simple_name").eq("length(org_code)",3).ne("org_code","001");
+        return baseMapper.selectList(queryWrapper);
+    }
 }