refactor code

pom.xml

@@ -428,7 +428,6 @@
     <modules>
         <module>taais-admin</module>
         <module>taais-common</module>
-        <module>taais-mydemo</module>
         <module>taais-extra</module>
         <module>taais-modules</module>
     </modules>

script/sql/postgresql/data(postgresql).sql

@@ -78,3 +78,32 @@ INSERT INTO public.sys_menu (menu_id, menu_name, parent_id, order_num, path, com
 INSERT INTO public.sys_menu (menu_id, menu_name, parent_id, order_num, path, component, component_name, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, version, create_by, create_time, update_by, update_time, remark) VALUES (2006, '数据管理导出', 2001, 5, NULL, '', NULL, NULL, '1', '0', 'F', '0', '0', 'demo:data:export', NULL, 0, 1, '2024-04-22 17:21:27.187713', 1, NULL, '');
 INSERT INTO public.sys_menu (menu_id, menu_name, parent_id, order_num, path, component, component_name, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, version, create_by, create_time, update_by, update_time, remark) VALUES (2001, '数据管理', 2, 1, '/demo/data', 'demo/data/index', '数据管理', NULL, '1', '0', 'C', '0', '0', 'demo:data:list', NULL, 6, 1, '2024-04-22 17:21:27.187713', 1, '2024-04-23 20:38:36.673', '数据管理菜单');
 INSERT INTO public.sys_menu (menu_id, menu_name, parent_id, order_num, path, component, component_name, query_param, is_frame, is_cache, menu_type, visible, status, perms, icon, version, create_by, create_time, update_by, update_time, remark) VALUES (2, '数据管理', 0, 2, 'data', NULL, NULL, NULL, '1', '0', 'M', '0', '0', NULL, 'data', 0, 1, NULL, 1, NULL, '数据管理目录');
+
+-- 算法配置表
+CREATE TABLE algorithm_config (
+    id BIGINT PRIMARY KEY,
+    subsystem VARCHAR NOT NULL,
+    algorithm_name VARCHAR NOT NULL,
+    algorithm_address VARCHAR NOT NULL,
+    parameter_config TEXT,
+    created_by BIGINT,
+    created_at TIMESTAMP WITHOUT TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    updated_by BIGINT,
+    updated_at TIMESTAMP WITHOUT TIME ZONE DEFAULT CURRENT_TIMESTAMP,
+    remarks VARCHAR(500) DEFAULT NULL
+);
+
+COMMENT ON TABLE algorithm_config IS '算法配置表';
+COMMENT ON COLUMN algorithm_config.id IS '主键ID';
+COMMENT ON COLUMN algorithm_config.subsystem IS '分系统';
+COMMENT ON COLUMN algorithm_config.algorithm_name IS '算法名称';
+COMMENT ON COLUMN algorithm_config.algorithm_address IS '算法地址';
+COMMENT ON COLUMN algorithm_config.parameter_config IS '参数配置';
+COMMENT ON COLUMN algorithm_config.created_by IS '创建人';
+COMMENT ON COLUMN algorithm_config.created_at IS '创建时间';
+COMMENT ON COLUMN algorithm_config.updated_by IS '更新人';
+COMMENT ON COLUMN algorithm_config.updated_at IS '更新时间';
+COMMENT ON COLUMN algorithm_config.remarks IS '备注';
+
+
+

taais-admin/pom.xml

@@ -60,12 +60,6 @@
             <artifactId>taais-generator</artifactId>
         </dependency>
 
-        <!--  demo模块  -->
-        <dependency>
-            <groupId>com.taais</groupId>
-            <artifactId>taais-demo</artifactId>
-        </dependency>
-
         <!--  spring-boot-admin 监控客户端  -->
         <dependency>
             <groupId>de.codecentric</groupId>
@@ -75,10 +69,6 @@
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.taais</groupId>
-            <artifactId>taais-demo</artifactId>
-        </dependency>
 
         <!--  powerjob 客户端  -->
         <!--        <dependency>-->

taais-admin/src/main/java/com/taais/web/controller/common/CommonController.java

@@ -4,38 +4,32 @@ import cn.hutool.core.convert.Convert;
 import com.taais.common.core.config.TaaisConfig;
 import com.taais.common.core.constant.Constants;
 import com.taais.common.core.core.domain.CommonResult;
-import com.taais.common.core.utils.MapstructUtils;
 import com.taais.common.core.utils.StringUtils;
 import com.taais.common.core.utils.file.FileUploadUtils;
 import com.taais.common.core.utils.file.FileUtils;
-import com.taais.common.core.utils.file.UnPackedUtil;
-import com.taais.common.excel.utils.ExcelUtil;
-import com.taais.demo.domain.Data;
-import com.taais.demo.domain.vo.DataVo;
-import com.taais.demo.service.IDataService;
 import com.taais.system.config.ServerConfig;
 import com.taais.system.domain.vo.SysOssUploadVo;
 import com.taais.system.domain.vo.SysOssVo;
 import com.taais.system.service.ISysOssService;
-import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-
-import net.lingala.zip4j.model.FileHeader;
-import org.apache.commons.io.FilenameUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.nio.file.Paths;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
@@ -52,12 +46,10 @@ import static com.taais.common.security.utils.LoginHelper.getLoginUser;
 public class CommonController {
     private static final Logger log = LoggerFactory.getLogger(CommonController.class);
     private static final String FILE_DELIMETER = ",";
-    @Autowired
-    private ServerConfig serverConfig;
     private final ISysOssService sysOssService;
 
     @Autowired
-    private IDataService dataService;
+    private ServerConfig serverConfig;
 
     public CommonController(ISysOssService sysOssService) {
         this.sysOssService = sysOssService;
@@ -121,104 +113,8 @@ public class CommonController {
         }
     }
 
-    @PostMapping("/zip/upload")
-    public CommonResult<SysOssUploadVo> uploadZipFile(@RequestParam("file") MultipartFile file, @RequestParam("excelFile") MultipartFile excelFile) throws Exception {
-//        try {
-
-
-            List<DataVo> userList = ExcelUtil.importExcel(excelFile.getInputStream(),DataVo.class);
-            Map<String, Data> pic_name2obj = new HashMap<>();
-            //为插入数据库做准备
-            for(DataVo dataVo:userList){
-                pic_name2obj.put(dataVo.getName(), MapstructUtils.convert(dataVo, Data.class));
-            }
-            String  originalFilename = file.getOriginalFilename();
-            assert originalFilename != null;
-            String suffix = StringUtils.substring(originalFilename, originalFilename.lastIndexOf("."), originalFilename.length());
-
-
-            // 解压
-            String basedir = TaaisConfig.getUploadPath();
-            File ZipOrRar_temp = FileUploadUtils.getAbsoluteFile(basedir,FileUploadUtils.extractFilename(file));// 解压目录
-            String dest_zip = ZipOrRar_temp.getAbsolutePath();
-
-            file.transferTo(Paths.get(dest_zip));
-            String dest = ZipOrRar_temp.getParent();
-
-            List<File> extractedFileList = new ArrayList<File>();
-            if(suffix.equals(".zip")){
-                List<FileHeader> fileheaders = UnPackedUtil.unPackZip(ZipOrRar_temp,dest);
-                //添加解压目录
-//                dest = dest + "\\" + FilenameUtils.getBaseName(file.getOriginalFilename());
-                for(FileHeader fileHeader : fileheaders) {
-
-                    if (!fileHeader.isDirectory()) {
-                        String fileHeaderName = fileHeader.getFileName();
-                        String fileHeader_suffix = StringUtils.substring(fileHeaderName, fileHeaderName.lastIndexOf("."), fileHeaderName.length());
-                        if(!fileHeader_suffix.equals(".jpg")&&!fileHeader_suffix.equals(".jpeg")
-                            &&!fileHeader_suffix.equals(".png")){
-                            continue;
-
-//                            for(File efile:extractedFileList){
-//                                efile.delete();
-//
-//                            }
-//                            return CommonResult.fail("压缩文件里有文件并不是图片！");
-                        }
-                        extractedFileList.add(new File(dest,fileHeader.getFileName()));
-                    }
-                }
 
 
-
-            }else if(suffix.equals(".rar")){
-                List<com.github.junrar.rarfile.FileHeader> fileheaders = UnPackedUtil.unPackRar(ZipOrRar_temp,dest);
-
-
-                //添加解压目录
-//                dest = dest + "\\" + FilenameUtils.getBaseName(file.getOriginalFilename());
-                for(com.github.junrar.rarfile.FileHeader fileHeader : fileheaders) {
-
-                    if (!fileHeader.isDirectory()) {
-                        String fileHeaderName = fileHeader.getFileName();
-                        String fileHeader_suffix = StringUtils.substring(fileHeaderName, fileHeaderName.lastIndexOf("."), fileHeaderName.length());
-                        if(!fileHeader_suffix.equals(".jpg")&&!fileHeader_suffix.equals(".jpeg")
-                            &&!fileHeader_suffix.equals(".png")){
-                            continue;
-
-//                            for(File efile:extractedFileList){
-//                                efile.delete();
-//
-//                            }
-//                            return CommonResult.fail("压缩文件里有文件并不是图片！");
-                        }
-                        extractedFileList.add(new File(dest,fileHeader.getFileName()));
-                    }
-                }
-
-
-            }
-
-            for(File efile:extractedFileList){
-                String fileName = FileUploadUtils.getPathFileName(dest,efile.getName());
-                String url = serverConfig.getUrl() + fileName;
-                url = url.replaceAll("\\\\", "/");
-                Data mydata = pic_name2obj.get(efile.getName());
-
-                // TODO: 将导入的excel表和url一起插入数据库，图片名称对应
-                mydata.setUrl(url);
-                dataService.save(mydata);
-            }
-            //删除压缩文件
-            FileUtils.deleteFile(dest_zip);
-
-
-            return CommonResult.success("数据集上传成功！");
-//        } catch (Exception e) {
-//            return CommonResult.fail(e.getMessage());
-//        }
-    }
-
     /**
      * 通用上传请求（多个）
      */

taais-modules/pom.xml

@@ -15,6 +15,7 @@
         <module>taais-generator</module>
         <module>taais-job</module>
         <module>taais-system</module>
+        <module>taais-biz</module>
     </modules>
 
     <artifactId>taais-modules</artifactId>

taais-mydemo/pom.xml → taais-modules/taais-biz/pom.xml

@@ -4,16 +4,16 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>com.taais</groupId>
-        <artifactId>taais</artifactId>
+        <artifactId>taais-modules</artifactId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
 
-    <artifactId>taais-demo</artifactId>
+    <artifactId>taais-biz</artifactId>
 
     <description>
-        mydemo模块
+        biz模块
     </description>
 
     <dependencies>
@@ -41,6 +41,10 @@
             <groupId>com.taais</groupId>
             <artifactId>taais-common-log</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.taais</groupId>
+            <artifactId>taais-system</artifactId>
+        </dependency>
 
     </dependencies>
 

taais-modules/taais-biz/src/main/java/com/taais/demo/controller/DataController.java

@@ -0,0 +1,212 @@
+package com.taais.demo.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.taais.common.core.config.TaaisConfig;
+import com.taais.common.core.core.domain.CommonResult;
+import com.taais.common.core.core.page.PageResult;
+import com.taais.common.core.utils.MapstructUtils;
+import com.taais.common.core.utils.StringUtils;
+import com.taais.common.core.utils.file.FileUploadUtils;
+import com.taais.common.core.utils.file.FileUtils;
+import com.taais.common.core.utils.file.UnPackedUtil;
+import com.taais.common.excel.utils.ExcelUtil;
+import com.taais.common.log.annotation.Log;
+import com.taais.common.log.enums.BusinessType;
+import com.taais.common.web.annotation.RepeatSubmit;
+import com.taais.common.web.core.BaseController;
+import com.taais.demo.domain.Data;
+import com.taais.demo.domain.bo.DataBo;
+import com.taais.demo.domain.vo.DataVo;
+import com.taais.demo.service.IDataService;
+import com.taais.system.config.ServerConfig;
+import com.taais.system.domain.vo.SysOssUploadVo;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import net.lingala.zip4j.model.FileHeader;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 数据管理Controller
+ *
+ * @author km
+ * 2024-04-22
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/demo/data")
+public class DataController extends BaseController {
+    @Resource
+    private IDataService dataService;
+    @Autowired
+    private ServerConfig serverConfig;
+
+    /**
+     * 查询数据管理列表
+     */
+    @SaCheckPermission("demo:data:list")
+    @GetMapping("/list")
+    public CommonResult<PageResult<DataVo>> list(DataBo dataBo) {
+
+        return CommonResult.success(dataService.selectPage(dataBo));
+
+    }
+
+    /**
+     * 导出数据管理列表
+     */
+    @SaCheckPermission("demo:data:export")
+    @Log(title = "数据管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, DataBo dataBo) {
+        List<DataVo> list = dataService.selectList(dataBo);
+        ExcelUtil.exportExcel(list, "数据管理", DataVo.class, response);
+    }
+
+    /**
+     * 获取数据管理详细信息
+     */
+    @SaCheckPermission("demo:data:query")
+    @GetMapping(value = "/{id}")
+    public CommonResult<DataVo> getInfo(@PathVariable Long id) {
+
+        return CommonResult.success(dataService.selectById(id));
+    }
+
+    /**
+     * 新增数据管理
+     */
+    @SaCheckPermission("demo:data:add")
+    @Log(title = "数据管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping
+    public CommonResult<Void> add(@Validated @RequestBody DataBo dataBo) {
+        boolean inserted = dataService.insert(dataBo);
+        if (!inserted) {
+            return CommonResult.fail("新增数据管理记录失败！");
+        }
+        return CommonResult.success();
+    }
+
+    /**
+     * 修改数据管理
+     */
+    @SaCheckPermission("demo:data:edit")
+    @Log(title = "数据管理", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping
+    public CommonResult<Void> edit(@Validated @RequestBody DataBo dataBo) {
+        Boolean updated = dataService.update(dataBo);
+        if (!updated) {
+            return CommonResult.fail("修改数据管理记录失败!");
+        }
+        return CommonResult.success();
+    }
+
+    /**
+     * 删除数据管理
+     */
+    @SaCheckPermission("demo:data:remove")
+    @Log(title = "数据管理", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public CommonResult<Void> remove(@PathVariable Long[] ids) {
+        boolean deleted = dataService.deleteByIds(ids);
+        if (!deleted) {
+            return CommonResult.fail("删除数据管理记录失败!");
+        }
+        return CommonResult.success();
+    }
+
+    @PostMapping("/importTemplate")
+    public void importTemplate(HttpServletResponse response) {
+        ExcelUtil.exportExcel(new ArrayList<>(), "用户数据", DataVo.class, response);
+    }
+
+    @PostMapping("/zip/upload")
+    public CommonResult<SysOssUploadVo> uploadZipFile(@RequestParam("file") MultipartFile file, @RequestParam("excelFile") MultipartFile excelFile) throws Exception {
+
+        List<DataVo> userList = ExcelUtil.importExcel(excelFile.getInputStream(),DataVo.class);
+        Map<String, Data> picName2Obj = new HashMap<>();
+        //为插入数据库做准备
+        for(DataVo dataVo:userList){
+            picName2Obj.put(dataVo.getName(), MapstructUtils.convert(dataVo, Data.class));
+        }
+        String  originalFilename = file.getOriginalFilename();
+        assert originalFilename != null;
+        String suffix = StringUtils.substring(originalFilename, originalFilename.lastIndexOf("."), originalFilename.length());
+
+
+        // 解压
+        String basedir = TaaisConfig.getUploadPath();
+        File zipOrRarTemp = FileUploadUtils.getAbsoluteFile(basedir,FileUploadUtils.extractFilename(file));// 解压目录
+        String destZip = zipOrRarTemp.getAbsolutePath();
+
+        file.transferTo(Paths.get(destZip));
+        String dest = zipOrRarTemp.getParent();
+
+        List<File> extractedFileList = new ArrayList<File>();
+        if(suffix.equals(".zip")){
+            List<FileHeader> fileheaders = UnPackedUtil.unPackZip(zipOrRarTemp,dest);
+            //添加解压目录
+            for(FileHeader fileHeader : fileheaders) {
+
+                if (!fileHeader.isDirectory()) {
+                    String fileHeaderName = fileHeader.getFileName();
+                    String fileHeader_suffix = StringUtils.substring(fileHeaderName, fileHeaderName.lastIndexOf("."), fileHeaderName.length());
+                    if(!fileHeader_suffix.equals(".jpg")&&!fileHeader_suffix.equals(".jpeg")
+                        &&!fileHeader_suffix.equals(".png")){
+                        continue;
+                    }
+                    extractedFileList.add(new File(dest,fileHeader.getFileName()));
+                }
+            }
+
+
+
+        }else if(suffix.equals(".rar")){
+            List<com.github.junrar.rarfile.FileHeader> fileheaders = UnPackedUtil.unPackRar(zipOrRarTemp,dest);
+
+
+            //添加解压目录
+            for(com.github.junrar.rarfile.FileHeader fileHeader : fileheaders) {
+
+                if (!fileHeader.isDirectory()) {
+                    String fileHeaderName = fileHeader.getFileName();
+                    String fileHeader_suffix = StringUtils.substring(fileHeaderName, fileHeaderName.lastIndexOf("."), fileHeaderName.length());
+                    if(!fileHeader_suffix.equals(".jpg")&&!fileHeader_suffix.equals(".jpeg")
+                        &&!fileHeader_suffix.equals(".png")){
+                        continue;
+                    }
+                    extractedFileList.add(new File(dest,fileHeader.getFileName()));
+                }
+            }
+        }
+
+        for(File efile:extractedFileList){
+            String fileName = FileUploadUtils.getPathFileName(dest,efile.getName());
+            String url = serverConfig.getUrl() + fileName;
+            url = url.replaceAll("\\\\", "/");
+            Data mydata = picName2Obj.get(efile.getName());
+
+            // TODO: 将导入的excel表和url一起插入数据库，图片名称对应
+            mydata.setUrl(url);
+            dataService.save(mydata);
+        }
+        //删除压缩文件
+        FileUtils.deleteFile(destZip);
+
+
+        return CommonResult.success("数据集上传成功！");
+    }
+}

taais-mydemo/src/main/java/com/taais/demo/domain/Data.java → taais-modules/taais-biz/src/main/java/com/taais/demo/domain/Data.java

@@ -1,16 +1,12 @@
 package com.taais.demo.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;
 import com.mybatisflex.annotation.Table;
-import com.taais.common.core.utils.uuid.Seq;
-
-import lombok.EqualsAndHashCode;
 
-import java.io.Serial;
+import java.util.Date;
 
 /**
  * 数据管理对象 data

taais-mydemo/src/main/java/com/taais/demo/domain/bo/DataBo.java → taais-modules/taais-biz/src/main/java/com/taais/demo/domain/bo/DataBo.java

@@ -1,16 +1,12 @@
 package com.taais.demo.domain.bo;
 
-import com.mybatisflex.annotation.Id;
-import com.mybatisflex.annotation.KeyType;
-import com.mybatisflex.annotation.Table;
-import com.taais.common.orm.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.taais.demo.domain.Data;
 import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
-import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 /**
  * 数据管理业务对象 data

taais-mydemo/src/main/java/com/taais/demo/domain/vo/DataVo.java → taais-modules/taais-biz/src/main/java/com/taais/demo/domain/vo/DataVo.java

@@ -1,20 +1,14 @@
 package com.taais.demo.domain.vo;
 
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.taais.common.core.utils.uuid.Seq;
-import com.taais.common.orm.core.domain.BaseEntity;
-import com.taais.demo.domain.Data;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.taais.common.excel.annotation.ExcelDictFormat;
-import com.taais.common.excel.convert.ExcelDictConvert;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.taais.demo.domain.Data;
 import io.github.linpeilie.annotations.AutoMapper;
 
-import jakarta.validation.constraints.NotBlank;
-import lombok.EqualsAndHashCode;
 import java.io.Serial;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 数据管理视图对象 data

taais-mydemo/src/main/java/com/taais/demo/service/IDataService.java → taais-modules/taais-biz/src/main/java/com/taais/demo/service/IDataService.java

@@ -1,13 +1,12 @@
 package com.taais.demo.service;
 
-import java.util.List;
-
 import com.taais.common.core.core.page.PageResult;
+import com.taais.common.orm.core.service.IBaseService;
 import com.taais.demo.domain.Data;
-import com.taais.demo.domain.vo.DataVo;
 import com.taais.demo.domain.bo.DataBo;
-import com.taais.common.orm.core.service.IBaseService;
-import com.taais.common.orm.core.page.TableDataInfo;
+import com.taais.demo.domain.vo.DataVo;
+
+import java.util.List;
 
 /**
  * 数据管理Service接口

taais-mydemo/src/main/java/com/taais/demo/service/impl/DataServiceImpl.java → taais-modules/taais-biz/src/main/java/com/taais/demo/service/impl/DataServiceImpl.java

@@ -1,26 +1,23 @@
 package com.taais.demo.service.impl;
 
-import java.util.Arrays;
-import java.util.List;
-
 import cn.hutool.core.util.ObjectUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.taais.common.core.core.page.PageResult;
 import com.taais.common.core.utils.MapstructUtils;
-import com.taais.common.core.utils.StringUtils;
-import com.taais.common.core.utils.uuid.Seq;
 import com.taais.common.orm.core.page.PageQuery;
-import com.taais.common.orm.core.page.TableDataInfo;
 import com.taais.common.orm.core.service.impl.BaseServiceImpl;
-import jakarta.annotation.Resource;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import com.taais.demo.mapper.DataMapper;
 import com.taais.demo.domain.Data;
 import com.taais.demo.domain.bo.DataBo;
 import com.taais.demo.domain.vo.DataVo;
+import com.taais.demo.mapper.DataMapper;
 import com.taais.demo.service.IDataService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+
 import static com.taais.demo.domain.table.DataTableDef.DATA;
 
 /**

taais-modules/taais-system/src/main/java/com/taais/system/domain/bo/SysMenuBo.java

@@ -53,7 +53,6 @@ public class SysMenuBo implements Serializable {
      * 路由名称
      */
     @Size(min = 0, max = 200, message = "路由名称不能超过{max}个字符")
-    @NotBlank(message = "名称不能为空")
     private String componentName;
 
     /**

taais-mydemo/src/main/java/com/taais/demo/controller/DataController.java

@@ -1,120 +0,0 @@
-package com.taais.demo.controller;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.mybatisflex.core.query.QueryWrapper;
-import com.taais.common.core.core.page.PageResult;
-import lombok.RequiredArgsConstructor;
-import jakarta.servlet.http.HttpServletResponse;
-import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.taais.common.core.core.domain.CommonResult;
-import com.taais.common.excel.utils.ExcelUtil;
-import com.taais.common.log.annotation.Log;
-import com.taais.common.log.enums.BusinessType;
-import com.taais.common.web.annotation.RepeatSubmit;
-import com.taais.common.web.core.BaseController;
-import jakarta.annotation.Resource;
-import com.taais.demo.domain.vo.DataVo;
-import com.taais.demo.domain.bo.DataBo;
-import com.taais.demo.service.IDataService;
-
-import com.taais.common.orm.core.page.TableDataInfo;
-
-/**
- * 数据管理Controller
- *
- * @author km
- * 2024-04-22
- */
-@Validated
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/demo/data")
-public class DataController extends BaseController {
-    @Resource
-    private IDataService dataService;
-
-    /**
-     * 查询数据管理列表
-     */
-    @SaCheckPermission("demo:data:list")
-    @GetMapping("/list")
-    public CommonResult<PageResult<DataVo>> list(DataBo dataBo) {
-
-        return CommonResult.success(dataService.selectPage(dataBo));
-
-    }
-
-    /**
-     * 导出数据管理列表
-     */
-    @SaCheckPermission("demo:data:export")
-    @Log(title = "数据管理", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, DataBo dataBo) {
-        List<DataVo> list = dataService.selectList(dataBo);
-        ExcelUtil.exportExcel(list, "数据管理", DataVo.class, response);
-    }
-
-    /**
-     * 获取数据管理详细信息
-     */
-    @SaCheckPermission("demo:data:query")
-    @GetMapping(value = "/{id}")
-    public CommonResult<DataVo> getInfo(@PathVariable Long id) {
-
-        return CommonResult.success(dataService.selectById(id));
-    }
-
-    /**
-     * 新增数据管理
-     */
-    @SaCheckPermission("demo:data:add")
-    @Log(title = "数据管理", businessType = BusinessType.INSERT)
-    @RepeatSubmit()
-    @PostMapping
-    public CommonResult<Void> add(@Validated @RequestBody DataBo dataBo) {
-        boolean inserted = dataService.insert(dataBo);
-        if (!inserted) {
-            return CommonResult.fail("新增数据管理记录失败！");
-        }
-        return CommonResult.success();
-    }
-
-    /**
-     * 修改数据管理
-     */
-    @SaCheckPermission("demo:data:edit")
-    @Log(title = "数据管理", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping
-    public CommonResult<Void> edit(@Validated @RequestBody DataBo dataBo) {
-        Boolean updated = dataService.update(dataBo);
-        if (!updated) {
-            return CommonResult.fail("修改数据管理记录失败!");
-        }
-        return CommonResult.success();
-    }
-
-    /**
-     * 删除数据管理
-     */
-    @SaCheckPermission("demo:data:remove")
-    @Log(title = "数据管理", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public CommonResult<Void> remove(@PathVariable Long[] ids) {
-        boolean deleted = dataService.deleteByIds(ids);
-        if (!deleted) {
-            return CommonResult.fail("删除数据管理记录失败!");
-        }
-        return CommonResult.success();
-    }
-
-    @PostMapping("/importTemplate")
-    public void importTemplate(HttpServletResponse response) {
-        ExcelUtil.exportExcel(new ArrayList<>(), "用户数据", DataVo.class, response);
-    }
-}