bump: 发布2.2.0

details see: https://helio.uncarbon.cc/#/i18n/zh-CN/appendix/change-log
uncarbon97 · Sep 21, 2024 · 858425d · 858425d
1 parent 11bedde
commit 858425d
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 45 deletions.
diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
  <description>基于renren-generator改造适配的代码生成器，可一键生成单体or微服务版的前、后端代码，减少无谓的重复劳动</description>
 
  <!-- 生成器制品版本号 -->
- <version>2.1.0</version>
+ <version>2.2.0</version>
 
  <parent>
  <groupId>org.springframework.boot</groupId>

diff --git a/src/main/resources/template/backend/AdminInsertOrUpdateDTO.java.vm b/src/main/resources/template/backend/AdminInsertOrUpdateDTO.java.vm
@@ -21,9 +21,6 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 #end
-#if(${helioFrameworkVersion} == 'v2')
-import java.io.Serial;
-#end
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -48,12 +45,6 @@ import cc.uncarbon.framework.core.enums.EnabledStatusEnum;
 @Data
 public class Admin${className}InsertOrUpdateDTO implements Serializable {
 
-#if(${helioFrameworkVersion} == 'v2')
- @Serial
-#end
- private static final long serialVersionUID = 1L;
-
-
 #if(${helioFrameworkVersion} == 'v2')
  @Schema(description = "主键ID", hidden = true, title = "仅更新时使用")
 #end

diff --git a/src/main/resources/template/backend/AdminListDTO.java.vm b/src/main/resources/template/backend/AdminListDTO.java.vm
@@ -14,9 +14,6 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import lombok.experimental.SuperBuilder;
 import org.springframework.format.annotation.DateTimeFormat;
-#if(${helioFrameworkVersion} == 'v2')
-import java.io.Serial;
-#end
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -40,12 +37,6 @@ import cc.uncarbon.framework.core.enums.EnabledStatusEnum;
 @NoArgsConstructor
 @Data
 public class Admin${className}ListDTO implements Serializable {
-
-#if(${helioFrameworkVersion} == 'v2')
- @Serial
-#end
- private static final long serialVersionUID = 1L;
-
 #if(${queryFormSchemaFlag})
 #foreach ($column in $columns)
 #if($column.columnName != $pk.columnName

diff --git a/src/main/resources/template/backend/BO.java.vm b/src/main/resources/template/backend/BO.java.vm
@@ -14,9 +14,6 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 import lombok.experimental.SuperBuilder;
 import org.springframework.format.annotation.DateTimeFormat;
-#if(${helioFrameworkVersion} == 'v2')
-import java.io.Serial;
-#end
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -41,12 +38,6 @@ import cc.uncarbon.framework.core.enums.EnabledStatusEnum;
 @Data
 public class ${className}BO implements Serializable {
 
-#if(${helioFrameworkVersion} == 'v2')
- @Serial
-#end
- private static final long serialVersionUID = 1L;
-
-
 #if(${helioFrameworkVersion} == 'v2')
  @Schema(description = "主键ID", hidden = true, title = "仅更新时使用")
 #end

diff --git a/src/main/resources/template/backend/Entity.java.vm b/src/main/resources/template/backend/Entity.java.vm
@@ -12,9 +12,6 @@ import io.swagger.v3.oas.annotations.media.Schema;
 #if(${helioFrameworkVersion} == 'v1')
 import io.swagger.annotations.ApiModelProperty;
 #end
-#if(${helioFrameworkVersion} == 'v2')
-import java.io.Serial;
-#end
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 #if(${hasBigDecimal})
@@ -39,12 +36,6 @@ import cc.uncarbon.framework.core.enums.EnabledStatusEnum;
 @Data
 @TableName(value = "${tableName}")
 public class ${className}Entity extends HelioBaseEntity<Long> {
-
-#if(${helioFrameworkVersion} == 'v2')
- @Serial
-#end
- private static final long serialVersionUID = 1L;
-
 #foreach ($column in $columns)
 #if($column.columnName != $pk.columnName
 && $column.columnName != "tenant_id"

diff --git a/src/main/resources/template/backend/ServiceImpl.java.vm b/src/main/resources/template/backend/ServiceImpl.java.vm
@@ -19,18 +19,14 @@ import ${package}.${moduleName}.service.${className}Service;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.text.CharSequenceUtil;
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
 
 /**
@@ -74,13 +70,13 @@ public class ${className}Service {
 #if($column.attrType == 'String')
  .like(CharSequenceUtil.isNotBlank(dto.get${column.pascalAttrName}()), ${className}Entity::get$column.pascalAttrName, CharSequenceUtil.cleanBlank(dto.get${column.pascalAttrName}()))
 #else
- .eq(ObjectUtil.isNotNull(dto.get${column.pascalAttrName}()), ${className}Entity::get$column.pascalAttrName, dto.get${column.pascalAttrName}())
+ .eq(Objects.nonNull(dto.get${column.pascalAttrName}()), ${className}Entity::get$column.pascalAttrName, dto.get${column.pascalAttrName}())
 #end
 #end
 #end
 #end
  // 时间区间
- .between(ObjectUtil.isNotNull(dto.getBeginAt()) && ObjectUtil.isNotNull(dto.getEndAt()), ${className}Entity::getCreatedAt, dto.getBeginAt(), dto.getEndAt())
+ .between(Objects.nonNull(dto.getBeginAt()) && Objects.nonNull(dto.getEndAt()), ${className}Entity::getCreatedAt, dto.getBeginAt(), dto.getEndAt())
  // 排序
  .orderByDesc(${className}Entity::getCreatedAt)
  );
@@ -166,7 +162,7 @@ public class ${className}Service {
  @Transactional(rollbackFor = Exception.class)
  public void adminDelete(Collection<Long> ids) {
  log.info("[后台管理-${comments}-删除] >> ids={}", ids);
- ${classname}Mapper.deleteBatchIds(ids);
+ ${classname}Mapper.deleteByIds(ids);
  }