From 4cbb8e9b89dff661ac921b85870d3e2223e3e21d Mon Sep 17 00:00:00 2001 From: "2192596591@qq.com" <2192596591@qq.com> Date: Mon, 16 Mar 2026 13:11:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93-=E6=A8=A1=E5=9E=8B=E9=A1=BA=E5=BA=8F=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../monitor/controller/FileController.java | 2 ++ .../pojo/dto/dataModel/ModelContentDTO.java | 5 +++++ .../dto/dataModel/UserModelContentDTO.java | 11 ++++++++++ .../admin/monitor/pojo/po/ModelContentDO.java | 7 +++++++ .../monitor/pojo/po/UserModelContentDO.java | 11 ++++++++++ .../service/impl/DataModelServiceImpl.java | 21 ++++++++++++------- .../service/impl/ModelContentServiceImpl.java | 8 ------- .../db/changelog/sql/dev_0.0.1_xq.sql | 6 ++++-- 8 files changed, 53 insertions(+), 18 deletions(-) diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/controller/FileController.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/controller/FileController.java index c7ce9cf..471f8b8 100644 --- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/controller/FileController.java +++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/controller/FileController.java @@ -47,11 +47,13 @@ public class FileController { } @GetMapping("/getFile") + @SaIgnore public ApiResult getFile(@RequestParam("id") String id) { return fileService.getFile(id); } @PostMapping("/saveFile") + @SaIgnore public ApiResult saveFile(@RequestParam("file") MultipartFile file) { return fileService.saveFile(file); } diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/dto/dataModel/ModelContentDTO.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/dto/dataModel/ModelContentDTO.java index b90fd47..5b51957 100644 --- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/dto/dataModel/ModelContentDTO.java +++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/dto/dataModel/ModelContentDTO.java @@ -29,6 +29,11 @@ public class ModelContentDTO { */ private String id; + /** + * 图形位置 + */ + private Integer modelIndex=99; + /** * 模型名称 */ diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/dto/dataModel/UserModelContentDTO.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/dto/dataModel/UserModelContentDTO.java index bc6805f..2a70ad2 100644 --- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/dto/dataModel/UserModelContentDTO.java +++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/dto/dataModel/UserModelContentDTO.java @@ -1,11 +1,14 @@ 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: @@ -32,4 +35,12 @@ public class UserModelContentDTO { * 模型内容 */ private String modelContentId; + /** + * 添加时间 + */ + private Date addTime; + /** + * 修改时间 + */ + private Date updateTime; } diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/ModelContentDO.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/ModelContentDO.java index 9c4ff9e..42542c2 100644 --- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/ModelContentDO.java +++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/ModelContentDO.java @@ -34,6 +34,12 @@ public class ModelContentDO { @Schema(description = "模型id") private String id; + /** + * 索引 + */ + @Schema(description = "模型索引") + private Integer modelIndex=99; + /** * 模型名称 */ @@ -107,6 +113,7 @@ public class ModelContentDO { 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"; diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/UserModelContentDO.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/UserModelContentDO.java index c0e01fe..7a4b8b3 100644 --- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/UserModelContentDO.java +++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/UserModelContentDO.java @@ -10,6 +10,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; +import java.util.Date; /** 用户模型中间表 * @description: @@ -44,6 +45,16 @@ public class UserModelContentDO implements Serializable { */ @Schema(description = "模型内容") private String modelContentId; + /** + * 添加时间 + */ + @Schema(description = "添加时间") + private Date addTime; + /** + * 修改时间 + */ + @Schema(description = "修改时间") + private Date updateTime; public static final String ID="id"; public static final String USER_ID="user_id"; diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/DataModelServiceImpl.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/DataModelServiceImpl.java index ae4c55b..e6c86b2 100644 --- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/DataModelServiceImpl.java +++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/DataModelServiceImpl.java @@ -114,7 +114,13 @@ public class DataModelServiceImpl { .map(item -> item.getModelContentId()) .collect(Collectors.toList()); - List modelContentDOS = modelContentService.listByIds(collect); + List modelContentDOS = modelContentService.list(QueryWrapper.create() + .from(ModelContentDO.class) + .in(ModelContentDO.ID, collect) + .orderBy(ModelContentDO.MODEL_INDEX, true) + ); + +// List modelContentDOS = modelContentService.listByIds(collect); for (ModelContentDO modelContentDO : modelContentDOS) { objects.add(ModelContentDO.doConvertDTO(modelContentDO)); } @@ -175,8 +181,12 @@ public class DataModelServiceImpl { throw new IllegalArgumentException("传值错误"); CanvasCfgDTO canvasCfg = dataModelDTO.getCanvasCfg(); GridCfgDTO gridCfg = dataModelDTO.getGridCfg(); - List json = dataModelDTO.getJson(); - + List 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); @@ -209,11 +219,6 @@ public class DataModelServiceImpl { .from(UserModelContentDO.class) .eq(UserModelContentDO.USER_ID, userId) .eq(UserModelContentDO.MENU_TYPE, dataModelDTO.getMenuType())); - - -// userModelContentService.remove(new QueryWrapper() -// .eq(UserModelContentDO.USER_ID, userId) //先写死 -// .eq(UserModelContentDO.MENU_TYPE, dataModelDTO.getMenuType())); return ApiResult.success(); } diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/ModelContentServiceImpl.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/ModelContentServiceImpl.java index 80ce157..93a052c 100644 --- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/ModelContentServiceImpl.java +++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/ModelContentServiceImpl.java @@ -60,14 +60,6 @@ public class ModelContentServiceImpl extends ServiceImpl doList = userModelContentService.list(queryWrapper); - -// List doList = userModelContentService.list(new QueryWrapper() -// .eq(UserModelContentDO.MODEL_CONTENT_ID, modelContentDO.getId()) -// .eq(UserModelContentDO.MENU_TYPE, menuType) -// .orderByDesc(UserModelContentDO.ID) -// .last("limit 1") -// ); - if (CollectionUtil.isEmpty(doList)) modelContentDO.setId(null); else diff --git a/sz-service/sz-service-admin/src/main/resources/db/changelog/sql/dev_0.0.1_xq.sql b/sz-service/sz-service-admin/src/main/resources/db/changelog/sql/dev_0.0.1_xq.sql index 52bdda8..67cb88e 100644 --- a/sz-service/sz-service-admin/src/main/resources/db/changelog/sql/dev_0.0.1_xq.sql +++ b/sz-service/sz-service-admin/src/main/resources/db/changelog/sql/dev_0.0.1_xq.sql @@ -7,6 +7,7 @@ create table ry_user_model_content ) comment '用户模型关系'; +-- auto-generated definition create table ry_model_content ( id varchar(32) not null comment '模型id' @@ -14,7 +15,7 @@ create table ry_model_content title varchar(32) null comment '模型名称', type varchar(32) null comment '模型类型', binfo varchar(128) null comment '位置（json）', - resize tinyint(1) null comment '调整大小', + resize tinyint(1) null comment '调整大小(bool)', rotate tinyint(1) null comment '旋转', `lock` tinyint(1) null comment '锁定', active tinyint(1) null comment '动作(bool)', @@ -22,7 +23,8 @@ create table ry_model_content props varchar(128) null comment '属性(json)', tag varchar(128) null comment 'vue组件名称', common_animations varchar(128) null comment '动画(json)', - events varchar(128) null comment '事件' + events varchar(128) null comment '事件', + `index` int null comment '索引' ) comment '模型内容';