Bläddra i källkod

1、blockly编程课支持多路线配置
2、日志逻辑按照每天、日志最大100,最多30天生成

liyanbo 4 månader sedan
förälder
incheckning
f75bee1aaa

+ 2 - 0
byzs-blockly/src/main/java/cn/iocoder/byzs/module/blockly/controller/admin/blockly/vo/BlocklyPageReqVO.java

@@ -42,6 +42,8 @@ public class BlocklyPageReqVO extends PageParam {
     private String blocklyWalkablePoints;
     @ExcelProperty("特殊方块")
     private String blocklySpecialBlocks;
+    @ExcelProperty("路径列表")
+    private String blocklyRouteList;
 
 
 

+ 4 - 0
byzs-blockly/src/main/java/cn/iocoder/byzs/module/blockly/controller/admin/blockly/vo/BlocklyRespVO.java

@@ -58,6 +58,10 @@ public class BlocklyRespVO {
     @Schema(description = "特殊方块")
     private String blocklySpecialBlocks;
 
+    @ExcelProperty("路径列表")
+    @Schema(description = "路径列表")
+    private String blocklyRouteList;
+
 
 
     @Schema(description = "课程是否有检查")

+ 3 - 0
byzs-blockly/src/main/java/cn/iocoder/byzs/module/blockly/controller/admin/blockly/vo/BlocklySaveReqVO.java

@@ -41,6 +41,9 @@ public class BlocklySaveReqVO {
     @ExcelProperty("特殊方块")
     private String blocklySpecialBlocks;
 
+    @ExcelProperty("路径列表")
+    private String blocklyRouteList;
+
     @Schema(description = "课程是否有检查")
     private String bcIsInspect;
 

+ 9 - 3
byzs-blockly/src/main/java/cn/iocoder/byzs/module/blockly/dal/dataobject/blockly/BlocklyDO.java

@@ -1,9 +1,10 @@
 package cn.iocoder.byzs.module.blockly.dal.dataobject.blockly;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import com.baomidou.mybatisplus.annotation.*;
 import cn.iocoder.byzs.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
 
 /**
  * 课程 DO
@@ -82,6 +83,11 @@ public class BlocklyDO extends BaseDO {
      */
     private String blocklySpecialBlocks;
 
+    /**
+     * 路径列表
+     */
+    private String blocklyRouteList;
+
 
     /**
      * 课程是否有检查

+ 1 - 1
byzs-blockly/src/main/resources/mapper/blockly/BlocklyMapper.xml

@@ -59,7 +59,7 @@
                c.blockly_walkable_points blocklyWalkablePoints,
                c.blockly_special_blocks blocklySpecialBlocks,
                c.bc_is_inspect bcIsInspect, c.bc_label bcLabel, c.bc_order bcOrder, c.bc_status bcStatus,
-               ct.ct_type bcTypeName
+               ct.ct_type bcTypeName, c.blockly_route_list blocklyRouteList
         <include refid="selectBlocklyList"/>
     </select>
 </mapper>

+ 6 - 0
byzs-server/src/main/resources/application-prod.yaml

@@ -142,6 +142,12 @@ spring:
 logging:
   file:
     name: ${user.home}/logs/${spring.application.name}.log # 日志文件名,全路径
+  logback:
+    rollingpolicy:
+      file-name-pattern: ${user.home}/logs/${spring.application.name}-%d{yyyy-MM-dd}.log
+      max-history: 30
+      total-size-cap: 1GB
+      max-file-size: 100MB
   level:
     # 配置自己写的 MyBatis Mapper 打印日志
     cn.iocoder.byzs.module.bpm.dal.mysql: debug

+ 2 - 0
byzs-web/src/main/java/cn/iocoder/byzs/module/web/controller/admin/blockly/vo/WebBlocklyVO.java

@@ -42,6 +42,8 @@ public class WebBlocklyVO extends PageParam {
     private String blocklyWalkablePoints;
     @Schema(description = "特殊方块")
     private String blocklySpecialBlocks;
+    @Schema(description = "路径列表")
+    private String blocklyRouteList;