소스 검색

fix: 字典接口优化

gufj 4 달 전
부모
커밋
be16a3323b

+ 2 - 2
bound-link-api/blink-admin/src/main/java/com/wx/blink/admin/system/support/AdminDictController.java

@@ -79,13 +79,13 @@ public class AdminDictController extends SupportBaseController {
     @Operation(summary = "数据字典KEY-删除- @author admin")
     @PostMapping("/dict/key/delete")
     @SaCheckPermission("support:dict:delete")
-    public ResponseDTO<String> keyDelete(@RequestBody List<Long> keyIdList) {
+    public ResponseDTO<String> keyDelete(@RequestBody List<String> keyIdList) {
         return dictService.keyDelete(keyIdList);
     }
 
     @Operation(summary = "数据字典Value-删除- @author admin")
     @PostMapping("/dict/value/delete")
-    public ResponseDTO<String> valueDelete(@RequestBody List<Long> valueIdList) {
+    public ResponseDTO<String> valueDelete(@RequestBody List<String> valueIdList) {
         return dictService.valueDelete(valueIdList);
     }
 

+ 2 - 1
bound-link-api/blink-backend/src/main/java/com/wx/blink/backend/manager/BlinkCustomizeProcessServiceImpl.java

@@ -15,7 +15,8 @@ public class BlinkCustomizeProcessServiceImpl implements IBlinkCustomizeProcessS
     @Override
     public ResponseDTO<String> supportCommonProcessHandle(StInstanceEvent event) {
         if (event != null) {
-            ResponseDTO<CustomizeProcessEventHandler> processorResponse = CustomizeProcessFactory.getProcessor(event.getState(), event.getFlowCode());
+            ResponseDTO<CustomizeProcessEventHandler> processorResponse =
+                    CustomizeProcessFactory.getProcessor(event.getState(), event.getFlowCode());
             if (processorResponse.getOk()) {
                 CustomizeProcessEventHandler processor = processorResponse.getData();
                 processor.process(event);

+ 1 - 1
bound-link-api/blink-base/src/main/java/com/wx/blink/base/module/support/dict/dao/DictKeyDao.java

@@ -30,7 +30,7 @@ public interface DictKeyDao extends BaseMapper<DictKeyEntity> {
      * 逻辑删除
      *
      */
-    void updateDeletedFlagByIdList(@Param("dictKeyIdList") List<Long> dictKeyIdList, @Param("deletedFlag") Boolean deletedFlag);
+    void updateDeletedFlagByIdList(@Param("dictKeyIdList") List<String> dictKeyIdList, @Param("deletedFlag") Boolean deletedFlag);
 
     /**
      * 分页查询

+ 3 - 3
bound-link-api/blink-base/src/main/java/com/wx/blink/base/module/support/dict/dao/DictValueDao.java

@@ -31,13 +31,13 @@ public interface DictValueDao extends BaseMapper<DictValueEntity> {
      * 查找所有未删除的自带key
      *
      */
-    List<DictValueEntity> selectByDeletedFlagAndKeyId(@Param("dictKeyId") Long dictKeyId, @Param("deletedFlag") Boolean deletedFlag);
+    List<DictValueEntity> selectByDeletedFlagAndKeyId(@Param("dictKeyId") String dictKeyId, @Param("deletedFlag") Boolean deletedFlag);
 
     /**
      * 逻辑删除
      *
      */
-    void updateDeletedFlagByIdList(@Param("dictValueIdList") List<Long> dictValueIdList, @Param("deletedFlag") Boolean deletedFlag);
+    void updateDeletedFlagByIdList(@Param("dictValueIdList") List<String> dictValueIdList, @Param("deletedFlag") Boolean deletedFlag);
 
     /**
      * 分页查询
@@ -49,5 +49,5 @@ public interface DictValueDao extends BaseMapper<DictValueEntity> {
      * 跟进code查询
      *
      */
-    DictValueEntity selectByCode(@Param("dictKeyId") Long dictKeyId,@Param("valueCode") String valueCode, @Param("deletedFlag") Boolean deletedFlag);
+    DictValueEntity selectByCode(@Param("dictKeyId") String dictKeyId,@Param("valueCode") String valueCode, @Param("deletedFlag") Boolean deletedFlag);
 }

+ 1 - 1
bound-link-api/blink-base/src/main/java/com/wx/blink/base/module/support/dict/domain/form/DictValueAddForm.java

@@ -19,7 +19,7 @@ public class DictValueAddForm {
 
     @Schema(description = "dictKeyId")
     @NotNull(message = "dictKeyId不能为空")
-    private Long dictKeyId;
+    private String dictKeyId;
 
     @Schema(description = "编码")
     @NotBlank(message = "编码不能为空")

+ 1 - 1
bound-link-api/blink-base/src/main/java/com/wx/blink/base/module/support/dict/domain/form/DictValueQueryForm.java

@@ -18,7 +18,7 @@ public class DictValueQueryForm extends PageParam {
 
     @Schema(description = "dictKeyId")
     @NotNull(message = "dictKeyId不能为空")
-    private Long dictKeyId;
+    private String dictKeyId;
 
     @Schema(description = "搜索词")
     private String searchWord;

+ 1 - 1
bound-link-api/blink-base/src/main/java/com/wx/blink/base/module/support/dict/domain/vo/DictKeyVO.java

@@ -14,7 +14,7 @@ import lombok.Data;
 public class DictKeyVO {
 
     @Schema(description = "dictKeyId")
-    private Long dictKeyId;
+    private String dictKeyId;
 
     @Schema(description = "编码")
     private String keyCode;

+ 1 - 1
bound-link-api/blink-base/src/main/java/com/wx/blink/base/module/support/dict/domain/vo/DictValueVO.java

@@ -14,7 +14,7 @@ import lombok.Data;
 public class DictValueVO {
 
     @Schema(description = "valueId")
-    private Long dictValueId;
+    private String dictValueId;
 
     @Schema(description = "dictKeyId")
     private String dictKeyId;

+ 2 - 2
bound-link-api/blink-base/src/main/java/com/wx/blink/base/module/support/dict/service/DictService.java

@@ -135,7 +135,7 @@ public class DictService {
      * @param keyIdList
      * @return
      */
-    public ResponseDTO<String> keyDelete(List<Long> keyIdList) {
+    public ResponseDTO<String> keyDelete(List<String> keyIdList) {
         if (CollectionUtils.isEmpty(keyIdList)) {
             return ResponseDTO.ok();
         }
@@ -151,7 +151,7 @@ public class DictService {
      * @param valueIdList
      * @return
      */
-    public ResponseDTO<String> valueDelete(List<Long> valueIdList) {
+    public ResponseDTO<String> valueDelete(List<String> valueIdList) {
         if (CollectionUtils.isEmpty(valueIdList)) {
             return ResponseDTO.ok();
         }