Kaynağa Gözat

feat(adm-diagram): 根据系统类型获取图标接口相关文件

liyang 3 yıl önce
ebeveyn
işleme
99e0909bc6

+ 15 - 2
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/controller/IconController.java

@@ -1,6 +1,5 @@
 package com.persagy.adm.diagram.controller;
 
-import cn.hutool.crypto.digest.DigestUtil;
 import cn.hutool.http.HttpUtil;
 import com.persagy.adm.diagram.entity.IconEntity;
 import com.persagy.adm.diagram.frame.BdtpRequest;
@@ -51,6 +50,7 @@ public class IconController {
      *
      * @param file     文件
      * @param legendId 所关联的图例id
+     * @param system   图例所属系统类型
      * @param skin     皮肤
      * @return
      */
@@ -58,6 +58,7 @@ public class IconController {
     @PostMapping("/uploadIcon")
     public CommonResult<Object> uploadIcon(@RequestParam("file") MultipartFile file,
                                            @RequestParam String legendId,
+                                           @RequestParam String system,
                                            @RequestParam(required = false) String skin) {
         String fileName = file.getOriginalFilename();
         long size = file.getSize();
@@ -65,6 +66,7 @@ public class IconController {
         IconEntity entity = new IconEntity();
         entity.setIconSkin(skin);
         entity.setLegendId(legendId);
+        entity.setSystemType(system);
         entity.setIconSize(String.valueOf(size));
 
         Optional.ofNullable(fileName).ifPresent(s -> {
@@ -157,8 +159,19 @@ public class IconController {
      * @return
      */
     @ApiOperation("获取所有图标")
-    @GetMapping("/cons")
+    @GetMapping("/icons")
     public CommonResult<List<IconEntity>> getIcons() {
         return ResultHelper.multi(iconService.getIcons());
     }
+
+    /**
+     * 根据系统类型获取所有图标
+     *
+     * @return
+     */
+    @ApiOperation("根据系统类型获取所有图标")
+    @GetMapping("/icons/type")
+    public CommonResult<List<IconEntity>> getIconsBySystemType(String system) {
+        return ResultHelper.multi(iconService.getIconsBySystemType(system));
+    }
 }

+ 7 - 0
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/dao/IconMapper.java

@@ -29,4 +29,11 @@ public interface IconMapper extends BaseMapper<IconEntity> {
      */
     List<IconEntity> getIcons();
 
+    /**
+     * 根据系统类型获取所有图标
+     *
+     * @param systemType 系统类型
+     * @return
+     */
+    List<IconEntity> getIconsBySystemType(String systemType);
 }

+ 4 - 0
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/entity/IconEntity.java

@@ -24,6 +24,10 @@ public class IconEntity extends AuditableEntity<IconEntity> {
      * 图标文件类型
      */
     private String iconType;
+    /**
+     * 图标所属系统类型
+     */
+    private String systemType;
 
     /**
      * 图标大小

+ 8 - 0
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/service/IconService.java

@@ -42,4 +42,12 @@ public interface IconService {
      * @return
      */
     List<IconEntity> getIcons();
+
+    /**
+     * 根据系统类型获取所有图标
+     *
+     * @param system 系统类型
+     * @return
+     */
+    List<IconEntity> getIconsBySystemType(String system);
 }

+ 10 - 0
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/service/impl/IconServiceImpl.java

@@ -45,4 +45,14 @@ public class IconServiceImpl implements IconService {
     public List<IconEntity> getIcons() {
         return iconMapper.getIcons();
     }
+    /**
+     * 根据系统类型获取所有图标
+     *
+     * @param systemType 系统类型
+     * @return
+     */
+    @Override
+    public List<IconEntity> getIconsBySystemType(String systemType) {
+        return iconMapper.getIconsBySystemType(systemType);
+    }
 }

+ 1 - 0
adm-business/adm-diagram/src/main/resources/db.init/schema.sql

@@ -83,6 +83,7 @@ CREATE TABLE IF NOT EXISTS `diagram_icon` (
   `legend_id` varchar(40) DEFAULT NULL COMMENT '图例id',
   `icon_name` varchar(255) DEFAULT NULL COMMENT '图标文件原名',
   `icon_type` varchar(255) DEFAULT NULL COMMENT '图标文件类型',
+  `system_type` varchar(40) DEFAULT NULL COMMENT '图标所属系统类型',
   `icon_size` varchar(255) DEFAULT NULL COMMENT '图标大小',
   `icon_file_id` varchar(255) NOT NULL COMMENT '图标对应的文件id',
   `icon_skin` varchar(255) DEFAULT NULL COMMENT '图标皮肤',

+ 8 - 1
adm-business/adm-diagram/src/main/resources/mapper/DiagramIcon.xml

@@ -6,6 +6,7 @@
         <id column="id" property="id" jdbcType="VARCHAR"/>
         <result column="icon_name" property="iconName" jdbcType="VARCHAR"/>
         <result column="icon_type" property="iconType" jdbcType="VARCHAR"/>
+        <result column="system_type" property="systemType" jdbcType="VARCHAR"/>
         <result column="icon_size" property="iconSize" jdbcType="VARCHAR"/>
         <result column="icon_file_id" property="iconFileId" jdbcType="VARCHAR"/>
         <result column="icon_skin" property="iconSkin" jdbcType="VARCHAR"/>
@@ -19,7 +20,7 @@
     </resultMap>
 
     <sql id="baseSql">
-        id,icon_name,icon_type,icon_size,icon_file_id,icon_skin,legend_id,
+        id,icon_name,icon_type,system_type,icon_size,icon_file_id,icon_skin,legend_id,
         creator,creation_time,modifier,modified_time,valid,ts
     </sql>
 
@@ -36,6 +37,12 @@
         FROM diagram_icon
         WHERE valid = 1
     </select>
+    <select id="getIconsBySystemType" resultMap="iconBaseMap">
+        SELECT
+        <include refid="baseSql"/>
+        FROM diagram_icon
+        WHERE valid = 1 AND system_type=#{systemType}
+    </select>
 </mapper>