feature: tag功能.

orion-ops-launch/src/main/java/com/orion/ops/launch/generator/CodeGenerator.java

@@ -44,7 +44,7 @@ public class CodeGenerator {
                 // new GenTable("system_user", "用户", "user")
                 //         .vue("user", "user")
                 //         .enums(UserStatusEnum.class),
-                new GenTable("favorite", "收藏", "favorite"),
+                new GenTable("tag", "标签枚举", "tag"),
         };
         // jdbc 配置 - 使用配置文件
         File yamlFile = new File("orion-ops-launch/src/main/resources/application-dev.yaml");

orion-ops-launch/src/main/resources/templates/orion-server-module-controller.java.vm

@@ -59,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(Id.class) ${type}UpdateRequest request) {
+    public Integer update${type}(@Validated(Id.class) @RequestBody ${type}UpdateRequest request) {
         return ${typeLower}Service.update${type}ById(request);
     }
 

orion-ops-launch/src/main/resources/templates/orion-server-module-convert.java.vm

@@ -29,7 +29,7 @@ public interface ${type}Convert {
 
     ${type}VO to(${type}DO domain);
 
-    ${type}Export export(${type}DO domain);
+    ${type}Export toExport(${type}DO domain);
 
     List<${type}VO> to(List<${type}DO> list);
 

orion-ops-launch/src/main/resources/templates/orion-server-module-mapper.java.vm

@@ -1,8 +1,8 @@
 package ${package.Mapper};
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import ${package.Entity}.${entity};
 import ${superMapperClassPackage};
+import ${package.Entity}.${entity};
 #if(${mapperAnnotationClass})
 import ${mapperAnnotationClass.name};
 #end

orion-ops-launch/src/main/resources/templates/orion-server-module-service-impl.java.vm

@@ -41,6 +41,7 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
 
     @Override
     public Long create${type}(${type}CreateRequest request) {
+        log.info("${type}Service-create${type} record: {}", JSON.toJSONString(record));
         // 转换
         ${type}DO record = ${type}Convert.MAPPER.to(request);
         record.setId(null);
@@ -48,12 +49,13 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
         this.check${type}Present(record);
         // 插入
         int effect = ${typeLower}DAO.insert(record);
-        log.info("${type}Service-create${type} effect: {}, record: {}", effect, JSON.toJSONString(record));
+        log.info("${type}Service-create${type} effect: {}", effect);
         return record.getId();
     }
 
     @Override
     public Integer update${type}ById(${type}UpdateRequest request) {
+        log.info("${type}Service-update${type}ById updateRecord: {}", JSON.toJSONString(updateRecord));
         // 查询
         Long id = Valid.notNull(request.getId(), ErrorMessage.ID_MISSING);
         ${type}DO record = ${typeLower}DAO.selectById(id);
@@ -64,7 +66,7 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
         this.check${type}Present(updateRecord);
         // 更新
         int effect = ${typeLower}DAO.updateById(updateRecord);
-        log.info("${type}Service-update${type}ById effect: {}, updateRecord: {}", effect, JSON.toJSONString(updateRecord));
+        log.info("${type}Service-update${type}ById effect: {}", effect);
         return effect;
     }
 
@@ -132,15 +134,17 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
 
     @Override
     public Integer delete${type}ById(Long id) {
+        log.info("${type}Service-delete${type}ById id: {}", id);
         int effect = ${typeLower}DAO.deleteById(id);
-        log.info("${type}Service-delete${type}ById id: {}, effect: {}", id, effect);
+        log.info("${type}Service-delete${type}ById effect: {}", effect);
         return effect;
     }
 
     @Override
     public Integer batchDelete${type}ByIdList(List<Long> idList) {
+        log.info("${type}Service-batchDelete${type}ByIdList idList: {}", idList);
         int effect = ${typeLower}DAO.deleteBatchIds(idList);
-        log.info("${type}Service-batchDelete${type}ByIdList idList: {}, effect: {}", idList, effect);
+        log.info("${type}Service-batchDelete${type}ByIdList effect: {}", effect);
         return effect;
     }
 
@@ -157,12 +161,14 @@ public class ${table.serviceImplName} implements ${table.serviceName} {
 
     @Override
     public void export${type}(${type}QueryRequest request, HttpServletResponse response) throws IOException {
+        log.info("${type}Service.export${type} request: {}", JSON.toJSONString(request));
         // 条件
         LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(request);
         // 查询
         List<${type}Export> rows = ${typeLower}DAO.of()
                 .wrapper(wrapper)
-                .list(${type}Convert.MAPPER::export);
+                .list(${type}Convert.MAPPER::toExport);
+        log.info("${type}Service.export${type} size: {}", rows.size());
         // 导出
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         ExcelExport.create(${type}Export.class)

orion-ops-launch/src/main/resources/templates/orion-server-provider-api-impl.java.vm

@@ -1,4 +1,4 @@
-package ${package.ServiceImpl};
+package ${currentPackage};
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -126,7 +126,9 @@ public class ${type}ApiImpl implements ${type}Api {
         log.info("${type}Api.delete${type}ById id: {}", id);
         Valid.notNull(id, ErrorMessage.ID_MISSING);
         // 删除
-        return ${typeLower}DAO.deleteById(id);
+        int effect = ${typeLower}DAO.deleteById(id);
+        log.info("${type}Api.delete${type}ById effect: {}", effect);
+        return effect;
     }
 
     @Override
@@ -134,7 +136,9 @@ public class ${type}ApiImpl implements ${type}Api {
         log.info("${type}Api.batchDelete${type}ByIdList idList: {}", idList);
         Valid.notEmpty(idList, ErrorMessage.ID_MISSING);
         // 删除
-        return ${typeLower}DAO.deleteBatchIds(idList);
+        int effect = ${typeLower}DAO.deleteBatchIds(idList);
+        log.info("${type}Api.batchDelete${type}ByIdList effect: {}", effect);
+        return effect;
     }
 
     @Override
@@ -144,7 +148,9 @@ public class ${type}ApiImpl implements ${type}Api {
         // 条件
         LambdaQueryWrapper<${type}DO> wrapper = this.buildQueryWrapper(dto);
         // 删除
-        return ${typeLower}DAO.delete(wrapper);
+        int effect = ${typeLower}DAO.delete(wrapper);
+        log.info("${type}Api.delete${type} effect: {}", effect);
+        return effect;
     }
 
     /**

orion-ops-launch/src/main/resources/templates/orion-server-test-api-impl-tests.java.vm

@@ -1,6 +1,5 @@
 package ${currentPackage};
 
-import com.orion.lang.define.wrapper.DataGrid;
 import com.orion.lang.utils.collect.Lists;
 import com.orion.ops.framework.test.core.base.BaseUnitTest;
 import com.orion.ops.framework.test.core.utils.EntityRandoms;
@@ -53,44 +52,63 @@ public class ${type}ApiImplTests extends BaseUnitTest {
 
     @Test
     @Order(3)
+    public void update${type}Test() {
+        ${type}QueryDTO query = new ${type}QueryDTO();
+        query.setId(lastId);
+        ${type}UpdateDTO req = EntityRandoms.random(${type}UpdateDTO.class);
+        req.setId(null);
+        Integer effect = ${typeLower}Api.update${type}(query, req);
+        assertEquals(effect, 1);
+    }
+
+    @Test
+    @Order(4)
     public void get${type}ByIdTest() {
         ${type}DTO row = ${typeLower}Api.get${type}ById(lastId);
         assertNotNull(row);
     }
 
     @Test
-    @Order(4)
+    @Order(5)
     public void get${type}ByIdListTest() {
         List<${type}DTO> rows = ${typeLower}Api.get${type}ByIdList(Lists.of(lastId));
         assertFalse(rows.isEmpty());
     }
 
     @Test
-    @Order(5)
+    @Order(6)
     public void get${type}ListTest() {
         List<${type}DTO> rows = ${typeLower}Api.get${type}List(new ${type}QueryDTO());
         assertFalse(rows.isEmpty());
     }
 
     @Test
-    @Order(6)
+    @Order(7)
     public void get${type}CountTest() {
         Long count = ${typeLower}Api.get${type}Count(new ${type}QueryDTO());
         assertEquals(count, 1L);
     }
 
     @Test
-    @Order(7)
+    @Order(8)
     public void delete${type}ByIdTest() {
         Integer effect = ${typeLower}Api.delete${type}ById(lastId);
         assertEquals(effect, 1);
     }
 
     @Test
-    @Order(8)
+    @Order(9)
     public void batchDelete${type}ByIdListTest() {
         Integer effect = ${typeLower}Api.batchDelete${type}ByIdList(Lists.of(lastId));
         assertEquals(effect, 0);
     }
 
+    @Test
+    @Order(10)
+    public void delete${type}Test() {
+        ${type}QueryDTO dto = new ${type}QueryDTO();
+        Integer effect = ${typeLower}Api.delete${type}(dto);
+        assertEquals(effect, 0);
+    }
+
 }

orion-ops-launch/src/main/resources/templates/orion-server-test-service-impl-tests.java.vm

@@ -53,34 +53,45 @@ public class ${type}ServiceImplTests extends BaseUnitTest {
 
     @Test
     @Order(3)
+    public void update${type}Test() {
+        ${type}QueryRequest query = new ${type}QueryRequest();
+        query.setId(lastId);
+        ${type}UpdateRequest req = EntityRandoms.random(${type}UpdateRequest.class);
+        req.setId(null);
+        Integer effect = ${typeLower}Service.update${type}(query, req);
+        assertEquals(effect, 1);
+    }
+
+    @Test
+    @Order(4)
     public void get${type}ByIdTest() {
         ${type}VO row = ${typeLower}Service.get${type}ById(lastId);
         assertNotNull(row);
     }
 
     @Test
-    @Order(4)
+    @Order(5)
     public void get${type}ByIdListTest() {
         List<${type}VO> rows = ${typeLower}Service.get${type}ByIdList(Lists.of(lastId));
         assertFalse(rows.isEmpty());
     }
 
     @Test
-    @Order(5)
+    @Order(6)
     public void get${type}ListTest() {
         List<${type}VO> rows = ${typeLower}Service.get${type}List(new ${type}QueryRequest());
         assertFalse(rows.isEmpty());
     }
 
     @Test
-    @Order(6)
+    @Order(7)
     public void get${type}CountTest() {
         Long count = ${typeLower}Service.get${type}Count(new ${type}QueryRequest());
         assertEquals(count, 1L);
     }
 
     @Test
-    @Order(7)
+    @Order(8)
     public void get${type}PageTest() {
         ${type}QueryRequest request = new ${type}QueryRequest();
         request.setPage(1);
@@ -90,17 +101,25 @@ public class ${type}ServiceImplTests extends BaseUnitTest {
     }
 
     @Test
-    @Order(8)
+    @Order(9)
     public void delete${type}ByIdTest() {
         Integer effect = ${typeLower}Service.delete${type}ById(lastId);
         assertEquals(effect, 1);
     }
 
     @Test
-    @Order(9)
+    @Order(10)
     public void batchDelete${type}ByIdListTest() {
         Integer effect = ${typeLower}Service.batchDelete${type}ByIdList(Lists.of(lastId));
         assertEquals(effect, 0);
     }
 
+    @Test
+    @Order(11)
+    public void delete${type}Test() {
+        ${type}QueryRequest query = new ${type}QueryRequest();
+        Integer effect = ${typeLower}Service.delete${type}(query);
+        assertEquals(effect, 0);
+    }
+
 }