修复bug

# Conflicts:
#	sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/CanvasCfgDO.java
#	sz-service/sz-service-admin/src/main/resources/db/changelog/sql/dev_0.0.1_xq.sql

config/dev/mysql.yml

@@ -1,9 +1,9 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/sz_admin_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://127.0.0.1:13306/sz_admin_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: Yanfa2023@
+    password: 123456
     hikari:
       #连接池名
       pool-name: HikariCP

config/preview/mysql.yml

@@ -1,9 +1,9 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/sz_admin_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://127.0.0.1:13306/sz_admin_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: Yanfa2023@
+    password: 123456
     hikari:
       #连接池名
       pool-name: HikariCP

config/prod/mysql.yml

@@ -1,9 +1,9 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://127.0.0.1:3306/sz_admin_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://127.0.0.1:13306/sz_admin_test?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: Yanfa2023@
+    password: 123456
     hikari:
       #连接池名
       pool-name: HikariCP

sz-common/sz-common-core/src/main/java/com/sz/core/common/entity/ApiResult.java

@@ -56,6 +56,12 @@ public class ApiResult<T> implements Serializable {
         return apiResult;
     }
 
+//    public static <T> ApiResult<T> error(T data) {
+//        ApiResult<T> apiResult = new ApiResult<>();
+//        apiResult.data = data;
+//        return apiResult;
+//    }
+
     public static <T> ApiResult<T> success(T data, Object param) {
         ApiResult<T> apiResult = new ApiResult<>();
         apiResult.data = data;

sz-service/sz-service-admin/src/main/java/com/sz/AdminApplication.java

@@ -6,7 +6,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.scheduling.annotation.EnableScheduling;
 

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/controller/DataModelController.java

@@ -0,0 +1,51 @@
+package com.sz.admin.monitor.controller;
+
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import com.sz.admin.monitor.pojo.dto.dataModel.DataModelDTO;
+import com.sz.admin.monitor.pojo.que.dataModel.DataModelQue;
+import com.sz.admin.monitor.service.impl.DataModelServiceImpl;
+import com.sz.core.common.entity.ApiResult;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author xq
+ * @description:
+ * @date 2026/3/14 12:35
+ */
+@Slf4j
+@RestController
+@RequestMapping("/data/model")
+public class DataModelController {
+    @Autowired
+    private DataModelServiceImpl dataModelService;
+
+    @PostMapping("/getModelData")
+    @SaIgnore
+    public ApiResult<DataModelDTO> getModelData(@RequestBody DataModelQue que) {
+        return dataModelService.getModelData(que);
+    }
+
+    /**
+     * 保存或者更新数据模型
+     *
+     * @param dataModelDTO
+     * @return
+     */
+    @PostMapping("/saveOrUpdate/modelData")
+    public ApiResult saveOrUpdateModelData(
+        @RequestBody DataModelDTO dataModelDTO,
+        HttpServletRequest request,
+        HttpServletResponse response) {
+        return dataModelService.saveOrUpdateModelData(dataModelDTO, request, response);
+    }
+
+    @GetMapping("/test")
+    public ApiResult test() {
+        return ApiResult.success(dataModelService.getList());
+    }
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/controller/FileController.java

@@ -0,0 +1,67 @@
+package com.sz.admin.monitor.controller;
+
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import com.sz.admin.monitor.pojo.dto.file.FileEntityDTO;
+import com.sz.admin.monitor.pojo.dto.file.FileStorageDTO;
+import com.sz.admin.monitor.pojo.que.file.FileStorageQue;
+import com.sz.admin.monitor.service.impl.FileServiceImpl;
+import com.sz.core.common.entity.ApiResult;
+import com.sz.core.common.entity.PageResult;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * @author xq
+ * @description:
+ * @date 2026/2/2 22:31
+ */
+@RestController
+@RequestMapping("/fileStorage")
+public class FileController {
+
+    @Autowired
+    private FileServiceImpl fileService;
+
+    @GetMapping("/deleteFileById")
+    public ApiResult<String> deleteFileById(@RequestParam("id") String id){
+        return fileService.deleteFileById(id);
+    }
+
+    @PostMapping("/editFileNameById")
+    public ApiResult<String> editFileNameById(@RequestBody FileEntityDTO dto){
+        return fileService.editFileNameById(dto);
+    }
+
+    @PostMapping("/file/list")
+    public ApiResult<PageResult<FileEntityDTO>> getFileObjectList(@RequestBody FileStorageQue que){
+        return fileService.getFileObjectList(que);
+    }
+
+    @GetMapping("/getPreviewFile/{id}")
+    @SaIgnore
+    public ResponseEntity<byte[]> getPreviewFile(@PathVariable String id){
+        return fileService.getPreviewFile(id);
+    }
+
+    @GetMapping("/getFile")
+    @SaIgnore
+    public ApiResult<FileStorageDTO> getFile(@RequestParam("id") String id) {
+        return fileService.getFile(id);
+    }
+
+    @PostMapping("/saveFile")
+    @SaIgnore
+    public ApiResult<FileStorageDTO> saveFile(@RequestParam("file") MultipartFile file) {
+        return fileService.saveFile(file);
+    }
+
+    @GetMapping("/test")
+    public void test01(){
+        fileService.test01();
+    }
+
+
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/listener/event/ApplicationEventListener.java

@@ -1,26 +0,0 @@
-package com.sz.admin.monitor.listener.event;
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.event.ContextRefreshedEvent;
-import org.springframework.context.event.EventListener;
-import org.springframework.stereotype.Service;
-
-/**
- * ClassName: ApplicationEventListener
- * Package: com.sz.admin.monitor.listener.event
- * Description:
- */
-//@Slf4j
-//@Service
-public class ApplicationEventListener {
-    /**
-     * 根容器初始化完成，
-     *
-     * @param event
-     */
-    // 监听ApplicationContext 初始化完成后的事件
-  //  @EventListener
-    public void onApplicationEvent(ContextRefreshedEvent event) {
-        //log.info("执行相关的操作");
-    }
-}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/listener/event/CameraDeleteEventListener.java

@@ -1,105 +0,0 @@
-package com.sz.admin.monitor.listener.event;
-
-import com.sz.admin.monitor.listener.mode.CameraDeleteEvent;
-import com.sz.admin.monitor.mapper.EdgeBoxMapper;
-import com.sz.admin.monitor.pojo.po.Camera;
-import com.sz.admin.monitor.pojo.po.EdgeBox;
-import com.sz.admin.monitor.pojo.vo.edgebox.AlgorithmTaskVO;
-import com.sz.admin.monitor.service.AlgorithmTaskService;
-import com.sz.admin.monitor.service.CameraService;
-import com.sz.admin.monitor.service.impl.CameraServiceImpl;
-import com.sz.admin.monitor.utils.AiBoxRequestUtil;
-import jakarta.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.event.EventListener;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Component;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-/**
- * ClassName: CameraDeleteEventListener
- * Package: com.sz.admin.monitor.listener.event
- * Description:
- */
-@Component
-@Slf4j
-public class CameraDeleteEventListener {
-    @Resource
-    private CameraService cameraService;
-    @Resource
-    private AlgorithmTaskService algorithmTaskService;
-    @Resource
-    private EdgeBoxMapper edgeBoxMapper;
-    @Resource
-    private AiBoxRequestUtil aiBoxRequestUtil;
-
-    @EventListener
-    @Async
-    public void handleCameraDelete(CameraDeleteEvent event) {
-        List<Long> ids = event.getCameraIds();
-        try {
-            List<Camera> cameraList = cameraService.listByIds(ids);
-            if (cameraList.isEmpty()) return;
-            List<AlgorithmTaskVO> taskList = algorithmTaskService.listByCameraIds(ids);
-            // 一次性查询出这批摄像头管理的盒子
-            Set<Long> boxIdset = cameraList
-                .stream()
-                .map(Camera::getBoxId)
-                .collect(Collectors.toSet());
-            Map<Long, EdgeBox> boxMap=new HashMap<>();
-            if(!boxIdset.isEmpty())
-            {
-                List<EdgeBox> edgeBoxList = edgeBoxMapper.selectListByIds(boxIdset);
-                boxMap = edgeBoxList.stream().collect(Collectors.toMap(EdgeBox::getId, edgeBox -> edgeBox));
-            }
-            try {
-                // 批量删除本地数据
-                cameraService.batchDeleteLocalData(ids, taskList);
-            } catch (Exception e) {
-                log.error("本地数据库删除失败，中止后续硬件清理逻辑以防数据割裂！", e);
-                return;
-            }
-            // 清理盒子的算法任务
-            for (AlgorithmTaskVO task : taskList) {
-                if(task!=null && task.getAlgTaskSession()!=null)
-                {
-                    Camera camera = cameraList.stream().filter(c -> c.getId().equals(task.getCameraId()))
-                        .findFirst()
-                        .orElse(null);
-                    if(camera==null) continue;
-                    EdgeBox edgeBox = boxMap.get(camera.getBoxId());
-                    if(edgeBox==null) continue;
-                    try {
-                        aiBoxRequestUtil.controlTask(edgeBox.getIp(), edgeBox.getPort(), task.getAlgTaskSession(), 0);
-                        aiBoxRequestUtil.deleteTask(edgeBox.getIp(), edgeBox.getPort(), task.getAlgTaskSession());
-                    } catch (Exception e) {
-                        log.error("清理 AI 盒子任务失败，摄像机ID: {}, 忽略该错误继续执行...", task.getCameraId(), e);
-                    }
-                }
-            }
-            // 清理盒子的通道
-            for (Camera camera : cameraList) {
-                Long boxId = camera.getBoxId();
-                if (boxId == null) continue;
-                EdgeBox edgeBox = boxMap.get(boxId);
-                if (edgeBox == null) continue;
-                try {
-                    aiBoxRequestUtil.deleteVideoChannel(edgeBox.getIp(), edgeBox.getPort(), camera.getId().toString());
-                } catch (Exception e) {
-                    log.error("清理 AI 盒子视频通道失败，摄像机ID: {}", camera.getId(), e);
-                }
-            }
-
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/listener/mode/CameraDeleteEvent.java

@@ -1,18 +0,0 @@
-package com.sz.admin.monitor.listener.mode;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * ClassName: CameraDeleteEvent
- * Package: com.sz.admin.monitor.listener.mode
- * Description:
- */
-@Data
-@AllArgsConstructor
-public class CameraDeleteEvent {
-    // 携带需要删除的摄像头 ID 集合
-    private List<Long> cameraIds;
-}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/mapper/CanvasCfgMapper.java

@@ -0,0 +1,13 @@
+package com.sz.admin.monitor.mapper;
+
+
+import com.mybatisflex.core.BaseMapper;
+import com.sz.admin.monitor.pojo.po.CanvasCfgDO;
+
+/**
+ * @description:画板
+ * @author xq
+ * @version 1.0
+ */
+public interface CanvasCfgMapper extends BaseMapper<CanvasCfgDO> {
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/mapper/FileStorageMapper.java

@@ -0,0 +1,8 @@
+package com.sz.admin.monitor.mapper;
+
+import com.mybatisflex.core.BaseMapper;
+import com.sz.admin.monitor.pojo.po.FileStorageDO;
+
+public interface FileStorageMapper extends BaseMapper<FileStorageDO> {
+}
+

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/mapper/GridCfgMapper.java

@@ -0,0 +1,13 @@
+package com.sz.admin.monitor.mapper;
+
+
+import com.mybatisflex.core.BaseMapper;
+import com.sz.admin.monitor.pojo.po.GridCfgDO;
+
+/**
+ * @description:  网格
+ * @author xq
+ * @version 1.0
+ */
+public interface GridCfgMapper extends BaseMapper<GridCfgDO> {
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/mapper/ModelContentMapper.java

@@ -0,0 +1,13 @@
+package com.sz.admin.monitor.mapper;
+
+
+import com.mybatisflex.core.BaseMapper;
+import com.sz.admin.monitor.pojo.po.ModelContentDO;
+
+/**
+ * @description: 存储模型的基本信息和配置
+ * @author xq
+ * @version 1.0
+ */
+public interface ModelContentMapper extends BaseMapper<ModelContentDO> {
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/mapper/UserModelContentMapper.java

@@ -0,0 +1,8 @@
+package com.sz.admin.monitor.mapper;
+
+import com.mybatisflex.core.BaseMapper;
+import com.sz.admin.monitor.pojo.po.Substation;
+import com.sz.admin.monitor.pojo.po.UserModelContentDO;
+
+public interface UserModelContentMapper extends BaseMapper<UserModelContentDO> {
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/dto/dataModel/CanvasCfgDTO.java

@@ -0,0 +1,122 @@
+package com.sz.admin.monitor.pojo.dto.dataModel;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.sz.admin.monitor.pojo.po.CanvasCfgDO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 画布配置数据对象
+ *
+ * @author xq
+ * @description: 存储画布的基本配置信息
+ * @date 2026/1/29 11:32
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CanvasCfgDTO {
+    /**
+     * 面板id
+     */
+    private String id;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 宽度
+     */
+    private Integer width;
+
+    /**
+     * 高度
+     */
+    private Integer height;
+
+    /**
+     * 比例
+     */
+    private Double scale;
+
+    /**
+     * 颜色
+     */
+    private String color;
+
+    /**
+     * 图片
+     */
+    private String img;
+
+    /**
+     * 指南
+     */
+    private Boolean guide;
+
+    /**
+     * 吸附
+     */
+    private Boolean adsorp;
+
+    /**
+     * 吸附差分
+     */
+    @JsonProperty("adsorp_diff")
+    private Double adsorpDiff;
+
+    /**
+     * 原点（json格式）
+     */
+    @JsonProperty("transform_origin")
+    private CoordinatePoint transformOrigin;
+
+    /**
+     * 拖拽（json格式）
+     */
+    @JsonProperty("drag_offset")
+    private CoordinatePoint dragOffset;
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class CoordinatePoint {
+        private Integer x;
+        private Integer y;
+
+        public void setX(Integer x) {
+            this.x = x;
+        }
+
+        public void setY(Integer y) {
+            this.y = y;  // 修正这里的错误赋值
+        }
+    }
+
+    /**
+     * 转换为数据库对象
+     *
+     * @param dto
+     * @return
+     */
+    public static CanvasCfgDO dtoConvertDO(CanvasCfgDTO dto) {
+        CanvasCfgDO canvasCfgDO = BeanUtil.copyProperties(dto, CanvasCfgDO.class);
+        ObjectMapper objectMapper = new ObjectMapper();
+        try {
+            String transformOrigin = objectMapper.writeValueAsString(dto.getTransformOrigin());
+            String dragOffset = objectMapper.writeValueAsString(dto.getDragOffset());
+            canvasCfgDO.setTransformOrigin(transformOrigin);
+            canvasCfgDO.setDragOffset(dragOffset);
+            return canvasCfgDO;
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/dto/dataModel/DataModelDTO.java

@@ -0,0 +1,41 @@
+package com.sz.admin.monitor.pojo.dto.dataModel;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @author xq
+ * @description:返回给前端的数据对象
+ * @date 2026/1/29 11:47
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class DataModelDTO {
+    /**
+     * 模型数据对象
+     */
+    private CanvasCfgDTO canvasCfg;
+
+    /**
+     * 画布配置数据对象
+     */
+    private GridCfgDTO gridCfg;
+
+    /**
+     * 模型数据对象
+     */
+    private List<ModelContentDTO> json;
+
+    /**
+     * 目录类型
+     */
+    private String menuType;
+
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/dto/dataModel/GridCfgDTO.java

@@ -0,0 +1,53 @@
+package com.sz.admin.monitor.pojo.dto.dataModel;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.sz.admin.monitor.pojo.po.GridCfgDO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 网格配置数据对象
+ * @description: 存储网格的基本配置信息
+ * @author xq
+ * @date 2026/1/29 11:35
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class GridCfgDTO {
+    /**
+     * 网格id
+     */
+    private String id;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 网格是否启用
+     */
+    private Boolean enabled;
+
+    /**
+     * 对齐
+     */
+    private Boolean align;
+
+    /**
+     * 大小
+     */
+    private Integer size;
+
+    /**
+     * 转换为数据库对象
+     * @param dto
+     * @return
+     */
+    public static GridCfgDO dtoConvertDO(GridCfgDTO dto){
+        GridCfgDO gridCfgDO = BeanUtil.copyProperties(dto, GridCfgDO.class);
+        return gridCfgDO;
+    }
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/dto/dataModel/ModelContentDTO.java

@@ -0,0 +1,144 @@
+package com.sz.admin.monitor.pojo.dto.dataModel;
+
+
+import cn.hutool.core.bean.BeanUtil;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.sz.admin.monitor.pojo.po.ModelContentDO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 模型数据对象
+ * @description: 存储模型的基本信息和配置
+ * @author xq
+ * @version 1.0
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ModelContentDTO {
+    /**
+     * 模型id
+     */
+    private String id;
+
+    /**
+     * 图形位置
+     */
+    private Integer modelIndex=99;
+
+    /**
+     * 模型名称
+     */
+    private String title;
+
+    /**
+     * 模型类型
+     */
+    private String type;
+
+    /**
+     * 位置（json格式）
+     */
+    private Place binfo;
+
+    /**
+     * 调整大小
+     */
+    private Boolean resize;
+
+    /**
+     * 旋转
+     */
+    private Boolean rotate;
+
+    /**
+     * 锁定
+     */
+    private Boolean lock;
+
+    /**
+     * 动作
+     */
+    private Boolean active;
+
+    /**
+     * 隐藏
+     */
+    private Boolean hide;
+
+    /**
+     * 属性（json格式）
+     */
+    private Map<String,String> props;
+
+    /**
+     * vue组件名称
+     */
+    private String tag;
+
+    /**
+     * 动画（json格式）
+     */
+    @JsonProperty("common_animations")
+    private Animation commonAnimations;
+
+    /**
+     * 事件
+     */
+    private List<String> events;
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class Place{
+        private BigDecimal left;
+        private BigDecimal top;
+        private BigDecimal width;
+        private BigDecimal height;
+        private BigDecimal angle;
+
+    }
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class Animation{
+        private String val;
+        private String delay;
+        private String speed;
+        private String repeat;
+
+    }
+
+    /**
+     * 转换为数据库对象
+     * @param dto
+     * @return
+     */
+    public static ModelContentDO dtoConvertDO(ModelContentDTO dto){
+        ModelContentDO modelContentDO = BeanUtil.copyProperties(dto, ModelContentDO.class);
+        ObjectMapper objectMapper = new ObjectMapper();
+        try {
+            String binfo = objectMapper.writeValueAsString(dto.getBinfo());
+            String commonAnimations = objectMapper.writeValueAsString(dto.getCommonAnimations());
+            String props = objectMapper.writeValueAsString(dto.getProps());
+
+            modelContentDO.setBinfo(binfo);
+            modelContentDO.setCommonAnimations(commonAnimations);
+            modelContentDO.setProps(props);
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+
+        return modelContentDO;
+    }
+
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/dto/dataModel/UserModelContentDTO.java

@@ -0,0 +1,38 @@
+package com.sz.admin.monitor.pojo.dto.dataModel;
+
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @author xq
+ * @description:
+ * @date 2026/1/29 11:50
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserModelContentDTO {
+    /**
+     * 表id
+     */
+    private String id;
+    /**
+     * 用户id
+     */
+    private String userId;
+    /**
+     * 目录类型
+     */
+    private String menuType;
+    /**
+     * 模型内容
+     */
+    private String modelContentId;
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/dto/file/FileEntityDTO.java

@@ -0,0 +1,38 @@
+package com.sz.admin.monitor.pojo.dto.file;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author xq
+ * @description:
+ * @date 2026/2/3 14:27
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class FileEntityDTO {
+    /**
+     * id
+     */
+    private String id;
+
+    /**
+     * 文件名称
+     */
+    private String fileName;
+
+    /**
+     * 添加时间
+     */
+    private Long addTime;
+
+    /**
+     * 获取文件的path
+     */
+    private String filePath;
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/dto/file/FileStorageDTO.java

@@ -0,0 +1,61 @@
+package com.sz.admin.monitor.pojo.dto.file;
+
+
+import cn.hutool.core.bean.BeanUtil;
+import com.sz.admin.monitor.pojo.po.FileStorageDO;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @author xq
+ * @description:文件存储数据对象
+ * @date 2026/2/2 22:18
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class FileStorageDTO {
+    /**
+     * id
+     */
+    private String id;
+
+    /**
+     * 文件路径
+     */
+    private String fileUrl;
+
+    /**
+     * 文件大小
+     */
+    private String fileSize;
+
+    /**
+     * 文件名称
+     */
+    private String fileName;
+
+    /**
+     * 文件后缀
+     */
+    private String fileSuffix;
+
+    /**
+     * base64数据
+     */
+    private String base64Data;
+
+    /**
+     * 添加时间
+     */
+    private Date addTime;
+
+    public static FileStorageDO dtoConvertDO(FileStorageDTO dto) {
+        return BeanUtil.copyProperties(dto, FileStorageDO.class);
+    }
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/AlgorithmTask.java

@@ -72,6 +72,7 @@ public class AlgorithmTask implements Serializable {
     private JsonNode userData;
 
 
+
     /**
      * 创建时间
      */

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/Camera.java

@@ -80,6 +80,7 @@ public class Camera implements Serializable {
     @Schema(description = "在线状态：1-在线, 0-离线")
     private Integer status;
 
+
     @Schema(description = "创建时间")
     private LocalDateTime createTime;
 

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/CameraSnapshot.java

@@ -46,7 +46,6 @@ public class CameraSnapshot implements Serializable {
     private Integer isAbnormal;
 
 
-
     @Schema(description = "抓拍时间")
     private LocalDateTime createTime;
 }

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/CanvasCfgDO.java

@@ -0,0 +1,159 @@
+package com.sz.admin.monitor.pojo.po;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.annotation.Table;
+import com.sz.admin.monitor.pojo.dto.dataModel.CanvasCfgDTO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 画布配置数据对象
+ * @description: 存储画布的基本配置信息
+ * @author xq
+ * @date 2026/1/29 11:32
+ */
+@Table("ry_canvas_cfg")
+@Schema(description = "画布配置数据对象")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CanvasCfgDO {
+    /**
+     * 面板id
+     */
+    @Id(keyType = KeyType.Generator, value = "uuid")
+    @Schema(description = "面板id")
+    private String id;
+
+    /**
+     * 用户id
+     */
+    @Schema(description = "用户id")
+    private String userId;
+
+    /**
+     * 宽度
+     */
+    @Schema(description = "宽度")
+    private Integer width;
+
+    /**
+     * 高度
+     */
+    @Schema(description = "高度")
+    private Integer height;
+
+    /**
+     * 比例
+     */
+    @Schema(description = "比例")
+    private Double scale;
+
+    /**
+     * 颜色
+     */
+    @Schema(description = "颜色")
+    private String color;
+
+    /**
+     * 图片
+     */
+    @Schema(description = "图片")
+    private String img;
+
+    /**
+     * 指南
+     */
+    @Schema(description = "指南")
+    private Boolean guide;
+
+    /**
+     * 吸附
+     */
+    @Schema(description = "吸附")
+    private Boolean adsorp;
+
+    /**
+     * 吸附差分
+     */
+    @Schema(description = "吸附差分")
+    private Double adsorpDiff;
+
+    /**
+     * 原点（json格式）
+     */
+    @Schema(description = "原点（json格式）")
+    private String transformOrigin;
+
+    /**
+     * 拖拽（json格式）
+     */
+    @Schema(description = "拖拽（json格式）")
+    private String dragOffset;
+
+    /**
+     * 转换为DTO对象
+     * @param canvasCfgDO
+     * @return
+     */
+    @Schema(description = "模型id")
+    public static CanvasCfgDTO doConvertDTO(CanvasCfgDO canvasCfgDO){
+        // 创建新的CanvasCfgDTO实例，先复制其他属性
+        CanvasCfgDTO canvasCfgDTO = new CanvasCfgDTO();
+
+        // 手动复制除transformOrigin和dragOffset之外的所有基本类型属性
+        canvasCfgDTO.setId(canvasCfgDO.getId());
+        canvasCfgDTO.setUserId(canvasCfgDO.getUserId());
+        canvasCfgDTO.setWidth(canvasCfgDO.getWidth());
+        canvasCfgDTO.setHeight(canvasCfgDO.getHeight());
+        canvasCfgDTO.setScale(canvasCfgDO.getScale());
+        canvasCfgDTO.setColor(canvasCfgDO.getColor());
+        canvasCfgDTO.setImg(canvasCfgDO.getImg());
+        canvasCfgDTO.setGuide(canvasCfgDO.getGuide());
+        canvasCfgDTO.setAdsorp(canvasCfgDO.getAdsorp());
+        canvasCfgDTO.setAdsorpDiff(canvasCfgDO.getAdsorpDiff());
+
+        ObjectMapper objectMapper = new ObjectMapper();
+        String transformOrigin = canvasCfgDO.getTransformOrigin();
+        String dragOffset = canvasCfgDO.getDragOffset();
+
+        try {
+            // 单独处理JSON转换 - 添加空值检查
+            if (transformOrigin != null && !transformOrigin.trim().isEmpty() && !transformOrigin.equals("null")) {
+                CanvasCfgDTO.CoordinatePoint originPoint = objectMapper.readValue(transformOrigin, CanvasCfgDTO.CoordinatePoint.class);
+                canvasCfgDTO.setTransformOrigin(originPoint);
+            }
+
+            if (dragOffset != null && !dragOffset.trim().isEmpty() && !dragOffset.equals("null")) {
+                CanvasCfgDTO.CoordinatePoint dragPoint = objectMapper.readValue(dragOffset, CanvasCfgDTO.CoordinatePoint.class);
+                canvasCfgDTO.setDragOffset(dragPoint);
+            }
+
+            return canvasCfgDTO;
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException("JSON parsing error: " + e.getMessage() + ", JSON: " + transformOrigin, e);
+        }
+    }
+
+
+
+    public static final String ID="id";
+    public static final String USER_ID="user_id";
+    public static final String WIDTH = "width";
+    public static final String HEIGHT = "height";
+    public static final String SCALE = "scale";
+    public static final String COLOR = "color";
+    public static final String IMG = "img";
+    public static final String GUIDE = "guide";
+    public static final String ADSORP = "adsorp";
+    public static final String ADSORP_DIFF = "adsorp_diff";
+    public static final String TRANSFORM_ORIGIN = "transform_origin";
+    public static final String DRAG_OFFSET = "drag_offset";
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/FileStorageDO.java

@@ -0,0 +1,69 @@
+package com.sz.admin.monitor.pojo.po;
+
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.annotation.Table;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @author xq
+ * @description:文件存储数据对象
+ * @date 2026/2/2 22:18
+ */
+@Table("ry_file_storage")
+@Schema(description = "文件存储数据对象")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class FileStorageDO {
+    /**
+     * id
+     */
+    @Id(keyType = KeyType.Generator, value = "uuid")
+    @Schema(description = "主键ID")
+    private String id;
+
+    /**
+     * 文件路径
+     */
+    @Schema(description = "文件路径")
+    private String fileUrl;
+
+    /**
+     * 文件大小
+     */
+    @Schema(description = "文件大小")
+    private String fileSize;
+
+    /**
+     * 文件名称
+     */
+    @Schema(description = "文件名称")
+    private String fileName;
+
+    /**
+     * 文件后缀
+     */
+    @Schema(description = "文件后缀")
+    private String fileSuffix;
+
+    /**
+     * 添加时间
+     */
+    @Schema(description = "添加时间")
+    private Date addTime;
+
+    public static final String ID="id";
+    public static final String FILE_URL="file_url";
+    public static final String FILE_SIZE="file_size";
+    public static final String FILE_NAME="file_name";
+    public static final String FILE_SUFFIX="file_suffix";
+    public static final String ADD_TIME="add_time";
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/GridCfgDO.java

@@ -0,0 +1,74 @@
+package com.sz.admin.monitor.pojo.po;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.annotation.Table;
+import com.sz.admin.monitor.pojo.dto.dataModel.GridCfgDTO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 网格配置数据对象
+ * @description: 存储网格的基本配置信息
+ * @author xq
+ * @date 2026/1/29 11:35
+ */
+@Table("ry_grid_cfg")
+@Schema(description = "存储网格的基本配置信息")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class GridCfgDO {
+    /**
+     * 网格id
+     */
+    @Id(keyType = KeyType.Generator, value = "uuid")
+    @Schema(description = "主键ID")
+    private String id;
+
+    /**
+     * 用户id
+     */
+    @Schema(description = "用户id")
+    private String userId;
+
+    /**
+     * 网格是否启用
+     */
+    @Schema(description = "网格是否启用")
+    private Boolean enabled;
+
+    /**
+     * 对齐
+     */
+    @Schema(description = "对齐")
+    private Boolean align;
+
+    /**
+     * 大小
+     */
+    @Schema(description = "大小")
+    private Integer size;
+
+    /**
+     * 转换为DTO对象
+     * @param gridCfgDO
+     * @return
+     */
+    public static GridCfgDTO doConvertDTO(GridCfgDO gridCfgDO){
+        GridCfgDTO gridCfgDTO = BeanUtil.copyProperties(gridCfgDO, GridCfgDTO.class);
+        return gridCfgDTO;
+    }
+
+
+    public static final String ID = "id";
+    public static final String USER_ID = "user_id";
+    public static final String ENABLED = "enabled";
+    public static final String ALIGN = "align";
+    public static final String SIZE = "size";
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/ModelContentDO.java

@@ -0,0 +1,177 @@
+package com.sz.admin.monitor.pojo.po;
+
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.annotation.Table;
+import com.sz.admin.monitor.pojo.dto.dataModel.ModelContentDTO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+/**
+ * 模型数据对象
+ * @description: 存储模型的基本信息和配置
+ * @author xq
+ * @version 1.0
+ */
+@Table("ry_model_content")
+@Schema(description = "存储模型的基本信息和配置")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ModelContentDO {
+    /**
+     * 模型id
+     */
+    @Id(keyType = KeyType.Generator, value = "uuid")
+    @Schema(description = "模型id")
+    private String id;
+
+    /**
+     * 索引
+     */
+    @Schema(description = "模型索引")
+    private Integer modelIndex=99;
+
+    /**
+     * 模型名称
+     */
+    @Schema(description = "模型名称")
+    private String title;
+
+    /**
+     * 模型类型
+     */
+    @Schema(description = "模型类型")
+    private String type;
+
+    /**
+     * 位置（json格式）
+     */
+    @Schema(description = "位置（json格式）")
+    private String binfo;
+
+    /**
+     * 调整大小
+     */
+    @Schema(description = "调整大小")
+    private Boolean resize;
+
+    /**
+     * 旋转
+     */
+    @Schema(description = "旋转")
+    private Boolean rotate;
+
+    /**
+     * 锁定
+     */
+    @Schema(description = "锁定")
+    private Boolean lock;
+
+    /**
+     * 动作
+     */
+    @Schema(description = "动作")
+    private Boolean active;
+
+    /**
+     * 隐藏
+     */
+    @Schema(description = "隐藏")
+    private Boolean hide;
+
+    /**
+     * 属性（json格式）
+     */
+    @Schema(description = "属性（json格式）")
+    private String props;
+
+    /**
+     * vue组件名称
+     */
+    @Schema(description = "vue组件名称")
+    private String tag;
+
+    /**
+     * 动画（json格式）
+     */
+    @Schema(description = "动画（json格式）")
+    private String commonAnimations;
+
+    /**
+     * 事件
+     */
+    @Schema(description = "事件")
+    private String events;
+
+    public static final String ID = "id";
+    public static final String MODEL_INDEX = "model_index";
+    public static final String TITLE = "title";
+    public static final String TYPE = "type";
+    public static final String BINFO = "binfo";
+    public static final String RESIZE = "resize";
+    public static final String ROTATE = "rotate";
+    public static final String LOCK = "lock";
+    public static final String ACTIVE = "active";
+    public static final String HIDE = "hide";
+    public static final String PROPS = "props";
+    public static final String TAG = "tag";
+    public static final String COMMON_ANIMATIONS = "common_animations";
+    public static final String EVENTS = "events";
+
+    public static ModelContentDTO doConvertDTO(ModelContentDO modelContentDO) {
+        if (modelContentDO == null) {
+            return null;
+        }
+
+        ModelContentDTO modelContentDTO = new ModelContentDTO();
+
+        // 基础字段映射
+        modelContentDTO.setId(modelContentDO.getId());
+        modelContentDTO.setTitle(modelContentDO.getTitle());
+        modelContentDTO.setType(modelContentDO.getType());
+        modelContentDTO.setResize(modelContentDO.getResize());
+        modelContentDTO.setRotate(modelContentDO.getRotate());
+        modelContentDTO.setLock(modelContentDO.getLock());
+        modelContentDTO.setActive(modelContentDO.getActive());
+        modelContentDTO.setHide(modelContentDO.getHide());
+        modelContentDTO.setTag(modelContentDO.getTag());
+        modelContentDTO.setEvents(new ArrayList<>());
+
+        ObjectMapper objectMapper = new ObjectMapper();
+
+        try {
+            // JSON 字段转换 - 位置信息
+            if (modelContentDO.getBinfo() != null && !modelContentDO.getBinfo().trim().isEmpty() && !"null".equals(modelContentDO.getBinfo())) {
+                ModelContentDTO.Place binfoObj = objectMapper.readValue(modelContentDO.getBinfo(), ModelContentDTO.Place.class);
+                modelContentDTO.setBinfo(binfoObj);
+            }
+
+            // JSON 字段转换 - 属性
+            if (modelContentDO.getProps() != null && !modelContentDO.getProps().trim().isEmpty() && !"null".equals(modelContentDO.getProps())) {
+                HashMap propsObj = objectMapper.readValue(modelContentDO.getProps(), HashMap.class);
+                modelContentDTO.setProps(propsObj);
+            }
+
+            // JSON 字段转换 - 动画
+            if (modelContentDO.getCommonAnimations() != null && !modelContentDO.getCommonAnimations().trim().isEmpty() && !"null".equals(modelContentDO.getCommonAnimations())) {
+                ModelContentDTO.Animation animationsObj = objectMapper.readValue(modelContentDO.getCommonAnimations(), ModelContentDTO.Animation.class);
+                modelContentDTO.setCommonAnimations(animationsObj);
+            }
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException("JSON parsing error in ModelContentDO conversion: " + e.getMessage(), e);
+        }
+
+        return modelContentDTO;
+    }
+
+
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/Preset.java

@@ -45,6 +45,7 @@ public class Preset {
     private String presetUrl;
 
 
+
     @Schema(description = "创建时间")
     private LocalDateTime createdTime;
 

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/UserModelContentDO.java

@@ -0,0 +1,53 @@
+package com.sz.admin.monitor.pojo.po;
+
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.annotation.Table;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/** 用户模型中间表
+ * @description:
+ * @author xq
+ * @version 1.0
+ */
+@Table("ry_user_model_content")
+@Schema(description = "用户模型中间表")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserModelContentDO implements Serializable {
+    /**
+     * id
+     */
+    @Id(keyType = KeyType.Generator, value = "uuid")
+    @Schema(description = "主键ID")
+    private String id;
+    /**
+     * 用户id
+     */
+    @Schema(description = "用户id")
+    private String userId;
+    /**
+     * 目录类型
+     */
+    @Schema(description = "目录类型")
+    private String menuType;
+    /**
+     * 模型内容
+     */
+    @Schema(description = "模型内容")
+    private String modelContentId;
+
+    public static final String ID="id";
+    public static final String USER_ID="user_id";
+    public static final String MENU_TYPE="menu_type";
+    public static final String MODEL_CONTENT_ID="model_content_id";
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/que/BasePage.java

@@ -0,0 +1,36 @@
+package com.sz.admin.monitor.pojo.que;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @author xq
+ * @description:
+ * @date 2026/2/3 14:21
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BasePage<T> {
+    private List<T> list;
+    /**
+     * 总数
+     */
+    private long total;
+    /**
+     * 每页数量
+     */
+    private long size;
+    /**
+     * 当前页
+     */
+    private long current;
+    /**
+     * 总页数
+     */
+    private long pages;
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/que/BaseQue.java

@@ -0,0 +1,38 @@
+package com.sz.admin.monitor.pojo.que;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author xq
+ * @description: 公共查询父类
+ * @date 2026/2/3 13:36
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class BaseQue {
+    /**
+     * 当前页数
+     */
+    private Integer pageNum;
+    /**
+     * 当前页数量
+     */
+    private Integer pageSize;
+
+    /**
+     * 初始化分页参数
+     * @param base
+     */
+//    public static <T> Page<T> init(BaseQue base,Class<T> cla){
+//        if(ObjectUtil.isEmpty(base))
+//            return null;
+//        base.setPageNum(ObjectUtil.isNotEmpty(base.getPageNum())?base.getPageNum():0);
+//        base.setPageSize(ObjectUtil.isNotEmpty(base.getPageSize())?base.getPageSize():10);
+//        return new Page<>(base.getPageNum(), base.getPageSize());
+//    }
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/que/dataModel/DataModelQue.java

@@ -0,0 +1,26 @@
+package com.sz.admin.monitor.pojo.que.dataModel;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author xq
+ * @description: 查询参数对象
+ * @date 2026/1/29 21:47
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DataModelQue {
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+    /**
+     * 目录类型
+     */
+    private String menuType;
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/que/file/FileStorageQue.java

@@ -0,0 +1,46 @@
+package com.sz.admin.monitor.pojo.que.file;
+
+
+import com.sz.admin.monitor.pojo.que.BaseQue;
+import com.sz.core.common.entity.PageQuery;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @author xq
+ * @description:
+ * @date 2026/2/3 13:35
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Schema(description = "文件查询Que")
+public class FileStorageQue extends PageQuery {
+    /**
+     * id
+     */
+    @Schema(description = "id")
+    private String id;
+    /**
+     * 文件名称
+     */
+    @Schema(description = "文件名称")
+    private String fileName;
+    /**
+     * 开始时间
+     */
+    @Schema(description = "开始时间")
+    private Long startTime;
+    /**
+     * 结束时间
+     */
+    @Schema(description = "结束时间")
+    private Long endTime;
+
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/sdk/ManageNVR.java

@@ -62,29 +62,30 @@ public class ManageNVR {
      */
     @Bean
     public Object nvrInit() {
-        //海康sdk注册
+        return null;
-        HCNetSDK hcNetSDK = hkNVR.registerPlugin();
+//        //海康sdk注册
-        Nvr nvr = new Nvr();
+//        HCNetSDK hcNetSDK = hkNVR.registerPlugin();
-        nvr.setDriver(0);
+//        Nvr nvr = new Nvr();
-        // 从数据库中查询出所有的nvr
+//        nvr.setDriver(0);
-        List<Nvr> devicesList = nvrService.list(QueryWrapper.create(nvr));
+//        // 从数据库中查询出所有的nvr
-        if (null == devicesList) {
+//        List<Nvr> devicesList = nvrService.list(QueryWrapper.create(nvr));
-            return hcNetSDK;
+//        if (null == devicesList) {
-        }
+//            return hcNetSDK;
-        // 遍历每个nvr，进行一个注册
+//        }
-        for (Nvr n : devicesList) {
+//        // 遍历每个nvr，进行一个注册
-            int lUserId = hkNVR.loginVcr(n.getIp(), n.getPort().toString(), n.getAccount(), n.getPassword());
+//        for (Nvr n : devicesList) {
-            if (lUserId == -1) {
+//            int lUserId = hkNVR.loginVcr(n.getIp(), n.getPort().toString(), n.getAccount(), n.getPassword());
-                // 如果注册失败，将状态设置为离线
+//            if (lUserId == -1) {
-                nvrService.upStatusById(n.getId(), 0);
+//                // 如果注册失败，将状态设置为离线
-            } else {
+//                nvrService.upStatusById(n.getId(), 0);
-                //将vcr的唯一Id和登录回调句柄luserid存储
+//            } else {
-                log.info("NVR登录成功，ID：{}", lUserId);
+//                //将vcr的唯一Id和登录回调句柄luserid存储
-                vcrlUserIdContainer.addData(n.getId().intValue(), lUserId);
+//                log.info("NVR登录成功，ID：{}", lUserId);
-                nvrService.upStatusById(n.getId(), 1);
+//                vcrlUserIdContainer.addData(n.getId().intValue(), lUserId);
-            }
+//                nvrService.upStatusById(n.getId(), 1);
-        }
+//            }
-        return hcNetSDK;
+//        }
+//        return hcNetSDK;
     }
 
 //    @Bean

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/sdk/hkSdk/HCNetSDK.java

@@ -688,7 +688,7 @@ public interface HCNetSDK extends Library {
     public static final int NET_DVR_GET_CCDPARAMCFG_EX = 3368;//获取前端参数(扩展)
     public static final int NET_DVR_SET_CCDPARAMCFG_EX = 3369;//设置前端参数(扩展)
     public static final int NET_DVR_GET_FOCUSMODECFG = 3305;//获取快球聚焦模式信息
-    public static final int NET_DVR_SET_FOCUSMODECFG = 3306;//设置快球聚焦模式信息
+    public static final int NET_DVR_SET_FOCUSMODECFG = 13306;//设置快球聚焦模式信息
 
     public static final int NET_DVR_GET_SUPPLEMENTLIGHT = 3728;  //获取内置补光灯配置协议
     public static final int NET_DVR_SET_SUPPLEMENTLIGHT = 3729;  //设置内置补光灯配置协议

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/sdk/hkSdk/HkNVR.java

@@ -14,7 +14,6 @@ import com.sz.admin.monitor.utils.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
-import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/CanvasCfgService.java

@@ -0,0 +1,15 @@
+package com.sz.admin.monitor.service;
+
+
+import com.mybatisflex.core.service.IService;
+import com.sz.admin.monitor.pojo.dto.dataModel.CanvasCfgDTO;
+import com.sz.admin.monitor.pojo.po.CanvasCfgDO;
+
+/**
+ * @description:  画板
+ * @author xq
+ * @version 1.0
+ */
+public interface CanvasCfgService extends IService<CanvasCfgDO> {
+    void saveOrUpdateCanvas(CanvasCfgDTO canvasCfgDTO);
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/FileStorageService.java

@@ -0,0 +1,13 @@
+package com.sz.admin.monitor.service;
+
+
+import com.mybatisflex.core.service.IService;
+import com.sz.admin.monitor.pojo.po.FileStorageDO;
+
+/**
+ * @author xq
+ * @description:文件存储数据对象
+ * @date 2026/2/2 22:18
+ */
+public interface FileStorageService extends IService<FileStorageDO> {
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/GridCfgService.java

@@ -0,0 +1,15 @@
+package com.sz.admin.monitor.service;
+
+
+import com.mybatisflex.core.service.IService;
+import com.sz.admin.monitor.pojo.dto.dataModel.GridCfgDTO;
+import com.sz.admin.monitor.pojo.po.GridCfgDO;
+
+/**
+ * @author xq
+ * @description:网格
+ * @date 2026/1/29 11:45
+ */
+public interface GridCfgService extends IService<GridCfgDO> {
+    void saveOrUpdateGrid(GridCfgDTO gridCfgDTO);
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/ModelContentService.java

@@ -0,0 +1,18 @@
+package com.sz.admin.monitor.service;
+
+
+import com.mybatisflex.core.service.IService;
+import com.sz.admin.monitor.pojo.dto.dataModel.ModelContentDTO;
+import com.sz.admin.monitor.pojo.po.ModelContentDO;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * @description:  存储模型的基本信息和配置
+ * @author xq
+ * @version 1.0
+ */
+public interface ModelContentService extends IService<ModelContentDO> {
+    HashMap<String, List<String>> saveOrUpdateModel(List<ModelContentDTO> list,String menuType);
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/UserModelContentService.java

@@ -0,0 +1,12 @@
+package com.sz.admin.monitor.service;
+
+import com.mybatisflex.core.service.IService;
+import com.sz.admin.monitor.pojo.dto.dataModel.ModelContentDTO;
+import com.sz.admin.monitor.pojo.po.Substation;
+import com.sz.admin.monitor.pojo.po.UserModelContentDO;
+
+import java.util.List;
+
+public interface UserModelContentService extends IService<UserModelContentDO> {
+    public void saveOrUpdateModel(List<ModelContentDTO> list);
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/CameraServiceImpl.java

@@ -1,23 +1,34 @@
 package com.sz.admin.monitor.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.mybatisflex.core.logicdelete.LogicDeleteManager;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
-import com.sz.admin.monitor.listener.mode.CameraDeleteEvent;
+import com.sz.admin.monitor.enums.HKPTZPreEnum;
 import com.sz.admin.monitor.mapper.*;
 import com.sz.admin.monitor.pojo.dto.camera.CameraListDTO;
 import com.sz.admin.monitor.pojo.dto.camera.CameraUpdateDTO;
+import com.sz.admin.monitor.pojo.po.AlgorithmTask;
 import com.sz.admin.monitor.pojo.po.Camera;
 import com.sz.admin.monitor.pojo.po.EdgeBox;
 import com.sz.admin.monitor.pojo.po.Nvr;
 import com.sz.admin.monitor.pojo.po.table.CameraTableDef;
 import com.sz.admin.monitor.pojo.vo.camera.CameraVO;
+import com.sz.admin.monitor.pojo.vo.camerasnapshot.CameraSnapshotVO;
 import com.sz.admin.monitor.pojo.vo.edgebox.AlgorithmTaskVO;
-import com.sz.admin.monitor.service.AlgorithmTaskService;
+import com.sz.admin.monitor.pojo.vo.preset.PresetVO;
-import com.sz.admin.monitor.service.CameraService;
+import com.sz.admin.monitor.sdk.ManageNVR;
+import com.sz.admin.monitor.enums.HCPlayControlEnum;
+import com.sz.admin.monitor.service.*;
 import com.sz.admin.monitor.utils.AiBoxRequestUtil;
 import com.sz.admin.monitor.utils.RtspUtil;
+import com.sz.admin.monitor.utils.ZLMediaKitUtils;
+import com.sz.admin.teacher.pojo.po.TeacherStatistics;
+import com.sz.admin.teacher.pojo.vo.TeacherStatisticsVO;
 import com.sz.core.common.entity.PageResult;
 import com.sz.core.common.entity.SelectIdsDTO;
 import com.sz.core.common.enums.CommonResponseEnum;
@@ -27,10 +38,10 @@ import com.sz.core.util.BeanCopyUtils;
 import com.sz.core.util.PageUtils;
 import com.sz.core.util.Utils;
 import com.sz.platform.enums.AdminResponseEnum;
+import com.sz.security.core.util.LoginUtils;
 import jakarta.annotation.Resource;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -38,6 +49,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import static com.sz.admin.monitor.pojo.po.table.NvrTableDef.NVR;
 
@@ -63,8 +75,6 @@ public class CameraServiceImpl extends ServiceImpl<CameraMapper, Camera> impleme
     private AiBoxRequestUtil aiBoxRequestUtil;
     @Resource
     private EdgeBoxMapper edgeBoxMapper;
-    @Resource
-    private ApplicationEventPublisher applicationEventPublisher;
     // 自己注入自己
     @Resource
     @Lazy
@@ -126,45 +136,37 @@ public class CameraServiceImpl extends ServiceImpl<CameraMapper, Camera> impleme
         }
     }
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public void remove(SelectIdsDTO dto) {
         CommonResponseEnum.INVALID_ID.assertTrue(dto.getIds().isEmpty());
         List<Camera> cameraList = listByIds(dto.getIds());
         if (cameraList.isEmpty()) {
             return;
         }
-        // 直接删除摄像头
+        List<AlgorithmTaskVO> taskList = algorithmTaskService.listByCameraIds(dto.getIds());
-        cameraMapper.deleteBatchByIds(dto.getIds());
+        for (AlgorithmTaskVO task : taskList) {
-        // 发布事件
+            if (task != null && task.getAlgTaskSession() != null) {
-        applicationEventPublisher.publishEvent(new CameraDeleteEvent((List<Long>) dto.getIds()));
+                try {
-//        List<AlgorithmTaskVO> taskList = algorithmTaskService.listByCameraIds(dto.getIds());
+                    Long cameraId = task.getCameraId();
-//        for (AlgorithmTaskVO task : taskList) {
+                    Camera camera = this.getById(cameraId);
-//            if (task != null && task.getAlgTaskSession() != null) {
+                    Long boxId = camera.getBoxId();
-//                try {
+                    EdgeBox edgeBox = edgeBoxMapper.selectOneById(boxId);
-//                    Long cameraId = task.getCameraId();
+                    // 删除任务
-//                    Camera camera = this.getById(cameraId);
+                    aiBoxRequestUtil.controlTask(edgeBox.getIp(), edgeBox.getPort(), task.getAlgTaskSession(), 0);
-//                    Long boxId = camera.getBoxId();
+                    aiBoxRequestUtil.deleteTask(edgeBox.getIp(), edgeBox.getPort(), task.getAlgTaskSession());
-//                    EdgeBox edgeBox = edgeBoxMapper.selectOneById(boxId);
+                } catch (Exception e) {
-//                    // 删除任务
+                    log.error("清理 AI 盒子任务失败，摄像机ID: {}, Session: {}", task.getCameraId(), task.getAlgTaskSession(), e);
-//                    aiBoxRequestUtil.controlTask(edgeBox.getIp(), edgeBox.getPort(), task.getAlgTaskSession(), 0);
+                    throw new BusinessException(AdminResponseEnum.OPERATION_FAIL,null,"同步清理设备算法任务失败，请检查网络后重试");
-//                    aiBoxRequestUtil.deleteTask(edgeBox.getIp(), edgeBox.getPort(), task.getAlgTaskSession());
+                }
-//                } catch (Exception e) {
+            }
-//                    log.error("清理 AI 盒子任务失败，摄像机ID: {}, Session: {}", task.getCameraId(), task.getAlgTaskSession(), e);
+        }
-//                    throw new BusinessException(AdminResponseEnum.OPERATION_FAIL,null,"同步清理设备算法任务失败，请检查网络后重试");
+        for (Camera camera : cameraList) {
-//                }
+            // 删除通道
-//            }
+            Long boxId = camera.getBoxId();
-//        }
+            EdgeBox edgeBox = edgeBoxMapper.selectOneById(boxId);
-//        for (Camera camera : cameraList) {
+            aiBoxRequestUtil.deleteVideoChannel(edgeBox.getIp(), edgeBox.getPort(), camera.getId().toString());
-//            // 删除通道
+        }
-//            Long boxId = camera.getBoxId();
+        cameraService.batchDeleteLocalData(dto.getIds(), taskList);
-//            if (boxId == null)
-//                continue;
-//            EdgeBox edgeBox = edgeBoxMapper.selectOneById(boxId);
-//            aiBoxRequestUtil.deleteVideoChannel(edgeBox.getIp(), edgeBox.getPort(), camera.getId().toString());
-//        }
-//        cameraService.batchDeleteLocalData(dto.getIds(), taskList);
     }
-
     @Transactional(rollbackFor = Exception.class)
     public void batchDeleteLocalData(List<? extends Serializable> cameraIds, List<AlgorithmTaskVO> taskList) {
         // 1. 批量删除预置位

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/CameraSnapshotServiceImpl.java

@@ -7,7 +7,6 @@ import com.sz.admin.monitor.mapper.CameraMapper;
 import com.sz.admin.monitor.mapper.CameraSnapshotMapper;
 import com.sz.admin.monitor.pojo.po.Camera;
 import com.sz.admin.monitor.pojo.po.CameraSnapshot;
-import com.sz.admin.monitor.pojo.po.table.CameraSnapshotTableDef;
 import com.sz.admin.monitor.pojo.vo.camerasnapshot.CameraSnapshotVO;
 import com.sz.admin.monitor.sdk.ManageNVR;
 import com.sz.admin.monitor.service.CameraService;

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/CanvasCfgServiceImpl.java

@@ -0,0 +1,51 @@
+package com.sz.admin.monitor.service.impl;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.mybatisflex.core.query.QueryWrapper;
+import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.sz.admin.monitor.mapper.CanvasCfgMapper;
+import com.sz.admin.monitor.pojo.dto.dataModel.CanvasCfgDTO;
+import com.sz.admin.monitor.pojo.po.CanvasCfgDO;
+import com.sz.admin.monitor.service.CanvasCfgService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author xq
+ * @description: 画板
+ * @date 2026/1/29 11:34
+ */
+@Service
+public class CanvasCfgServiceImpl extends ServiceImpl<CanvasCfgMapper, CanvasCfgDO> implements CanvasCfgService {
+    @Override
+    public void saveOrUpdateCanvas(CanvasCfgDTO canvasCfgDTO) {
+        if(ObjectUtil.isEmpty(canvasCfgDTO))
+            return;
+        CanvasCfgDO canvasCfgDO = CanvasCfgDTO.dtoConvertDO(canvasCfgDTO);
+        if(StrUtil.isEmpty(canvasCfgDO.getUserId())) {
+            saveOrUpdate(canvasCfgDO);
+            return;
+        }
+
+        QueryWrapper queryWrapper = QueryWrapper
+            .create()
+            .from(CanvasCfgDO.class)
+            .eq(CanvasCfgDO.USER_ID, canvasCfgDTO.getUserId())
+            .limit(1);
+
+        CanvasCfgDO one = getOne(queryWrapper);
+
+//        CanvasCfgDO one = getOne(new QueryWrapper<CanvasCfgDO>()
+//            .eq(CanvasCfgDO.USER_ID, canvasCfgDTO.getUserId())
+//            .last("limit 1")
+//        );
+
+        if(ObjectUtil.isEmpty(one)) {
+            saveOrUpdate(canvasCfgDO);
+            return;
+        }
+        canvasCfgDO.setId(one.getId());
+        saveOrUpdate(canvasCfgDO);
+    }
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/DataModelServiceImpl.java

@@ -0,0 +1,272 @@
+package com.sz.admin.monitor.service.impl;
+
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.mybatisflex.core.query.QueryWrapper;
+import com.sz.admin.monitor.pojo.dto.dataModel.CanvasCfgDTO;
+import com.sz.admin.monitor.pojo.dto.dataModel.DataModelDTO;
+import com.sz.admin.monitor.pojo.dto.dataModel.GridCfgDTO;
+import com.sz.admin.monitor.pojo.dto.dataModel.ModelContentDTO;
+import com.sz.admin.monitor.pojo.po.CanvasCfgDO;
+import com.sz.admin.monitor.pojo.po.GridCfgDO;
+import com.sz.admin.monitor.pojo.po.ModelContentDO;
+import com.sz.admin.monitor.pojo.po.UserModelContentDO;
+import com.sz.admin.monitor.pojo.que.dataModel.DataModelQue;
+import com.sz.admin.monitor.service.CanvasCfgService;
+import com.sz.admin.monitor.service.GridCfgService;
+import com.sz.admin.monitor.service.ModelContentService;
+import com.sz.admin.monitor.service.UserModelContentService;
+import com.sz.core.common.entity.ApiResult;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * @author xq
+ * @description:
+ * @date 2026/1/29 10:51
+ */
+@Service
+public class DataModelServiceImpl {
+    @Autowired
+    private CanvasCfgService canvasCfgService; // 画板
+
+    @Autowired
+    private GridCfgService gridCfgService; // 网格
+
+    @Autowired
+    private ModelContentService modelContentService;  //模型
+
+    @Autowired
+    private UserModelContentService userModelContentService; //用户模型中间表
+
+    private static final String userId = "1";
+
+    public ApiResult<DataModelDTO> getModelData(DataModelQue que) {
+        if (StrUtil.isEmpty(que.getUserId()))
+            que.setUserId(userId);
+
+        QueryWrapper queryWrapper = QueryWrapper.create()
+            .from(CanvasCfgDO.class)
+            .eq(CanvasCfgDO.USER_ID, que.getUserId())
+            .limit(1);
+
+        // 获取画板数据
+        CanvasCfgDO canvasCfgDO = canvasCfgService.getOne(queryWrapper);
+
+//        CanvasCfgDO canvasCfgDO = canvasCfgService.getOne(new QueryWrapper<CanvasCfgDO>()
+//                .eq(CanvasCfgDO.USER_ID, que.getUserId())
+//                .last("limit 1")
+//        );
+        if (ObjectUtil.isEmpty(canvasCfgDO)) {
+            canvasCfgDO = initCanvasCfg();
+            canvasCfgService.saveOrUpdate(canvasCfgDO);
+        }
+
+        // 获取网格数据
+        GridCfgDO gridCfgDO = gridCfgService.getOne(QueryWrapper.create()
+            .from(GridCfgDO.class)
+            .eq(GridCfgDO.USER_ID, que.getUserId())
+            .limit(1)
+        );
+//        GridCfgDO gridCfgDO = gridCfgService.getOne(new QueryWrapper<GridCfgDO>()
+//                .eq(GridCfgDO.USER_ID, userId)
+//                .last("limit 1")
+//        );
+        if (ObjectUtil.isEmpty(gridCfgDO)) {
+            gridCfgDO = initGridCfg();
+            gridCfgService.saveOrUpdate(gridCfgDO);
+        }
+
+        //中间表
+        List<UserModelContentDO> userModelList = userModelContentService.list(QueryWrapper.create()
+            .from(UserModelContentDO.class)
+            .eq(UserModelContentDO.USER_ID, userId)
+            .eq(UserModelContentDO.MENU_TYPE, que.getMenuType())
+        );
+//        List<UserModelContentDO> userModelList = userModelContentService.list(new QueryWrapper<UserModelContentDO>()
+//            .eq(UserModelContentDO.USER_ID, userId)
+//            .eq(UserModelContentDO.MENU_TYPE, que.getMenuType())
+//        );
+
+        ArrayList<ModelContentDTO> objects = new ArrayList<>();
+
+        if (CollectionUtil.isEmpty(userModelList)) {
+            DataModelDTO build = DataModelDTO.builder()
+                .canvasCfg(CanvasCfgDO.doConvertDTO(canvasCfgDO))
+                .gridCfg(GridCfgDO.doConvertDTO(gridCfgDO))
+                .json(objects)
+                .build();
+            return ApiResult.success(build);
+        }
+
+        List<String> collect = userModelList.stream()
+            .map(item -> item.getModelContentId())
+            .collect(Collectors.toList());
+
+        List<ModelContentDO> modelContentDOS = modelContentService.list(QueryWrapper.create()
+            .from(ModelContentDO.class)
+            .in(ModelContentDO.ID, collect)
+            .orderBy(ModelContentDO.MODEL_INDEX, true)
+        );
+
+//        List<ModelContentDO> modelContentDOS = modelContentService.listByIds(collect);
+        for (ModelContentDO modelContentDO : modelContentDOS) {
+            objects.add(ModelContentDO.doConvertDTO(modelContentDO));
+        }
+        DataModelDTO build = DataModelDTO.builder()
+            .canvasCfg(CanvasCfgDO.doConvertDTO(canvasCfgDO))
+            .gridCfg(GridCfgDO.doConvertDTO(gridCfgDO))
+            .json(objects)
+            .build();
+        return ApiResult.success(build);
+    }
+
+    /**
+     * 初始化网格数据
+     *
+     * @return
+     */
+    public GridCfgDO initGridCfg() {
+        return GridCfgDO.builder()
+            .userId(userId)
+            .enabled(true)
+            .align(true)
+            .size(10)
+            .build();
+    }
+
+    /**
+     * 初始化画板数据
+     *
+     * @return
+     */
+    public CanvasCfgDO initCanvasCfg() {
+        return CanvasCfgDO.builder()
+            .width(1920)
+            .userId(userId)
+            .height(1080)
+            .scale(1D)
+            .color("")
+            .img("")
+            .guide(true)
+            .adsorp(true)
+            .adsorpDiff(5D)
+            .transformOrigin("{\"x\":0,\"y\":0}")
+            .dragOffset("{\"x\":0,\"y\":0}")
+            .build();
+    }
+
+    /**
+     * 保存模型数据
+     *
+     * @param dataModelDTO
+     * @param request
+     * @param response
+     * @return
+     */
+    @Transactional
+    public ApiResult saveOrUpdateModelData(DataModelDTO dataModelDTO, HttpServletRequest request, HttpServletResponse response) {
+        if (ObjectUtil.isEmpty(dataModelDTO))
+            throw new IllegalArgumentException("传值错误");
+        CanvasCfgDTO canvasCfg = dataModelDTO.getCanvasCfg();
+        GridCfgDTO gridCfg = dataModelDTO.getGridCfg();
+        List<ModelContentDTO> json=new ArrayList<>();
+        for (int i = 0; i < dataModelDTO.getJson().size(); i++) {
+            ModelContentDTO modelContentDTO = dataModelDTO.getJson().get(i);
+            modelContentDTO.setModelIndex(i);
+            json.add(modelContentDTO);
+        }
+        //保存、更新面板
+        canvasCfg.setUserId(userId);
+        canvasCfgService.saveOrUpdateCanvas(canvasCfg);
+
+        //保存、更新网格
+        gridCfg.setUserId(userId);
+        gridCfgService.saveOrUpdateGrid(gridCfg);
+
+        //保存数据模型
+        HashMap<String, List<String>> map = modelContentService.saveOrUpdateModel(json, dataModelDTO.getMenuType());
+
+        //获取中间表
+        List<UserModelContentDO> list = userModelContentService.list(QueryWrapper.create()
+            .from(UserModelContentDO.class)
+            .eq(UserModelContentDO.USER_ID, userId) //先写死
+            .eq(UserModelContentDO.MENU_TYPE, dataModelDTO.getMenuType())
+        );
+//        List<UserModelContentDO> list = userModelContentService.list(new QueryWrapper<UserModelContentDO>()
+//            .eq(UserModelContentDO.USER_ID, userId) //先写死
+//            .eq(UserModelContentDO.MENU_TYPE, dataModelDTO.getMenuType())
+//        );
+
+        if (CollectionUtil.isEmpty(map)) {
+            List<String> modelIds = list.stream()
+                .map(item -> item.getModelContentId())
+                .collect(Collectors.toList());
+            modelContentService.removeByIds(modelIds);
+
+            userModelContentService.remove(QueryWrapper.create()
+                .from(UserModelContentDO.class)
+                .eq(UserModelContentDO.USER_ID, userId)
+                .eq(UserModelContentDO.MENU_TYPE, dataModelDTO.getMenuType()));
+            return ApiResult.success();
+        }
+
+        //增加的id集合
+        List<String> addIdModels = map.get("addIdModels");
+        //跟新的id集合
+        List<String> updateIdModels = map.get("updateIdModels");
+        if (CollectionUtil.isEmpty(addIdModels))
+            return ApiResult.success();
+
+        //中间表没有数据，直接添加
+        if (CollectionUtil.isEmpty(list)) {
+            List<String> allModelIds = Stream.concat(addIdModels.stream(), updateIdModels.stream())
+                .distinct()
+                .collect(Collectors.toList());
+
+            for (String modelId : allModelIds) {
+                UserModelContentDO build = UserModelContentDO.builder()
+                    .userId(userId)
+                    .menuType(dataModelDTO.getMenuType())
+                    .modelContentId(modelId)
+                    .build();
+                userModelContentService.save(build);
+            }
+            return ApiResult.success();
+        } else { //中间表有数据
+            List<String> collect = list.stream().map(UserModelContentDO::getModelContentId).collect(Collectors.toList());
+            collect.removeAll(updateIdModels);
+            modelContentService.removeByIds(collect);
+            List<String> targetCollect = list.stream()
+                .filter(item -> collect.contains(item.getModelContentId()))
+                .map(UserModelContentDO::getId)
+                .collect(Collectors.toList());
+            userModelContentService.removeByIds(targetCollect);
+            for (String addIdModel : addIdModels) {
+                UserModelContentDO build = UserModelContentDO.builder()
+                    .userId(userId)
+                    .menuType(dataModelDTO.getMenuType())
+                    .modelContentId(addIdModel)
+                    .build();
+                userModelContentService.save(build);
+            }
+        }
+        return ApiResult.success();
+    }
+
+    public List<UserModelContentDO> getList() {
+        return null;
+    }
+
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/FileServiceImpl.java

@@ -0,0 +1,274 @@
+package com.sz.admin.monitor.service.impl;
+
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.codec.Base64;
+import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.mybatisflex.core.paginate.Page;
+import com.mybatisflex.core.query.QueryWrapper;
+import com.sz.admin.monitor.pojo.dto.camera.CameraListDTO;
+import com.sz.admin.monitor.pojo.dto.file.FileEntityDTO;
+import com.sz.admin.monitor.pojo.dto.file.FileStorageDTO;
+import com.sz.admin.monitor.pojo.po.Camera;
+import com.sz.admin.monitor.pojo.po.FileStorageDO;
+import com.sz.admin.monitor.pojo.po.Nvr;
+import com.sz.admin.monitor.pojo.que.file.FileStorageQue;
+import com.sz.admin.monitor.pojo.vo.camera.CameraVO;
+import com.sz.admin.monitor.service.FileStorageService;
+import com.sz.core.common.entity.ApiResult;
+import com.sz.core.common.entity.PageResult;
+import com.sz.core.datascope.SimpleDataScopeHelper;
+import com.sz.core.util.PageUtils;
+import com.sz.core.util.Utils;
+import com.sz.platform.enums.AdminResponseEnum;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.*;
+
+/**
+ * @author xq
+ * @description:文件存储业务
+ * @date 2026/3/13 15:28
+ */
+@Service
+public class FileServiceImpl {
+    @Autowired
+    private FileStorageService fileStorageService;
+
+    @Value("${file.object.storage.targetDir:/defaultFile}")
+    private String targetDir;
+
+    // 获取当前操作系统的文件分隔符
+    private static String separator = "/";
+
+    //获取文件流路径（请求路径）
+    private static String path = "/fileStorage/getPreviewFile/";
+
+    /**
+     * 删除文件
+     *
+     * @param id
+     * @return
+     */
+    public ApiResult<String> deleteFileById(String id) {
+        if (ObjectUtil.isEmpty(id))
+            return ApiResult.error(AdminResponseEnum.OPERATION_FAIL);
+        FileStorageDO fileStorageDO = fileStorageService.getById(id);
+        if (ObjectUtil.isEmpty(fileStorageDO))
+            return ApiResult.error(AdminResponseEnum.OPERATION_FAIL);
+        fileStorageService.removeById(id);
+        return ApiResult.success("删除成功");
+    }
+
+    /**
+     * 修改文件名称
+     *
+     * @param dto
+     * @return
+     */
+    public ApiResult<String> editFileNameById(FileEntityDTO dto) {
+        if (ObjectUtil.isEmpty(dto.getId()))
+            return ApiResult.error(AdminResponseEnum.OPERATION_FAIL);
+        FileStorageDO fileStorageDO = fileStorageService.getById(dto.getId());
+        if (ObjectUtil.isEmpty(fileStorageDO))
+            return ApiResult.error(AdminResponseEnum.OPERATION_FAIL);
+        fileStorageDO.setFileName(dto.getFileName());
+        fileStorageService.saveOrUpdate(fileStorageDO);
+        return ApiResult.success("修改成功");
+    }
+
+    /**
+     * 分页查询
+     *
+     * @param que
+     * @return
+     */
+    public ApiResult<PageResult<FileEntityDTO>> getFileObjectList(FileStorageQue que) {
+        SimpleDataScopeHelper.start(FileStorageDO.class); // 指定要追加条件的表PO实体
+
+        QueryWrapper queryWrapper = QueryWrapper.create()
+            .from(FileStorageDO.class)
+            .eq(FileStorageDO.ID, que.getId(), ObjectUtil.isNotEmpty(que.getId()))
+            .like(FileStorageDO.FILE_NAME, que.getFileName(), ObjectUtil.isNotEmpty(que.getFileName()));
+        if (ObjectUtil.isNotEmpty(que.getStartTime()) && ObjectUtil.isNotEmpty(que.getEndTime())) {
+            queryWrapper.between(
+                FileStorageDO.ADD_TIME,
+                new Date(que.getStartTime()),
+                new Date(que.getEndTime())
+            );
+        }
+        queryWrapper.orderBy(FileStorageDO.ADD_TIME, false);
+
+
+        Page<FileStorageDO> page = fileStorageService.pageAs(PageUtils.getPage(que), queryWrapper, FileStorageDO.class);// 调试sql
+        if (ObjectUtil.isEmpty(page) || page.getRecords().isEmpty())
+            return ApiResult.success(new PageResult<>(que.getPage().longValue(), que.getLimit().longValue(), 0, 0, new ArrayList<>()));
+
+        List<FileEntityDTO> fileEntityDTOS = new ArrayList<>();
+        for (FileStorageDO record : page.getRecords()) {
+            FileEntityDTO fileEntityDTO = BeanUtil.copyProperties(record, FileEntityDTO.class);
+            fileEntityDTO.setFilePath(path + record.getId());
+            fileEntityDTOS.add(fileEntityDTO);
+        }
+
+        return ApiResult.success(new PageResult<>(
+            page.getPageNumber(),
+            page.getPageSize(),
+            page.getTotalPage(),
+            page.getTotalRow(),
+            fileEntityDTOS));
+    }
+
+//    public ApiResult<PageResult<FileEntityDTO>> getFileObjectList(FileStorageQue que) {
+//        Page<FileStorageDO> doPage = BaseQue.init(que, FileStorageDO.class);
+//        Page<FileStorageDO> page = fileStorageService.page(doPage, new QueryWrapper<FileStorageDO>()
+//            .eq(ObjectUtil.isNotEmpty(que.getId()), FileStorageDO.ID, que.getId())
+//            .like(ObjectUtil.isNotEmpty(que.getFileName()), FileStorageDO.FILE_NAME, que.getFileName())
+//            .between(
+//                ObjectUtil.isNotEmpty(que.getStartTime()) && ObjectUtil.isNotEmpty(que.getEndTime())
+//                , FileStorageDO.ADD_TIME
+//                , que.getStartTime(), que.getEndTime())
+//            .orderByDesc(FileStorageDO.ADD_TIME)
+//        );
+//        if(ObjectUtil.isEmpty(page) || page.getRecords().isEmpty())
+//            return ResponseBody.ok();
+//
+//        BasePage<FileEntityDTO> basePage = new BasePage();
+//        basePage.setTotal(page.getTotal());
+//        basePage.setSize(page.getSize());
+//        basePage.setCurrent(page.getCurrent());
+//        basePage.setPages(page.getPages());
+//
+//        List<FileEntityDTO> fileEntityDTOS = new ArrayList<>();
+//        for (FileStorageDO record : page.getRecords()) {
+//            FileEntityDTO fileEntityDTO = BeanUtil.copyProperties(record, FileEntityDTO.class);
+//            fileEntityDTO.setFilePath(path+record.getId());
+//            fileEntityDTOS.add(fileEntityDTO);
+//        }
+//        basePage.setList(fileEntityDTOS);
+//        return ApiResult.success(basePage);
+//    }
+
+
+    /**
+     * 返回文件流
+     *
+     * @param id
+     * @return
+     */
+    public ResponseEntity<byte[]> getPreviewFile(String id) {
+        FileStorageDO fileStorageDO = fileStorageService.getById(id);
+        String filePath = fileStorageDO.getFileUrl();
+        // 使用Hutool读取文件并转换为Base64编码
+        byte[] imageBytes = FileUtil.readBytes(filePath);
+        String mimeType = getMimeType(filePath);
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.parseMediaType(mimeType));
+        headers.setContentLength(imageBytes.length);
+
+        return new ResponseEntity<>(imageBytes, headers, HttpStatus.OK);
+    }
+
+    /**
+     * 获取文件
+     *
+     * @param id
+     * @return
+     */
+    public ApiResult<FileStorageDTO> getFile(String id) {
+        FileStorageDO fileStorageDO = fileStorageService.getById(id);
+        if (ObjectUtil.isEmpty(fileStorageDO))
+            return ApiResult.error(AdminResponseEnum.OPERATION_FAIL);
+
+        String filePath = fileStorageDO.getFileUrl();
+        // 使用Hutool读取文件并转换为Base64编码
+        byte[] fileBytes = FileUtil.readBytes(filePath);
+        String base64Data = Base64.encode(fileBytes);
+        String mimeType = getMimeType(filePath);
+        String dataUrl = "data:" + mimeType + ";base64," + base64Data;
+        FileStorageDTO fileStorageDTO = BeanUtil.copyProperties(fileStorageDO, FileStorageDTO.class);
+        fileStorageDTO.setBase64Data(dataUrl);
+        return ApiResult.success(fileStorageDTO);
+    }
+
+    /**
+     * 图片存储
+     *
+     * @param file
+     * @return
+     */
+    public ApiResult<FileStorageDTO> saveFile(MultipartFile file) {
+        Map<String, Object> result = new HashMap<>();
+
+        if (file.isEmpty())
+            return ApiResult.error(AdminResponseEnum.OPERATION_FAIL);
+
+        String path = targetDir;
+        try {
+            FileUtil.mkdir(path);
+
+            // 生成唯一文件名
+            String fileName = System.currentTimeMillis() + "_" + file.getOriginalFilename();
+            String filePath = path + separator + fileName;
+
+            // 使用Hutool保存文件
+            FileUtil.writeBytes(file.getBytes(), filePath);
+
+            String mimeType = getMimeType(filePath);
+            FileStorageDTO fileDTO = FileStorageDTO.builder()
+                .fileUrl(filePath)
+                .fileSize(ObjectUtil.isNotEmpty(file.getSize()) ? String.valueOf(file.getSize()) : "0")
+                .fileName(file.getOriginalFilename())
+                .fileSuffix(mimeType)
+                .addTime(new Date())
+                .build();
+
+            FileStorageDO fileStorageDO = FileStorageDTO.dtoConvertDO(fileDTO);
+            fileStorageService.saveOrUpdate(fileStorageDO);
+            fileDTO.setId(fileStorageDO.getId());
+
+            String base64Data = Base64.encode(file.getBytes());
+            String dataUrl = "data:" + mimeType + ";base64," + base64Data;
+            fileDTO.setBase64Data(dataUrl);
+
+            return ApiResult.success(fileDTO);
+        } catch (IOException e) {
+            result.put("success", false);
+            result.put("message", "文件上传失败: " + e.getMessage());
+            return ApiResult.error(null);
+        }
+    }
+
+    public void test01() {
+        fileStorageService.list().forEach(System.out::println);
+    }
+
+    /**
+     * 根据文件扩展名获取MIME类型
+     */
+    private String getMimeType(String filePath) {
+        String lowerPath = filePath.toLowerCase();
+        if (lowerPath.endsWith(".jpg") || lowerPath.endsWith(".jpeg")) {
+            return "image/jpeg";
+        } else if (lowerPath.endsWith(".png")) {
+            return "image/png";
+        } else if (lowerPath.endsWith(".gif")) {
+            return "image/gif";
+        } else if (lowerPath.endsWith(".bmp")) {
+            return "image/bmp";
+        } else {
+            return "image/jpeg"; // 默认JPEG类型
+        }
+    }
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/FileStorageServiceImpl.java

@@ -0,0 +1,17 @@
+package com.sz.admin.monitor.service.impl;
+
+
+import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.sz.admin.monitor.mapper.FileStorageMapper;
+import com.sz.admin.monitor.pojo.po.FileStorageDO;
+import com.sz.admin.monitor.service.FileStorageService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author xq
+ * @description:文件存储数据对象
+ * @date 2026/2/2 22:18
+ */
+@Service
+public class FileStorageServiceImpl extends ServiceImpl<FileStorageMapper, FileStorageDO> implements FileStorageService {
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/GridCfgServiceImpl.java

@@ -0,0 +1,49 @@
+package com.sz.admin.monitor.service.impl;
+
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.mybatisflex.core.query.QueryWrapper;
+import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.sz.admin.monitor.mapper.GridCfgMapper;
+import com.sz.admin.monitor.pojo.dto.dataModel.GridCfgDTO;
+import com.sz.admin.monitor.pojo.po.GridCfgDO;
+import com.sz.admin.monitor.service.GridCfgService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author xq
+ * @description:网格
+ * @date 2026/1/29 11:45
+ */
+@Service
+public class GridCfgServiceImpl extends ServiceImpl<GridCfgMapper, GridCfgDO> implements GridCfgService {
+    @Override
+    public void saveOrUpdateGrid(GridCfgDTO dto) {
+        if (ObjectUtil.isEmpty(dto))
+            return;
+        GridCfgDO gridCfgDO = GridCfgDTO.dtoConvertDO(dto);
+        if (StrUtil.isEmpty(gridCfgDO.getUserId())) {
+            saveOrUpdate(gridCfgDO);
+            return;
+        }
+
+        QueryWrapper queryWrapper = QueryWrapper.create()
+            .from(GridCfgDO.class)
+            .eq(GridCfgDO.USER_ID, gridCfgDO.getUserId())
+            .limit(1);
+
+        GridCfgDO one = getOne(queryWrapper);
+
+//        GridCfgDO one = getOne(new QueryWrapper<GridCfgDO>()
+//            .eq(GridCfgDO.USER_ID, gridCfgDO.getUserId())
+//            .last("limit 1")
+//        );
+        if (ObjectUtil.isEmpty(one)) {
+            saveOrUpdate(gridCfgDO);
+            return;
+        }
+        gridCfgDO.setId(one.getId());
+        saveOrUpdate(gridCfgDO);
+    }
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/IpChannelServiceImpl.java

@@ -228,7 +228,7 @@ public class IpChannelServiceImpl extends ServiceImpl<CameraMapper, Camera> impl
 
     }
 
-    // 开启和关闭云台守望  0表示关闭，1表示开启
+    // 开启和关闭云台守望
     @Override
     @Transactional
     public boolean ControlSentinel(Long id, int openOrNo, int watchTime, Integer presetIndex) {
@@ -237,19 +237,15 @@ public class IpChannelServiceImpl extends ServiceImpl<CameraMapper, Camera> impl
         {
              flag = manageNVR.watchful(id.intValue(), openOrNo, watchTime, -1);
         }else {
-            if(presetIndex==null)
-            {
-                throw new BusinessException(AdminResponseEnum.OPERATION_FAIL, null, "预置点不能为空");
-            }
              flag = manageNVR.watchful(id.intValue(), openOrNo, watchTime, presetIndex);
         }
         if (flag) {
             // 获取当前预置点的ptz坐标，并且保存
-         //   PTZVO ptzLocation = manageNVR.getPTZLocation(id);
+            PTZVO ptzLocation = manageNVR.getPTZLocation(id);
-         //   ptzLocation.setCameraId(id);
+            ptzLocation.setCameraId(id);
             // 将ptz保存到redis中
-          //  stringRedisTemplate.opsForValue().set("camera:sentinel", JSON.toJSONString(ptzLocation));
+            stringRedisTemplate.opsForValue().set("camera:sentinel", JSON.toJSONString(ptzLocation));
-          //  log.info("ptz 坐标：{}", ptzLocation);
+            log.info("ptz 坐标：{}", ptzLocation);
             Camera camera = this.getById(id);
             // 保存守望信息
             camera.setWatchfulTime(watchTime);

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/ModelContentServiceImpl.java

@@ -0,0 +1,95 @@
+package com.sz.admin.monitor.service.impl;
+
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import com.mybatisflex.core.query.QueryWrapper;
+import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.sz.admin.monitor.mapper.ModelContentMapper;
+import com.sz.admin.monitor.pojo.dto.dataModel.ModelContentDTO;
+import com.sz.admin.monitor.pojo.po.ModelContentDO;
+import com.sz.admin.monitor.pojo.po.UserModelContentDO;
+import com.sz.admin.monitor.service.ModelContentService;
+import com.sz.admin.monitor.service.UserModelContentService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * @author xq
+ * @description:存储模型的基本信息和配置
+ * @date 2026/1/29 11:30
+ */
+@Component
+public class ModelContentServiceImpl extends ServiceImpl<ModelContentMapper, ModelContentDO> implements ModelContentService {
+
+    @Autowired
+    private UserModelContentService userModelContentService;
+
+    /**
+     * 保存、更新模型
+     *
+     * @param list
+     * @param menuType
+     * @return 返回一个map 只有两个key addIdModels是添加的id集合 updateIdModels是更新的id集合
+     */
+    @Override
+    public HashMap<String, List<String>> saveOrUpdateModel(List<ModelContentDTO> list, String menuType) {
+        if (CollectionUtil.isEmpty(list))
+            return null;
+
+        //获取需要保存的id,然后返回给中间表
+        List<String> addIdModels = new ArrayList<>();
+        List<String> updateIdModels = new ArrayList<>();
+        for (ModelContentDTO modelContentDTO : list) {
+            ModelContentDO modelContentDO = ModelContentDTO.dtoConvertDO(modelContentDTO);
+            disposeDO(modelContentDO, updateIdModels);
+
+            //这种情况可能是直接复用其他组件
+            if (StrUtil.isNotEmpty(modelContentDO.getId())) {
+                QueryWrapper queryWrapper = QueryWrapper.create()
+                    .select()
+                    .from(UserModelContentDO.class)
+                    .eq(UserModelContentDO.MODEL_CONTENT_ID, modelContentDO.getId())
+                    .eq(UserModelContentDO.MENU_TYPE, menuType)
+                    //true:ASC   false:DESC
+                    .orderBy(UserModelContentDO.ID, false)
+                    .limit(1);
+
+                List<UserModelContentDO> doList = userModelContentService.list(queryWrapper);
+                if (CollectionUtil.isEmpty(doList))
+                    modelContentDO.setId(null);
+                else
+                    updateIdModels.add(modelContentDO.getId());
+            }
+
+
+            saveOrUpdate(modelContentDO);
+            if (!updateIdModels.contains(modelContentDO.getId()))
+                addIdModels.add(modelContentDO.getId());
+        }
+        HashMap<String, List<String>> map = new HashMap<>();
+        map.put("addIdModels", addIdModels);
+        map.put("updateIdModels", updateIdModels);
+        return map;
+    }
+
+    /**
+     * 处理DO的id
+     *
+     * @param modelContentDO
+     */
+    public void disposeDO(ModelContentDO modelContentDO, List<String> updateIdModels) {
+        //这里是空，肯定是add
+        if (StrUtil.isEmpty(modelContentDO.getId()))
+            return;
+
+        //判断是否是前端生成的id
+        if (!modelContentDO.getId().matches("\\d+"))
+            modelContentDO.setId(null);
+
+    }
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/PresetServiceImpl.java

@@ -1,7 +1,6 @@
 package com.sz.admin.monitor.service.impl;
 
 import com.mybatisflex.core.query.QueryWrapper;
-import com.mybatisflex.core.update.UpdateChain;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
 import com.sz.admin.monitor.mapper.CameraMapper;
 import com.sz.admin.monitor.mapper.PresetMapper;
@@ -85,12 +84,13 @@ public class PresetServiceImpl extends ServiceImpl<PresetMapper, Preset> impleme
                 throw new BusinessException(AdminResponseEnum.CHANNEL_PRESET_FAIL, null, "当前预置位被设置为守望位，请先关闭或者修改守望位");
             }
             if (watchful.getWatchfulState() == 0 && isCurrentWatchful) {
-                // update Camera set watchfulIndex = null where id = 132 and watchfulIndex = 1
+                Camera updateEntity = new Camera();
-                UpdateChain.of(Camera.class)
+                updateEntity.setWatchfulIndex(null);
-                    .set(CameraTableDef.CAMERA.WATCHFUL_INDEX, null)
+                QueryWrapper updateWrapper = QueryWrapper.create()
+                    .from(CameraTableDef.CAMERA)
                     .where(CameraTableDef.CAMERA.ID.eq(dto.getCameraId()))
-                    .and(CameraTableDef.CAMERA.WATCHFUL_INDEX.eq(dto.getCurrentPresetIndex()))
+                    .and(CameraTableDef.CAMERA.WATCHFUL_INDEX.eq(dto.getCurrentPresetIndex()));
-                    .update();
+                int updateCount = cameraMapper.updateByQuery(updateEntity, updateWrapper);
             }
         }
         // 3. 删除预置位表中的数据

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/UserModelContentServiceImpl.java

@@ -0,0 +1,34 @@
+package com.sz.admin.monitor.service.impl;
+
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.mybatisflex.spring.service.impl.ServiceImpl;
+import com.sz.admin.monitor.mapper.SubstationMapper;
+import com.sz.admin.monitor.mapper.UserModelContentMapper;
+import com.sz.admin.monitor.pojo.dto.dataModel.ModelContentDTO;
+import com.sz.admin.monitor.pojo.po.Substation;
+import com.sz.admin.monitor.pojo.po.UserModelContentDO;
+import com.sz.admin.monitor.service.SubstationService;
+import com.sz.admin.monitor.service.UserModelContentService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author xq
+ * @description:
+ * @date 2026/3/13 10:23
+ */
+@Service
+@RequiredArgsConstructor
+public class UserModelContentServiceImpl extends ServiceImpl<UserModelContentMapper, UserModelContentDO> implements UserModelContentService {
+    @Override
+    public void saveOrUpdateModel(List<ModelContentDTO> list) {
+        if(CollectionUtil.isEmpty(list))
+            return;
+        for (ModelContentDTO modelContentDTO : list) {
+            ModelContentDTO.dtoConvertDO(modelContentDTO);
+        }
+    }
+}

sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/utils/AiBoxRequestUtil.java

@@ -96,6 +96,7 @@ public class AiBoxRequestUtil {
         JSONObject responseJSON = new JSONObject();
         responseJSON.put("code", CommonResponseEnum.MEDIA_HTTP_FAIL.getCode());
         responseJSON.put("msg", CommonResponseEnum.MEDIA_HTTP_FAIL.getMessage());
+
         MediaType JSON_TYPE = MediaType.parse("application/json; charset=utf-8");
         String jsonString = "";
         if (param != null) {

sz-service/sz-service-admin/src/main/resources/application.yml

@@ -75,3 +75,9 @@ management:
   endpoint:
     health:
       show-details: "never"
+
+
+file:
+  object:
+    storage:
+      targetDir: D:/work/images

sz-service/sz-service-admin/src/main/resources/db/changelog/business/1.0.0/000_demo.sql

@@ -1,52 +1,52 @@
---liquibase formatted sql
+-- --liquibase formatted sql
-
+--
---changeset 升职哦（sz）:20250425_0924
+-- --changeset 升职哦（sz）:20250425_0924
--- 以下为演示环境脚本，-- 仅供演示使用，实际业务请删除
+-- -- 以下为演示环境脚本，-- 仅供演示使用，实际业务请删除
-CREATE TABLE IF NOT EXISTS `teacher_statistics`  (
+-- CREATE TABLE IF NOT EXISTS `teacher_statistics`  (
-                                                     `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID',
+--                                                      `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID',
-                                                     `year` varchar(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '统计年限',
+--                                                      `year` varchar(4) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '统计年限',
-    `month` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '统计月份',
+--     `month` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '统计月份',
-    `during_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '统计年月',
+--     `during_time` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '统计年月',
-    `teacher_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '教师id',
+--     `teacher_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '教师id',
-    `teacher_common_type` int NOT NULL COMMENT '讲师区分类型',
+--     `teacher_common_type` int NOT NULL COMMENT '讲师区分类型',
-    `total_teaching` int NULL DEFAULT NULL COMMENT '授课总数',
+--     `total_teaching` int NULL DEFAULT NULL COMMENT '授课总数',
-    `total_class_count` int NULL DEFAULT NULL COMMENT '服务班次数',
+--     `total_class_count` int NULL DEFAULT NULL COMMENT '服务班次数',
-    `total_hours` decimal(10, 2) NULL DEFAULT NULL COMMENT '课时总数',
+--     `total_hours` decimal(10, 2) NULL DEFAULT NULL COMMENT '课时总数',
-    `check_status` int NOT NULL DEFAULT 0 COMMENT '核对状态',
+--     `check_status` int NOT NULL DEFAULT 0 COMMENT '核对状态',
-    `check_time` datetime NULL DEFAULT NULL COMMENT '核对时间',
+--     `check_time` datetime NULL DEFAULT NULL COMMENT '核对时间',
-    `create_time` datetime NULL DEFAULT NULL COMMENT '生成时间',
+--     `create_time` datetime NULL DEFAULT NULL COMMENT '生成时间',
-    `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
+--     `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间',
-    `last_sync_time` datetime NULL DEFAULT NULL COMMENT '最近一次同步时间',
+--     `last_sync_time` datetime NULL DEFAULT NULL COMMENT '最近一次同步时间',
-    `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
+--     `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
-    `create_id` bigint NULL DEFAULT NULL COMMENT '创建人ID',
+--     `create_id` bigint NULL DEFAULT NULL COMMENT '创建人ID',
-    `update_id` bigint NULL DEFAULT NULL COMMENT '更新人ID',
+--     `update_id` bigint NULL DEFAULT NULL COMMENT '更新人ID',
-    `dept_scope` json NULL COMMENT '部门范围',
+--     `dept_scope` json NULL COMMENT '部门范围',
-    PRIMARY KEY (`id`) USING BTREE
+--     PRIMARY KEY (`id`) USING BTREE
-    ) ENGINE = InnoDB AUTO_INCREMENT = 28 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '教师统计总览表' ROW_FORMAT = DYNAMIC;
+--     ) ENGINE = InnoDB AUTO_INCREMENT = 28 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '教师统计总览表' ROW_FORMAT = DYNAMIC;
-
+--
-INSERT IGNORE INTO `teacher_statistics` (`id`, `year`, `month`, `during_time`, `teacher_id`, `teacher_common_type`, `total_teaching`, `total_class_count`, `total_hours`, `check_status`, `check_time`, `create_time`, `update_time`, `last_sync_time`, `remark`, `create_id`, `update_id`, `dept_scope`) VALUES (22, '2018', '12', '03', '1503', 1000001, 12, 22, 15.00, 1000001, '2024-07-08 10:39:56', '2024-07-08 10:40:16', NULL, '2024-07-08 10:39:57', 'test1 创建记录', 3, NULL, '[4]');
+-- INSERT IGNORE INTO `teacher_statistics` (`id`, `year`, `month`, `during_time`, `teacher_id`, `teacher_common_type`, `total_teaching`, `total_class_count`, `total_hours`, `check_status`, `check_time`, `create_time`, `update_time`, `last_sync_time`, `remark`, `create_id`, `update_id`, `dept_scope`) VALUES (22, '2018', '12', '03', '1503', 1000001, 12, 22, 15.00, 1000001, '2024-07-08 10:39:56', '2024-07-08 10:40:16', NULL, '2024-07-08 10:39:57', 'test1 创建记录', 3, NULL, '[4]');
-INSERT IGNORE INTO `teacher_statistics` (`id`, `year`, `month`, `during_time`, `teacher_id`, `teacher_common_type`, `total_teaching`, `total_class_count`, `total_hours`, `check_status`, `check_time`, `create_time`, `update_time`, `last_sync_time`, `remark`, `create_id`, `update_id`, `dept_scope`) VALUES (23, '2019', '12', '03', '111', 1000001, 1, 2, 3.00, 1000001, '2024-07-08 10:41:09', '2024-07-08 10:41:18', NULL, '2024-07-08 10:41:11', 'test1 创建记录', 3, NULL, '[4]');
+-- INSERT IGNORE INTO `teacher_statistics` (`id`, `year`, `month`, `during_time`, `teacher_id`, `teacher_common_type`, `total_teaching`, `total_class_count`, `total_hours`, `check_status`, `check_time`, `create_time`, `update_time`, `last_sync_time`, `remark`, `create_id`, `update_id`, `dept_scope`) VALUES (23, '2019', '12', '03', '111', 1000001, 1, 2, 3.00, 1000001, '2024-07-08 10:41:09', '2024-07-08 10:41:18', NULL, '2024-07-08 10:41:11', 'test1 创建记录', 3, NULL, '[4]');
-INSERT IGNORE INTO `teacher_statistics` (`id`, `year`, `month`, `during_time`, `teacher_id`, `teacher_common_type`, `total_teaching`, `total_class_count`, `total_hours`, `check_status`, `check_time`, `create_time`, `update_time`, `last_sync_time`, `remark`, `create_id`, `update_id`, `dept_scope`) VALUES (24, '2020', '12', '2020-12', '023', 1000001, 1, 1, 1.00, 1000001, '2024-07-08 13:06:55', '2024-07-08 13:07:07', NULL, '2024-07-08 13:06:57', 'test1 创建记录', 3, NULL, '[4]');
+-- INSERT IGNORE INTO `teacher_statistics` (`id`, `year`, `month`, `during_time`, `teacher_id`, `teacher_common_type`, `total_teaching`, `total_class_count`, `total_hours`, `check_status`, `check_time`, `create_time`, `update_time`, `last_sync_time`, `remark`, `create_id`, `update_id`, `dept_scope`) VALUES (24, '2020', '12', '2020-12', '023', 1000001, 1, 1, 1.00, 1000001, '2024-07-08 13:06:55', '2024-07-08 13:07:07', NULL, '2024-07-08 13:06:57', 'test1 创建记录', 3, NULL, '[4]');
-INSERT IGNORE INTO `teacher_statistics` (`id`, `year`, `month`, `during_time`, `teacher_id`, `teacher_common_type`, `total_teaching`, `total_class_count`, `total_hours`, `check_status`, `check_time`, `create_time`, `update_time`, `last_sync_time`, `remark`, `create_id`, `update_id`, `dept_scope`) VALUES (25, '2021', '12', '2021-12', '123', 1000001, 1, 1, 1.00, 1000001, '2024-07-08 13:13:56', '2024-07-08 13:13:59', NULL, NULL, 'test2 创建记录', 4, NULL, '[15]');
+-- INSERT IGNORE INTO `teacher_statistics` (`id`, `year`, `month`, `during_time`, `teacher_id`, `teacher_common_type`, `total_teaching`, `total_class_count`, `total_hours`, `check_status`, `check_time`, `create_time`, `update_time`, `last_sync_time`, `remark`, `create_id`, `update_id`, `dept_scope`) VALUES (25, '2021', '12', '2021-12', '123', 1000001, 1, 1, 1.00, 1000001, '2024-07-08 13:13:56', '2024-07-08 13:13:59', NULL, NULL, 'test2 创建记录', 4, NULL, '[15]');
-INSERT IGNORE INTO `teacher_statistics` (`id`, `year`, `month`, `during_time`, `teacher_id`, `teacher_common_type`, `total_teaching`, `total_class_count`, `total_hours`, `check_status`, `check_time`, `create_time`, `update_time`, `last_sync_time`, `remark`, `create_id`, `update_id`, `dept_scope`) VALUES (26, '2022', '12', '2022-12', '13123', 1000001, 1, 1, 1.00, 1000001, '2024-07-08 13:15:36', '2024-07-08 13:15:37', '2024-07-08 13:15:46', NULL, 'test3 创建记录', 5, 5, '[15]');
+-- INSERT IGNORE INTO `teacher_statistics` (`id`, `year`, `month`, `during_time`, `teacher_id`, `teacher_common_type`, `total_teaching`, `total_class_count`, `total_hours`, `check_status`, `check_time`, `create_time`, `update_time`, `last_sync_time`, `remark`, `create_id`, `update_id`, `dept_scope`) VALUES (26, '2022', '12', '2022-12', '13123', 1000001, 1, 1, 1.00, 1000001, '2024-07-08 13:15:36', '2024-07-08 13:15:37', '2024-07-08 13:15:46', NULL, 'test3 创建记录', 5, 5, '[15]');
-INSERT IGNORE INTO `teacher_statistics` (`id`, `year`, `month`, `during_time`, `teacher_id`, `teacher_common_type`, `total_teaching`, `total_class_count`, `total_hours`, `check_status`, `check_time`, `create_time`, `update_time`, `last_sync_time`, `remark`, `create_id`, `update_id`, `dept_scope`) VALUES (27, '2099', '12', '12', '123123', 1000001, 1, 1, 1.00, 1000001, NULL, '2024-07-08 13:20:29', NULL, NULL, '管理员创建', 1, NULL, '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]');
+-- INSERT IGNORE INTO `teacher_statistics` (`id`, `year`, `month`, `during_time`, `teacher_id`, `teacher_common_type`, `total_teaching`, `total_class_count`, `total_hours`, `check_status`, `check_time`, `create_time`, `update_time`, `last_sync_time`, `remark`, `create_id`, `update_id`, `dept_scope`) VALUES (27, '2099', '12', '12', '123123', 1000001, 1, 1, 1.00, 1000001, NULL, '2024-07-08 13:20:29', NULL, NULL, '管理员创建', 1, NULL, '[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19]');
-
+--
-INSERT IGNORE INTO `generator_table` (`table_id`, `table_name`, `table_comment`, `class_name`, `camel_class_name`, `tpl_category`, `package_name`, `module_name`, `business_name`, `function_name`, `function_author`, `type`, `options`, `parent_menu_id`, `path`, `path_api`, `path_web`, `menu_init_type`, `btn_permission_type`, `has_import`, `has_export`, `generate_type`, `create_id`, `update_id`, `create_time`, `update_time`, `is_autofill`) VALUES (1, 'teacher_statistics', '教师统计总览表', 'TeacherStatistics', 'teacherStatistics', 'crud', 'com.sz.admin', 'teacherstatistics', 'teacherStatistics', '教师统计总览表', 'sz-admin', '0', NULL, '0', '/', 'E:\\dev\\Code\\Github\\sz-boot-parent\\sz-service\\sz-service-admin', '', '1', '1', '1', '1', 'all', 1, NULL, '2024-05-10 21:45:32', NULL, '1');
+-- INSERT IGNORE INTO `generator_table` (`table_id`, `table_name`, `table_comment`, `class_name`, `camel_class_name`, `tpl_category`, `package_name`, `module_name`, `business_name`, `function_name`, `function_author`, `type`, `options`, `parent_menu_id`, `path`, `path_api`, `path_web`, `menu_init_type`, `btn_permission_type`, `has_import`, `has_export`, `generate_type`, `create_id`, `update_id`, `create_time`, `update_time`, `is_autofill`) VALUES (1, 'teacher_statistics', '教师统计总览表', 'TeacherStatistics', 'teacherStatistics', 'crud', 'com.sz.admin', 'teacherstatistics', 'teacherStatistics', '教师统计总览表', 'sz-admin', '0', NULL, '0', '/', 'E:\\dev\\Code\\Github\\sz-boot-parent\\sz-service\\sz-service-admin', '', '1', '1', '1', '1', 'all', 1, NULL, '2024-05-10 21:45:32', NULL, '1');
-
+--
-INSERT IGNORE INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (1, 1, 'id', 'id', 'int', 'Long', 'input', 'number', NULL, 'id', 'Id', '1', '1', '0', '0', '1', '1', '0', '0', '0', '0', '0', NULL, 'EQ', 'input-number', '', '0', NULL, 1, 1, NULL, '2024-05-10 21:45:32', NULL, '0');
+-- INSERT IGNORE INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (1, 1, 'id', 'id', 'int', 'Long', 'input', 'number', NULL, 'id', 'Id', '1', '1', '0', '0', '1', '1', '0', '0', '0', '0', '0', NULL, 'EQ', 'input-number', '', '0', NULL, 1, 1, NULL, '2024-05-10 21:45:32', NULL, '0');
-INSERT IGNORE INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (2, 1, 'year', '统计年限', 'varchar(4)', 'String', 'input', 'string', NULL, 'year', 'Year', '0', '0', '1', '1', '1', '1', '1', '1', '1', '0', '0', NULL, 'EQ', 'input', '', '0', NULL, 2, 1, NULL, '2024-05-10 21:45:32', NULL, '0');
+-- INSERT IGNORE INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (2, 1, 'year', '统计年限', 'varchar(4)', 'String', 'input', 'string', NULL, 'year', 'Year', '0', '0', '1', '1', '1', '1', '1', '1', '1', '0', '0', NULL, 'EQ', 'input', '', '0', NULL, 2, 1, NULL, '2024-05-10 21:45:32', NULL, '0');
-INSERT IGNORE INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (3, 1, 'month', '统计月份', 'varchar(2)', 'String', 'input', 'string', NULL, 'month', 'Month', '0', '0', '1', '1', '1', '1', '1', '1', '1', '0', '0', NULL, 'EQ', 'input', '', '0', NULL, 3, 1, NULL, '2024-05-10 21:45:32', NULL, '0');
+-- INSERT IGNORE INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (3, 1, 'month', '统计月份', 'varchar(2)', 'String', 'input', 'string', NULL, 'month', 'Month', '0', '0', '1', '1', '1', '1', '1', '1', '1', '0', '0', NULL, 'EQ', 'input', '', '0', NULL, 3, 1, NULL, '2024-05-10 21:45:32', NULL, '0');
-INSERT IGNORE INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (4, 1, 'during_time', '统计年月', 'varchar(10)', 'String', 'date-picker', 'string', NULL, 'duringTime', 'DuringTime', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', NULL, 'EQ', 'input', '', '0', NULL, 4, 1, NULL, '2024-05-10 21:45:32', NULL, '0');
+-- INSERT IGNORE INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (4, 1, 'during_time', '统计年月', 'varchar(10)', 'String', 'date-picker', 'string', NULL, 'duringTime', 'DuringTime', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', NULL, 'EQ', 'input', '', '0', NULL, 4, 1, NULL, '2024-05-10 21:45:32', NULL, '0');
-INSERT IGNORE INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (5, 1, 'teacher_id', '教师id', 'varchar(32)', 'String', 'input', 'string', NULL, 'teacherId', 'TeacherId', '0', '0', '1', '1', '1', '1', '1', '1', '1', '0', '0', NULL, 'EQ', 'input', '', '0', NULL, 5, 1, NULL, '2024-05-10 21:45:32', NULL, '0');
+-- INSERT IGNORE INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (5, 1, 'teacher_id', '教师id', 'varchar(32)', 'String', 'input', 'string', NULL, 'teacherId', 'TeacherId', '0', '0', '1', '1', '1', '1', '1', '1', '1', '0', '0', NULL, 'EQ', 'input', '', '0', NULL, 5, 1, NULL, '2024-05-10 21:45:32', NULL, '0');
-INSERT IGNORE INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (6, 1, 'teacher_common_type', '讲师区分类型', 'int', 'Integer', 'select', 'number', NULL, 'teacherCommonType', 'TeacherCommonType', '0', '0', '1', '1', '1', '1', '1', '1', '1', '0', '0', NULL, 'EQ', 'select', '', '0', NULL, 6, 1, NULL, '2024-05-10 21:45:32', NULL, '0');
+-- INSERT IGNORE INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (6, 1, 'teacher_common_type', '讲师区分类型', 'int', 'Integer', 'select', 'number', NULL, 'teacherCommonType', 'TeacherCommonType', '0', '0', '1', '1', '1', '1', '1', '1', '1', '0', '0', NULL, 'EQ', 'select', '', '0', NULL, 6, 1, NULL, '2024-05-10 21:45:32', NULL, '0');
-INSERT IGNORE INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (7, 1, 'total_teaching', '授课总数', 'int', 'Integer', 'input', 'number', NULL, 'totalTeaching', 'TotalTeaching', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', NULL, 'EQ', 'input-number', '', '0', NULL, 7, 1, NULL, '2024-05-10 21:45:32', NULL, '0');
+-- INSERT IGNORE INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (7, 1, 'total_teaching', '授课总数', 'int', 'Integer', 'input', 'number', NULL, 'totalTeaching', 'TotalTeaching', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', NULL, 'EQ', 'input-number', '', '0', NULL, 7, 1, NULL, '2024-05-10 21:45:32', NULL, '0');
-INSERT IGNORE INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (8, 1, 'total_class_count', '服务班次数', 'int', 'Integer', 'input', 'number', NULL, 'totalClassCount', 'TotalClassCount', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', NULL, 'EQ', 'input-number', '', '0', NULL, 8, 1, NULL, '2024-05-10 21:45:32', NULL, '0');
+-- INSERT IGNORE INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (8, 1, 'total_class_count', '服务班次数', 'int', 'Integer', 'input', 'number', NULL, 'totalClassCount', 'TotalClassCount', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', NULL, 'EQ', 'input-number', '', '0', NULL, 8, 1, NULL, '2024-05-10 21:45:32', NULL, '0');
-INSERT IGNORE INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (9, 1, 'total_hours', '课时总数', 'decimal(10,2)', 'BigDecimal', 'input', 'number', 'java.math.BigDecimal', 'totalHours', 'TotalHours', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', NULL, 'EQ', 'input-number', '', '0', NULL, 9, 1, NULL, '2024-05-10 21:45:32', NULL, '0');
+-- INSERT IGNORE INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (9, 1, 'total_hours', '课时总数', 'decimal(10,2)', 'BigDecimal', 'input', 'number', 'java.math.BigDecimal', 'totalHours', 'TotalHours', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', NULL, 'EQ', 'input-number', '', '0', NULL, 9, 1, NULL, '2024-05-10 21:45:32', NULL, '0');
-INSERT IGNORE INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (10, 1, 'check_status', '核对状态', 'int', 'Integer', 'select', 'number', NULL, 'checkStatus', 'CheckStatus', '0', '0', '1', '1', '1', '1', '1', '1', '1', '0', '0', NULL, 'EQ', 'radio', '', '0', NULL, 10, 1, NULL, '2024-05-10 21:45:32', NULL, '0');
+-- INSERT IGNORE INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (10, 1, 'check_status', '核对状态', 'int', 'Integer', 'select', 'number', NULL, 'checkStatus', 'CheckStatus', '0', '0', '1', '1', '1', '1', '1', '1', '1', '0', '0', NULL, 'EQ', 'radio', '', '0', NULL, 10, 1, NULL, '2024-05-10 21:45:32', NULL, '0');
-INSERT IGNORE INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (11, 1, 'check_time', '核对时间', 'datetime', 'LocalDateTime', 'date-picker', 'string', 'java.time.LocalDateTime', 'checkTime', 'CheckTime', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', NULL, 'EQ', 'datetime', '', '0', NULL, 11, 1, NULL, '2024-05-10 21:45:32', NULL, '0');
+-- INSERT IGNORE INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (11, 1, 'check_time', '核对时间', 'datetime', 'LocalDateTime', 'date-picker', 'string', 'java.time.LocalDateTime', 'checkTime', 'CheckTime', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', NULL, 'EQ', 'datetime', '', '0', NULL, 11, 1, NULL, '2024-05-10 21:45:32', NULL, '0');
-INSERT IGNORE INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (12, 1, 'create_time', '生成时间', 'datetime', 'LocalDateTime', 'date-picker', 'string', 'java.time.LocalDateTime', 'createTime', 'CreateTime', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', 'FieldFill.INSERT', 'EQ', 'datetime', '', '0', NULL, 12, 1, NULL, '2024-05-10 21:45:32', NULL, '0');
+-- INSERT IGNORE INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (12, 1, 'create_time', '生成时间', 'datetime', 'LocalDateTime', 'date-picker', 'string', 'java.time.LocalDateTime', 'createTime', 'CreateTime', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', 'FieldFill.INSERT', 'EQ', 'datetime', '', '0', NULL, 12, 1, NULL, '2024-05-10 21:45:32', NULL, '0');
-INSERT IGNORE INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (13, 1, 'update_time', '更新时间', 'datetime', 'LocalDateTime', 'date-picker', 'string', 'java.time.LocalDateTime', 'updateTime', 'UpdateTime', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', 'FieldFill.UPDATE', 'EQ', 'datetime', '', '0', NULL, 13, 1, NULL, '2024-05-10 21:45:32', NULL, '0');
+-- INSERT IGNORE INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (13, 1, 'update_time', '更新时间', 'datetime', 'LocalDateTime', 'date-picker', 'string', 'java.time.LocalDateTime', 'updateTime', 'UpdateTime', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', 'FieldFill.UPDATE', 'EQ', 'datetime', '', '0', NULL, 13, 1, NULL, '2024-05-10 21:45:32', NULL, '0');
-INSERT IGNORE INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (14, 1, 'last_sync_time', '最近一次同步时间', 'datetime', 'LocalDateTime', 'date-picker', 'string', 'java.time.LocalDateTime', 'lastSyncTime', 'LastSyncTime', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', NULL, 'EQ', 'datetime', '', '0', NULL, 14, 1, NULL, '2024-05-10 21:45:32', NULL, '0');
+-- INSERT IGNORE INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (14, 1, 'last_sync_time', '最近一次同步时间', 'datetime', 'LocalDateTime', 'date-picker', 'string', 'java.time.LocalDateTime', 'lastSyncTime', 'LastSyncTime', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', NULL, 'EQ', 'datetime', '', '0', NULL, 14, 1, NULL, '2024-05-10 21:45:32', NULL, '0');
-INSERT IGNORE INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (15, 1, 'remark', '备注', 'varchar(255)', 'String', 'input', 'string', NULL, 'remark', 'Remark', '0', '0', '0', '1', '1', '1', '0', '1', '1', '0', '0', NULL, 'EQ', 'input', '', '0', NULL, 15, 1, NULL, '2024-05-10 21:45:32', NULL, '0');
+-- INSERT IGNORE INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (15, 1, 'remark', '备注', 'varchar(255)', 'String', 'input', 'string', NULL, 'remark', 'Remark', '0', '0', '0', '1', '1', '1', '0', '1', '1', '0', '0', NULL, 'EQ', 'input', '', '0', NULL, 15, 1, NULL, '2024-05-10 21:45:32', NULL, '0');
-
+--
-
+--

sz-service/sz-service-admin/src/main/resources/db/changelog/business/1.0.0/001_demo.sql

@@ -1,31 +1,31 @@
---liquibase formatted sql
+-- --liquibase formatted sql
-
+--
---changeset 升职哦（sz）:20250526_1636
+-- --changeset 升职哦（sz）:20250526_1636
--- 以下为演示环境脚本，-- 仅供演示使用，实际业务请删除
+-- -- 以下为演示环境脚本，-- 仅供演示使用，实际业务请删除
-UPDATE `sys_menu` SET `use_data_scope` = 'T' WHERE `id` = '85b54322630f43a39296488a5e76ba16';
+-- UPDATE `sys_menu` SET `use_data_scope` = 'T' WHERE `id` = '85b54322630f43a39296488a5e76ba16';
-DELETE FROM `generator_table` WHERE `table_id` = 1;
+-- DELETE FROM `generator_table` WHERE `table_id` = 1;
-DELETE FROM `generator_table_column` WHERE `table_id` = 1;
+-- DELETE FROM `generator_table_column` WHERE `table_id` = 1;
-ALTER TABLE `teacher_statistics`
+-- ALTER TABLE `teacher_statistics`
-    MODIFY COLUMN `create_time` datetime DEFAULT NULL COMMENT '生成时间' AFTER `create_id`,
+--     MODIFY COLUMN `create_time` datetime DEFAULT NULL COMMENT '生成时间' AFTER `create_id`,
-    MODIFY COLUMN `update_time` datetime DEFAULT NULL COMMENT '更新时间' AFTER `update_id`;
+--     MODIFY COLUMN `update_time` datetime DEFAULT NULL COMMENT '更新时间' AFTER `update_id`;
-
+--
-INSERT INTO `generator_table` (`table_id`, `table_name`, `table_comment`, `class_name`, `camel_class_name`, `tpl_category`, `package_name`, `module_name`, `business_name`, `function_name`, `function_author`, `type`, `options`, `parent_menu_id`, `path`, `path_api`, `path_web`, `menu_init_type`, `btn_permission_type`, `has_import`, `has_export`, `generate_type`, `create_id`, `update_id`, `create_time`, `update_time`, `is_autofill`) VALUES (1, 'teacher_statistics', '教师统计总览表', 'TeacherStatistics', 'teacherStatistics', 'crud', 'com.sz.admin', 'teacher', 'teacherStatistics', '教师统计总览表', 'sz-admin', '0', '', '0', '/', 'E:\\code\\Github\\sz\\sz-boot-parent\\sz-service\\sz-service-admin', '', '1', '1', '1', '1', 'all', 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '1');
+-- INSERT INTO `generator_table` (`table_id`, `table_name`, `table_comment`, `class_name`, `camel_class_name`, `tpl_category`, `package_name`, `module_name`, `business_name`, `function_name`, `function_author`, `type`, `options`, `parent_menu_id`, `path`, `path_api`, `path_web`, `menu_init_type`, `btn_permission_type`, `has_import`, `has_export`, `generate_type`, `create_id`, `update_id`, `create_time`, `update_time`, `is_autofill`) VALUES (1, 'teacher_statistics', '教师统计总览表', 'TeacherStatistics', 'teacherStatistics', 'crud', 'com.sz.admin', 'teacher', 'teacherStatistics', '教师统计总览表', 'sz-admin', '0', '', '0', '/', 'E:\\code\\Github\\sz\\sz-boot-parent\\sz-service\\sz-service-admin', '', '1', '1', '1', '1', 'all', 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '1');
-
+--
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (16, 1, 'id', 'ID', 'bigint', 'Long', 'input', 'number', '', 'id', 'Id', '1', '1', '0', '0', '1', '1', '0', '0', '0', '0', '0', '', 'EQ', 'input-number', '', '0', '', 1, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (16, 1, 'id', 'ID', 'bigint', 'Long', 'input', 'number', '', 'id', 'Id', '1', '1', '0', '0', '1', '1', '0', '0', '0', '0', '0', '', 'EQ', 'input-number', '', '0', '', 1, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (17, 1, 'year', '统计年限', 'varchar(4)', 'String', 'input', 'string', '', 'year', 'Year', '0', '0', '1', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'input', '', '0', '', 2, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (17, 1, 'year', '统计年限', 'varchar(4)', 'String', 'input', 'string', '', 'year', 'Year', '0', '0', '1', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'input', '', '0', '', 2, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (18, 1, 'month', '统计月份', 'varchar(2)', 'String', 'input', 'string', '', 'month', 'Month', '0', '0', '1', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'input', '', '0', '', 3, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (18, 1, 'month', '统计月份', 'varchar(2)', 'String', 'input', 'string', '', 'month', 'Month', '0', '0', '1', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'input', '', '0', '', 3, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (19, 1, 'during_time', '统计年月', 'varchar(10)', 'String', 'date-picker', 'string', '', 'duringTime', 'DuringTime', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'input', '', '0', '', 4, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (19, 1, 'during_time', '统计年月', 'varchar(10)', 'String', 'date-picker', 'string', '', 'duringTime', 'DuringTime', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'input', '', '0', '', 4, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (20, 1, 'teacher_id', '教师id', 'varchar(32)', 'String', 'input', 'string', '', 'teacherId', 'TeacherId', '0', '0', '1', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'input', '', '0', '', 5, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (20, 1, 'teacher_id', '教师id', 'varchar(32)', 'String', 'input', 'string', '', 'teacherId', 'TeacherId', '0', '0', '1', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'input', '', '0', '', 5, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (21, 1, 'teacher_common_type', '讲师区分类型', 'int', 'Integer', 'select', 'number', '', 'teacherCommonType', 'TeacherCommonType', '0', '0', '1', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'select', '', '0', '', 6, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (21, 1, 'teacher_common_type', '讲师区分类型', 'int', 'Integer', 'select', 'number', '', 'teacherCommonType', 'TeacherCommonType', '0', '0', '1', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'select', '', '0', '', 6, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (22, 1, 'total_teaching', '授课总数', 'int', 'Integer', 'input', 'number', '', 'totalTeaching', 'TotalTeaching', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'input-number', '', '0', '', 7, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (22, 1, 'total_teaching', '授课总数', 'int', 'Integer', 'input', 'number', '', 'totalTeaching', 'TotalTeaching', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'input-number', '', '0', '', 7, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (23, 1, 'total_class_count', '服务班次数', 'int', 'Integer', 'input', 'number', '', 'totalClassCount', 'TotalClassCount', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'input-number', '', '0', '', 8, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (23, 1, 'total_class_count', '服务班次数', 'int', 'Integer', 'input', 'number', '', 'totalClassCount', 'TotalClassCount', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'input-number', '', '0', '', 8, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (24, 1, 'total_hours', '课时总数', 'decimal(10,2)', 'BigDecimal', 'input', 'number', 'java.math.BigDecimal', 'totalHours', 'TotalHours', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'input-number', '', '0', '', 9, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (24, 1, 'total_hours', '课时总数', 'decimal(10,2)', 'BigDecimal', 'input', 'number', 'java.math.BigDecimal', 'totalHours', 'TotalHours', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'input-number', '', '0', '', 9, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (25, 1, 'check_status', '核对状态', 'int', 'Integer', 'select', 'number', '', 'checkStatus', 'CheckStatus', '0', '0', '1', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'radio', '', '0', '', 10, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (25, 1, 'check_status', '核对状态', 'int', 'Integer', 'select', 'number', '', 'checkStatus', 'CheckStatus', '0', '0', '1', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'radio', '', '0', '', 10, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (26, 1, 'check_time', '核对时间', 'datetime', 'LocalDateTime', 'date-picker', 'string', 'java.time.LocalDateTime', 'checkTime', 'CheckTime', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', '', 'BETWEEN', 'datetime', '', '0', '', 11, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (26, 1, 'check_time', '核对时间', 'datetime', 'LocalDateTime', 'date-picker', 'string', 'java.time.LocalDateTime', 'checkTime', 'CheckTime', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', '', 'BETWEEN', 'datetime', '', '0', '', 11, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (27, 1, 'last_sync_time', '最近一次同步时间', 'datetime', 'LocalDateTime', 'date-picker', 'string', 'java.time.LocalDateTime', 'lastSyncTime', 'LastSyncTime', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', '', 'BETWEEN', 'datetime', '', '0', '', 12, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (27, 1, 'last_sync_time', '最近一次同步时间', 'datetime', 'LocalDateTime', 'date-picker', 'string', 'java.time.LocalDateTime', 'lastSyncTime', 'LastSyncTime', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', '', 'BETWEEN', 'datetime', '', '0', '', 12, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (28, 1, 'remark', '备注', 'varchar(255)', 'String', 'input', 'string', '', 'remark', 'Remark', '0', '0', '0', '1', '1', '1', '0', '1', '1', '0', '0', '', 'EQ', 'input', '', '0', '', 13, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (28, 1, 'remark', '备注', 'varchar(255)', 'String', 'input', 'string', '', 'remark', 'Remark', '0', '0', '0', '1', '1', '1', '0', '1', '1', '0', '0', '', 'EQ', 'input', '', '0', '', 13, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (29, 1, 'create_id', '创建人ID', 'bigint', 'Long', 'input', 'number', '', 'createId', 'CreateId', '0', '0', '0', '0', '0', '1', '0', '0', '1', '1', '0', 'FieldFill.INSERT', 'EQ', 'input-number', 'dynamic_user_options', '0', '', 14, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (29, 1, 'create_id', '创建人ID', 'bigint', 'Long', 'input', 'number', '', 'createId', 'CreateId', '0', '0', '0', '0', '0', '1', '0', '0', '1', '1', '0', 'FieldFill.INSERT', 'EQ', 'input-number', 'dynamic_user_options', '0', '', 14, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (30, 1, 'create_time', '生成时间', 'datetime', 'LocalDateTime', 'date-picker', 'string', 'java.time.LocalDateTime', 'createTime', 'CreateTime', '0', '0', '0', '0', '0', '1', '0', '0', '1', '1', '0', 'FieldFill.INSERT', 'BETWEEN', 'datetime', '', '0', '', 15, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (30, 1, 'create_time', '生成时间', 'datetime', 'LocalDateTime', 'date-picker', 'string', 'java.time.LocalDateTime', 'createTime', 'CreateTime', '0', '0', '0', '0', '0', '1', '0', '0', '1', '1', '0', 'FieldFill.INSERT', 'BETWEEN', 'datetime', '', '0', '', 15, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (31, 1, 'update_id', '更新人ID', 'bigint', 'Long', 'input', 'number', '', 'updateId', 'UpdateId', '0', '0', '0', '0', '0', '1', '0', '0', '1', '1', '0', 'FieldFill.UPDATE', 'EQ', 'input-number', 'dynamic_user_options', '0', '', 16, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (31, 1, 'update_id', '更新人ID', 'bigint', 'Long', 'input', 'number', '', 'updateId', 'UpdateId', '0', '0', '0', '0', '0', '1', '0', '0', '1', '1', '0', 'FieldFill.UPDATE', 'EQ', 'input-number', 'dynamic_user_options', '0', '', 16, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (32, 1, 'update_time', '更新时间', 'datetime', 'LocalDateTime', 'date-picker', 'string', 'java.time.LocalDateTime', 'updateTime', 'UpdateTime', '0', '0', '0', '0', '0', '1', '0', '0', '1', '1', '0', 'FieldFill.UPDATE', 'BETWEEN', 'datetime', '', '0', '', 17, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (32, 1, 'update_time', '更新时间', 'datetime', 'LocalDateTime', 'date-picker', 'string', 'java.time.LocalDateTime', 'updateTime', 'UpdateTime', '0', '0', '0', '0', '0', '1', '0', '0', '1', '1', '0', 'FieldFill.UPDATE', 'BETWEEN', 'datetime', '', '0', '', 17, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (33, 1, 'dept_scope', '部门范围', 'json', 'String', 'input', 'string', '', 'deptScope', 'DeptScope', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '', 'EQ', '', '', '0', '', 18, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (33, 1, 'dept_scope', '部门范围', 'json', 'String', 'input', 'string', '', 'deptScope', 'DeptScope', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '', 'EQ', '', '', '0', '', 18, 1, 1, '2025-05-27 09:37:08', '2025-05-27 13:23:24', '0');

sz-service/sz-service-admin/src/main/resources/db/changelog/business/1.3.0/001_teacher.sql

@@ -1,10 +1,10 @@
---liquibase formatted sql
+-- --liquibase formatted sql
-
+--
---changeset 升职哦（sz）:20251013_1836
+-- --changeset 升职哦（sz）:20251013_1836
--- 以下为演示环境脚本，-- 仅供演示使用，实际业务请删除
+-- -- 以下为演示环境脚本，-- 仅供演示使用，实际业务请删除
-
+--
-ALTER TABLE `teacher_statistics` ADD COLUMN `url` json DEFAULT NULL COMMENT '文件地址(JSON)';
+-- ALTER TABLE `teacher_statistics` ADD COLUMN `url` json DEFAULT NULL COMMENT '文件地址(JSON)';
-
+--
---changeset 升职哦（sz）:20251021_2100
+-- --changeset 升职哦（sz）:20251021_2100
-UPDATE `teacher_statistics` SET  `url` = '[{\"url\": \"https://minioapi.szadmin.cn/test/teacher/20251021/bg1.png\", \"etag\": \"73be62dc9778dc13478c59f0c236feca\", \"size\": 105636, \"dirTag\": \"teacher\", \"fileId\": 158, \"filename\": \"bg1.png\", \"metaData\": {\"original-filename\": \"bg1.png\"}, \"objectName\": \"teacher/20251021/bg1.png\", \"contextType\": \"image/png\"}, {\"url\": \"https://minioapi.szadmin.cn/test/teacher/20251021/bg7.png\", \"etag\": \"6b6857c36b4fded86645d0ed2662869b\", \"size\": 66861, \"dirTag\": \"teacher\", \"fileId\": 156, \"filename\": \"bg7.png\", \"metaData\": {\"original-filename\": \"bg7.png\"}, \"objectName\": \"teacher/20251021/bg7.png\", \"contextType\": \"image/png\"}, {\"url\": \"https://minioapi.szadmin.cn/test/teacher/20251021/bg10.png\", \"etag\": \"9a546cb494af380c9e2cf5efac2ae362\", \"size\": 87531, \"dirTag\": \"teacher\", \"fileId\": 157, \"filename\": \"bg10.png\", \"metaData\": {\"original-filename\": \"bg10.png\"}, \"objectName\": \"teacher/20251021/bg10.png\", \"contextType\": \"image/png\"}]' WHERE `id` = 26;
+-- UPDATE `teacher_statistics` SET  `url` = '[{\"url\": \"https://minioapi.szadmin.cn/test/teacher/20251021/bg1.png\", \"etag\": \"73be62dc9778dc13478c59f0c236feca\", \"size\": 105636, \"dirTag\": \"teacher\", \"fileId\": 158, \"filename\": \"bg1.png\", \"metaData\": {\"original-filename\": \"bg1.png\"}, \"objectName\": \"teacher/20251021/bg1.png\", \"contextType\": \"image/png\"}, {\"url\": \"https://minioapi.szadmin.cn/test/teacher/20251021/bg7.png\", \"etag\": \"6b6857c36b4fded86645d0ed2662869b\", \"size\": 66861, \"dirTag\": \"teacher\", \"fileId\": 156, \"filename\": \"bg7.png\", \"metaData\": {\"original-filename\": \"bg7.png\"}, \"objectName\": \"teacher/20251021/bg7.png\", \"contextType\": \"image/png\"}, {\"url\": \"https://minioapi.szadmin.cn/test/teacher/20251021/bg10.png\", \"etag\": \"9a546cb494af380c9e2cf5efac2ae362\", \"size\": 87531, \"dirTag\": \"teacher\", \"fileId\": 157, \"filename\": \"bg10.png\", \"metaData\": {\"original-filename\": \"bg10.png\"}, \"objectName\": \"teacher/20251021/bg10.png\", \"contextType\": \"image/png\"}]' WHERE `id` = 26;
-UPDATE `teacher_statistics` SET  `url` = '[{\"url\": \"https://minioapi.szadmin.cn/test/teacher/20251021/bg4.png\", \"etag\": \"c4a227a6f24d5b818bf46a49d28cf282\", \"size\": 90015, \"dirTag\": \"teacher\", \"fileId\": 153, \"filename\": \"bg4.png\", \"metaData\": {\"original-filename\": \"bg4.png\"}, \"objectName\": \"teacher/20251021/bg4.png\", \"contextType\": \"image/png\"}, {\"url\": \"https://minioapi.szadmin.cn/test/teacher/20251021/bg5.png\", \"etag\": \"a6e547dcfe5a50a060d5f895857f0c9b\", \"size\": 70640, \"dirTag\": \"teacher\", \"fileId\": 152, \"filename\": \"bg5.png\", \"metaData\": {\"original-filename\": \"bg5.png\"}, \"objectName\": \"teacher/20251021/bg5.png\", \"contextType\": \"image/png\"}, {\"url\": \"https://minioapi.szadmin.cn/test/teacher/20251021/微信图片_20240420160033.jpg\", \"etag\": \"322e08e6b47cd85dec6a7b8dc9e88476\", \"size\": 20276, \"dirTag\": \"teacher\", \"fileId\": 151, \"filename\": \"微信图片_20240420160033.jpg\", \"metaData\": {\"original-filename\": \"微信图片_20240420160033.jpg\"}, \"objectName\": \"teacher/20251021/微信图片_20240420160033.jpg\", \"contextType\": \"image/jpeg\"}, {\"url\": \"https://minioapi.szadmin.cn/test/teacher/20251021/教师统计.xlsx\", \"etag\": \"47c4e1a9be3987a477d2c9672f761968\", \"size\": 5481, \"dirTag\": \"teacher\", \"fileId\": 154, \"filename\": \"教师统计.xlsx\", \"metaData\": {\"original-filename\": \"教师统计.xlsx\"}, \"objectName\": \"teacher/20251021/教师统计.xlsx\", \"contextType\": \"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet\"}, {\"url\": \"https://minioapi.szadmin.cn/test/teacher/20251021/题库导入模板.xlsx\", \"etag\": \"54e2201ec376091aeb3f25581feba1c1\", \"size\": 13862, \"dirTag\": \"teacher\", \"fileId\": 155, \"filename\": \"题库导入模板.xlsx\", \"metaData\": {\"original-filename\": \"题库导入模板.xlsx\"}, \"objectName\": \"teacher/20251021/题库导入模板.xlsx\", \"contextType\": \"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet\"}]' WHERE `id` = 27;
+-- UPDATE `teacher_statistics` SET  `url` = '[{\"url\": \"https://minioapi.szadmin.cn/test/teacher/20251021/bg4.png\", \"etag\": \"c4a227a6f24d5b818bf46a49d28cf282\", \"size\": 90015, \"dirTag\": \"teacher\", \"fileId\": 153, \"filename\": \"bg4.png\", \"metaData\": {\"original-filename\": \"bg4.png\"}, \"objectName\": \"teacher/20251021/bg4.png\", \"contextType\": \"image/png\"}, {\"url\": \"https://minioapi.szadmin.cn/test/teacher/20251021/bg5.png\", \"etag\": \"a6e547dcfe5a50a060d5f895857f0c9b\", \"size\": 70640, \"dirTag\": \"teacher\", \"fileId\": 152, \"filename\": \"bg5.png\", \"metaData\": {\"original-filename\": \"bg5.png\"}, \"objectName\": \"teacher/20251021/bg5.png\", \"contextType\": \"image/png\"}, {\"url\": \"https://minioapi.szadmin.cn/test/teacher/20251021/微信图片_20240420160033.jpg\", \"etag\": \"322e08e6b47cd85dec6a7b8dc9e88476\", \"size\": 20276, \"dirTag\": \"teacher\", \"fileId\": 151, \"filename\": \"微信图片_20240420160033.jpg\", \"metaData\": {\"original-filename\": \"微信图片_20240420160033.jpg\"}, \"objectName\": \"teacher/20251021/微信图片_20240420160033.jpg\", \"contextType\": \"image/jpeg\"}, {\"url\": \"https://minioapi.szadmin.cn/test/teacher/20251021/教师统计.xlsx\", \"etag\": \"47c4e1a9be3987a477d2c9672f761968\", \"size\": 5481, \"dirTag\": \"teacher\", \"fileId\": 154, \"filename\": \"教师统计.xlsx\", \"metaData\": {\"original-filename\": \"教师统计.xlsx\"}, \"objectName\": \"teacher/20251021/教师统计.xlsx\", \"contextType\": \"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet\"}, {\"url\": \"https://minioapi.szadmin.cn/test/teacher/20251021/题库导入模板.xlsx\", \"etag\": \"54e2201ec376091aeb3f25581feba1c1\", \"size\": 13862, \"dirTag\": \"teacher\", \"fileId\": 155, \"filename\": \"题库导入模板.xlsx\", \"metaData\": {\"original-filename\": \"题库导入模板.xlsx\"}, \"objectName\": \"teacher/20251021/题库导入模板.xlsx\", \"contextType\": \"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet\"}]' WHERE `id` = 27;

sz-service/sz-service-admin/src/main/resources/db/changelog/business/1.3.0/002_demo.sql

@@ -1,66 +1,66 @@
---liquibase formatted sql
+-- --liquibase formatted sql
-
+--
---changeset 升职哦（sz）:20251105_1934
+-- --changeset 升职哦（sz）:20251105_1934
-DELETE FROM `sys_role` WHERE id = 3 and permissions = 'teacher_statics_menu';
+-- DELETE FROM `sys_role` WHERE id = 3 and permissions = 'teacher_statics_menu';
--- 创建新的演示角色
+-- -- 创建新的演示角色
-INSERT IGNORE INTO `sys_role` (`id`, `role_name`, `remark`, `del_flag`, `create_time`, `update_time`, `create_id`, `update_id`, `is_lock`, `permissions`) VALUES (3, '教师统计-全部', '演示：数据权限-全部', 'F', '2024-05-10 21:53:15', '2025-11-05 13:39:50', NULL, 1, 'T', 'teacher_statics_menu_1006001');
+-- INSERT IGNORE INTO `sys_role` (`id`, `role_name`, `remark`, `del_flag`, `create_time`, `update_time`, `create_id`, `update_id`, `is_lock`, `permissions`) VALUES (3, '教师统计-全部', '演示：数据权限-全部', 'F', '2024-05-10 21:53:15', '2025-11-05 13:39:50', NULL, 1, 'T', 'teacher_statics_menu_1006001');
-INSERT IGNORE INTO `sys_role` (`id`, `role_name`, `remark`, `del_flag`, `create_time`, `update_time`, `create_id`, `update_id`, `is_lock`, `permissions`) VALUES (4, '教师统计-部门及以下', '演示：数据权限-部门及以下', 'F', '2025-11-05 11:24:40', '2025-11-05 13:39:45', 1, 1, 'T', 'teacher_statics_menu_1006002');
+-- INSERT IGNORE INTO `sys_role` (`id`, `role_name`, `remark`, `del_flag`, `create_time`, `update_time`, `create_id`, `update_id`, `is_lock`, `permissions`) VALUES (4, '教师统计-部门及以下', '演示：数据权限-部门及以下', 'F', '2025-11-05 11:24:40', '2025-11-05 13:39:45', 1, 1, 'T', 'teacher_statics_menu_1006002');
-INSERT IGNORE INTO `sys_role` (`id`, `role_name`, `remark`, `del_flag`, `create_time`, `update_time`, `create_id`, `update_id`, `is_lock`, `permissions`) VALUES (5, '教师统计-仅本部', '演示：数据权限-仅本部', 'F', '2025-11-05 11:25:21', '2025-11-05 13:40:02', 1, 1, 'T', 'teacher_statics_menu_1006003');
+-- INSERT IGNORE INTO `sys_role` (`id`, `role_name`, `remark`, `del_flag`, `create_time`, `update_time`, `create_id`, `update_id`, `is_lock`, `permissions`) VALUES (5, '教师统计-仅本部', '演示：数据权限-仅本部', 'F', '2025-11-05 11:25:21', '2025-11-05 13:40:02', 1, 1, 'T', 'teacher_statics_menu_1006003');
-INSERT IGNORE INTO `sys_role` (`id`, `role_name`, `remark`, `del_flag`, `create_time`, `update_time`, `create_id`, `update_id`, `is_lock`, `permissions`) VALUES (6, '教师统计-仅本人', '演示：数据权限-仅本人', 'F', '2025-11-05 13:39:19', '2025-11-05 13:40:08', 1, 1, 'T', 'teacher_statics_menu_1006004');
+-- INSERT IGNORE INTO `sys_role` (`id`, `role_name`, `remark`, `del_flag`, `create_time`, `update_time`, `create_id`, `update_id`, `is_lock`, `permissions`) VALUES (6, '教师统计-仅本人', '演示：数据权限-仅本人', 'F', '2025-11-05 13:39:19', '2025-11-05 13:40:08', 1, 1, 'T', 'teacher_statics_menu_1006004');
-INSERT IGNORE INTO `sys_role` (`id`, `role_name`, `remark`, `del_flag`, `create_time`, `update_time`, `create_id`, `update_id`, `is_lock`, `permissions`) VALUES (7, '教师统计-自定义', '演示：数据权限-自定义', 'F', '2025-11-05 13:46:50', '2025-11-05 13:46:50', 1, 1, 'T', 'teacher_statics_menu_1006005');
+-- INSERT IGNORE INTO `sys_role` (`id`, `role_name`, `remark`, `del_flag`, `create_time`, `update_time`, `create_id`, `update_id`, `is_lock`, `permissions`) VALUES (7, '教师统计-自定义', '演示：数据权限-自定义', 'F', '2025-11-05 13:46:50', '2025-11-05 13:46:50', 1, 1, 'T', 'teacher_statics_menu_1006005');
--- 为新的角色分配菜单权
+-- -- 为新的角色分配菜单权
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('ab1ac16c617d41979472ebe433c1f8e4', 3, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('ab1ac16c617d41979472ebe433c1f8e4', 3, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('85b54322630f43a39296488a5e76ba16', 3, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('85b54322630f43a39296488a5e76ba16', 3, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('cb3500315dba4c2d83e4d92edf36dff7', 3, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('cb3500315dba4c2d83e4d92edf36dff7', 3, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('7391f12ad51049c2b86d231d39708c71', 3, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('7391f12ad51049c2b86d231d39708c71', 3, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('73d312f4fa8949ddba3d9807c0c56f00', 3, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('73d312f4fa8949ddba3d9807c0c56f00', 3, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('91ccb13b5c174583803a4c492a5dfdb6', 3, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('91ccb13b5c174583803a4c492a5dfdb6', 3, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('8061d8e79be744bf91b7b438f8e8e887', 3, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('8061d8e79be744bf91b7b438f8e8e887', 3, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('85b54322630f43a39296488a5e76ba16', 3, 'scope', '1006001');
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('85b54322630f43a39296488a5e76ba16', 3, 'scope', '1006001');
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('ab1ac16c617d41979472ebe433c1f8e4', 4, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('ab1ac16c617d41979472ebe433c1f8e4', 4, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('85b54322630f43a39296488a5e76ba16', 4, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('85b54322630f43a39296488a5e76ba16', 4, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('cb3500315dba4c2d83e4d92edf36dff7', 4, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('cb3500315dba4c2d83e4d92edf36dff7', 4, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('7391f12ad51049c2b86d231d39708c71', 4, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('7391f12ad51049c2b86d231d39708c71', 4, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('73d312f4fa8949ddba3d9807c0c56f00', 4, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('73d312f4fa8949ddba3d9807c0c56f00', 4, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('91ccb13b5c174583803a4c492a5dfdb6', 4, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('91ccb13b5c174583803a4c492a5dfdb6', 4, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('8061d8e79be744bf91b7b438f8e8e887', 4, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('8061d8e79be744bf91b7b438f8e8e887', 4, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('85b54322630f43a39296488a5e76ba16', 4, 'scope', '1006002');
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('85b54322630f43a39296488a5e76ba16', 4, 'scope', '1006002');
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('ab1ac16c617d41979472ebe433c1f8e4', 6, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('ab1ac16c617d41979472ebe433c1f8e4', 6, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('85b54322630f43a39296488a5e76ba16', 6, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('85b54322630f43a39296488a5e76ba16', 6, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('cb3500315dba4c2d83e4d92edf36dff7', 6, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('cb3500315dba4c2d83e4d92edf36dff7', 6, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('7391f12ad51049c2b86d231d39708c71', 6, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('7391f12ad51049c2b86d231d39708c71', 6, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('73d312f4fa8949ddba3d9807c0c56f00', 6, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('73d312f4fa8949ddba3d9807c0c56f00', 6, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('91ccb13b5c174583803a4c492a5dfdb6', 6, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('91ccb13b5c174583803a4c492a5dfdb6', 6, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('8061d8e79be744bf91b7b438f8e8e887', 6, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('8061d8e79be744bf91b7b438f8e8e887', 6, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('85b54322630f43a39296488a5e76ba16', 6, 'scope', '1006004');
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('85b54322630f43a39296488a5e76ba16', 6, 'scope', '1006004');
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('ab1ac16c617d41979472ebe433c1f8e4', 5, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('ab1ac16c617d41979472ebe433c1f8e4', 5, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('85b54322630f43a39296488a5e76ba16', 5, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('85b54322630f43a39296488a5e76ba16', 5, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('cb3500315dba4c2d83e4d92edf36dff7', 5, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('cb3500315dba4c2d83e4d92edf36dff7', 5, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('7391f12ad51049c2b86d231d39708c71', 5, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('7391f12ad51049c2b86d231d39708c71', 5, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('73d312f4fa8949ddba3d9807c0c56f00', 5, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('73d312f4fa8949ddba3d9807c0c56f00', 5, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('91ccb13b5c174583803a4c492a5dfdb6', 5, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('91ccb13b5c174583803a4c492a5dfdb6', 5, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('8061d8e79be744bf91b7b438f8e8e887', 5, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('8061d8e79be744bf91b7b438f8e8e887', 5, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('85b54322630f43a39296488a5e76ba16', 5, 'scope', '1006003');
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('85b54322630f43a39296488a5e76ba16', 5, 'scope', '1006003');
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('ab1ac16c617d41979472ebe433c1f8e4', 7, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('ab1ac16c617d41979472ebe433c1f8e4', 7, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('85b54322630f43a39296488a5e76ba16', 7, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('85b54322630f43a39296488a5e76ba16', 7, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('cb3500315dba4c2d83e4d92edf36dff7', 7, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('cb3500315dba4c2d83e4d92edf36dff7', 7, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('7391f12ad51049c2b86d231d39708c71', 7, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('7391f12ad51049c2b86d231d39708c71', 7, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('73d312f4fa8949ddba3d9807c0c56f00', 7, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('73d312f4fa8949ddba3d9807c0c56f00', 7, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('91ccb13b5c174583803a4c492a5dfdb6', 7, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('91ccb13b5c174583803a4c492a5dfdb6', 7, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('8061d8e79be744bf91b7b438f8e8e887', 7, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('8061d8e79be744bf91b7b438f8e8e887', 7, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('85b54322630f43a39296488a5e76ba16', 7, 'scope', '1006005');
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('85b54322630f43a39296488a5e76ba16', 7, 'scope', '1006005');
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('d90946bc9ed54e598e3c4471dbd1f496', 2, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('d90946bc9ed54e598e3c4471dbd1f496', 2, 'menu', NULL);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('7a4544831af34e69aa73148bf84b9924', 2, 'menu', NULL);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`, `permission_type`, `data_scope_cd`) VALUES ('7a4544831af34e69aa73148bf84b9924', 2, 'menu', NULL);
-
+--
--- 为自定义角色分配数据权限
+-- -- 为自定义角色分配数据权限
-INSERT IGNORE INTO `sys_data_role_relation` (`role_id`, `relation_type_cd`, `relation_id`, `menu_id`) VALUES (7, '1007001', 3, '85b54322630f43a39296488a5e76ba16');
+-- INSERT IGNORE INTO `sys_data_role_relation` (`role_id`, `relation_type_cd`, `relation_id`, `menu_id`) VALUES (7, '1007001', 3, '85b54322630f43a39296488a5e76ba16');
-INSERT IGNORE INTO `sys_data_role_relation` (`role_id`, `relation_type_cd`, `relation_id`, `menu_id`) VALUES (7, '1007001', 5, '85b54322630f43a39296488a5e76ba16');
+-- INSERT IGNORE INTO `sys_data_role_relation` (`role_id`, `relation_type_cd`, `relation_id`, `menu_id`) VALUES (7, '1007001', 5, '85b54322630f43a39296488a5e76ba16');
-INSERT IGNORE INTO `sys_data_role_relation` (`role_id`, `relation_type_cd`, `relation_id`, `menu_id`) VALUES (7, '1007002', 15, '85b54322630f43a39296488a5e76ba16');
+-- INSERT IGNORE INTO `sys_data_role_relation` (`role_id`, `relation_type_cd`, `relation_id`, `menu_id`) VALUES (7, '1007002', 15, '85b54322630f43a39296488a5e76ba16');
-
+--
---changeset 升职哦（sz）:20251106_2018
+-- --changeset 升职哦（sz）:20251106_2018
-DELETE `sys_user_role` FROM `sys_user_role` JOIN `sys_user` on `sys_user_role`.`user_id` = `sys_user`.`id` where `sys_user`.`username` in ('user', 'test1', 'test2', 'test3', 'test4');
+-- DELETE `sys_user_role` FROM `sys_user_role` JOIN `sys_user` on `sys_user_role`.`user_id` = `sys_user`.`id` where `sys_user`.`username` in ('user', 'test1', 'test2', 'test3', 'test4');
-INSERT INTO `sys_user_role` (`role_id`, `user_id`) VALUES (3, 2);
+-- INSERT INTO `sys_user_role` (`role_id`, `user_id`) VALUES (3, 2);
-INSERT INTO `sys_user_role` (`role_id`, `user_id`) VALUES (4, 3);
+-- INSERT INTO `sys_user_role` (`role_id`, `user_id`) VALUES (4, 3);
-INSERT INTO `sys_user_role` (`role_id`, `user_id`) VALUES (5, 4);
+-- INSERT INTO `sys_user_role` (`role_id`, `user_id`) VALUES (5, 4);
-INSERT INTO `sys_user_role` (`role_id`, `user_id`) VALUES (6, 5);
+-- INSERT INTO `sys_user_role` (`role_id`, `user_id`) VALUES (6, 5);
-INSERT INTO `sys_user_role` (`role_id`, `user_id`) VALUES (7, 6);
+-- INSERT INTO `sys_user_role` (`role_id`, `user_id`) VALUES (7, 6);

sz-service/sz-service-admin/src/main/resources/db/changelog/business/1.3.0/003_generator.sql

@@ -1,28 +1,28 @@
---liquibase formatted sql
+-- --liquibase formatted sql
-
+--
---changeset 升职哦（sz）:20251108_1239
+-- --changeset 升职哦（sz）:20251108_1239
---comment: 更新代码生成器的演示记录
+-- --comment: 更新代码生成器的演示记录
-TRUNCATE TABLE generator_table;
+-- TRUNCATE TABLE generator_table;
-TRUNCATE TABLE generator_table_column;
+-- TRUNCATE TABLE generator_table_column;
-
+--
-INSERT INTO `generator_table` (`table_id`, `table_name`, `table_comment`, `class_name`, `camel_class_name`, `tpl_category`, `package_name`, `module_name`, `business_name`, `function_name`, `function_author`, `type`, `options`, `parent_menu_id`, `path`, `path_api`, `path_web`, `menu_init_type`, `btn_permission_type`, `btn_data_scope_type`, `has_import`, `has_export`, `generate_type`, `create_id`, `update_id`, `create_time`, `update_time`, `is_autofill`) VALUES (2, 'teacher_statistics', '教师统计总览表', 'TeacherStatistics', 'teacherStatistics', 'crud', 'com.sz.admin', 'teacher', 'teacherStatistics', '教师统计总览表', 'sz-admin', '0', '', '0', '/', 'E:\\dev\\Code\\Github\\sz-boot-parent\\sz-service\\sz-service-admin', '', '1', '1', '1', '1', '1', 'all', 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:28', '1');
+-- INSERT INTO `generator_table` (`table_id`, `table_name`, `table_comment`, `class_name`, `camel_class_name`, `tpl_category`, `package_name`, `module_name`, `business_name`, `function_name`, `function_author`, `type`, `options`, `parent_menu_id`, `path`, `path_api`, `path_web`, `menu_init_type`, `btn_permission_type`, `btn_data_scope_type`, `has_import`, `has_export`, `generate_type`, `create_id`, `update_id`, `create_time`, `update_time`, `is_autofill`) VALUES (2, 'teacher_statistics', '教师统计总览表', 'TeacherStatistics', 'teacherStatistics', 'crud', 'com.sz.admin', 'teacher', 'teacherStatistics', '教师统计总览表', 'sz-admin', '0', '', '0', '/', 'E:\\dev\\Code\\Github\\sz-boot-parent\\sz-service\\sz-service-admin', '', '1', '1', '1', '1', '1', 'all', 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:28', '1');
-
+--
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (34, 2, 'id', 'ID', 'bigint', 'Long', 'input', 'number', '', 'id', 'Id', '1', '1', '0', '0', '1', '1', '0', '0', '0', '0', '0', '', 'EQ', 'input-number', '', '0', '{}', 1, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (34, 2, 'id', 'ID', 'bigint', 'Long', 'input', 'number', '', 'id', 'Id', '1', '1', '0', '0', '1', '1', '0', '0', '0', '0', '0', '', 'EQ', 'input-number', '', '0', '{}', 1, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (35, 2, 'year', '统计年限', 'varchar(4)', 'String', 'input', 'string', '', 'year', 'Year', '0', '0', '1', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'input', '', '0', '{}', 2, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (35, 2, 'year', '统计年限', 'varchar(4)', 'String', 'input', 'string', '', 'year', 'Year', '0', '0', '1', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'input', '', '0', '{}', 2, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (36, 2, 'month', '统计月份', 'varchar(2)', 'String', 'input', 'string', '', 'month', 'Month', '0', '0', '1', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'input', '', '0', '{}', 3, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (36, 2, 'month', '统计月份', 'varchar(2)', 'String', 'input', 'string', '', 'month', 'Month', '0', '0', '1', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'input', '', '0', '{}', 3, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (37, 2, 'during_time', '统计年月', 'varchar(10)', 'String', 'date-picker', 'string', '', 'duringTime', 'DuringTime', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'input', '', '0', '{}', 4, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (37, 2, 'during_time', '统计年月', 'varchar(10)', 'String', 'date-picker', 'string', '', 'duringTime', 'DuringTime', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'input', '', '0', '{}', 4, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (38, 2, 'teacher_id', '教师id', 'varchar(32)', 'String', 'input', 'string', '', 'teacherId', 'TeacherId', '0', '0', '1', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'input', '', '0', '{}', 5, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (38, 2, 'teacher_id', '教师id', 'varchar(32)', 'String', 'input', 'string', '', 'teacherId', 'TeacherId', '0', '0', '1', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'input', '', '0', '{}', 5, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (39, 2, 'teacher_common_type', '讲师区分类型', 'int', 'Integer', 'select', 'number', '', 'teacherCommonType', 'TeacherCommonType', '0', '0', '1', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'select', '', '0', '{}', 6, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (39, 2, 'teacher_common_type', '讲师区分类型', 'int', 'Integer', 'select', 'number', '', 'teacherCommonType', 'TeacherCommonType', '0', '0', '1', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'select', '', '0', '{}', 6, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (40, 2, 'total_teaching', '授课总数', 'int', 'Integer', 'input', 'number', '', 'totalTeaching', 'TotalTeaching', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'input-number', '', '0', '{}', 7, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (40, 2, 'total_teaching', '授课总数', 'int', 'Integer', 'input', 'number', '', 'totalTeaching', 'TotalTeaching', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'input-number', '', '0', '{}', 7, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (41, 2, 'total_class_count', '服务班次数', 'int', 'Integer', 'input', 'number', '', 'totalClassCount', 'TotalClassCount', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'input-number', '', '0', '{}', 8, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (41, 2, 'total_class_count', '服务班次数', 'int', 'Integer', 'input', 'number', '', 'totalClassCount', 'TotalClassCount', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'input-number', '', '0', '{}', 8, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (42, 2, 'total_hours', '课时总数', 'decimal(10,2)', 'BigDecimal', 'input', 'number', 'java.math.BigDecimal', 'totalHours', 'TotalHours', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'input-number', '', '0', '{}', 9, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (42, 2, 'total_hours', '课时总数', 'decimal(10,2)', 'BigDecimal', 'input', 'number', 'java.math.BigDecimal', 'totalHours', 'TotalHours', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'input-number', '', '0', '{}', 9, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (43, 2, 'check_status', '核对状态', 'int', 'Integer', 'select', 'number', '', 'checkStatus', 'CheckStatus', '0', '0', '1', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'radio', '', '0', '{}', 10, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (43, 2, 'check_status', '核对状态', 'int', 'Integer', 'select', 'number', '', 'checkStatus', 'CheckStatus', '0', '0', '1', '1', '1', '1', '1', '1', '1', '0', '0', '', 'EQ', 'radio', '', '0', '{}', 10, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (44, 2, 'check_time', '核对时间', 'datetime', 'LocalDateTime', 'date-picker', 'string', 'java.time.LocalDateTime', 'checkTime', 'CheckTime', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', '', 'BETWEEN', 'datetime', '', '0', '{}', 11, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (44, 2, 'check_time', '核对时间', 'datetime', 'LocalDateTime', 'date-picker', 'string', 'java.time.LocalDateTime', 'checkTime', 'CheckTime', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', '', 'BETWEEN', 'datetime', '', '0', '{}', 11, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (45, 2, 'last_sync_time', '最近一次同步时间', 'datetime', 'LocalDateTime', 'date-picker', 'string', 'java.time.LocalDateTime', 'lastSyncTime', 'LastSyncTime', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', '', 'BETWEEN', 'datetime', '', '0', '{}', 12, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (45, 2, 'last_sync_time', '最近一次同步时间', 'datetime', 'LocalDateTime', 'date-picker', 'string', 'java.time.LocalDateTime', 'lastSyncTime', 'LastSyncTime', '0', '0', '0', '1', '1', '1', '1', '1', '1', '0', '0', '', 'BETWEEN', 'datetime', '', '0', '{}', 12, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (46, 2, 'remark', '备注', 'varchar(255)', 'String', 'input', 'string', '', 'remark', 'Remark', '0', '0', '0', '1', '1', '1', '0', '1', '1', '0', '0', '', 'EQ', 'input', '', '0', '{}', 13, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (46, 2, 'remark', '备注', 'varchar(255)', 'String', 'input', 'string', '', 'remark', 'Remark', '0', '0', '0', '1', '1', '1', '0', '1', '1', '0', '0', '', 'EQ', 'input', '', '0', '{}', 13, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (47, 2, 'create_id', '创建人ID', 'bigint', 'Long', 'input', 'number', '', 'createId', 'CreateId', '0', '0', '0', '0', '0', '1', '0', '0', '1', '1', '0', 'FieldFill.INSERT', 'EQ', 'input-number', 'dynamic_user_options', '0', '{}', 14, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (47, 2, 'create_id', '创建人ID', 'bigint', 'Long', 'input', 'number', '', 'createId', 'CreateId', '0', '0', '0', '0', '0', '1', '0', '0', '1', '1', '0', 'FieldFill.INSERT', 'EQ', 'input-number', 'dynamic_user_options', '0', '{}', 14, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (48, 2, 'create_time', '生成时间', 'datetime', 'LocalDateTime', 'date-picker', 'string', 'java.time.LocalDateTime', 'createTime', 'CreateTime', '0', '0', '0', '0', '0', '1', '0', '0', '1', '1', '0', 'FieldFill.INSERT', 'BETWEEN', 'datetime', '', '0', '{}', 15, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (48, 2, 'create_time', '生成时间', 'datetime', 'LocalDateTime', 'date-picker', 'string', 'java.time.LocalDateTime', 'createTime', 'CreateTime', '0', '0', '0', '0', '0', '1', '0', '0', '1', '1', '0', 'FieldFill.INSERT', 'BETWEEN', 'datetime', '', '0', '{}', 15, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (49, 2, 'update_id', '更新人ID', 'bigint', 'Long', 'input', 'number', '', 'updateId', 'UpdateId', '0', '0', '0', '0', '0', '1', '0', '0', '1', '1', '0', 'FieldFill.UPDATE', 'EQ', 'input-number', 'dynamic_user_options', '0', '{}', 16, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (49, 2, 'update_id', '更新人ID', 'bigint', 'Long', 'input', 'number', '', 'updateId', 'UpdateId', '0', '0', '0', '0', '0', '1', '0', '0', '1', '1', '0', 'FieldFill.UPDATE', 'EQ', 'input-number', 'dynamic_user_options', '0', '{}', 16, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (50, 2, 'update_time', '更新时间', 'datetime', 'LocalDateTime', 'date-picker', 'string', 'java.time.LocalDateTime', 'updateTime', 'UpdateTime', '0', '0', '0', '0', '0', '1', '0', '0', '1', '1', '0', 'FieldFill.UPDATE', 'BETWEEN', 'datetime', '', '0', '{}', 17, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (50, 2, 'update_time', '更新时间', 'datetime', 'LocalDateTime', 'date-picker', 'string', 'java.time.LocalDateTime', 'updateTime', 'UpdateTime', '0', '0', '0', '0', '0', '1', '0', '0', '1', '1', '0', 'FieldFill.UPDATE', 'BETWEEN', 'datetime', '', '0', '{}', 17, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (51, 2, 'dept_scope', '部门范围', 'json', 'String', 'input', 'string', '', 'deptScope', 'DeptScope', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '', 'EQ', '', '', '0', '{}', 18, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (51, 2, 'dept_scope', '部门范围', 'json', 'String', 'input', 'string', '', 'deptScope', 'DeptScope', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '', 'EQ', '', '', '0', '{}', 18, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
-INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (52, 2, 'url', '文件地址(JSON)', 'json', 'List<UploadResult>', 'input', 'string', 'com.mybatisflex.core.handler.JacksonTypeHandler,com.sz.core.common.entity.UploadResult,java.util.List,com.mybatisflex.annotation.Column', 'url', 'Url', '0', '0', '0', '1', '1', '1', '0', '0', '0', '0', '0', '', 'EQ', 'fileUpload', '', '0', '{\"file-download-list.align\":\"left\",\"upload-files.dir\":\"tmp\",\"upload-files.limit\":\"5\",\"upload-files.fileSize\":\"3\",\"upload-files.accept\":\"\",\"file-download-list.maxRows\":\"3\"}', 19, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');
+-- INSERT INTO `generator_table_column` (`column_id`, `table_id`, `column_name`, `column_comment`, `column_type`, `java_type`, `search_type`, `ts_type`, `java_type_package`, `java_field`, `up_camel_field`, `is_pk`, `is_increment`, `is_required`, `is_insert`, `is_edit`, `is_list`, `is_query`, `is_import`, `is_export`, `is_autofill`, `is_unique_valid`, `autofill_type`, `query_type`, `html_type`, `dict_type`, `is_logic_del`, `options`, `sort`, `create_id`, `update_id`, `create_time`, `update_time`, `dict_show_way`) VALUES (52, 2, 'url', '文件地址(JSON)', 'json', 'List<UploadResult>', 'input', 'string', 'com.mybatisflex.core.handler.JacksonTypeHandler,com.sz.core.common.entity.UploadResult,java.util.List,com.mybatisflex.annotation.Column', 'url', 'Url', '0', '0', '0', '1', '1', '1', '0', '0', '0', '0', '0', '', 'EQ', 'fileUpload', '', '0', '{\"file-download-list.align\":\"left\",\"upload-files.dir\":\"tmp\",\"upload-files.limit\":\"5\",\"upload-files.fileSize\":\"3\",\"upload-files.accept\":\"\",\"file-download-list.maxRows\":\"3\"}', 19, 1, 1, '2025-11-08 09:11:50', '2025-11-08 10:26:29', '0');

sz-service/sz-service-admin/src/main/resources/db/changelog/framework/1.2.0-beta/001_sys_message.sql

@@ -1,41 +1,41 @@
---liquibase formatted sql
+-- --liquibase formatted sql
-
+--
---changeset 升职哦（sz）:20250424_1750
+-- --changeset 升职哦（sz）:20250424_1750
-CREATE TABLE IF NOT EXISTS `sys_message` (
+-- CREATE TABLE IF NOT EXISTS `sys_message` (
-                               `id` bigint NOT NULL AUTO_INCREMENT COMMENT '消息ID',
+--                                `id` bigint NOT NULL AUTO_INCREMENT COMMENT '消息ID',
-                               `message_type_cd` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '消息类型',
+--                                `message_type_cd` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '消息类型',
-                               `sender_id` bigint NOT NULL COMMENT '发送人ID',
+--                                `sender_id` bigint NOT NULL COMMENT '发送人ID',
-                               `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '消息标题',
+--                                `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '消息标题',
-                               `content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '消息内容',
+--                                `content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '消息内容',
-                               `del_flag` enum('T','F') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'F' COMMENT '删除标识',
+--                                `del_flag` enum('T','F') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'F' COMMENT '删除标识',
-                               `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+--                                `create_time` datetime DEFAULT NULL COMMENT '创建时间',
-                               `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+--                                `update_time` datetime DEFAULT NULL COMMENT '更新时间',
-                               `create_id` bigint DEFAULT NULL COMMENT '创建人 ID',
+--                                `create_id` bigint DEFAULT NULL COMMENT '创建人 ID',
-                               `update_id` bigint DEFAULT NULL COMMENT '更新人 ID',
+--                                `update_id` bigint DEFAULT NULL COMMENT '更新人 ID',
-                               `menu_router` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '菜单路由地址，冗余',
+--                                `menu_router` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '菜单路由地址，冗余',
-                               PRIMARY KEY (`id`)
+--                                PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='消息管理';
+-- ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='消息管理';
-
+--
-CREATE TABLE IF NOT EXISTS `sys_message_user` (
+-- CREATE TABLE IF NOT EXISTS `sys_message_user` (
-                                    `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID',
+--                                     `id` bigint NOT NULL AUTO_INCREMENT COMMENT 'ID',
-                                    `message_id` bigint NOT NULL COMMENT '消息ID',
+--                                     `message_id` bigint NOT NULL COMMENT '消息ID',
-                                    `receiver_id` bigint NOT NULL COMMENT '接收人ID',
+--                                     `receiver_id` bigint NOT NULL COMMENT '接收人ID',
-                                    `is_read` enum('T','F') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'F' COMMENT '是否已读',
+--                                     `is_read` enum('T','F') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'F' COMMENT '是否已读',
-                                    `read_time` datetime DEFAULT NULL COMMENT '阅读时间',
+--                                     `read_time` datetime DEFAULT NULL COMMENT '阅读时间',
-                                    `del_flag` enum('T','F') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'F' COMMENT '删除标识',
+--                                     `del_flag` enum('T','F') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'F' COMMENT '删除标识',
-                                    PRIMARY KEY (`id`)
+--                                     PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='消息接收用户表';
+-- ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='消息接收用户表';
-
+--
-
+--
-INSERT IGNORE INTO `sys_dict_type` (`id`, `type_name`, `type_code`, `is_lock`, `is_show`, `del_flag`, `remark`, `create_time`, `update_time`, `delete_time`, `create_id`, `update_id`, `delete_id`, `type`) VALUES (1008, '消息类型', 'message_type', 'F', 'T', 'F', '系统消息的类型（待办、通知等）', '2025-04-21T15:22:15', NULL, NULL, NULL, NULL, NULL, 'system');
+-- INSERT IGNORE INTO `sys_dict_type` (`id`, `type_name`, `type_code`, `is_lock`, `is_show`, `del_flag`, `remark`, `create_time`, `update_time`, `delete_time`, `create_id`, `update_id`, `delete_id`, `type`) VALUES (1008, '消息类型', 'message_type', 'F', 'T', 'F', '系统消息的类型（待办、通知等）', '2025-04-21T15:22:15', NULL, NULL, NULL, NULL, NULL, 'system');
-
+--
-INSERT IGNORE INTO `sys_dict` (`id`, `sys_dict_type_id`, `code_name`, `alias`, `sort`, `callback_show_style`, `remark`, `is_lock`, `is_show`, `del_flag`, `create_time`, `update_time`, `delete_time`, `create_id`, `update_id`, `delete_id`) VALUES (1008001, '1008', '待办', 'todo', 1, 'warning', '', 'F', 'T', 'F', '2025-04-21T15:22:45', NULL, NULL, NULL, NULL, NULL);
+-- INSERT IGNORE INTO `sys_dict` (`id`, `sys_dict_type_id`, `code_name`, `alias`, `sort`, `callback_show_style`, `remark`, `is_lock`, `is_show`, `del_flag`, `create_time`, `update_time`, `delete_time`, `create_id`, `update_id`, `delete_id`) VALUES (1008001, '1008', '待办', 'todo', 1, 'warning', '', 'F', 'T', 'F', '2025-04-21T15:22:45', NULL, NULL, NULL, NULL, NULL);
-INSERT IGNORE INTO `sys_dict` (`id`, `sys_dict_type_id`, `code_name`, `alias`, `sort`, `callback_show_style`, `remark`, `is_lock`, `is_show`, `del_flag`, `create_time`, `update_time`, `delete_time`, `create_id`, `update_id`, `delete_id`) VALUES (1008002, '1008', '消息', 'msg', 2, 'success', '', 'F', 'T', 'F', '2025-04-21T15:23:01', NULL, NULL, NULL, NULL, NULL);
+-- INSERT IGNORE INTO `sys_dict` (`id`, `sys_dict_type_id`, `code_name`, `alias`, `sort`, `callback_show_style`, `remark`, `is_lock`, `is_show`, `del_flag`, `create_time`, `update_time`, `delete_time`, `create_id`, `update_id`, `delete_id`) VALUES (1008002, '1008', '消息', 'msg', 2, 'success', '', 'F', 'T', 'F', '2025-04-21T15:23:01', NULL, NULL, NULL, NULL, NULL);
-
+--
-INSERT IGNORE INTO `sys_message` (`id`, `message_type_cd`, `sender_id`, `title`, `content`, `del_flag`, `create_time`, `update_time`, `create_id`, `update_id`, `menu_router`) VALUES (1, 'msg', 1, '欢迎使用sz-admin', '如果喜欢这个项目或支持作者，欢迎Star、Fork、Watch 一键三连 🚀！！', 'F', '2025-04-24 16:14:25', '2025-04-24 16:14:25', 1, 1, NULL);
+-- INSERT IGNORE INTO `sys_message` (`id`, `message_type_cd`, `sender_id`, `title`, `content`, `del_flag`, `create_time`, `update_time`, `create_id`, `update_id`, `menu_router`) VALUES (1, 'msg', 1, '欢迎使用sz-admin', '如果喜欢这个项目或支持作者，欢迎Star、Fork、Watch 一键三连 🚀！！', 'F', '2025-04-24 16:14:25', '2025-04-24 16:14:25', 1, 1, NULL);
-INSERT IGNORE INTO `sys_message_user` (`id`, `message_id`, `receiver_id`, `is_read`, `read_time`, `del_flag`) VALUES (1, 1, 1, 'F', NULL, 'F');
+-- INSERT IGNORE INTO `sys_message_user` (`id`, `message_id`, `receiver_id`, `is_read`, `read_time`, `del_flag`) VALUES (1, 1, 1, 'F', NULL, 'F');
-INSERT IGNORE INTO `sys_message_user` (`id`, `message_id`, `receiver_id`, `is_read`, `read_time`, `del_flag`) VALUES (2, 1, 2, 'F', NULL, 'F');
+-- INSERT IGNORE INTO `sys_message_user` (`id`, `message_id`, `receiver_id`, `is_read`, `read_time`, `del_flag`) VALUES (2, 1, 2, 'F', NULL, 'F');
-INSERT IGNORE INTO `sys_message_user` (`id`, `message_id`, `receiver_id`, `is_read`, `read_time`, `del_flag`) VALUES (3, 1, 3, 'F', NULL, 'F');
+-- INSERT IGNORE INTO `sys_message_user` (`id`, `message_id`, `receiver_id`, `is_read`, `read_time`, `del_flag`) VALUES (3, 1, 3, 'F', NULL, 'F');
-INSERT IGNORE INTO `sys_message_user` (`id`, `message_id`, `receiver_id`, `is_read`, `read_time`, `del_flag`) VALUES (4, 1, 4, 'F', NULL, 'F');
+-- INSERT IGNORE INTO `sys_message_user` (`id`, `message_id`, `receiver_id`, `is_read`, `read_time`, `del_flag`) VALUES (4, 1, 4, 'F', NULL, 'F');
-INSERT IGNORE INTO `sys_message_user` (`id`, `message_id`, `receiver_id`, `is_read`, `read_time`, `del_flag`) VALUES (5, 1, 5, 'F', NULL, 'F');
+-- INSERT IGNORE INTO `sys_message_user` (`id`, `message_id`, `receiver_id`, `is_read`, `read_time`, `del_flag`) VALUES (5, 1, 5, 'F', NULL, 'F');
-INSERT IGNORE INTO `sys_message_user` (`id`, `message_id`, `receiver_id`, `is_read`, `read_time`, `del_flag`) VALUES (6, 1, 6, 'F', NULL, 'F');
+-- INSERT IGNORE INTO `sys_message_user` (`id`, `message_id`, `receiver_id`, `is_read`, `read_time`, `del_flag`) VALUES (6, 1, 6, 'F', NULL, 'F');

sz-service/sz-service-admin/src/main/resources/db/changelog/framework/1.2.1-beta/001_sys_menu.sql

@@ -1,14 +1,14 @@
---liquibase formatted sql
+-- --liquibase formatted sql
-
+--
---changeset 升职哦（sz）:20250508_2222
+-- --changeset 升职哦（sz）:20250508_2222
-UPDATE `sys_menu` SET `name` = 'AccountManage' WHERE `id` = '140c9ed43ef54542bbcdde8a5d928400';
+-- UPDATE `sys_menu` SET `name` = 'AccountManage' WHERE `id` = '140c9ed43ef54542bbcdde8a5d928400';
-UPDATE `sys_menu` SET `name` = 'RoleManage' WHERE `id` = 'c6dd479d5b304731be403d7551c60d70';
+-- UPDATE `sys_menu` SET `name` = 'RoleManage' WHERE `id` = 'c6dd479d5b304731be403d7551c60d70';
-UPDATE `sys_menu` SET `name` = 'MenuManage' WHERE `id` = '99c2ee7b882749e597bcd62385f368fb';
+-- UPDATE `sys_menu` SET `name` = 'MenuManage' WHERE `id` = '99c2ee7b882749e597bcd62385f368fb';
-UPDATE `sys_menu` SET `name` = 'DictManage' WHERE `id` = 'dcb6aabcd910469ebf3efbc7e43282d4';
+-- UPDATE `sys_menu` SET `name` = 'DictManage' WHERE `id` = 'dcb6aabcd910469ebf3efbc7e43282d4';
-UPDATE `sys_menu` SET `name` = 'ConfigManage' WHERE `id` = '29d33eba6b73420287d8f7e64aea62b3';
+-- UPDATE `sys_menu` SET `name` = 'ConfigManage' WHERE `id` = '29d33eba6b73420287d8f7e64aea62b3';
-UPDATE `sys_menu` SET `name` = 'ClientManageView' WHERE `id` = '9e731ff422184fc1be2022c5c985735e';
+-- UPDATE `sys_menu` SET `name` = 'ClientManageView' WHERE `id` = '9e731ff422184fc1be2022c5c985735e';
-UPDATE `sys_menu` SET `name` = 'SysDeptView' WHERE `id` = '8354d626cc65487594a7c38e98de1bad';
+-- UPDATE `sys_menu` SET `name` = 'SysDeptView' WHERE `id` = '8354d626cc65487594a7c38e98de1bad';
-UPDATE `sys_menu` SET `name` = 'SysDataRoleView' WHERE `id` = '0444cd2c01584f0687264b6205536691';
+-- UPDATE `sys_menu` SET `name` = 'SysDataRoleView' WHERE `id` = '0444cd2c01584f0687264b6205536691';
-UPDATE `sys_menu` SET `name` = 'SysFileView' WHERE `id` = 'c4896e8735a745bda9b47ecaf50f46f2';
+-- UPDATE `sys_menu` SET `name` = 'SysFileView' WHERE `id` = 'c4896e8735a745bda9b47ecaf50f46f2';
-UPDATE `sys_menu` SET `name` = 'SysTempFileView' WHERE `id` = '8231a369712e4f8f8ac09fce232cd034';
+-- UPDATE `sys_menu` SET `name` = 'SysTempFileView' WHERE `id` = '8231a369712e4f8f8ac09fce232cd034';
-UPDATE `sys_menu` SET `name` = 'Generator' WHERE `id` = '0e529e8a9dbf450898b695e051c36d48';
+-- UPDATE `sys_menu` SET `name` = 'Generator' WHERE `id` = '0e529e8a9dbf450898b695e051c36d48';

sz-service/sz-service-admin/src/main/resources/db/changelog/framework/1.2.2-beta/001_system.sql

@@ -1,5 +1,5 @@
---liquibase formatted sql
+-- --liquibase formatted sql
-
+--
---changeset 升职哦（sz）:20250526_2022
+-- --changeset 升职哦（sz）:20250526_2022
---comment: 增加eTag长度，修复文件上传时eTag过长导致的错误
+-- --comment: 增加eTag长度，修复文件上传时eTag过长导致的错误
-ALTER TABLE `sys_file` MODIFY COLUMN `e_tag` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'eTag标识';
+-- ALTER TABLE `sys_file` MODIFY COLUMN `e_tag` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT 'eTag标识';

sz-service/sz-service-admin/src/main/resources/db/changelog/framework/1.2.3-beta/001_system.sql

@@ -1,15 +1,15 @@
---liquibase formatted sql
+-- --liquibase formatted sql
-
+--
---changeset 升职哦（sz）:20250603_1400
+-- --changeset 升职哦（sz）:20250603_1400
---comment: 更新 sys_temp_file 表，将url varchar 改为 json数组
+-- --comment: 更新 sys_temp_file 表，将url varchar 改为 json数组
--- 1️⃣ 新增临时 JSON 数组字段
+-- -- 1️⃣ 新增临时 JSON 数组字段
-ALTER TABLE sys_temp_file ADD COLUMN url_json JSON DEFAULT NULL COMMENT '地址(JSON数组格式)';
+-- ALTER TABLE sys_temp_file ADD COLUMN url_json JSON DEFAULT NULL COMMENT '地址(JSON数组格式)';
-
+--
--- 2️⃣ 将原有 varchar(url) 数据更新为 JSON 数组格式，例如 ["原url"]
+-- -- 2️⃣ 将原有 varchar(url) 数据更新为 JSON 数组格式，例如 ["原url"]
-UPDATE sys_temp_file SET url_json = JSON_ARRAY(url);
+-- UPDATE sys_temp_file SET url_json = JSON_ARRAY(url);
-
+--
--- 3️⃣ 删除原来的 varchar(url) 字段
+-- -- 3️⃣ 删除原来的 varchar(url) 字段
-ALTER TABLE sys_temp_file DROP COLUMN url;
+-- ALTER TABLE sys_temp_file DROP COLUMN url;
-
+--
--- 4️⃣ 将临时字段 url_json 改名为 url
+-- -- 4️⃣ 将临时字段 url_json 改名为 url
-ALTER TABLE sys_temp_file CHANGE COLUMN url_json url JSON DEFAULT NULL COMMENT '地址(JSON数组格式)';
+-- ALTER TABLE sys_temp_file CHANGE COLUMN url_json url JSON DEFAULT NULL COMMENT '地址(JSON数组格式)';

sz-service/sz-service-admin/src/main/resources/db/changelog/framework/1.2.4-beta/001_system.sql

@@ -1,6 +1,6 @@
---liquibase formatted sql
+-- --liquibase formatted sql
-
+--
---changeset 升职哦（sz）:20250614_1621
+-- --changeset 升职哦（sz）:20250614_1621
---comment: 修正菜单路径拼写错误
+-- --comment: 修正菜单路径拼写错误
-UPDATE `sys_menu` SET `path` = '/system/menuManage' WHERE `path` = '/system/menuMange';
+-- UPDATE `sys_menu` SET `path` = '/system/menuManage' WHERE `path` = '/system/menuMange';
-UPDATE `sys_menu` SET `component` = '/system/menuManage/index' WHERE `component` = '/system/menuMange/index';
+-- UPDATE `sys_menu` SET `component` = '/system/menuManage/index' WHERE `component` = '/system/menuMange/index';

sz-service/sz-service-admin/src/main/resources/db/changelog/framework/1.2.6-beta/001_system.sql

@@ -1,42 +1,42 @@
---liquibase formatted sql
+-- --liquibase formatted sql
-
+--
---changeset 升职哦（sz）:20250717_1321
+-- --changeset 升职哦（sz）:20250717_1321
---comment: 新增部门角色关联数据库表
+-- --comment: 新增部门角色关联数据库表
-CREATE TABLE IF NOT EXISTS `sys_dept_role`  (
+-- CREATE TABLE IF NOT EXISTS `sys_dept_role`  (
-                                  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '部门-角色关联ID',
+--                                   `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '部门-角色关联ID',
-                                  `dept_id` bigint(20) NULL DEFAULT NULL COMMENT '部门ID (sys_dept_id)',
+--                                   `dept_id` bigint(20) NULL DEFAULT NULL COMMENT '部门ID (sys_dept_id)',
-                                  `role_id` bigint(20) NULL DEFAULT NULL COMMENT '角色ID(sys_role_id)',
+--                                   `role_id` bigint(20) NULL DEFAULT NULL COMMENT '角色ID(sys_role_id)',
-                                  PRIMARY KEY (`id`) USING BTREE
+--                                   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统部门-角色关联表' ROW_FORMAT = DYNAMIC;
+-- ) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统部门-角色关联表' ROW_FORMAT = DYNAMIC;
-
+--
---changeset 升职哦（sz）:20250725_1327
+-- --changeset 升职哦（sz）:20250725_1327
---comment: 新增登陆日志数据库表
+-- --comment: 新增登陆日志数据库表
-CREATE TABLE IF NOT EXISTS `sys_login_log`  (
+-- CREATE TABLE IF NOT EXISTS `sys_login_log`  (
-                                                `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '登陆ID',
+--                                                 `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '登陆ID',
-    `del_flag` enum('T','F') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'F' COMMENT '删除标识',
+--     `del_flag` enum('T','F') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'F' COMMENT '删除标识',
-    `user_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户名',
+--     `user_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用户名',
-    `login_status` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '登陆状态',
+--     `login_status` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '登陆状态',
-    `login_time` datetime NULL DEFAULT NULL COMMENT '登陆时间',
+--     `login_time` datetime NULL DEFAULT NULL COMMENT '登陆时间',
-    `ip_address` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '登陆ip地址',
+--     `ip_address` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '登陆ip地址',
-    `login_location` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '登陆地点',
+--     `login_location` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '登陆地点',
-    `browser` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '浏览器类型',
+--     `browser` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '浏览器类型',
-    `os` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作系统',
+--     `os` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作系统',
-    `msg` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '提示消息',
+--     `msg` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '提示消息',
-    `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
+--     `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注',
-    PRIMARY KEY (`id`) USING BTREE
+--     PRIMARY KEY (`id`) USING BTREE
-    ) ENGINE = InnoDB AUTO_INCREMENT = 20 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '登陆日志表' ROW_FORMAT = DYNAMIC;
+--     ) ENGINE = InnoDB AUTO_INCREMENT = 20 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '登陆日志表' ROW_FORMAT = DYNAMIC;
-
+--
---changeset 升职哦（sz）:20250726_0927
+-- --changeset 升职哦（sz）:20250726_0927
---comment: 新增登陆日志菜单
+-- --comment: 新增登陆日志菜单
-INSERT IGNORE INTO `sys_menu` (`id`, `pid`, `path`, `name`, `title`, `icon`, `component`, `redirect`, `sort`, `deep`, `menu_type_cd`, `permissions`, `is_hidden`, `has_children`, `is_link`, `is_full`, `is_affix`, `is_keep_alive`, `create_time`, `update_time`, `create_id`, `update_id`, `del_flag`, `delete_id`, `delete_time`, `use_data_scope`) VALUES ('191878090b294ec5892a68081dd91428', '88b2e5def2ff474fa8bf3537d4a2fe5b', '/system/sysLoginLog', 'SysLoginLogView', '登陆日志', 'Location', '/system/sysLoginLog/index', '', 1100, 2, '1002002', 'sys.login.log.query_table', 'F', 'T', 'F', 'F', 'F', 'F', NULL, NULL, NULL, NULL, 'F', NULL, NULL, 'F');
+-- INSERT IGNORE INTO `sys_menu` (`id`, `pid`, `path`, `name`, `title`, `icon`, `component`, `redirect`, `sort`, `deep`, `menu_type_cd`, `permissions`, `is_hidden`, `has_children`, `is_link`, `is_full`, `is_affix`, `is_keep_alive`, `create_time`, `update_time`, `create_id`, `update_id`, `del_flag`, `delete_id`, `delete_time`, `use_data_scope`) VALUES ('191878090b294ec5892a68081dd91428', '88b2e5def2ff474fa8bf3537d4a2fe5b', '/system/sysLoginLog', 'SysLoginLogView', '登陆日志', 'Location', '/system/sysLoginLog/index', '', 1100, 2, '1002002', 'sys.login.log.query_table', 'F', 'T', 'F', 'F', 'F', 'F', NULL, NULL, NULL, NULL, 'F', NULL, NULL, 'F');
-INSERT IGNORE INTO `sys_menu` (`id`, `pid`, `path`, `name`, `title`, `icon`, `component`, `redirect`, `sort`, `deep`, `menu_type_cd`, `permissions`, `is_hidden`, `has_children`, `is_link`, `is_full`, `is_affix`, `is_keep_alive`, `create_time`, `update_time`, `create_id`, `update_id`, `del_flag`, `delete_id`, `delete_time`, `use_data_scope`) VALUES ('52fb3db605334671bb0dfe4f50cb1147', '191878090b294ec5892a68081dd91428', '', '', '导出', '', '', '', 100, 3, '1002003', 'sys.login.log.export', 'F', 'F', 'F', 'F', 'F', 'F', NULL, NULL, NULL, NULL, 'F', NULL, NULL, 'F');
+-- INSERT IGNORE INTO `sys_menu` (`id`, `pid`, `path`, `name`, `title`, `icon`, `component`, `redirect`, `sort`, `deep`, `menu_type_cd`, `permissions`, `is_hidden`, `has_children`, `is_link`, `is_full`, `is_affix`, `is_keep_alive`, `create_time`, `update_time`, `create_id`, `update_id`, `del_flag`, `delete_id`, `delete_time`, `use_data_scope`) VALUES ('52fb3db605334671bb0dfe4f50cb1147', '191878090b294ec5892a68081dd91428', '', '', '导出', '', '', '', 100, 3, '1002003', 'sys.login.log.export', 'F', 'F', 'F', 'F', 'F', 'F', NULL, NULL, NULL, NULL, 'F', NULL, NULL, 'F');
-
+--
---changeset 升职哦（sz）:20250729_0304
+-- --changeset 升职哦（sz）:20250729_0304
---comment: 新增登陆状态字典
+-- --comment: 新增登陆状态字典
-INSERT IGNORE INTO `sys_dict_type` (`id`, `type_name`, `type_code`, `is_lock`, `is_show`, `del_flag`, `remark`, `create_time`, `update_time`, `delete_time`, `create_id`, `update_id`, `delete_id`, `type`) VALUES (1009, '登陆状态', 'login_status', 'F', 'T', 'F', '', '2025-07-29 22:49:03', '2025-07-29 22:49:03', NULL, 1, 1, NULL, 'system');
+-- INSERT IGNORE INTO `sys_dict_type` (`id`, `type_name`, `type_code`, `is_lock`, `is_show`, `del_flag`, `remark`, `create_time`, `update_time`, `delete_time`, `create_id`, `update_id`, `delete_id`, `type`) VALUES (1009, '登陆状态', 'login_status', 'F', 'T', 'F', '', '2025-07-29 22:49:03', '2025-07-29 22:49:03', NULL, 1, 1, NULL, 'system');
-INSERT IGNORE INTO `sys_dict` (`id`, `sys_dict_type_id`, `code_name`, `alias`, `sort`, `callback_show_style`, `remark`, `is_lock`, `is_show`, `del_flag`, `create_time`, `update_time`, `delete_time`, `create_id`, `update_id`, `delete_id`) VALUES (1009002, 1009, '登陆失败', '', 1, 'danger', '', 'F', 'T', 'F', '2025-07-29 22:49:34', '2025-07-29 22:49:34', NULL, 1, 1, NULL);
+-- INSERT IGNORE INTO `sys_dict` (`id`, `sys_dict_type_id`, `code_name`, `alias`, `sort`, `callback_show_style`, `remark`, `is_lock`, `is_show`, `del_flag`, `create_time`, `update_time`, `delete_time`, `create_id`, `update_id`, `delete_id`) VALUES (1009002, 1009, '登陆失败', '', 1, 'danger', '', 'F', 'T', 'F', '2025-07-29 22:49:34', '2025-07-29 22:49:34', NULL, 1, 1, NULL);
-INSERT IGNORE INTO `sys_dict` (`id`, `sys_dict_type_id`, `code_name`, `alias`, `sort`, `callback_show_style`, `remark`, `is_lock`, `is_show`, `del_flag`, `create_time`, `update_time`, `delete_time`, `create_id`, `update_id`, `delete_id`) VALUES (1009001, 1009, '登陆成功', '', 1, 'success', '', 'F', 'T', 'F', '2025-07-29 22:49:22', '2025-07-29 22:49:22', NULL, 1, 1, NULL);
+-- INSERT IGNORE INTO `sys_dict` (`id`, `sys_dict_type_id`, `code_name`, `alias`, `sort`, `callback_show_style`, `remark`, `is_lock`, `is_show`, `del_flag`, `create_time`, `update_time`, `delete_time`, `create_id`, `update_id`, `delete_id`) VALUES (1009001, 1009, '登陆成功', '', 1, 'success', '', 'F', 'T', 'F', '2025-07-29 22:49:22', '2025-07-29 22:49:22', NULL, 1, 1, NULL);
-
+--
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('191878090b294ec5892a68081dd91428', 1);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('191878090b294ec5892a68081dd91428', 1);
-INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('52fb3db605334671bb0dfe4f50cb1147', 1);
+-- INSERT IGNORE INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('52fb3db605334671bb0dfe4f50cb1147', 1);
-
+--

sz-service/sz-service-admin/src/main/resources/db/changelog/framework/1.3.0-beta/001_system.sql

@@ -1,86 +1,86 @@
---liquibase formatted sql
+-- --liquibase formatted sql
-
+--
---changeset 升职哦（sz）:20250920_1414
+-- --changeset 升职哦（sz）:20250920_1414
---comment: 更新菜单权限标识
+-- --comment: 更新菜单权限标识
-
+--
--- ===============================================
+-- -- ===============================================
--- ⚠️【破坏性更新】请谨慎升级！
+-- -- ⚠️【破坏性更新】请谨慎升级！
--- 菜单路由会发生改变
+-- -- 菜单路由会发生改变
--- ===============================================
+-- -- ===============================================
--- 账号管理
+-- -- 账号管理
-UPDATE sys_menu SET permissions = '', path = '/system/account' WHERE id = '140c9ed43ef54542bbcdde8a5d928400';
+-- UPDATE sys_menu SET permissions = '', path = '/system/account' WHERE id = '140c9ed43ef54542bbcdde8a5d928400';
-INSERT IGNORE INTO `sys_menu` (`id`, `pid`, `path`, `name`, `title`, `icon`, `component`, `redirect`, `sort`, `deep`, `menu_type_cd`, `permissions`, `is_hidden`, `has_children`, `is_link`, `is_full`, `is_affix`, `is_keep_alive`, `del_flag`) VALUES ('0bef80d81a264f689d091613053c659e', '140c9ed43ef54542bbcdde8a5d928400', '', '', '查询账号', '', '', '', 99, 3, '1002003', 'sys.user.query_table', 'F', 'F', 'F', 'F', 'F', 'F', 'F');
+-- INSERT IGNORE INTO `sys_menu` (`id`, `pid`, `path`, `name`, `title`, `icon`, `component`, `redirect`, `sort`, `deep`, `menu_type_cd`, `permissions`, `is_hidden`, `has_children`, `is_link`, `is_full`, `is_affix`, `is_keep_alive`, `del_flag`) VALUES ('0bef80d81a264f689d091613053c659e', '140c9ed43ef54542bbcdde8a5d928400', '', '', '查询账号', '', '', '', 99, 3, '1002003', 'sys.user.query_table', 'F', 'F', 'F', 'F', 'F', 'F', 'F');
--- 角色管理
+-- -- 角色管理
-UPDATE sys_menu SET permissions = '', path = '/system/role' WHERE id = 'c6dd479d5b304731be403d7551c60d70';
+-- UPDATE sys_menu SET permissions = '', path = '/system/role' WHERE id = 'c6dd479d5b304731be403d7551c60d70';
-INSERT IGNORE INTO `sys_menu` (`id`, `pid`, `path`, `name`, `title`, `icon`, `component`, `redirect`, `sort`, `deep`, `menu_type_cd`, `permissions`, `is_hidden`, `has_children`, `is_link`, `is_full`, `is_affix`, `is_keep_alive`, `del_flag`) VALUES ('abecbec6abe74023abaa653f827a3b0f', 'c6dd479d5b304731be403d7551c60d70', '', '', '查询角色', '', '', '', 99, 3, '1002003', 'sys.role.query_table', 'F', 'F', 'F', 'F', 'F', 'F', 'F');
+-- INSERT IGNORE INTO `sys_menu` (`id`, `pid`, `path`, `name`, `title`, `icon`, `component`, `redirect`, `sort`, `deep`, `menu_type_cd`, `permissions`, `is_hidden`, `has_children`, `is_link`, `is_full`, `is_affix`, `is_keep_alive`, `del_flag`) VALUES ('abecbec6abe74023abaa653f827a3b0f', 'c6dd479d5b304731be403d7551c60d70', '', '', '查询角色', '', '', '', 99, 3, '1002003', 'sys.role.query_table', 'F', 'F', 'F', 'F', 'F', 'F', 'F');
--- 菜单管理
+-- -- 菜单管理
-UPDATE sys_menu SET permissions = '', path = '/system/menu' WHERE id = '99c2ee7b882749e597bcd62385f368fb';
+-- UPDATE sys_menu SET permissions = '', path = '/system/menu' WHERE id = '99c2ee7b882749e597bcd62385f368fb';
-INSERT IGNORE INTO `sys_menu` (`id`, `pid`, `path`, `name`, `title`, `icon`, `component`, `redirect`, `sort`, `deep`, `menu_type_cd`, `permissions`, `is_hidden`, `has_children`, `is_link`, `is_full`, `is_affix`, `is_keep_alive`, `del_flag`) VALUES ('9dfeebc408e1490e88bf10db3b5e1239', '99c2ee7b882749e597bcd62385f368fb', '', '', '查询菜单', '', '', '', 99, 3, '1002003', 'sys.menu.query_table', 'F', 'F', 'F', 'F', 'F', 'F', 'F');
+-- INSERT IGNORE INTO `sys_menu` (`id`, `pid`, `path`, `name`, `title`, `icon`, `component`, `redirect`, `sort`, `deep`, `menu_type_cd`, `permissions`, `is_hidden`, `has_children`, `is_link`, `is_full`, `is_affix`, `is_keep_alive`, `del_flag`) VALUES ('9dfeebc408e1490e88bf10db3b5e1239', '99c2ee7b882749e597bcd62385f368fb', '', '', '查询菜单', '', '', '', 99, 3, '1002003', 'sys.menu.query_table', 'F', 'F', 'F', 'F', 'F', 'F', 'F');
--- 字典管理
+-- -- 字典管理
-UPDATE sys_menu SET permissions = '', path = '/system/dict' WHERE id = 'dcb6aabcd910469ebf3efbc7e43282d4';
+-- UPDATE sys_menu SET permissions = '', path = '/system/dict' WHERE id = 'dcb6aabcd910469ebf3efbc7e43282d4';
-INSERT IGNORE INTO `sys_menu` (`id`, `pid`, `path`, `name`, `title`, `icon`, `component`, `redirect`, `sort`, `deep`, `menu_type_cd`, `permissions`, `is_hidden`, `has_children`, `is_link`, `is_full`, `is_affix`, `is_keep_alive`, `del_flag`) VALUES ('d90946bc9ed54e598e3c4471dbd1f496', 'dcb6aabcd910469ebf3efbc7e43282d4', '', '', '查询字典', '', '', '', 99, 3, '1002003', 'sys.dict.query_table', 'F', 'F', 'F', 'F', 'F', 'F', 'F');
+-- INSERT IGNORE INTO `sys_menu` (`id`, `pid`, `path`, `name`, `title`, `icon`, `component`, `redirect`, `sort`, `deep`, `menu_type_cd`, `permissions`, `is_hidden`, `has_children`, `is_link`, `is_full`, `is_affix`, `is_keep_alive`, `del_flag`) VALUES ('d90946bc9ed54e598e3c4471dbd1f496', 'dcb6aabcd910469ebf3efbc7e43282d4', '', '', '查询字典', '', '', '', 99, 3, '1002003', 'sys.dict.query_table', 'F', 'F', 'F', 'F', 'F', 'F', 'F');
--- 参数管理
+-- -- 参数管理
-UPDATE sys_menu SET permissions = '', path = '/system/conf' WHERE id = '29d33eba6b73420287d8f7e64aea62b3';
+-- UPDATE sys_menu SET permissions = '', path = '/system/conf' WHERE id = '29d33eba6b73420287d8f7e64aea62b3';
-INSERT IGNORE INTO `sys_menu` (`id`, `pid`, `path`, `name`, `title`, `icon`, `component`, `redirect`, `sort`, `deep`, `menu_type_cd`, `permissions`, `is_hidden`, `has_children`, `is_link`, `is_full`, `is_affix`, `is_keep_alive`, `del_flag`) VALUES ('bef8f1330490494f924314eec9687055', '29d33eba6b73420287d8f7e64aea62b3', '', '', '查询参数', '', '', '', 99, 3, '1002003', 'sys.config.query_table', 'F', 'F', 'F', 'F', 'F', 'F', 'F');
+-- INSERT IGNORE INTO `sys_menu` (`id`, `pid`, `path`, `name`, `title`, `icon`, `component`, `redirect`, `sort`, `deep`, `menu_type_cd`, `permissions`, `is_hidden`, `has_children`, `is_link`, `is_full`, `is_affix`, `is_keep_alive`, `del_flag`) VALUES ('bef8f1330490494f924314eec9687055', '29d33eba6b73420287d8f7e64aea62b3', '', '', '查询参数', '', '', '', 99, 3, '1002003', 'sys.config.query_table', 'F', 'F', 'F', 'F', 'F', 'F', 'F');
--- 客户端管理
+-- -- 客户端管理
-UPDATE sys_menu SET permissions = '', path = '/system/client' WHERE id = '9e731ff422184fc1be2022c5c985735e';
+-- UPDATE sys_menu SET permissions = '', path = '/system/client' WHERE id = '9e731ff422184fc1be2022c5c985735e';
-INSERT IGNORE INTO `sys_menu` (`id`, `pid`, `path`, `name`, `title`, `icon`, `component`, `redirect`, `sort`, `deep`, `menu_type_cd`, `permissions`, `is_hidden`, `has_children`, `is_link`, `is_full`, `is_affix`, `is_keep_alive`, `del_flag`) VALUES ('6307bd1221fb474b8c8777afaed4440f', '9e731ff422184fc1be2022c5c985735e', '', '', '查询', '', '', '', 99, 3, '1002003', 'sys.client.query_table', 'F', 'F', 'F', 'F', 'F', 'F', 'F');
+-- INSERT IGNORE INTO `sys_menu` (`id`, `pid`, `path`, `name`, `title`, `icon`, `component`, `redirect`, `sort`, `deep`, `menu_type_cd`, `permissions`, `is_hidden`, `has_children`, `is_link`, `is_full`, `is_affix`, `is_keep_alive`, `del_flag`) VALUES ('6307bd1221fb474b8c8777afaed4440f', '9e731ff422184fc1be2022c5c985735e', '', '', '查询', '', '', '', 99, 3, '1002003', 'sys.client.query_table', 'F', 'F', 'F', 'F', 'F', 'F', 'F');
--- 部门管理
+-- -- 部门管理
-UPDATE sys_menu SET permissions = '', path = '/system/dept' WHERE id = '8354d626cc65487594a7c38e98de1bad';
+-- UPDATE sys_menu SET permissions = '', path = '/system/dept' WHERE id = '8354d626cc65487594a7c38e98de1bad';
-INSERT IGNORE INTO `sys_menu` (`id`, `pid`, `path`, `name`, `title`, `icon`, `component`, `redirect`, `sort`, `deep`, `menu_type_cd`, `permissions`, `is_hidden`, `has_children`, `is_link`, `is_full`, `is_affix`, `is_keep_alive`, `del_flag`) VALUES ('31dca47db78f4c14b9cfe65226061b65', '8354d626cc65487594a7c38e98de1bad', '', '', '查询', '', '', '', 99, 3, '1002003', 'sys.dept.query_table', 'F', 'F', 'F', 'F', 'F', 'F', 'F');
+-- INSERT IGNORE INTO `sys_menu` (`id`, `pid`, `path`, `name`, `title`, `icon`, `component`, `redirect`, `sort`, `deep`, `menu_type_cd`, `permissions`, `is_hidden`, `has_children`, `is_link`, `is_full`, `is_affix`, `is_keep_alive`, `del_flag`) VALUES ('31dca47db78f4c14b9cfe65226061b65', '8354d626cc65487594a7c38e98de1bad', '', '', '查询', '', '', '', 99, 3, '1002003', 'sys.dept.query_table', 'F', 'F', 'F', 'F', 'F', 'F', 'F');
--- 数据权限
+-- -- 数据权限
-UPDATE sys_menu SET permissions = '', path = '/system/data' WHERE id = '0444cd2c01584f0687264b6205536691';
+-- UPDATE sys_menu SET permissions = '', path = '/system/data' WHERE id = '0444cd2c01584f0687264b6205536691';
-INSERT IGNORE INTO `sys_menu` (`id`, `pid`, `path`, `name`, `title`, `icon`, `component`, `redirect`, `sort`, `deep`, `menu_type_cd`, `permissions`, `is_hidden`, `has_children`, `is_link`, `is_full`, `is_affix`, `is_keep_alive`, `del_flag`) VALUES ('2ae05bd0afaa4c6dbc173bf1dd0da2cf', '0444cd2c01584f0687264b6205536691', '', '', '查询', '', '', '', 99, 3, '1002003', 'sys.data.role.query_table', 'F', 'F', 'F', 'F', 'F', 'F', 'F');
+-- INSERT IGNORE INTO `sys_menu` (`id`, `pid`, `path`, `name`, `title`, `icon`, `component`, `redirect`, `sort`, `deep`, `menu_type_cd`, `permissions`, `is_hidden`, `has_children`, `is_link`, `is_full`, `is_affix`, `is_keep_alive`, `del_flag`) VALUES ('2ae05bd0afaa4c6dbc173bf1dd0da2cf', '0444cd2c01584f0687264b6205536691', '', '', '查询', '', '', '', 99, 3, '1002003', 'sys.data.role.query_table', 'F', 'F', 'F', 'F', 'F', 'F', 'F');
--- 文件管理
+-- -- 文件管理
-UPDATE sys_menu SET permissions = '', path = '/system/file' WHERE id = 'c4896e8735a745bda9b47ecaf50f46f2';
+-- UPDATE sys_menu SET permissions = '', path = '/system/file' WHERE id = 'c4896e8735a745bda9b47ecaf50f46f2';
-INSERT IGNORE INTO `sys_menu` (`id`, `pid`, `path`, `name`, `title`, `icon`, `component`, `redirect`, `sort`, `deep`, `menu_type_cd`, `permissions`, `is_hidden`, `has_children`, `is_link`, `is_full`, `is_affix`, `is_keep_alive`, `del_flag`) VALUES ('62dd478ed2f54792b08ed9202e73d2cf', 'c4896e8735a745bda9b47ecaf50f46f2', '', '', '查询', '', '', '', 99, 3, '1002003', 'sys.file.query_table', 'F', 'F', 'F', 'F', 'F', 'F', 'F');
+-- INSERT IGNORE INTO `sys_menu` (`id`, `pid`, `path`, `name`, `title`, `icon`, `component`, `redirect`, `sort`, `deep`, `menu_type_cd`, `permissions`, `is_hidden`, `has_children`, `is_link`, `is_full`, `is_affix`, `is_keep_alive`, `del_flag`) VALUES ('62dd478ed2f54792b08ed9202e73d2cf', 'c4896e8735a745bda9b47ecaf50f46f2', '', '', '查询', '', '', '', 99, 3, '1002003', 'sys.file.query_table', 'F', 'F', 'F', 'F', 'F', 'F', 'F');
--- 模板文件管理
+-- -- 模板文件管理
-UPDATE sys_menu SET permissions = '', path = '/system/fileTemp' WHERE id = '8231a369712e4f8f8ac09fce232cd034';
+-- UPDATE sys_menu SET permissions = '', path = '/system/fileTemp' WHERE id = '8231a369712e4f8f8ac09fce232cd034';
-INSERT IGNORE INTO `sys_menu` (`id`, `pid`, `path`, `name`, `title`, `icon`, `component`, `redirect`, `sort`, `deep`, `menu_type_cd`, `permissions`, `is_hidden`, `has_children`, `is_link`, `is_full`, `is_affix`, `is_keep_alive`, `del_flag`) VALUES ('47e5805374bc44a2831126676b8c78dd', '8231a369712e4f8f8ac09fce232cd034', '', '', '查询', '', '', '', 99, 3, '1002003', 'sys.temp.file.query_table', 'F', 'F', 'F', 'F', 'F', 'F', 'F');
+-- INSERT IGNORE INTO `sys_menu` (`id`, `pid`, `path`, `name`, `title`, `icon`, `component`, `redirect`, `sort`, `deep`, `menu_type_cd`, `permissions`, `is_hidden`, `has_children`, `is_link`, `is_full`, `is_affix`, `is_keep_alive`, `del_flag`) VALUES ('47e5805374bc44a2831126676b8c78dd', '8231a369712e4f8f8ac09fce232cd034', '', '', '查询', '', '', '', 99, 3, '1002003', 'sys.temp.file.query_table', 'F', 'F', 'F', 'F', 'F', 'F', 'F');
--- 登录日志
+-- -- 登录日志
-UPDATE sys_menu SET permissions = '' WHERE id = '191878090b294ec5892a68081dd91428';
+-- UPDATE sys_menu SET permissions = '' WHERE id = '191878090b294ec5892a68081dd91428';
-INSERT IGNORE INTO `sys_menu` (`id`, `pid`, `path`, `name`, `title`, `icon`, `component`, `redirect`, `sort`, `deep`, `menu_type_cd`, `permissions`, `is_hidden`, `has_children`, `is_link`, `is_full`, `is_affix`, `is_keep_alive`, `del_flag`) VALUES ('c555243b02814270948a240e8d2d3408', '191878090b294ec5892a68081dd91428', '', '', '查询', '', '', '', 99, 3, '1002003', 'sys.login.log.query_table', 'F', 'F', 'F', 'F', 'F', 'F', 'F');
+-- INSERT IGNORE INTO `sys_menu` (`id`, `pid`, `path`, `name`, `title`, `icon`, `component`, `redirect`, `sort`, `deep`, `menu_type_cd`, `permissions`, `is_hidden`, `has_children`, `is_link`, `is_full`, `is_affix`, `is_keep_alive`, `del_flag`) VALUES ('c555243b02814270948a240e8d2d3408', '191878090b294ec5892a68081dd91428', '', '', '查询', '', '', '', 99, 3, '1002003', 'sys.login.log.query_table', 'F', 'F', 'F', 'F', 'F', 'F', 'F');
-
+--
-UPDATE sys_menu SET permissions = '' WHERE id = '0e529e8a9dbf450898b695e051c36d48';
+-- UPDATE sys_menu SET permissions = '' WHERE id = '0e529e8a9dbf450898b695e051c36d48';
-INSERT IGNORE INTO `sys_menu` (`id`, `pid`, `path`, `name`, `title`, `icon`, `component`, `redirect`, `sort`, `deep`, `menu_type_cd`, `permissions`, `is_hidden`, `has_children`, `is_link`, `is_full`, `is_affix`, `is_keep_alive`, `del_flag`) VALUES ('765d139874424930b0a672128712de9b', '0e529e8a9dbf450898b695e051c36d48', '', '', '查询', '', '', '', 99, 3, '1002003', 'generator.list', 'F', 'F', 'F', 'F', 'F', 'F', 'F');
+-- INSERT IGNORE INTO `sys_menu` (`id`, `pid`, `path`, `name`, `title`, `icon`, `component`, `redirect`, `sort`, `deep`, `menu_type_cd`, `permissions`, `is_hidden`, `has_children`, `is_link`, `is_full`, `is_affix`, `is_keep_alive`, `del_flag`) VALUES ('765d139874424930b0a672128712de9b', '0e529e8a9dbf450898b695e051c36d48', '', '', '查询', '', '', '', 99, 3, '1002003', 'generator.list', 'F', 'F', 'F', 'F', 'F', 'F', 'F');
-
+--
-UPDATE sys_menu SET permissions = '' WHERE id = '85b54322630f43a39296488a5e76ba16';
+-- UPDATE sys_menu SET permissions = '' WHERE id = '85b54322630f43a39296488a5e76ba16';
-INSERT IGNORE INTO `sys_menu` (`id`, `pid`, `path`, `name`, `title`, `icon`, `component`, `redirect`, `sort`, `deep`, `menu_type_cd`, `permissions`, `is_hidden`, `has_children`, `is_link`, `is_full`, `is_affix`, `is_keep_alive`, `del_flag`) VALUES ('ab1ac16c617d41979472ebe433c1f8e4', '85b54322630f43a39296488a5e76ba16', '', '', '查询', '', '', '', 99, 2, '1002003', 'teacher.statistics.query_table', 'F', 'F', 'F', 'F', 'F', 'F', 'F');
+-- INSERT IGNORE INTO `sys_menu` (`id`, `pid`, `path`, `name`, `title`, `icon`, `component`, `redirect`, `sort`, `deep`, `menu_type_cd`, `permissions`, `is_hidden`, `has_children`, `is_link`, `is_full`, `is_affix`, `is_keep_alive`, `del_flag`) VALUES ('ab1ac16c617d41979472ebe433c1f8e4', '85b54322630f43a39296488a5e76ba16', '', '', '查询', '', '', '', 99, 2, '1002003', 'teacher.statistics.query_table', 'F', 'F', 'F', 'F', 'F', 'F', 'F');
-
+--
---changeset 升职哦（sz）:20250920_1520
+-- --changeset 升职哦（sz）:20250920_1520
---comment: 更新角色菜单关联
+-- --comment: 更新角色菜单关联
-INSERT INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('0bef80d81a264f689d091613053c659e', 1);
+-- INSERT INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('0bef80d81a264f689d091613053c659e', 1);
-INSERT INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('abecbec6abe74023abaa653f827a3b0f', 1);
+-- INSERT INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('abecbec6abe74023abaa653f827a3b0f', 1);
-INSERT INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('9dfeebc408e1490e88bf10db3b5e1239', 1);
+-- INSERT INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('9dfeebc408e1490e88bf10db3b5e1239', 1);
-INSERT INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('d90946bc9ed54e598e3c4471dbd1f496', 1);
+-- INSERT INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('d90946bc9ed54e598e3c4471dbd1f496', 1);
-INSERT INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('bef8f1330490494f924314eec9687055', 1);
+-- INSERT INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('bef8f1330490494f924314eec9687055', 1);
-INSERT INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('6307bd1221fb474b8c8777afaed4440f', 1);
+-- INSERT INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('6307bd1221fb474b8c8777afaed4440f', 1);
-INSERT INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('31dca47db78f4c14b9cfe65226061b65', 1);
+-- INSERT INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('31dca47db78f4c14b9cfe65226061b65', 1);
-INSERT INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('2ae05bd0afaa4c6dbc173bf1dd0da2cf', 1);
+-- INSERT INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('2ae05bd0afaa4c6dbc173bf1dd0da2cf', 1);
-INSERT INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('62dd478ed2f54792b08ed9202e73d2cf', 1);
+-- INSERT INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('62dd478ed2f54792b08ed9202e73d2cf', 1);
-INSERT INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('47e5805374bc44a2831126676b8c78dd', 1);
+-- INSERT INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('47e5805374bc44a2831126676b8c78dd', 1);
-INSERT INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('c555243b02814270948a240e8d2d3408', 1);
+-- INSERT INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('c555243b02814270948a240e8d2d3408', 1);
-INSERT INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('765d139874424930b0a672128712de9b', 1);
+-- INSERT INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('765d139874424930b0a672128712de9b', 1);
-INSERT INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('ab1ac16c617d41979472ebe433c1f8e4', 1);
+-- INSERT INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('ab1ac16c617d41979472ebe433c1f8e4', 1);
-INSERT INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('ab1ac16c617d41979472ebe433c1f8e4', 3);
+-- INSERT INTO `sys_role_menu` (`menu_id`, `role_id`) VALUES ('ab1ac16c617d41979472ebe433c1f8e4', 3);
-
+--
---changeset 升职哦（sz）:20251030_1925
+-- --changeset 升职哦（sz）:20251030_1925
---comment: 修改sys_role_menu表, 增加字段
+-- --comment: 修改sys_role_menu表, 增加字段
-ALTER TABLE `sys_role_menu` ADD COLUMN `permission_type` enum('menu','scope') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 'menu' COMMENT '权限类型（功能权限；数据权限）';
+-- ALTER TABLE `sys_role_menu` ADD COLUMN `permission_type` enum('menu','scope') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 'menu' COMMENT '权限类型（功能权限；数据权限）';
-ALTER TABLE `sys_role_menu` ADD COLUMN `data_scope_cd` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '数据权限范围，data_scope字典';
+-- ALTER TABLE `sys_role_menu` ADD COLUMN `data_scope_cd` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '数据权限范围，data_scope字典';
-UPDATE `sys_role_menu` SET `permission_type` = 'menu' WHERE `permission_type` IS NULL;
+-- UPDATE `sys_role_menu` SET `permission_type` = 'menu' WHERE `permission_type` IS NULL;
-
+--
---changeset 升职哦（sz）:20251031_1930
+-- --changeset 升职哦（sz）:20251031_1930
-ALTER TABLE `sys_data_role_relation` ADD COLUMN `menu_id` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '菜单id';
+-- ALTER TABLE `sys_data_role_relation` ADD COLUMN `menu_id` varchar(64) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '菜单id';
-
+--
---changeset 升职哦（sz）:20251103_2312
+-- --changeset 升职哦（sz）:20251103_2312
-UPDATE `sys_menu` SET `is_hidden` = 'T' WHERE `id` = '0444cd2c01584f0687264b6205536691';
+-- UPDATE `sys_menu` SET `is_hidden` = 'T' WHERE `id` = '0444cd2c01584f0687264b6205536691';
-UPDATE `sys_menu` SET `use_data_scope` = 'T' WHERE `pid` IN ( SELECT `id` FROM (SELECT `id` FROM `sys_menu` WHERE `is_hidden` = 'T' AND `menu_type_cd` != '1002003') AS temp);
+-- UPDATE `sys_menu` SET `use_data_scope` = 'T' WHERE `pid` IN ( SELECT `id` FROM (SELECT `id` FROM `sys_menu` WHERE `is_hidden` = 'T' AND `menu_type_cd` != '1002003') AS temp);
-ALTER TABLE `sys_data_role_menu` COMMENT='系统数据角色-菜单表【废弃, from 2025-v1.3.0】';
+-- ALTER TABLE `sys_data_role_menu` COMMENT='系统数据角色-菜单表【废弃, from 2025-v1.3.0】';
-ALTER TABLE `sys_data_role` COMMENT='系统数据角色表【废弃, from 2025-v1.3.0】';
+-- ALTER TABLE `sys_data_role` COMMENT='系统数据角色表【废弃, from 2025-v1.3.0】';
-
+--
---changeset 升职哦（sz）:20251104_1933
+-- --changeset 升职哦（sz）:20251104_1933
-INSERT INTO `sys_config` (`config_name`, `config_key`, `config_value`, `is_lock`, `create_id`, `create_time`, `update_id`, `update_time`, `remark`) VALUES ('超级管理员角色权限配置', 'sys.admin.superAdminRoleId', '1', 'T', 1, '2025-11-04 13:06:45', 1, '2025-11-04 16:32:25', '超管权限，指定的生效角色 ID。');
+-- INSERT INTO `sys_config` (`config_name`, `config_key`, `config_value`, `is_lock`, `create_id`, `create_time`, `update_id`, `update_time`, `remark`) VALUES ('超级管理员角色权限配置', 'sys.admin.superAdminRoleId', '1', 'T', 1, '2025-11-04 13:06:45', 1, '2025-11-04 16:32:25', '超管权限，指定的生效角色 ID。');
-UPDATE `sys_dict` SET `sys_dict_type_id` = 1001, `code_name` = '测试用户', `alias` = '', `sort` = 3, `callback_show_style` = 'warning', `remark` = '', `is_lock` = 'T', `is_show` = 'T', `del_flag` = 'F', `create_time` = '2023-08-20 16:38:58', `update_time` = '2025-11-05 14:56:22', `delete_time` = NULL, `create_id` = NULL, `update_id` = 1, `delete_id` = NULL WHERE `id` = 1001001;
+-- UPDATE `sys_dict` SET `sys_dict_type_id` = 1001, `code_name` = '测试用户', `alias` = '', `sort` = 3, `callback_show_style` = 'warning', `remark` = '', `is_lock` = 'T', `is_show` = 'T', `del_flag` = 'F', `create_time` = '2023-08-20 16:38:58', `update_time` = '2025-11-05 14:56:22', `delete_time` = NULL, `create_id` = NULL, `update_id` = 1, `delete_id` = NULL WHERE `id` = 1001001;
-UPDATE `sys_dict` SET `sys_dict_type_id` = 1001, `code_name` = '超级管理员', `alias` = '', `sort` = 2, `callback_show_style` = 'danger', `remark` = '', `is_lock` = 'T', `is_show` = 'T', `del_flag` = 'F', `create_time` = '2023-08-20 16:39:05', `update_time` = '2025-11-05 14:56:34', `delete_time` = NULL, `create_id` = NULL, `update_id` = 1, `delete_id` = NULL WHERE `id` = 1001002;
+-- UPDATE `sys_dict` SET `sys_dict_type_id` = 1001, `code_name` = '超级管理员', `alias` = '', `sort` = 2, `callback_show_style` = 'danger', `remark` = '', `is_lock` = 'T', `is_show` = 'T', `del_flag` = 'F', `create_time` = '2023-08-20 16:39:05', `update_time` = '2025-11-05 14:56:34', `delete_time` = NULL, `create_id` = NULL, `update_id` = 1, `delete_id` = NULL WHERE `id` = 1001002;
-UPDATE `sys_dict` SET `sys_dict_type_id` = 1001, `code_name` = '普通用户', `alias` = '', `sort` = 1, `callback_show_style` = 'primary', `remark` = '', `is_lock` = 't', `is_show` = 'T', `del_flag` = 'F', `create_time` = '2023-08-20 16:39:11', `update_time` = '2025-11-05 14:56:39', `delete_time` = NULL, `create_id` = NULL, `update_id` = 1, `delete_id` = NULL WHERE `id` = 1001003;
+-- UPDATE `sys_dict` SET `sys_dict_type_id` = 1001, `code_name` = '普通用户', `alias` = '', `sort` = 1, `callback_show_style` = 'primary', `remark` = '', `is_lock` = 't', `is_show` = 'T', `del_flag` = 'F', `create_time` = '2023-08-20 16:39:11', `update_time` = '2025-11-05 14:56:39', `delete_time` = NULL, `create_id` = NULL, `update_id` = 1, `delete_id` = NULL WHERE `id` = 1001003;

sz-service/sz-service-admin/src/main/resources/db/changelog/framework/1.3.0-beta/002_breaking_change.sql

@@ -1,20 +1,20 @@
---liquibase formatted sql
+-- --liquibase formatted sql
-
+--
---changeset 升职哦（sz）:20250924_1930
+-- --changeset 升职哦（sz）:20250924_1930
--- ===============================================
+-- -- ===============================================
--- ⚠️【破坏性更新】请谨慎升级！
+-- -- ⚠️【破坏性更新】请谨慎升级！
--- 此操作会删除数据，请务必提前备份相关数据！
+-- -- 此操作会删除数据，请务必提前备份相关数据！
--- ===============================================
+-- -- ===============================================
--- 删除 演示数据
+-- -- 删除 演示数据
-DELETE FROM `sys_file` WHERE id IN (97, 98, 99);
+-- DELETE FROM `sys_file` WHERE id IN (97, 98, 99);
-DELETE FROM `sys_temp_file` WHERE id = 1 and sys_file_id = 98;
+-- DELETE FROM `sys_temp_file` WHERE id = 1 and sys_file_id = 98;
-DELETE FROM `sys_temp_file_history` WHERE sys_temp_file_id = 1;
+-- DELETE FROM `sys_temp_file_history` WHERE sys_temp_file_id = 1;
--- 此改动为修正之前的设计缺陷，将sys_temp_file和sys_temp_file_history的url字段由varchar改为json类型，以支持存储多个文件地址
+-- -- 此改动为修正之前的设计缺陷，将sys_temp_file和sys_temp_file_history的url字段由varchar改为json类型，以支持存储多个文件地址
-ALTER TABLE `sys_temp_file` MODIFY COLUMN  `url` json DEFAULT NULL COMMENT '地址(JSON数组对象)';
+-- ALTER TABLE `sys_temp_file` MODIFY COLUMN  `url` json DEFAULT NULL COMMENT '地址(JSON数组对象)';
-ALTER TABLE `sys_temp_file_history` MODIFY COLUMN  `url` json DEFAULT NULL COMMENT '地址(JSON数组对象)';
+-- ALTER TABLE `sys_temp_file_history` MODIFY COLUMN  `url` json DEFAULT NULL COMMENT '地址(JSON数组对象)';
-ALTER TABLE `sys_temp_file` ADD COLUMN  alias varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '标识，唯一';
+-- ALTER TABLE `sys_temp_file` ADD COLUMN  alias varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '' COMMENT '标识，唯一';
-
+--
---changeset 升职哦（sz）:20251020_2250
+-- --changeset 升职哦（sz）:20251020_2250
-INSERT IGNORE INTO `sys_file` (`id`, `filename`, `dir_tag`, `size`, `url`, `create_time`, `object_name`, `context_type`, `e_tag`, `create_id`) VALUES (100, '教师统计模板.xlsx', 'tmp', 9866, 'https://minioapi.szadmin.cn/test/excel/教师统计模板.xlsx', '2025-10-20 22:36:53', 'tmp/20251020/教师统计模板.xlsx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', '8bba8015aa748013cc8295a13637fb3a', 1);
+-- INSERT IGNORE INTO `sys_file` (`id`, `filename`, `dir_tag`, `size`, `url`, `create_time`, `object_name`, `context_type`, `e_tag`, `create_id`) VALUES (100, '教师统计模板.xlsx', 'tmp', 9866, 'https://minioapi.szadmin.cn/test/excel/教师统计模板.xlsx', '2025-10-20 22:36:53', 'tmp/20251020/教师统计模板.xlsx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', '8bba8015aa748013cc8295a13637fb3a', 1);
-INSERT IGNORE INTO `sys_temp_file` (`id`, `sys_file_id`, `temp_name`, `remark`, `del_flag`, `create_id`, `create_time`, `update_id`, `update_time`, `url`, `alias`) VALUES (2, 100, '教师统计模板.xlsx', '教师统计-导入模板', 'F', 1, '2025-10-20 22:37:22', 1, '2025-10-20 22:37:22', '[{\"url\": \"https://minioapi.szadmin.cn/test/excel/教师统计模板.xlsx\", \"etag\": \"8bba8015aa748013cc8295a13637fb3a\", \"size\": 9866, \"dirTag\": \"tmp\", \"fileId\": 100, \"filename\": \"教师统计模板.xlsx\", \"metaData\": null, \"objectName\": \"excel/教师统计模板.xlsx\", \"contextType\": \"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet\"}]', 'jstj');
+-- INSERT IGNORE INTO `sys_temp_file` (`id`, `sys_file_id`, `temp_name`, `remark`, `del_flag`, `create_id`, `create_time`, `update_id`, `update_time`, `url`, `alias`) VALUES (2, 100, '教师统计模板.xlsx', '教师统计-导入模板', 'F', 1, '2025-10-20 22:37:22', 1, '2025-10-20 22:37:22', '[{\"url\": \"https://minioapi.szadmin.cn/test/excel/教师统计模板.xlsx\", \"etag\": \"8bba8015aa748013cc8295a13637fb3a\", \"size\": 9866, \"dirTag\": \"tmp\", \"fileId\": 100, \"filename\": \"教师统计模板.xlsx\", \"metaData\": null, \"objectName\": \"excel/教师统计模板.xlsx\", \"contextType\": \"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet\"}]', 'jstj');
-INSERT IGNORE INTO `sys_temp_file_history` (`id`, `sys_temp_file_id`, `sys_file_id`, `temp_name`, `url`, `remark`, `create_id`, `create_time`, `update_id`, `update_time`) VALUES (3, 2, 100, '教师统计模板.xlsx', '[{\"url\": \"https://minioapi.szadmin.cn/test/excel/教师统计模板.xlsx\", \"etag\": \"8bba8015aa748013cc8295a13637fb3a\", \"size\": 9866, \"dirTag\": \"tmp\", \"fileId\": 100, \"filename\": \"教师统计模板.xlsx\", \"metaData\": null, \"objectName\": \"excel/教师统计模板.xlsx\", \"contextType\": \"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet\"}]', '教师统计-导入模板', 1, '2025-10-20 22:37:22', 1, '2025-10-20 22:37:22');
+-- INSERT IGNORE INTO `sys_temp_file_history` (`id`, `sys_temp_file_id`, `sys_file_id`, `temp_name`, `url`, `remark`, `create_id`, `create_time`, `update_id`, `update_time`) VALUES (3, 2, 100, '教师统计模板.xlsx', '[{\"url\": \"https://minioapi.szadmin.cn/test/excel/教师统计模板.xlsx\", \"etag\": \"8bba8015aa748013cc8295a13637fb3a\", \"size\": 9866, \"dirTag\": \"tmp\", \"fileId\": 100, \"filename\": \"教师统计模板.xlsx\", \"metaData\": null, \"objectName\": \"excel/教师统计模板.xlsx\", \"contextType\": \"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet\"}]', '教师统计-导入模板', 1, '2025-10-20 22:37:22', 1, '2025-10-20 22:37:22');

sz-service/sz-service-admin/src/main/resources/db/changelog/framework/1.3.0-beta/003_login.sql

@@ -1,9 +1,9 @@
---liquibase formatted sql
+-- --liquibase formatted sql
-
+--
---changeset 升职哦（sz）:20251016_1914
+-- --changeset 升职哦（sz）:20251016_1914
-
+--
-INSERT IGNORE INTO `sys_config` (`config_name`, `config_key`, `config_value`, `is_lock`, `create_id`, `create_time`, `update_id`, `update_time`, `remark`) VALUES ('登录请求次数限制', 'sys.login.requestLimit', '100', 'F', 1, '2025-10-14 16:35:28', 1, '2025-10-15 16:40:34', '一段时间内的登录请求次数限制，根据requestId（Ip + UserAgent）判断；若为 0 则不限制');
+-- INSERT IGNORE INTO `sys_config` (`config_name`, `config_key`, `config_value`, `is_lock`, `create_id`, `create_time`, `update_id`, `update_time`, `remark`) VALUES ('登录请求次数限制', 'sys.login.requestLimit', '100', 'F', 1, '2025-10-14 16:35:28', 1, '2025-10-15 16:40:34', '一段时间内的登录请求次数限制，根据requestId（Ip + UserAgent）判断；若为 0 则不限制');
-INSERT IGNORE INTO `sys_config` (`config_name`, `config_key`, `config_value`, `is_lock`, `create_id`, `create_time`, `update_id`, `update_time`, `remark`) VALUES ('登录次数计数周期（分）', 'sys.login.requestCycle', '10', 'F', 1, '2025-10-14 16:36:14', 1, '2025-10-16 16:51:44', '默认10分钟');
+-- INSERT IGNORE INTO `sys_config` (`config_name`, `config_key`, `config_value`, `is_lock`, `create_id`, `create_time`, `update_id`, `update_time`, `remark`) VALUES ('登录次数计数周期（分）', 'sys.login.requestCycle', '10', 'F', 1, '2025-10-14 16:36:14', 1, '2025-10-16 16:51:44', '默认10分钟');
-
+--
-UPDATE `sys_config` SET `config_name` = '验证码请求次数限制', `config_key` = 'sys.captcha.requestLimit', `config_value` = '100', `is_lock` = 'T', `create_id` = 1, `create_time` = '2025-01-08 22:09:28', `update_id` = 1, `update_time` = '2025-10-16 17:30:09', `remark` = '一段时间内的验证码请求次数上限（0为不限制），默认100次' WHERE `config_key` = 'sys.captcha.requestLimit';
+-- UPDATE `sys_config` SET `config_name` = '验证码请求次数限制', `config_key` = 'sys.captcha.requestLimit', `config_value` = '100', `is_lock` = 'T', `create_id` = 1, `create_time` = '2025-01-08 22:09:28', `update_id` = 1, `update_time` = '2025-10-16 17:30:09', `remark` = '一段时间内的验证码请求次数上限（0为不限制），默认100次' WHERE `config_key` = 'sys.captcha.requestLimit';
-UPDATE `sys_config` SET `config_name` = '验证码计数周期（分）', `config_key` = 'sys.captcha.requestCycle', `config_value` = '10', `is_lock` = 'T', `create_id` = 1, `create_time` = '2025-01-08 22:13:09', `update_id` = 1, `update_time` = '2025-10-16 17:30:40', `remark` = '默认10（分）' WHERE `config_key` = 'sys.captcha.requestCycle';
+-- UPDATE `sys_config` SET `config_name` = '验证码计数周期（分）', `config_key` = 'sys.captcha.requestCycle', `config_value` = '10', `is_lock` = 'T', `create_id` = 1, `create_time` = '2025-01-08 22:13:09', `update_id` = 1, `update_time` = '2025-10-16 17:30:40', `remark` = '默认10（分）' WHERE `config_key` = 'sys.captcha.requestCycle';

sz-service/sz-service-admin/src/main/resources/db/changelog/framework/1.3.0-beta/004_generator.sql

@@ -1,4 +1,4 @@
---liquibase formatted sql
+-- --liquibase formatted sql
-
+--
---changeset 升职哦（sz）:20251105_2005
+-- --changeset 升职哦（sz）:20251105_2005
-ALTER TABLE `generator_table` ADD COLUMN `btn_data_scope_type` char(1) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '1' COMMENT '是否开启数据权限（1 是）' after `btn_permission_type`;
+-- ALTER TABLE `generator_table` ADD COLUMN `btn_data_scope_type` char(1) COLLATE utf8mb4_general_ci NOT NULL DEFAULT '1' COMMENT '是否开启数据权限（1 是）' after `btn_permission_type`;

sz-service/sz-service-admin/src/main/resources/db/changelog/framework/1.3.2-beta/001_generator.sql

@@ -1,4 +1,4 @@
---liquibase formatted sql
+-- --liquibase formatted sql
-
+--
---changeset 升职哦（sz）:20251212_1954
+-- --changeset 升职哦（sz）:20251212_1954
-ALTER TABLE `generator_table` ADD COLUMN `window_show_type` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '窗口展示方式(0 dialog弹窗；1 drawer 抽屉)';
+-- ALTER TABLE `generator_table` ADD COLUMN `window_show_type` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '窗口展示方式(0 dialog弹窗；1 drawer 抽屉)';

sz-service/sz-service-admin/src/main/resources/db/changelog/framework/1.3.2-beta/002_system.sql

@@ -1,12 +1,12 @@
---liquibase formatted sql
+-- --liquibase formatted sql
-
+--
---changeset 升职哦（sz）:20260112_2114
+-- --changeset 升职哦（sz）:20260112_2114
-ALTER TABLE `sys_config` ADD COLUMN `frontend_visible` enum('T','F') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 'F' COMMENT '该参数是否需要前端加载、缓存及使用' after `is_lock`;
+-- ALTER TABLE `sys_config` ADD COLUMN `frontend_visible` enum('T','F') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 'F' COMMENT '该参数是否需要前端加载、缓存及使用' after `is_lock`;
-
+--
---changeset 升职哦（sz）:20260116_2025
+-- --changeset 升职哦（sz）:20260116_2025
-INSERT INTO `sys_config` (`config_name`, `config_key`, `config_value`, `is_lock`, `frontend_visible`, `create_id`, `create_time`, `update_id`, `update_time`, `remark`) VALUES ('资源访问模式', 'oss.accessMode', 'private', 'F', 'T', 1, '2026-01-13 09:59:09', 1, '2026-01-16 13:57:52', '用于控制前端资源文件（如 Minio OSS）访问方式。当值为 public 时，前端直接使用数据库中存储的完整资源 URL 进行加载，适用于公开访问的资源；当值为 private 时，前端通过 Minio 获取私有资源的临时授权地址进行加载，适用于需权限验证的私有资源。');
+-- INSERT INTO `sys_config` (`config_name`, `config_key`, `config_value`, `is_lock`, `frontend_visible`, `create_id`, `create_time`, `update_id`, `update_time`, `remark`) VALUES ('资源访问模式', 'oss.accessMode', 'private', 'F', 'T', 1, '2026-01-13 09:59:09', 1, '2026-01-16 13:57:52', '用于控制前端资源文件（如 Minio OSS）访问方式。当值为 public 时，前端直接使用数据库中存储的完整资源 URL 进行加载，适用于公开访问的资源；当值为 private 时，前端通过 Minio 获取私有资源的临时授权地址进行加载，适用于需权限验证的私有资源。');
-
+--
---changeset 升职哦（sz）:20260116_2215
+-- --changeset 升职哦（sz）:20260116_2215
-UPDATE `sys_config` SET `is_lock` = 'T' WHERE `config_key` = 'oss.accessMode';
+-- UPDATE `sys_config` SET `is_lock` = 'T' WHERE `config_key` = 'oss.accessMode';
-UPDATE `sys_config` SET `is_lock` = 'T' WHERE `config_key` = 'sys.login.requestCycle';
+-- UPDATE `sys_config` SET `is_lock` = 'T' WHERE `config_key` = 'sys.login.requestCycle';
-UPDATE `sys_config` SET `is_lock` = 'T' WHERE `config_key` = 'sys.login.requestLimit';
+-- UPDATE `sys_config` SET `is_lock` = 'T' WHERE `config_key` = 'sys.login.requestLimit';

sz-service/sz-service-admin/src/main/resources/db/changelog/sql/dev_0.0.1_xq.sql

@@ -0,0 +1,79 @@
+create table ry_user_model_content
+(
+    id               varchar(32) null comment '表id',
+    user_id          varchar(32) null comment '用户id',
+    menu_type        varchar(32) null comment '目录类型',
+    model_content_id varchar(32) null comment '模型内容'
+) comment '用户模型关系';
+
+
+-- auto-generated definition
+create table ry_model_content
+(
+    id                varchar(32)  not null comment '模型id'
+        primary key,
+    title             varchar(32)  null comment '模型名称',
+    type              varchar(32)  null comment '模型类型',
+    binfo             varchar(128) null comment '位置（json）',
+    resize            tinyint(1)   null comment '调整大小(bool)',
+    rotate            tinyint(1)   null comment '旋转',
+    `lock`            tinyint(1)   null comment '锁定',
+    active            tinyint(1)   null comment '动作(bool)',
+    hide              tinyint(1)   null comment '隐藏(bool)',
+    props             varchar(128) null comment '属性(json)',
+    tag               varchar(128) null comment 'vue组件名称',
+    common_animations varchar(128) null comment '动画(json)',
+    events            varchar(128) null comment '事件',
+    `index`           int          null comment '索引'
+)
+    comment '模型内容';
+
+
+create table ry_canvas_cfg
+(
+    id               varchar(32) not null comment '面板id'  primary key,
+    user_id          varchar(32) null comment '用户id',
+    width            int null comment '宽度',
+    height           int null comment '高度',
+    scale            int null comment '比例',
+    color            varchar(32) null comment '颜色',
+    img              varchar(32) null comment '图片',
+    guide            varchar(32) null,
+    adsorp           boolean null comment '吸附(bool)',
+    adsorp_diff      int null comment '吸附差分',
+    transform_origin text null comment '原点(json)',
+    drag_offset      text null comment '拖拽(json)'
+) comment '面板';
+
+create table ry_grid_cfg
+(
+    id      varchar(32) not null
+        primary key,
+    user_id varchar(32) null comment '用户id',
+    enabled boolean null comment '网格(bool)',
+    align   boolean null comment '对齐(bool)',
+    size    int null comment '大小'
+) comment '网格';
+
+-- auto-generated definition
+create table ry_file_storage
+(
+    id          varchar(32)  not null
+        primary key,
+    file_url    varchar(356) null comment '文件路径',
+    file_size   varchar(32)  null comment '文件大小',
+    file_name   varchar(32)  null comment '文件名称',
+    file_suffix varchar(128) null comment '文件后缀',
+    add_time    datetime     null comment '添加时间'
+)
+    comment '文件存储';
+
+
+
+
+
+
+
+
+
+