feature: 收藏功能.

2023-09-05 11:50:53 +08:00
parent fb42e31f6e
commit 8035396995
15 changed files with 206 additions and 46 deletions
--- a/orion-ops-launch/src/main/resources/templates/orion-server-module-controller.java.vm
+++ b/orion-ops-launch/src/main/resources/templates/orion-server-module-controller.java.vm
@@ -1,10 +1,11 @@
 package ${package.Controller};

 import com.orion.lang.define.wrapper.DataGrid;
-import com.orion.lang.define.wrapper.IPageRequest;
 import com.orion.ops.framework.common.annotation.IgnoreLog;
 import com.orion.ops.framework.common.annotation.RestWrapper;
 import com.orion.ops.framework.common.constant.IgnoreLogMode;
+import com.orion.ops.framework.common.valid.group.Id;
+import com.orion.ops.framework.common.valid.group.Page;
 import ${package.Service}.*;
 #foreach($pkg in ${customModuleFilePackages})
 import ${pkg}.*;
@@ -21,6 +22,8 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.List;

 /**
@@ -56,7 +59,7 @@ public class ${table.controllerName} {
    @PutMapping("/update")
    @Operation(summary = "${apiComment.updateById}")
    @PreAuthorize("@ss.hasPermission('${package.ModuleName}:${typeHyphen}:update')")
-    public Integer update${type}(@Validated @RequestBody ${type}UpdateRequest request) {
+    public Integer update${type}(@Validated @RequestBody(Id.class) ${type}UpdateRequest request) {
        return ${typeLower}Service.update${type}ById(request);
    }

@@ -90,7 +93,7 @@ public class ${table.controllerName} {
    @PostMapping("/query")
    @Operation(summary = "${apiComment.queryPage}")
    @PreAuthorize("@ss.hasPermission('${package.ModuleName}:${typeHyphen}:query')")
-    public DataGrid<${type}VO> get${type}Page(@Validated(IPageRequest.class) @RequestBody ${type}QueryRequest request) {
+    public DataGrid<${type}VO> get${type}Page(@Validated(Page.class) @RequestBody ${type}QueryRequest request) {
        return ${typeLower}Service.get${type}Page(request);
    }

@@ -114,7 +117,7 @@ public class ${table.controllerName} {
    @Operation(summary = "${apiComment.export}")
    @PreAuthorize("@ss.hasPermission('${package.ModuleName}:${typeHyphen}:export')")
    public void export${type}(@Validated @RequestBody ${type}QueryRequest request,
-                                 HttpServletResponse response) throws IOException {
+                              HttpServletResponse response) throws IOException {
        ${typeLower}Service.export${type}(request, response);
    }

--- a/orion-ops-launch/src/main/resources/templates/orion-server-module-convert.java.vm
+++ b/orion-ops-launch/src/main/resources/templates/orion-server-module-convert.java.vm
@@ -29,6 +29,8 @@ public interface ${type}Convert {

    ${type}VO to(${type}DO domain);

+    ${type}Export export(${type}DO domain);
+
    List<${type}VO> to(List<${type}DO> list);

 }
--- a/orion-ops-launch/src/main/resources/templates/orion-server-module-service-impl.java.vm
+++ b/orion-ops-launch/src/main/resources/templates/orion-server-module-service-impl.java.vm
@@ -3,6 +3,7 @@ package ${package.ServiceImpl};
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.orion.lang.define.wrapper.DataGrid;
+import com.orion.lang.utils.collect.Lists;
 import com.orion.office.excel.writer.exporting.ExcelExport;
 import com.orion.ops.framework.common.constant.ErrorMessage;
 import com.orion.ops.framework.common.utils.FileNames;
@@ -67,6 +68,19 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
        return effect;
    }

+    @Override
+    public Integer update${type}(${type}QueryRequest query, ${type}UpdateRequest update) {
+        log.info("${type}Service.update${type} query: {}, update: {}", JSON.toJSONString(query), JSON.toJSONString(update));
+        // 条件
+        LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(query);
+        // 转换
+        ${type}DO updateRecord = ${type}Convert.MAPPER.to(update);
+        // 更新
+        int effect = ${typeLower}DAO.update(updateRecord, wrapper);
+        log.info("${type}Service.update${type} effect: {}", effect);
+        return effect;
+    }
+
    @Override
    public ${type}VO get${type}ById(Long id) {
        // 查询
@@ -130,6 +144,17 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
        return effect;
    }

+    @Override
+    public Integer delete${type}(${type}QueryRequest request) {
+        log.info("${type}Service.delete${type} request: {}", JSON.toJSONString(request));
+        // 条件
+        LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(request);
+        // 删除
+        int effect = ${typeLower}DAO.delete(wrapper);
+        log.info("${type}Service.delete${type} effect: {}", effect);
+        return effect;
+    }
+
    @Override
    public void export${type}(${type}QueryRequest request, HttpServletResponse response) throws IOException {
        // 条件
--- a/orion-ops-launch/src/main/resources/templates/orion-server-module-service.java.vm
+++ b/orion-ops-launch/src/main/resources/templates/orion-server-module-service.java.vm
@@ -5,6 +5,8 @@ import com.orion.lang.define.wrapper.DataGrid;
 import ${pkg}.*;
 #end

+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.List;

 /**
@@ -32,6 +34,15 @@ public interface ${table.serviceName} {
     */
    Integer update${type}ById(${type}UpdateRequest request);

+    /**
+     * ${apiComment.updateAll}
+     *
+     * @param query  query
+     * @param update update
+     * @return effect
+     */
+    Integer update${type}(${type}QueryRequest query, ${type}UpdateRequest update);
+
    /**
     * ${apiComment.getById}
     *
@@ -88,6 +99,14 @@ public interface ${table.serviceName} {
     */
    Integer batchDelete${type}ByIdList(List<Long> idList);

+    /**
+     * ${apiComment.deleteAll}
+     *
+     * @param request request
+     * @return effect
+     */
+    Integer delete${type}(${type}QueryRequest request);
+
    /**
     * ${apiComment.export}
     *
--- a/orion-ops-launch/src/main/resources/templates/orion-server-provider-api-impl.java.vm
+++ b/orion-ops-launch/src/main/resources/templates/orion-server-provider-api-impl.java.vm
@@ -41,24 +41,39 @@ public class ${type}ApiImpl implements ${type}Api {

    @Override
    public Long create${type}(${type}CreateDTO dto) {
-        log.info("${type}Api.create${type} request: {}", JSON.toJSONString(dto));
+        log.info("${type}Api.create${type} dto: {}", JSON.toJSONString(dto));
        Valid.valid(dto);
        // 转换
-        ${type}CreateRequest request = ${type}ProviderConvert.MAPPER.to(dto);
+        ${type}CreateRequest request = ${type}ProviderConvert.MAPPER.toRequest(dto);
        // 创建
        return ${typeLower}Service.create${type}(request);
    }

    @Override
    public Integer update${type}ById(${type}UpdateDTO dto) {
-        log.info("${type}Api.update${type}ById request: {}", JSON.toJSONString(dto));
+        log.info("${type}Api.update${type}ById dto: {}", JSON.toJSONString(dto));
        Valid.valid(dto);
        // 转换
-        ${type}UpdateRequest request = ${type}ProviderConvert.MAPPER.to(dto);
+        ${type}UpdateRequest request = ${type}ProviderConvert.MAPPER.toRequest(dto);
        // 修改
        return ${typeLower}Service.update${type}ById(request);
    }

+    @Override
+    public Integer update${type}(${type}QueryDTO query, ${type}UpdateDTO update) {
+        log.info("${type}Api.update${type} query: {}, update: {}", JSON.toJSONString(query), JSON.toJSONString(update));
+        Valid.valid(query);
+        Valid.valid(update);
+        // 条件
+        LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(query);
+        // 转换
+        ${type}DO updateRecord = ${type}ProviderConvert.MAPPER.to(update);
+        // 更新
+        int effect = ${typeLower}DAO.update(updateRecord, wrapper);
+        log.info("${type}Api.update${type} effect: {}", effect);
+        return effect;
+    }
+
    @Override
    public ${type}DTO get${type}ById(Long id) {
        log.info("${type}Api.get${type}ById id: {}", id);
@@ -122,6 +137,16 @@ public class ${type}ApiImpl implements ${type}Api {
        return ${typeLower}DAO.deleteBatchIds(idList);
    }

+    @Override
+    public Integer delete${type}(${type}QueryDTO dto) {
+        log.info("${type}Api.delete${type} dto: {}", JSON.toJSONString(dto));
+        Valid.valid(dto);
+        // 条件
+        LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(dto);
+        // 删除
+        return ${typeLower}DAO.delete(wrapper);
+    }
+
    /**
     * 构建查询 wrapper
     *
--- a/orion-ops-launch/src/main/resources/templates/orion-server-provider-api.java.vm
+++ b/orion-ops-launch/src/main/resources/templates/orion-server-provider-api.java.vm
@@ -32,6 +32,15 @@ public interface ${type}Api {
     */
    Integer update${type}ById(${type}UpdateDTO dto);

+    /**
+     * ${apiComment.updateAll}
+     *
+     * @param query  query
+     * @param update update
+     * @return effect
+     */
+    Integer update${type}(${type}QueryDTO query, ${type}UpdateDTO update);
+
    /**
     * ${apiComment.getById}
     *
@@ -80,4 +89,12 @@ public interface ${type}Api {
     */
    Integer batchDelete${type}ByIdList(Collection<Long> idList);

+    /**
+     * ${apiComment.deleteAll}
+     *
+     * @param dto dto
+     * @return effect
+     */
+    Integer delete${type}(${type}QueryDTO dto);
+
 }
--- a/orion-ops-launch/src/main/resources/templates/orion-server-provider-convert.java.vm
+++ b/orion-ops-launch/src/main/resources/templates/orion-server-provider-convert.java.vm
@@ -30,9 +30,11 @@ public interface ${type}ProviderConvert {

    ${type}DO to(${type}QueryDTO domain);

-    ${type}CreateRequest to(${type}CreateDTO domain);
+    ${type}DO to(${type}UpdateDTO update);

-    ${type}UpdateRequest to(${type}UpdateDTO domain);
+    ${type}CreateRequest toRequest(${type}CreateDTO request);
+
+    ${type}UpdateRequest toRequest(${type}UpdateDTO request);

    List<${type}DTO> toList(List<${type}DO> list);