Merge branch 'master' of http://47.97.176.204:19000/root/framework-tools

framework-analysis/src/main/java/org/arch/analysis/controller/ArchMapController.java

 package org.arch.analysis.controller;
 
+import lombok.RequiredArgsConstructor;
+import org.apache.commons.lang.StringUtils;
+import org.arch.analysis.dto.ArchMapDto;
+import org.arch.analysis.service.IArchMapService;
 import org.arch.base.Result;
+import org.arch.log.annotation.OperLog;
+import org.arch.log.logenum.LogOperTypeEnum;
+import org.arch.log.logenum.LogTypeEnum;
+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 java.util.List;
+import java.util.Map;
+
 /**
  * 架构地图控制器
  */
 @RestController
 @RequestMapping("/analysis")
+@RequiredArgsConstructor
 public class ArchMapController {
 
-    public Result slectPage() {
-        return null;
-    }
+    private final IArchMapService archMapService;
 
     /**
      * 总体业务架构资产展示
      *
+     * @param mapDto :入参
      * @return
      */
-    public Result getOverAllBusAssets() {
-
-        return null;
+    @PostMapping("getOverAllBusAsset")
+    @OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "获取总体业务架构资产信息", moduleName = "架构地图")
+    public Result getOverAllBusAsset(@RequestBody ArchMapDto mapDto) {
+        String archType = mapDto.getArchType();
+        String level = mapDto.getLevel();
+        String eleName = mapDto.getEleName();
+        if (StringUtils.isEmpty(archType)
+                || StringUtils.isEmpty(level)
+                || StringUtils.isEmpty(eleName)) {
+            throw new NullPointerException("架构类型、架构层级及元素名称不能为空;");
+        }
+        List<Map<String, Object>> resultDatas = archMapService.getOverAllBusAsset(mapDto);
+        return Result.success(resultDatas);
     }
 
     /**
@@ -30,7 +52,10 @@ public class ArchMapController {
      *
      * @return
      */
+    @PostMapping("getOverAllAppAsset")
+    @OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "获取总体应用架构资产信息", moduleName = "架构地图")
     public Result getOverAllAppAsset() {
+
         return null;
     }
 
@@ -39,6 +64,8 @@ public class ArchMapController {
      *
      * @return
      */
+    @PostMapping("getOverAllDataAsset")
+    @OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "获取总体数据架构资产信息", moduleName = "架构地图")
     public Result getOverAllDataAsset() {
         return null;
     }
@@ -48,6 +75,8 @@ public class ArchMapController {
      *
      * @return
      */
+    @PostMapping("getOverTechAppAsset")
+    @OperLog(value = LogOperTypeEnum.QUERY, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "获取总体技术架构资产信息", moduleName = "架构地图")
     public Result getOverTechAppAsset() {
         return null;
     }

framework-analysis/src/main/java/org/arch/analysis/dto/ArchMapDto.java

+package org.arch.analysis.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ArchMapDto {
+    /**
+     * 元素名称
+     */
+    private String eleName;
+    /**
+     * 级别
+     */
+    private String level;
+    /**
+     * 架构类型
+     */
+    private String archType;
+}

framework-analysis/src/main/java/org/arch/analysis/mapper/ArchMapMapper.java

 package org.arch.analysis.mapper;
 
 
-import org.apache.ibatis.annotations.Mapper;
+import org.arch.analysis.dto.ArchMapDto;
 
-@Mapper
-public class ArchMapMapper {
+import java.util.List;
+import java.util.Map;
+
+public interface ArchMapMapper {
+    List<Map<String, Object>> getOverAllBusAsset(ArchMapDto mapDto);
 }

framework-analysis/src/main/java/org/arch/analysis/serivce/ArchMapService.java

-package org.arch.analysis.serivce;
-
-public interface ArchMapService {
-}

framework-analysis/src/main/java/org/arch/analysis/serivce/impl/ArchMapServiceImpl.java

-package org.arch.analysis.serivce.impl;
-
-
-import org.arch.analysis.serivce.ArchMapService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class ArchMapServiceImpl implements ArchMapService {
-}

framework-analysis/src/main/java/org/arch/analysis/service/IArchMapService.java

+package org.arch.analysis.service;
+
+
+import org.arch.analysis.dto.ArchMapDto;
+
+import java.util.List;
+import java.util.Map;
+
+public interface IArchMapService {
+    List<Map<String, Object>> getOverAllBusAsset(ArchMapDto mapDto);
+}

framework-analysis/src/main/java/org/arch/analysis/service/impl/ArchMapServiceImpl.java

+package org.arch.analysis.service.impl;
+
+
+import org.arch.analysis.dto.ArchMapDto;
+import org.arch.analysis.mapper.ArchMapMapper;
+import org.arch.analysis.service.IArchMapService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class ArchMapServiceImpl implements IArchMapService {
+    @Resource
+    private ArchMapMapper archMapMapper;
+
+    @Override
+    public List<Map<String, Object>> getOverAllBusAsset(ArchMapDto mapDto) {
+        return archMapMapper.getOverAllBusAsset(mapDto);
+    }
+}

framework-analysis/src/main/resources/bootstrap-local.yml

@@ -35,6 +35,6 @@ spring:
         namespace: ${nacos.namespace}
   config:
     activate:
-      on-profile: dev
+      on-profile: local
 
 

framework-analysis/src/main/resources/mapper/ArchMapMapp.xml

+<?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">
+<mapper namespace="org.arch.analysis.mapper.ArchMapMapper">
+    <select id="getOverAllBusAsset" resultType="java.util.Map" parameterType="org.arch.analysis.dto.ArchMapDto">
+        SELECT
+            n.asset_name,
+            archi_asset_type,
+            archi_type,
+            asset_code
+        FROM
+            archi_asset_info n
+        WHERE
+            n.archi_type = #{archType}
+          AND n.ele_name = #{eleName}
+          AND n.parent_asset_id = 0
+          AND n.asset_code IS NOT NULL
+    </select>
+</mapper>
\ No newline at end of file

framework-asset/src/main/resources/bootstrap-local.yml

@@ -35,6 +35,6 @@ spring:
         namespace: ${nacos.namespace}
   config:
     activate:
-      on-profile: dev
+      on-profile: local
 
 

framework-gateway/src/main/resources/bootstrap-local.yml

@@ -44,5 +44,5 @@ spring:
         add-to-simple-url-handler-mapping: true
   config:
     activate:
-      on-profile: dev
+      on-profile: local
 

framework-system-manage/pom.xml

@@ -27,6 +27,12 @@
             <artifactId>nacos</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.arch</groupId>
+            <artifactId>storage</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <finalName>${project.artifactId}</finalName>

framework-system-manage/src/main/java/org/arch/manage/SystemManageApp.java

 package org.arch.manage;
 
+import org.dromara.x.file.storage.spring.EnableFileStorage;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
@@ -8,6 +9,7 @@ import org.springframework.jmx.support.RegistrationPolicy;
 
 @SpringBootApplication
 @EnableMBeanExport(registration = RegistrationPolicy.IGNORE_EXISTING)
+@EnableFileStorage
 public class SystemManageApp {
     public static void main(String[] args) {
         SpringApplication.run(SystemManageApp.class, args);

framework-system-manage/src/main/java/org/arch/manage/conterller/OssController.java

+package org.arch.manage.conterller;
+
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.arch.base.Result;
+import org.arch.common.modules.base.dto.DelDTO;
+import org.arch.common.modules.base.dto.DownloadObjectDTO;
+import org.arch.common.modules.base.vo.UpLoadVO;
+import org.arch.log.annotation.OperLog;
+import org.arch.log.logenum.LogOperTypeEnum;
+import org.arch.log.logenum.LogTypeEnum;
+import org.arch.storage.service.OssService;
+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 org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * oss对象存储管理
+ *
+ * @author makejava
+ * @since 2023-05-04 13:29:20
+ */
+@Api(value = "oss", tags = {"OSS对象存储管理"})
+@RestController
+@RequestMapping("oss")
+@AllArgsConstructor
+public class OssController {
+
+    private final OssService ossService;
+
+    @ApiOperation(value = "上传")
+    @PostMapping("/upload")
+    @OperLog(value = LogOperTypeEnum.OTHER, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "文件上传", moduleName = "系统功能")
+    public Result<UpLoadVO> upload(MultipartFile file) {
+        return Result.success(this.ossService.upload(file));
+    }
+
+    @ApiOperation(value = "下载")
+    @PostMapping("/download")
+    @OperLog(value = LogOperTypeEnum.DOWNLOAD, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "文件下载", moduleName = "系统功能")
+    public void downloadObject(@RequestBody DownloadObjectDTO params, HttpServletResponse response) {
+        this.ossService.downloadObject(params, response);
+    }
+
+    @ApiOperation(value = "删除")
+    @PostMapping("/del")
+    @OperLog(value = LogOperTypeEnum.DELETE, logTypeValue = LogTypeEnum.BUSI_LOG, operDes = "文件删除", moduleName = "系统功能")
+    public Result delObject(@RequestBody DelDTO dto) {
+        return this.ossService.delObject(dto) ? Result.success() : Result.error("文件删除失败！");
+    }
+}
+

framework-system-manage/src/main/resources/bootstrap-local.yml

@@ -35,6 +35,6 @@ spring:
         namespace: ${nacos.namespace}
   config:
     activate:
-      on-profile: dev
+      on-profile: local