lyhzzz 1 dag geleden
bovenliggende
commit
cb163bc61d

+ 21 - 0
src/main/java/com/fdkankan/fusion/controller/CaseFilesTypeIconController.java

@@ -0,0 +1,21 @@
+package com.fdkankan.fusion.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2025-08-20
+ */
+@RestController
+@RequestMapping("/fusion/caseFilesTypeIcon")
+public class CaseFilesTypeIconController {
+
+}
+

+ 21 - 0
src/main/java/com/fdkankan/fusion/controller/DictIconController.java

@@ -0,0 +1,21 @@
+package com.fdkankan.fusion.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2025-08-20
+ */
+@RestController
+@RequestMapping("/fusion/dictIcon")
+public class DictIconController {
+
+}
+

+ 8 - 0
src/main/java/com/fdkankan/fusion/entity/CaseFilesType.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -55,4 +57,10 @@ public class CaseFilesType implements Serializable {
 
     @TableField("flat_show")
     private Integer flatShow;
+
+    @TableField("sort")
+    private Integer sort;
+
+    @TableField(exist = false)
+    private List<CaseFilesTypeIcon> iconList;
 }

+ 51 - 0
src/main/java/com/fdkankan/fusion/entity/CaseFilesTypeIcon.java

@@ -0,0 +1,51 @@
+package com.fdkankan.fusion.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2025-08-20
+ */
+@Getter
+@Setter
+@TableName("t_case_files_type_icon")
+public class CaseFilesTypeIcon implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("name")
+    private String name;
+
+    @TableField("files_type_id")
+    private Integer filesTypeId;
+
+    @TableField("icon_url")
+    private String iconUrl;
+
+    @TableField("tb_status")
+    @TableLogic
+    private Integer tbStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

+ 48 - 0
src/main/java/com/fdkankan/fusion/entity/DictIcon.java

@@ -0,0 +1,48 @@
+package com.fdkankan.fusion.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2025-08-20
+ */
+@Getter
+@Setter
+@TableName("t_dict_icon")
+public class DictIcon implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("name")
+    private String name;
+
+    @TableField("dict_id")
+    private Integer dictId;
+
+    @TableField("icon_url")
+    private String iconUrl;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

+ 2 - 2
src/main/java/com/fdkankan/fusion/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir") ;
 
         generate(path,"fusion", getTables(new String[]{
-               "jy_platform"
+               "t_dict_icon"
         }));
 
 //        generate(path,"goods", getTables(new String[]{
@@ -48,7 +48,7 @@ public class AutoGenerate {
     public static void  generate(String path,String moduleName,  List<String> tables){
 //        FastAutoGenerator.create("jdbc:mysql://192.168.0.25:3306/fd_fusion_xj",
 //                "root","mysql123!ROOT.")
-        FastAutoGenerator.create("jdbc:mysql://119.23.182.50:3306/4dkankan_v4",
+        FastAutoGenerator.create("jdbc:mysql://192.168.0.125:13306/4dkankan_v4",
                 "root","4dkk2023cuikuan%")
                 .globalConfig(builder -> {
                     builder.author("")               //作者

+ 18 - 0
src/main/java/com/fdkankan/fusion/mapper/ICaseFilesTypeIconMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.fusion.mapper;
+
+import com.fdkankan.fusion.entity.CaseFilesTypeIcon;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2025-08-20
+ */
+@Mapper
+public interface ICaseFilesTypeIconMapper extends BaseMapper<CaseFilesTypeIcon> {
+
+}

+ 18 - 0
src/main/java/com/fdkankan/fusion/mapper/IDictIconMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.fusion.mapper;
+
+import com.fdkankan.fusion.entity.DictIcon;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2025-08-20
+ */
+@Mapper
+public interface IDictIconMapper extends BaseMapper<DictIcon> {
+
+}

+ 20 - 0
src/main/java/com/fdkankan/fusion/service/ICaseFilesTypeIconService.java

@@ -0,0 +1,20 @@
+package com.fdkankan.fusion.service;
+
+import com.fdkankan.fusion.entity.CaseFilesTypeIcon;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2025-08-20
+ */
+public interface ICaseFilesTypeIconService extends IService<CaseFilesTypeIcon> {
+
+    HashMap<Integer, List<CaseFilesTypeIcon>> getMapByTypeIds(List<Integer> ids);
+}

+ 16 - 0
src/main/java/com/fdkankan/fusion/service/IDictIconService.java

@@ -0,0 +1,16 @@
+package com.fdkankan.fusion.service;
+
+import com.fdkankan.fusion.entity.DictIcon;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2025-08-20
+ */
+public interface IDictIconService extends IService<DictIcon> {
+
+}

+ 42 - 0
src/main/java/com/fdkankan/fusion/service/impl/CaseFilesTypeIconServiceImpl.java

@@ -0,0 +1,42 @@
+package com.fdkankan.fusion.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.fusion.entity.CaseFilesTypeIcon;
+import com.fdkankan.fusion.mapper.ICaseFilesTypeIconMapper;
+import com.fdkankan.fusion.service.ICaseFilesTypeIconService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2025-08-20
+ */
+@Service
+public class CaseFilesTypeIconServiceImpl extends ServiceImpl<ICaseFilesTypeIconMapper, CaseFilesTypeIcon> implements ICaseFilesTypeIconService {
+
+    @Override
+    public HashMap<Integer, List<CaseFilesTypeIcon>> getMapByTypeIds(List<Integer> ids) {
+        HashMap<Integer, List<CaseFilesTypeIcon>> map = new HashMap<>();
+        if(ids != null && !ids.isEmpty()){
+            LambdaQueryWrapper<CaseFilesTypeIcon> wrapper = new LambdaQueryWrapper<>();
+            wrapper.in(CaseFilesTypeIcon::getFilesTypeId,ids);
+            List<CaseFilesTypeIcon> list = this.list(wrapper);
+            for (CaseFilesTypeIcon dictIcon : list) {
+                if(map.get(dictIcon.getFilesTypeId()) == null){
+                    map.put(dictIcon.getFilesTypeId(), Arrays.asList(dictIcon));
+                }else {
+                    map.get(dictIcon.getFilesTypeId()).add(dictIcon);
+                }
+            }
+        }
+        return map;
+    }
+}

+ 14 - 1
src/main/java/com/fdkankan/fusion/service/impl/CaseFilesTypeServiceImpl.java

@@ -3,9 +3,11 @@ package com.fdkankan.fusion.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.fusion.entity.CaseFiles;
 import com.fdkankan.fusion.entity.CaseFilesType;
+import com.fdkankan.fusion.entity.CaseFilesTypeIcon;
 import com.fdkankan.fusion.mapper.ICaseFilesTypeMapper;
 import com.fdkankan.fusion.response.CaseFilesTypeTreeVo;
 import com.fdkankan.fusion.service.ICaseFilesService;
+import com.fdkankan.fusion.service.ICaseFilesTypeIconService;
 import com.fdkankan.fusion.service.ICaseFilesTypeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.BeanUtils;
@@ -31,6 +33,8 @@ public class CaseFilesTypeServiceImpl extends ServiceImpl<ICaseFilesTypeMapper,
 
     @Autowired
     ICaseFilesService caseFilesService;
+    @Autowired
+    ICaseFilesTypeIconService caseFilesTypeIconService;
     @Override
     public List<CaseFilesType> getByParentId(Integer parentId) {
         LambdaQueryWrapper<CaseFilesType> wrapper = new LambdaQueryWrapper<>();
@@ -40,7 +44,16 @@ public class CaseFilesTypeServiceImpl extends ServiceImpl<ICaseFilesTypeMapper,
 
     @Override
     public Object getByTree(Integer caseId) {
-        List<CaseFilesType> list = this.list();
+        LambdaQueryWrapper<CaseFilesType> wrapper = new LambdaQueryWrapper<>();
+        wrapper.orderByAsc(CaseFilesType::getSort);
+        List<CaseFilesType> list = this.list(wrapper);
+
+        List<Integer> ids = list.stream().map(CaseFilesType::getFilesTypeId).collect(Collectors.toList());
+        HashMap<Integer,List<CaseFilesTypeIcon>> iconMap  = caseFilesTypeIconService.getMapByTypeIds(ids);
+        for (CaseFilesType caseFilesType : list) {
+            caseFilesType.setIconList(iconMap.get(caseFilesType.getFilesTypeId()));
+        }
+
         List<CaseFiles> caseFilesList = caseFilesService.getByCaseId(caseId);
         HashMap<Integer,List<CaseFiles>> map = new HashMap<>();
 

+ 22 - 0
src/main/java/com/fdkankan/fusion/service/impl/DictIconServiceImpl.java

@@ -0,0 +1,22 @@
+package com.fdkankan.fusion.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.fdkankan.fusion.entity.DictIcon;
+import com.fdkankan.fusion.mapper.IDictIconMapper;
+import com.fdkankan.fusion.service.IDictIconService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2025-08-20
+ */
+@Service
+@DS("db2")
+public class DictIconServiceImpl extends ServiceImpl<IDictIconMapper, DictIcon> implements IDictIconService {
+
+}

+ 30 - 0
src/main/java/com/fdkankan/fusion/task/TaskService.java

@@ -54,9 +54,13 @@ public class TaskService {
         updateGuide();
         updatePath();
         updateAnimation();
+        insertFilesTypeIcon();
+
     }
 
 
+
+
     @Autowired
     ICommonUploadService commonUploadService;
     @Autowired
@@ -190,4 +194,30 @@ public class TaskService {
         }
     }
 
+    @Autowired
+    IDictIconService dictIconService;
+    @Autowired
+    ICaseFilesTypeService caseFilesTypeService;
+    @Autowired
+    ICaseFilesTypeIconService caseFilesTypeIconService;
+    @Autowired
+    IDictService dictService;
+    private void insertFilesTypeIcon() {
+        List<CaseFilesTypeIcon> list1 = caseFilesTypeIconService.list();
+        if(!list1.isEmpty()){
+            return;
+        }
+
+        List<DictIcon> list = dictIconService.list();
+        for (DictIcon dictIcon : list) {
+            Dict dict = dictService.getById(dictIcon.getDictId());
+            CaseFilesType caseFilesType = caseFilesTypeService.getByName(dict.getDictName());
+
+            CaseFilesTypeIcon caseFilesTypeIcon = new CaseFilesTypeIcon();
+            caseFilesTypeIcon.setName(dictIcon.getName());
+            caseFilesTypeIcon.setFilesTypeId(caseFilesType.getFilesTypeId());
+            caseFilesTypeIcon.setIconUrl(dictIcon.getIconUrl());
+            caseFilesTypeIconService.save(caseFilesTypeIcon);
+        }
+    }
 }

+ 5 - 0
src/main/resources/mapper/fusion/CaseFilesTypeIconMapper.xml

@@ -0,0 +1,5 @@
+<?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="com.fdkankan.fusion.mapper.ICaseFilesTypeIconMapper">
+
+</mapper>

+ 5 - 0
src/main/resources/mapper/fusion/DictIconMapper.xml

@@ -0,0 +1,5 @@
+<?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="com.fdkankan.fusion.mapper.IDictIconMapper">
+
+</mapper>