From ce78186b789c35e2773c6dd17b7847ac8a27cad5 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Tue, 27 Feb 2024 17:59:43 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E7=BC=96=E5=86=99=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devtools/entity/GencodeTemplateGroup.java | 8 ++-- .../devtools/entity/GencodeTemplateObj.java | 14 +++--- .../handler/BlobToStringTypeHandler.java | 44 +++++++++++++++++++ .../GencodeTemplateGroupController.java | 20 +++++++-- .../GencodeTemplateObjController.java | 1 + .../service/IGencodeTemplateGroupService.java | 3 ++ .../impl/GencodeTemplateGroupServiceImpl.java | 17 +++++-- 7 files changed, 90 insertions(+), 17 deletions(-) create mode 100644 kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/devtools/handler/BlobToStringTypeHandler.java diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/devtools/entity/GencodeTemplateGroup.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/devtools/entity/GencodeTemplateGroup.java index 42227a59..ac13f30a 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/devtools/entity/GencodeTemplateGroup.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/devtools/entity/GencodeTemplateGroup.java @@ -28,7 +28,7 @@ import org.apache.commons.compress.utils.Lists; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("sys_gencode_template_group") +@TableName(value = "sys_gencode_template_group") @ApiModel(value = "GencodeTemplateGroup对象", description = "代码生成器模板") public class GencodeTemplateGroup extends CommonEntity { @@ -43,10 +43,12 @@ public class GencodeTemplateGroup extends CommonEntity { @ApiModelProperty("模板分类") private String type; - @ApiModelProperty("是否系统表") + @ApiModelProperty("是否系统表 1系统, 0非系统") private String isSystem; + @ApiModelProperty("子集模板对象") @TableField(exist = false) - private List genCodeTemplateObjList = ListUtil.empty(); + @JsonInclude(JsonInclude.Include.NON_NULL) + private List genCodeTemplateObjList; } diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/devtools/entity/GencodeTemplateObj.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/devtools/entity/GencodeTemplateObj.java index 7a503973..e59abd82 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/devtools/entity/GencodeTemplateObj.java +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/devtools/entity/GencodeTemplateObj.java @@ -1,15 +1,13 @@ package com.cloud.kicc.system.api.devtools.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.cloud.kicc.common.data.entity.CommonEntity; -import java.io.Serializable; -import java.sql.Blob; +import com.cloud.kicc.system.api.devtools.handler.BlobToStringTypeHandler; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; import lombok.experimental.Accessors; /** @@ -23,7 +21,7 @@ import lombok.experimental.Accessors; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("sys_gencode_template_obj") +@TableName(value = "sys_gencode_template_obj", excludeProperty = { "createById", "createByName", "createTime", "updateById", "updateByName", "updateTime" }) @ApiModel(value = "GencodeTemplateObj对象", description = "模板实体") public class GencodeTemplateObj extends CommonEntity { @@ -39,10 +37,12 @@ public class GencodeTemplateObj extends CommonEntity { private String groupId; @ApiModelProperty("模板内容") - private Blob contents; + @TableField(typeHandler = BlobToStringTypeHandler.class) + private String contents; @ApiModelProperty("默认内容") - private Blob defaultContents; + @TableField(typeHandler = BlobToStringTypeHandler.class) + private String defaultContents; @ApiModelProperty("排序") private String sort; diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/devtools/handler/BlobToStringTypeHandler.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/devtools/handler/BlobToStringTypeHandler.java new file mode 100644 index 00000000..1cc788ea --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/devtools/handler/BlobToStringTypeHandler.java @@ -0,0 +1,44 @@ +package com.cloud.kicc.system.api.devtools.handler; + +import org.apache.ibatis.type.BaseTypeHandler; +import org.apache.ibatis.type.JdbcType; + +import java.io.ByteArrayInputStream; +import java.nio.charset.StandardCharsets; +import java.sql.*; + +/** + *

+ * BlobToString 字段类型转换 + *

+ * + * @Author: wangxiang4 + * @Since: 2024/2/27 + */ +public class BlobToStringTypeHandler extends BaseTypeHandler { + + @Override + public void setNonNullParameter(PreparedStatement ps, int i, String parameter, JdbcType jdbcType) throws SQLException { + ByteArrayInputStream bis = new ByteArrayInputStream(parameter.getBytes(StandardCharsets.UTF_8)); + ps.setBinaryStream(i, bis, parameter.getBytes().length); + } + + @Override + public String getNullableResult(ResultSet rs, String columnName) throws SQLException { + Blob blob = rs.getBlob(columnName); + return blob != null ? new String(blob.getBytes(1, (int) blob.length()), StandardCharsets.UTF_8) : ""; + } + + @Override + public String getNullableResult(CallableStatement cs, int columnIndex) throws SQLException { + Blob blob = cs.getBlob(columnIndex); + return blob != null ? new String(blob.getBytes(1, (int) blob.length()), StandardCharsets.UTF_8) : ""; + } + + @Override + public String getNullableResult(ResultSet rs, int i) throws SQLException { + Blob blob = rs.getBlob(i); + return blob != null ? new String(blob.getBytes(1, (int) blob.length()), StandardCharsets.UTF_8) : ""; + } + +} diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GencodeTemplateGroupController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GencodeTemplateGroupController.java index eded85ce..83693f42 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GencodeTemplateGroupController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GencodeTemplateGroupController.java @@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; +import com.cloud.kicc.system.api.devtools.entity.GencodeCustomField; +import com.cloud.kicc.system.api.devtools.entity.GencodeCustomObj; import com.cloud.kicc.system.api.devtools.entity.GencodeTemplateGroup; import com.cloud.kicc.system.api.devtools.entity.GencodeTemplateObj; import com.cloud.kicc.system.devtools.service.IGencodeTemplateGroupService; @@ -34,6 +36,7 @@ public class GencodeTemplateGroupController { private LambdaQueryWrapper getQueryWrapper(GencodeTemplateGroup gencodeTemplateGroup) { return new LambdaQueryWrapper() + .eq(StrUtil.isNotBlank(gencodeTemplateGroup.getType()), GencodeTemplateGroup::getType, gencodeTemplateGroup.getType()) .like(StrUtil.isNotBlank(gencodeTemplateGroup.getName()), GencodeTemplateGroup::getName, gencodeTemplateGroup.getName()); } @@ -46,7 +49,10 @@ public class GencodeTemplateGroupController { @GetMapping("/{id:\\w+}") public R getById(@PathVariable("id") String id) { GencodeTemplateGroup gencodeTemplateGroup = iGencodeTemplateGroupService.getById(id); - gencodeTemplateGroup.setGenCodeTemplateObjList(iGencodeTemplateObjService.list(Wrappers.lambdaQuery().eq(GencodeTemplateObj::getGroupId, gencodeTemplateGroup.getId()))); + gencodeTemplateGroup.setGenCodeTemplateObjList(iGencodeTemplateObjService.list(Wrappers.lambdaQuery() + .eq(GencodeTemplateObj::getGroupId, gencodeTemplateGroup.getId()) + .orderByAsc(GencodeTemplateObj::getSort) + )); return R.ok(iGencodeTemplateGroupService.getById(id)); } @@ -62,15 +68,21 @@ public class GencodeTemplateGroupController { return R.ok(); } + @PutMapping("/saveAndGencodeTemplateObj") + public R saveAndGencodeTemplateObj(@RequestBody GencodeTemplateGroup gencodeTemplateGroup) { + iGencodeTemplateGroupService.saveAndGencodeTemplateObj(gencodeTemplateGroup); + return R.ok(); + } + @PostMapping("/copy") public R copy(@RequestBody GencodeTemplateGroup gencodeTemplateGroup) { iGencodeTemplateGroupService.copy(gencodeTemplateGroup); return R.ok(); } - @DeleteMapping("/remove/{id:[\\w,]+}") - public R remove(@PathVariable String[] id) { - iGencodeTemplateGroupService.removeByIds(Arrays.asList(id)); + @DeleteMapping("/remove/{ids:[\\w,]+}") + public R remove(@PathVariable String[] ids) { + iGencodeTemplateGroupService.removeByIds(Arrays.asList(ids)); return R.ok(); } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GencodeTemplateObjController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GencodeTemplateObjController.java index 6db294a1..db4ef448 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GencodeTemplateObjController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/controller/GencodeTemplateObjController.java @@ -31,6 +31,7 @@ public class GencodeTemplateObjController { private LambdaQueryWrapper getQueryWrapper(GencodeTemplateObj gencodeTemplateObj) { return new LambdaQueryWrapper() + .eq(StrUtil.isNotBlank(gencodeTemplateObj.getGroupId()), GencodeTemplateObj::getGroupId, gencodeTemplateObj.getGroupId()) .like(StrUtil.isNotBlank(gencodeTemplateObj.getName()), GencodeTemplateObj::getName, gencodeTemplateObj.getName()); } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/service/IGencodeTemplateGroupService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/service/IGencodeTemplateGroupService.java index f22bfb98..9710bc12 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/service/IGencodeTemplateGroupService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/service/IGencodeTemplateGroupService.java @@ -1,5 +1,6 @@ package com.cloud.kicc.system.devtools.service; +import com.cloud.kicc.system.api.devtools.entity.GencodeCustomObj; import com.cloud.kicc.system.api.devtools.entity.GencodeTemplateGroup; import com.baomidou.mybatisplus.extension.service.IService; @@ -15,4 +16,6 @@ public interface IGencodeTemplateGroupService extends IService @@ -24,16 +26,25 @@ public class GencodeTemplateGroupServiceImpl extends ServiceImpllambdaUpdate().eq(GencodeTemplateObj::getGroupId, gencodeTemplateGroup.getId())); + iGencodeTemplateObjService.saveBatch(gencodeTemplateGroup.getGenCodeTemplateObjList()); + } + }