From 52f8c1ad80392d534ca809ce5a6ecf49e422339f Mon Sep 17 00:00:00 2001 From: "2192596591@qq.com" <2192596591@qq.com> Date: Mon, 16 Mar 2026 10:35:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=AD=98=E5=82=A8?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DataModelController.java | 49 +++++++++++++++++++ .../sz/admin/monitor/pojo/po/CanvasCfgDO.java | 5 +- .../sz/admin/monitor/pojo/po/GridCfgDO.java | 11 +++-- .../admin/monitor/pojo/po/ModelContentDO.java | 3 ++ .../monitor/pojo/po/UserModelContentDO.java | 5 +- .../service/impl/CanvasCfgServiceImpl.java | 3 +- .../service/impl/DataModelServiceImpl.java | 12 ++--- .../service/impl/GridCfgServiceImpl.java | 2 +- .../service/impl/ModelContentServiceImpl.java | 2 +- .../db/changelog/sql/dev_0.0.1_xq.sql | 27 +++++----- 10 files changed, 93 insertions(+), 26 deletions(-) create mode 100644 sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/controller/DataModelController.java diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/controller/DataModelController.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/controller/DataModelController.java new file mode 100644 index 0000000..eca1a0e --- /dev/null +++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/controller/DataModelController.java @@ -0,0 +1,49 @@ +package com.sz.admin.monitor.controller; + + +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") + public ApiResult 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()); + } +} diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/CanvasCfgDO.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/CanvasCfgDO.java index c83878f..424e6ab 100644 --- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/CanvasCfgDO.java +++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/CanvasCfgDO.java @@ -2,6 +2,8 @@ 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; @@ -16,7 +18,7 @@ import lombok.NoArgsConstructor; * @author xq * @date 2026/1/29 11:32 */ -@Table("model_content") +@Table("canvas_cfg") @Schema(description = "画布配置数据对象") @Data @Builder @@ -26,6 +28,7 @@ public class CanvasCfgDO { /** * 面板id */ + @Id(keyType = KeyType.Generator, value = "uuid") @Schema(description = "面板id") private String id; diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/GridCfgDO.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/GridCfgDO.java index f8e1135..02f0ee9 100644 --- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/GridCfgDO.java +++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/GridCfgDO.java @@ -1,6 +1,8 @@ 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; @@ -25,31 +27,32 @@ public class GridCfgDO { /** * 网格id */ + @Id(keyType = KeyType.Generator, value = "uuid") @Schema(description = "主键ID") private String id; /** * 用户id */ - @Schema(description = "主键ID") + @Schema(description = "用户id") private String userId; /** * 网格是否启用 */ - @Schema(description = "主键ID") + @Schema(description = "网格是否启用") private Boolean enabled; /** * 对齐 */ - @Schema(description = "主键ID") + @Schema(description = "对齐") private Boolean align; /** * 大小 */ - @Schema(description = "主键ID") + @Schema(description = "大小") private Integer size; /** 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 3c3c31a..1982fad 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 @@ -3,6 +3,8 @@ 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; @@ -28,6 +30,7 @@ public class ModelContentDO { /** * 模型id */ + @Id(keyType = KeyType.Generator, value = "uuid") @Schema(description = "模型id") private String id; 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 eae82f5..473ec27 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 @@ -1,5 +1,7 @@ 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; @@ -22,8 +24,9 @@ import java.io.Serializable; @AllArgsConstructor public class UserModelContentDO implements Serializable { /** - * 表id + * id */ + @Id(keyType = KeyType.Generator, value = "uuid") @Schema(description = "主键ID") private String id; /** diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/CanvasCfgServiceImpl.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/CanvasCfgServiceImpl.java index 4bebe64..c3bda89 100644 --- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/CanvasCfgServiceImpl.java +++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/CanvasCfgServiceImpl.java @@ -31,8 +31,9 @@ public class CanvasCfgServiceImpl extends ServiceImpl() 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 41a1afb..ae4c55b 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 @@ -58,7 +58,7 @@ public class DataModelServiceImpl { QueryWrapper queryWrapper = QueryWrapper.create() .from(CanvasCfgDO.class) - .where(CanvasCfgDO.USER_ID, que.getUserId()) + .eq(CanvasCfgDO.USER_ID, que.getUserId()) .limit(1); // 获取画板数据 @@ -76,7 +76,7 @@ public class DataModelServiceImpl { // 获取网格数据 GridCfgDO gridCfgDO = gridCfgService.getOne(QueryWrapper.create() .from(GridCfgDO.class) - .where(GridCfgDO.USER_ID, que.getUserId()) + .eq(GridCfgDO.USER_ID, que.getUserId()) .limit(1) ); // GridCfgDO gridCfgDO = gridCfgService.getOne(new QueryWrapper() @@ -91,8 +91,8 @@ public class DataModelServiceImpl { //中间表 List userModelList = userModelContentService.list(QueryWrapper.create() .from(UserModelContentDO.class) - .where(UserModelContentDO.USER_ID, userId) - .limit(1) + .eq(UserModelContentDO.USER_ID, userId) + .eq(UserModelContentDO.MENU_TYPE, que.getMenuType()) ); // List userModelList = userModelContentService.list(new QueryWrapper() // .eq(UserModelContentDO.USER_ID, userId) @@ -191,7 +191,7 @@ public class DataModelServiceImpl { //获取中间表 List list = userModelContentService.list(QueryWrapper.create() .from(UserModelContentDO.class) - .where(UserModelContentDO.USER_ID, userId) //先写死 + .eq(UserModelContentDO.USER_ID, userId) //先写死 .eq(UserModelContentDO.MENU_TYPE, dataModelDTO.getMenuType()) ); // List list = userModelContentService.list(new QueryWrapper() @@ -207,7 +207,7 @@ public class DataModelServiceImpl { userModelContentService.remove(QueryWrapper.create() .from(UserModelContentDO.class) - .where(UserModelContentDO.USER_ID, userId) + .eq(UserModelContentDO.USER_ID, userId) .eq(UserModelContentDO.MENU_TYPE, dataModelDTO.getMenuType())); diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/GridCfgServiceImpl.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/GridCfgServiceImpl.java index 676b023..106f25a 100644 --- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/GridCfgServiceImpl.java +++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/service/impl/GridCfgServiceImpl.java @@ -30,7 +30,7 @@ public class GridCfgServiceImpl extends ServiceImpl im QueryWrapper queryWrapper = QueryWrapper.create() .from(GridCfgDO.class) - .where(GridCfgDO.USER_ID, gridCfgDO.getUserId()) + .eq(GridCfgDO.USER_ID, gridCfgDO.getUserId()) .limit(1); GridCfgDO one = getOne(queryWrapper); 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 dc74c20..80ce157 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 @@ -53,7 +53,7 @@ public class ModelContentServiceImpl extends ServiceImpl Date: Mon, 16 Mar 2026 11:10:08 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93DO=20=20BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/dev/mysql.yml | 2 +- config/local/mysql.yml | 2 +- config/preview/mysql.yml | 2 +- config/prod/mysql.yml | 2 +- .../sz/admin/monitor/pojo/po/CanvasCfgDO.java | 2 +- .../lib/win/HCNetSDKCom/HCGeneralCfgMgr.dll | Bin 2058664 -> 2058662 bytes .../src/main/resources/lib/win/libeay32.dll | Bin 1806813 -> 1806812 bytes 7 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/dev/mysql.yml b/config/dev/mysql.yml index c8f06a3..9238c9f 100644 --- a/config/dev/mysql.yml +++ b/config/dev/mysql.yml @@ -3,7 +3,7 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver 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 diff --git a/config/local/mysql.yml b/config/local/mysql.yml index e0bf6bc..3f603b3 100644 --- a/config/local/mysql.yml +++ b/config/local/mysql.yml @@ -1,7 +1,7 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/sz_admin_preview?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&allowPublicKeyRetrieval=true + url: jdbc:mysql://127.0.0.1:13306/sz_admin_preview?useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 hikari: diff --git a/config/preview/mysql.yml b/config/preview/mysql.yml index c8f06a3..9238c9f 100644 --- a/config/preview/mysql.yml +++ b/config/preview/mysql.yml @@ -3,7 +3,7 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver 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 diff --git a/config/prod/mysql.yml b/config/prod/mysql.yml index c8f06a3..9238c9f 100644 --- a/config/prod/mysql.yml +++ b/config/prod/mysql.yml @@ -3,7 +3,7 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver 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 diff --git a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/CanvasCfgDO.java b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/CanvasCfgDO.java index 2f204fd..c808adc 100644 --- a/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/CanvasCfgDO.java +++ b/sz-service/sz-service-admin/src/main/java/com/sz/admin/monitor/pojo/po/CanvasCfgDO.java @@ -18,7 +18,7 @@ import lombok.NoArgsConstructor; * @author xq * @date 2026/1/29 11:32 */ -@Table("ry_model_content") +@Table("ry_canvas_cfg") @Schema(description = "画布配置数据对象") @Data @Builder diff --git a/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCGeneralCfgMgr.dll b/sz-service/sz-service-admin/src/main/resources/lib/win/HCNetSDKCom/HCGeneralCfgMgr.dll index 75e98fff97cdeca932e3db69aa30299f31cd29b5..502b9ce72de9a1b8531015c365311c39cd747d66 100644 GIT binary patch delta 121 zcmZ2+xpvv*+J+X!7N!>F7M2#)7Pc1l7LFFq7OocV7M>Q~7QPn#EdtMHF>+1+I7=XJ z`h^^Rj`sN30zfRdJ$|;(4WD+47eYWR48$TpEDFS8Kr9Z#5xpu|n+J+X!7N!>F7M2#)7Pc1l7LFFq7OocV7M>Q~7QPn#EdtMHG4XOu|2Rt^ zclw1Ke$Mu|*#bZ;xIJ#R&<&q<(-%TOEDXdVKr9NxVn8eo#1cR(3B*!BEDgjmKrFl6 J^o3kuBLG^yF+czS diff --git a/sz-service/sz-service-admin/src/main/resources/lib/win/libeay32.dll b/sz-service/sz-service-admin/src/main/resources/lib/win/libeay32.dll index 23a2ed80ee818335fcc0c0c1eab02d95af54c7a6..cfd726ecbde2bbb5adefba4a76129cb7e36a0534 100644 GIT binary patch delta 107 zcmWN=$q9fk6hJ}T;=b>8X9}jHltuEzJYno_L%JuM_lp5m*7&XJ+)N~ d88K$Ulo@jtELpK;!jHltuEzJYnn_L}VwM_lp5m*7&XJ+)N~ d88K$Ulo@jtELpK;! Date: Mon, 16 Mar 2026 13:11:26 +0800 Subject: [PATCH 3/3] =?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 '模型内容';