瀏覽代碼

新增流程分类排序支持

hubin 1 年之前
父節點
當前提交
4f983200f6

+ 8 - 0
src/main/java/com/aizuda/boot/modules/flw/controller/FlwProcessCategoryController.java

@@ -1,6 +1,7 @@
 package com.aizuda.boot.modules.flw.controller;
 
 import com.aizuda.boot.modules.flw.entity.FlwProcessCategory;
+import com.aizuda.boot.modules.flw.entity.dto.FlwCategorySortDTO;
 import com.aizuda.boot.modules.flw.service.IFlwProcessCategoryService;
 import com.aizuda.core.api.ApiController;
 import com.aizuda.core.validation.Create;
@@ -38,6 +39,13 @@ public class FlwProcessCategoryController extends ApiController {
         return flwProcessCategoryService.updateById(flwProcessCategory);
     }
 
+    @Operation(summary = "排序")
+    @Permission("flw:processCategory")
+    @PostMapping("/sort")
+    public boolean sort(@Validated(Create.class) @RequestBody List<FlwCategorySortDTO> dtoList) {
+        return flwProcessCategoryService.sort(dtoList);
+    }
+
     @Operation(summary = "创建添加")
     @Permission("flw:processCategory:create")
     @PostMapping("/create")

+ 17 - 0
src/main/java/com/aizuda/boot/modules/flw/entity/dto/FlwCategorySortDTO.java

@@ -0,0 +1,17 @@
+package com.aizuda.boot.modules.flw.entity.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class FlwCategorySortDTO {
+
+    @Schema(description = "主键ID")
+    private Long id;
+
+    @Schema(description = "排序")
+    private Integer sort;
+
+}

+ 3 - 0
src/main/java/com/aizuda/boot/modules/flw/service/IFlwProcessCategoryService.java

@@ -1,6 +1,7 @@
 package com.aizuda.boot.modules.flw.service;
 
 import com.aizuda.boot.modules.flw.entity.FlwProcessCategory;
+import com.aizuda.boot.modules.flw.entity.dto.FlwCategorySortDTO;
 import com.aizuda.service.service.IBaseService;
 
 import java.util.List;
@@ -14,4 +15,6 @@ import java.util.List;
 public interface IFlwProcessCategoryService extends IBaseService<FlwProcessCategory> {
 
     boolean removeCategoryByIds(List<Long> ids);
+
+    boolean sort(List<FlwCategorySortDTO> dtoList);
 }

+ 12 - 0
src/main/java/com/aizuda/boot/modules/flw/service/impl/FlwProcessCategoryServiceImpl.java

@@ -1,6 +1,7 @@
 package com.aizuda.boot.modules.flw.service.impl;
 
 import com.aizuda.boot.modules.flw.entity.FlwProcessCategory;
+import com.aizuda.boot.modules.flw.entity.dto.FlwCategorySortDTO;
 import com.aizuda.boot.modules.flw.mapper.FlwProcessCategoryMapper;
 import com.aizuda.boot.modules.flw.service.IFlwProcessCategoryService;
 import com.aizuda.boot.modules.flw.service.IFlwProcessConfigureService;
@@ -10,6 +11,7 @@ import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 流程分类 服务实现类
@@ -33,4 +35,14 @@ public class FlwProcessCategoryServiceImpl extends BaseServiceImpl<FlwProcessCat
         ApiAssert.fail(flwProcessConfigureService.existByCategoryIds(ids), "存在流程定义关联不允许删除");
         return super.removeByIds(ids);
     }
+
+    @Override
+    public boolean sort(List<FlwCategorySortDTO> dtoList) {
+        return super.updateBatchById(dtoList.stream().map(t -> {
+            FlwProcessCategory fpc = new FlwProcessCategory();
+            fpc.setId(t.getId());
+            fpc.setSort(t.getSort());
+            return fpc;
+        }).collect(Collectors.toList()));
+    }
 }

+ 2 - 10
src/main/resources/log4j2.xml

@@ -43,21 +43,13 @@
             </Policies>
             <DefaultRolloverStrategy max="30"/>
         </RollingRandomAccessFile>
-        <Jdbc name="databaseAppender" tableName="log">
-            <DriverManager connectionString="jdbc:postgresql://127.0.0.1:5432/aizuda"
-                           driverClassName="org.postgresql.Driver"
-                           username="postgres" password="123456" />
-            <Column name="eventdate" isEventTimestamp="true" />
-            <Column name="level" pattern="%level" isUnicode="false" />
-            <Column name="logger" pattern="%logger{36}" isUnicode="false"/>
-            <Column name="message" pattern="%message" isUnicode="false" />
-            <Column name="exception" pattern="%exception"  isUnicode="false" />
-        </Jdbc>
     </Appenders>
     <Loggers>
+        <!--
         <logger name="com.aizuda" level="error" additivity="false">
             <appender-ref ref="databaseAppender" level="error"/>
         </logger>
+        -->
         <AsyncLogger name="org.apache.ibatis" level="error" includeLocation="true"/>
         <AsyncLogger name="org.springframework.web" level="error" includeLocation="true"/>
         <AsyncRoot level="error" includeLocation="true">