!544 同步最新商城代码

Merge pull request !544 from 芋道源码/feature/mall_product
YunaiV · Jul 26, 2023 · b287fdb · b287fdb
2 parents 91769f0 + 6c174d9
commit b287fdb
Show file tree

Hide file tree

Showing 198 changed files with 3,229 additions and 956 deletions.
diff --git a/...udao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/WebFilterOrderEnum.java b/...udao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/WebFilterOrderEnum.java
@@ -27,8 +27,6 @@ public interface WebFilterOrderEnum {
 
     int TENANT_SECURITY_FILTER = -99; // 需要保证在 Spring Security 过滤器后面
 
-    int ACTIVITI_FILTER = -98; // 需要保证在 Spring Security 过滤后面
-
     int FLOWABLE_FILTER = -98; // 需要保证在 Spring Security 过滤后面
 
     int DEMO_FILTER = Integer.MAX_VALUE;

diff --git a/...main/java/cn/iocoder/yudao/framework/common/exception/enums/GlobalErrorCodeConstants.java b/...main/java/cn/iocoder/yudao/framework/common/exception/enums/GlobalErrorCodeConstants.java
@@ -37,15 +37,4 @@ public interface GlobalErrorCodeConstants {
 
     ErrorCode UNKNOWN = new ErrorCode(999, "未知错误");
 
-    /**
-     * 是否为服务端错误，参考 HTTP 5XX 错误码段
-     *
-     * @param code 错误码
-     * @return 是否
-     */
-   static boolean isServerErrorCode(Integer code) {
-       return code != null
-               && code >= INTERNAL_SERVER_ERROR.getCode() && code <= INTERNAL_SERVER_ERROR.getCode() + 99;
-   }
-
 }
diff --git a/...ework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/CommonResult.java b/...ework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/CommonResult.java
@@ -1,7 +1,6 @@
 package cn.iocoder.yudao.framework.common.pojo;
 
 import cn.iocoder.yudao.framework.common.exception.ErrorCode;
-import cn.iocoder.yudao.framework.common.exception.ServerException;
 import cn.iocoder.yudao.framework.common.exception.ServiceException;
 import cn.iocoder.yudao.framework.common.exception.enums.GlobalErrorCodeConstants;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -92,10 +91,6 @@ public void checkError() throws ServiceException {
         if (isSuccess()) {
             return;
         }
-        // 服务端异常
-        if (GlobalErrorCodeConstants.isServerErrorCode(code)) {
-            throw new ServerException(code, msg);
-        }
         // 业务异常
         throw new ServiceException(code, msg);
     }

diff --git a/...-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java b/...-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/LocalDateTimeUtils.java
@@ -4,6 +4,7 @@
 
 import java.time.Duration;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 
 /**
  * 时间工具类，用于 {@link java.time.LocalDateTime}
@@ -50,7 +51,7 @@ public static LocalDateTime[] buildBetweenTime(int year1, int mouth1, int day1,
      * 判断当前时间是否在该时间范围内
      *
      * @param startTime 开始时间
-     * @param endTime 结束时间
+     * @param endTime   结束时间
      * @return 是否
      */
     public static boolean isBetween(LocalDateTime startTime, LocalDateTime endTime) {
@@ -60,4 +61,24 @@ public static boolean isBetween(LocalDateTime startTime, LocalDateTime endTime)
         return LocalDateTimeUtil.isIn(LocalDateTime.now(), startTime, endTime);
     }
 
+    /**
+     * 检查时间重叠 不包含日期
+     *
+     * @param startTime1 需要校验的开始时间
+     * @param endTime1   需要校验的结束时间
+     * @param startTime2 校验所需的开始时间
+     * @param endTime2   校验所需的结束时间
+     * @return 是否重叠
+     */
+    // TODO @puhui999：LocalDateTimeUtil.isOverlap() 是不是可以满足呀？
+    public static boolean checkTimeOverlap(LocalTime startTime1, LocalTime endTime1, LocalTime startTime2, LocalTime endTime2) {
+        // 判断时间是否重叠
+        // 开始时间在已配置时段的结束时间之前 且 结束时间在已配置时段的开始时间之后 []
+        return startTime1.isBefore(endTime2) && endTime1.isAfter(startTime2)
+                // 开始时间在已配置时段的开始时间之前 且 结束时间在已配置时段的开始时间之后 (] 或 ()
+                || startTime1.isBefore(startTime2) && endTime1.isAfter(startTime2)
+                // 开始时间在已配置时段的结束时间之前 且 结束时间在已配值时段的结束时间之后 [) 或 ()
+                || startTime1.isBefore(endTime2) && endTime1.isAfter(endTime2);
+    }
+
 }
diff --git a/...rc/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java b/...rc/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
@@ -21,6 +21,7 @@ public class YudaoJacksonAutoConfiguration {
     @Bean
     public BeanPostProcessor objectMapperBeanPostProcessor() {
         return new BeanPostProcessor() {
+
             @Override
             public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
                 if (!(bean instanceof ObjectMapper)) {

diff --git a/...module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java b/...module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/convert/task/BpmTaskConvert.java
@@ -17,12 +17,9 @@
 import org.flowable.task.api.history.HistoricTaskInstance;
 import org.mapstruct.*;
 import org.mapstruct.factory.Mappers;
-import org.springframework.beans.BeanUtils;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * Bpm 任务 Convert
@@ -34,37 +31,9 @@ public interface BpmTaskConvert {
 
     BpmTaskConvert INSTANCE = Mappers.getMapper(BpmTaskConvert.class);
 
-    /**
-     * 复制对象
-     *
-     * @param source 源 要复制的对象
-     * @param target 目标 复制到此对象
-     * @param <T>
-     *
-     * @return
-     */
-    public static <T> T copy(Object source, Class<T> target) {
-        if (source == null || target == null) {
-            return null;
-        }
-        try {
-            T newInstance = target.getDeclaredConstructor().newInstance();
-            BeanUtils.copyProperties(source, newInstance);
-            return newInstance;
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    default <T, K> List<K> copyList(List<T> source, Class<K> target) {
-        if (null == source || source.isEmpty()) {
-            return Collections.emptyList();
-        }
-        return source.stream().map(e -> copy(e, target)).collect(Collectors.toList());
-    }
-
     default List<BpmTaskTodoPageItemRespVO> convertList1(List<Task> tasks,
-        Map<String, ProcessInstance> processInstanceMap, Map<Long, AdminUserRespDTO> userMap) {
+                                                         Map<String, ProcessInstance> processInstanceMap,
+                                                         Map<Long, AdminUserRespDTO> userMap) {
         return CollectionUtils.convertList(tasks, task -> {
             BpmTaskTodoPageItemRespVO respVO = convert1(task);
             ProcessInstance processInstance = processInstanceMap.get(task.getProcessInstanceId());

diff --git a/...-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/task/BpmActivityDO.java b/...-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/task/BpmActivityDO.java
diff --git a/.../java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/CodegenPreviewRespVO.java b/.../java/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/CodegenPreviewRespVO.java
@@ -3,7 +3,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-@Schema(description = "管理后台 - 代码生成预览 Response VO,注意，每个文件都是一个该对象")
+@Schema(description = "管理后台 - 代码生成预览 Response VO，注意，每个文件都是一个该对象")
 @Data
 public class CodegenPreviewRespVO {
 

diff --git a/...cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/column/CodegenColumnBaseVO.java b/...cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/column/CodegenColumnBaseVO.java
@@ -70,7 +70,7 @@ public class CodegenColumnBaseVO {
     @NotNull(message = "是否为 List 查询操作的字段不能为空")
     private Boolean listOperation;
 
-    @Schema(description = "List 查询操作的条件类型,参见 CodegenColumnListConditionEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "LIKE")
+    @Schema(description = "List 查询操作的条件类型，参见 CodegenColumnListConditionEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "LIKE")
     @NotNull(message = "List 查询操作的条件类型不能为空")
     private String listOperationCondition;
 

diff --git a/...a/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTableBaseVO.java b/...a/cn/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTableBaseVO.java
@@ -12,7 +12,7 @@
 @Data
 public class CodegenTableBaseVO {
 
-    @Schema(description = "生成场景,参见 CodegenSceneEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "生成场景，参见 CodegenSceneEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "导入类型不能为空")
     private Integer scene;
 

diff --git a/...n/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTablePageReqVO.java b/...n/iocoder/yudao/module/infra/controller/admin/codegen/vo/table/CodegenTablePageReqVO.java
@@ -17,13 +17,13 @@
 @ToString(callSuper = true)
 public class CodegenTablePageReqVO extends PageParam {
 
-    @Schema(description = "表名称,模糊匹配", example = "yudao")
+    @Schema(description = "表名称，模糊匹配", example = "yudao")
     private String tableName;
 
-    @Schema(description = "表描述,模糊匹配", example = "芋道")
+    @Schema(description = "表描述，模糊匹配", example = "芋道")
     private String tableComment;
 
-    @Schema(description = "实体,模糊匹配", example = "Yudao")
+    @Schema(description = "实体，模糊匹配", example = "Yudao")
     private String className;
 
     @Schema(description = "创建时间", example = "[2022-07-01 00:00:00,2022-07-01 23:59:59]")

diff --git a/...main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigExportReqVO.java b/...main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigExportReqVO.java
@@ -15,10 +15,10 @@ public class ConfigExportReqVO {
     @Schema(description = "参数名称", example = "模糊匹配")
     private String name;
 
-    @Schema(description = "参数键名,模糊匹配", example = "yunai.db.username")
+    @Schema(description = "参数键名，模糊匹配", example = "yunai.db.username")
     private String key;
 
-    @Schema(description = "参数类型,参见 SysConfigTypeEnum 枚举", example = "1")
+    @Schema(description = "参数类型，参见 SysConfigTypeEnum 枚举", example = "1")
     private Integer type;
 
     @Schema(description = "创建时间", example = "[2022-07-01 00:00:00,2022-07-01 23:59:59]")

diff --git a/...c/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigPageReqVO.java b/...c/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigPageReqVO.java
@@ -17,13 +17,13 @@
 @ToString(callSuper = true)
 public class ConfigPageReqVO extends PageParam {
 
-    @Schema(description = "数据源名称,模糊匹配", example = "名称")
+    @Schema(description = "数据源名称，模糊匹配", example = "名称")
     private String name;
 
-    @Schema(description = "参数键名,模糊匹配", example = "yunai.db.username")
+    @Schema(description = "参数键名，模糊匹配", example = "yunai.db.username")
     private String key;
 
-    @Schema(description = "参数类型,参见 SysConfigTypeEnum 枚举", example = "1")
+    @Schema(description = "参数类型，参见 SysConfigTypeEnum 枚举", example = "1")
     private Integer type;
 
     @Schema(description = "创建时间", example = "[2022-07-01 00:00:00,2022-07-01 23:59:59]")

diff --git a/.../src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigRespVO.java b/.../src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigRespVO.java
@@ -21,7 +21,7 @@ public class ConfigRespVO extends ConfigBaseVO {
     @Size(max = 100, message = "参数键名长度不能超过100个字符")
     private String key;
 
-    @Schema(description = "参数类型,参见 SysConfigTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "参数类型，参见 SysConfigTypeEnum 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Integer type;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式")

diff --git a/.../cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigCreateReqVO.java b/.../cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigCreateReqVO.java
@@ -14,7 +14,7 @@
 @ToString(callSuper = true)
 public class FileConfigCreateReqVO extends FileConfigBaseVO {
 
-    @Schema(description = "存储器,参见 FileStorageEnum 枚举类参见 FileStorageEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "存储器，参见 FileStorageEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "存储器不能为空")
     private Integer storage;
 

diff --git a/...va/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigPageReqVO.java b/...va/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigPageReqVO.java
@@ -23,8 +23,8 @@ public class FileConfigPageReqVO extends PageParam {
     @Schema(description = "存储器", example = "1")
     private Integer storage;
 
+    @Schema(description = "创建时间", example = "[2022-07-01 00:00:00, 2022-07-01 23:59:59]")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    @Schema(description = "创建时间")
     private LocalDateTime[] createTime;
 
 }
diff --git a/.../java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigRespVO.java b/.../java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/config/FileConfigRespVO.java
@@ -18,7 +18,7 @@ public class FileConfigRespVO extends FileConfigBaseVO {
     @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Long id;
 
-    @Schema(description = "存储器,参见 FileStorageEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @Schema(description = "存储器，参见 FileStorageEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @NotNull(message = "存储器不能为空")
     private Integer storage;
 

diff --git a/.../main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FilePageReqVO.java b/.../main/java/cn/iocoder/yudao/module/infra/controller/admin/file/vo/file/FilePageReqVO.java
@@ -17,14 +17,14 @@
 @ToString(callSuper = true)
 public class FilePageReqVO extends PageParam {
 
-    @Schema(description = "文件路径,模糊匹配", example = "yudao")
+    @Schema(description = "文件路径，模糊匹配", example = "yudao")
     private String path;
 
-    @Schema(description = "文件类型,模糊匹配", example = "application/octet-stream")
+    @Schema(description = "文件类型，模糊匹配", example = "jpg")
     private String type;
 
+    @Schema(description = "创建时间", example = "[2022-07-01 00:00:00, 2022-07-01 23:59:59]")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    @Schema(description = "创建时间")
     private LocalDateTime[] createTime;
 
 }
diff --git a/...src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/job/JobPageReqVO.java b/...src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/job/JobPageReqVO.java
@@ -12,13 +12,13 @@
 @ToString(callSuper = true)
 public class JobPageReqVO extends PageParam {
 
-    @Schema(description = "任务名称,模糊匹配", example = "测试任务")
+    @Schema(description = "任务名称，模糊匹配", example = "测试任务")
     private String name;
 
-    @Schema(description = "任务状态,参见 JobStatusEnum 枚举", example = "1")
+    @Schema(description = "任务状态，参见 JobStatusEnum 枚举", example = "1")
     private Integer status;
 
-    @Schema(description = "处理器的名字,模糊匹配", example = "sysUserSessionTimeoutJob")
+    @Schema(description = "处理器的名字，模糊匹配", example = "sysUserSessionTimeoutJob")
     private String handlerName;
 
 }