chore: 编写代码模板接口

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<GencodeTemplateObj> genCodeTemplateObjList = ListUtil.empty();
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private List<GencodeTemplateObj> genCodeTemplateObjList;
 
 }

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 com.cloud.kicc.system.api.devtools.handler.BlobToStringTypeHandler;
-import java.sql.Blob;
 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;

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.*;
+
+/**
+ *<p>
+ * BlobToString 字段类型转换
+ *</p>
+ *
+ * @Author: wangxiang4
+ * @Since: 2024/2/27
+ */
+public class BlobToStringTypeHandler extends BaseTypeHandler<String> {
+
+    @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) : "";
+    }
+
+}

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<GencodeTemplateGroup> getQueryWrapper(GencodeTemplateGroup gencodeTemplateGroup) {
         return new LambdaQueryWrapper<GencodeTemplateGroup>()
+                .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.<GencodeTemplateObj>lambdaQuery().eq(GencodeTemplateObj::getGroupId, gencodeTemplateGroup.getId())));
+        gencodeTemplateGroup.setGenCodeTemplateObjList(iGencodeTemplateObjService.list(Wrappers.<GencodeTemplateObj>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,]+}")
+    @DeleteMapping("/remove/{ids:[\\w,]+}")
-    public R remove(@PathVariable String[] id) {
+    public R remove(@PathVariable String[] ids) {
-        iGencodeTemplateGroupService.removeByIds(Arrays.asList(id));
+        iGencodeTemplateGroupService.removeByIds(Arrays.asList(ids));
         return R.ok();
     }
 

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<GencodeTemplateObj> getQueryWrapper(GencodeTemplateObj gencodeTemplateObj) {
         return new LambdaQueryWrapper<GencodeTemplateObj>()
+                .eq(StrUtil.isNotBlank(gencodeTemplateObj.getGroupId()), GencodeTemplateObj::getGroupId, gencodeTemplateObj.getGroupId())
                 .like(StrUtil.isNotBlank(gencodeTemplateObj.getName()), GencodeTemplateObj::getName, gencodeTemplateObj.getName());
     }
 

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<GencodeTemplateGr
 
     void copy(GencodeTemplateGroup gencodeTemplateGroup);
 
+    void saveAndGencodeTemplateObj(GencodeTemplateGroup gencodeTemplateGroup);
+
 }

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/devtools/service/impl/GencodeTemplateGroupServiceImpl.java

@@ -1,5 +1,6 @@
 package com.cloud.kicc.system.devtools.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cloud.kicc.system.api.devtools.entity.GencodeTemplateGroup;
 import com.cloud.kicc.system.api.devtools.entity.GencodeTemplateObj;
@@ -8,6 +9,7 @@ import com.cloud.kicc.system.devtools.service.IGencodeTemplateGroupService;
 import com.cloud.kicc.system.devtools.service.IGencodeTemplateObjService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * <p>
@@ -24,16 +26,25 @@ public class GencodeTemplateGroupServiceImpl extends ServiceImpl<GencodeTemplate
     private final IGencodeTemplateObjService iGencodeTemplateObjService;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void copy(GencodeTemplateGroup gencodeTemplateGroup) {
-        gencodeTemplateGroup.setId("");
+        gencodeTemplateGroup.setId(null);
-        gencodeTemplateGroup.setIsSystem("2");
+        gencodeTemplateGroup.setIsSystem("0");
         gencodeTemplateGroup.setName(gencodeTemplateGroup.getName() + "--副本");
         super.save(gencodeTemplateGroup);
         for (GencodeTemplateObj gencodeTemplateObj : gencodeTemplateGroup.getGenCodeTemplateObjList()) {
-            gencodeTemplateObj.setId("");
+            gencodeTemplateObj.setId(null);
             gencodeTemplateObj.setGroupId(gencodeTemplateGroup.getId());
             iGencodeTemplateObjService.save(gencodeTemplateObj);
         }
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveAndGencodeTemplateObj(GencodeTemplateGroup gencodeTemplateGroup) {
+        super.saveOrUpdate(gencodeTemplateGroup);
+        iGencodeTemplateObjService.remove(Wrappers.<GencodeTemplateObj>lambdaUpdate().eq(GencodeTemplateObj::getGroupId, gencodeTemplateGroup.getId()));
+        iGencodeTemplateObjService.saveBatch(gencodeTemplateGroup.getGenCodeTemplateObjList());
+    }
+
 }