服务目录下拉框+新增

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/ServiceCatalogCategoryController.java

@@ -7,6 +7,7 @@ import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.dromara.platform.domain.ServiceCatalogCategory;
+import org.dromara.platform.domain.vo.ServiceCatalogSelectVo;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -65,7 +66,7 @@ public class ServiceCatalogCategoryController extends BaseController {
     @SaCheckPermission("platform:catalogCategory:query")
     @GetMapping("/{id}")
     public R<ServiceCatalogCategoryVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable String id) {
+                                                   @PathVariable String id) {
         return R.ok(serviceCatalogCategoryService.queryById(id));
     }
 
@@ -106,7 +107,6 @@ public class ServiceCatalogCategoryController extends BaseController {
 
     /**
      * 获取服务目录-  (父+子)
-     *
      */
     @SaCheckPermission("platform:catalogCategory:queryAll")
     @GetMapping("/queryAll")
@@ -128,13 +128,17 @@ public class ServiceCatalogCategoryController extends BaseController {
     }
 
 
-
     @SaCheckPermission("platform:catalogCategory:queryCategory")
     @GetMapping("/queryCategory")
     public R<List<ServiceCatalogCategoryVo>> queryCategory() {
         return R.ok(serviceCatalogCategoryService.queryCategory());
     }
 
+    /**
+     * 多层级服务目录
+     *
+     * @return
+     */
     @SaCheckPermission("platform:catalogCategory:buildFullTree")
     @GetMapping("/queryBuildFullTree")
     public R<List<ServiceCatalogCategory>> buildFullTree() {
@@ -142,4 +146,27 @@ public class ServiceCatalogCategoryController extends BaseController {
     }
 
 
+    /**
+     * 查询全部服务目录名称用于(下拉框)
+     *
+     * @return
+     */
+    @SaCheckPermission("platform:catalogCategory:queryAllCategoryName")
+    @GetMapping("/queryAllCategoryName")
+    public R<List<ServiceCatalogSelectVo>> queryAllCategoryName() {
+        return R.ok(serviceCatalogCategoryService.queryAllCatalogName());
+    }
+
+
+    /**
+     * 新增服务目录-类别
+     */
+    @SaCheckPermission("platform:catalogCategory:saveCategory")
+    @Log(title = "服务目录-类别", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping("/saveCategory")
+    public  R<Void> saveCategory(@Validated(AddGroup.class) @RequestBody ServiceCatalogCategoryBo bo) {
+        return toAjax( serviceCatalogCategoryService.saveByBo(bo));
+    }
+
 }

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/bo/ServiceCatalogCategoryBo.java

@@ -23,7 +23,7 @@ public class ServiceCatalogCategoryBo extends BaseEntity {
     /**
      * 目录ID，唯一标识每个目录条目
      */
-    @NotBlank(message = "目录ID，唯一标识每个目录条目不能为空", groups = { EditGroup.class })
+    //@NotBlank(message = "目录ID，唯一标识每个目录条目不能为空", groups = { EditGroup.class })
     private String id;
 
 //    /**
@@ -41,37 +41,37 @@ public class ServiceCatalogCategoryBo extends BaseEntity {
     /**
      * 描述
      */
-    @NotBlank(message = "描述不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "描述不能为空", groups = { AddGroup.class, EditGroup.class })
     private String description;
 
     /**
      * 编号，用于额外标识或排序目的
      */
-    @NotBlank(message = "编号，用于额外标识或排序目的不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "编号，用于额外标识或排序目的不能为空", groups = { AddGroup.class, EditGroup.class })
     private String code;
 
     /**
      * 是否为子目录，true表示是子目录，false则不是
      */
-    @NotNull(message = "是否为子目录，true表示是子目录，false则不是不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "是否为子目录，true表示是子目录，false则不是不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long isChildren;
 
     /**
      * 上级目录id，指向父目录的id，如果没有父目录则为空
      */
-    @NotBlank(message = "上级目录id，指向父目录的id，如果没有父目录则为空不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "上级目录id，指向父目录的id，如果没有父目录则为空不能为空", groups = { AddGroup.class, EditGroup.class })
     private String ownerId;
 
     /**
      * 上级目录名称，冗余存储父目录的名称以便查询优化
      */
-    @NotBlank(message = "上级目录名称，冗余存储父目录的名称以便查询优化不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotBlank(message = "上级目录名称，冗余存储父目录的名称以便查询优化不能为空", groups = { AddGroup.class, EditGroup.class })
     private String ownerName;
 
     /**
      * 当前状态
      */
-    @NotNull(message = "当前状态不能为空", groups = { AddGroup.class, EditGroup.class })
+    //@NotNull(message = "当前状态不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long status;
 
 

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/vo/ServiceCatalogSelectVo.java

@@ -0,0 +1,9 @@
+package org.dromara.platform.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class ServiceCatalogSelectVo {
+    private String id;
+    private String categoryName;
+}

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/listener/AgreementInfoListener.java

@@ -41,6 +41,11 @@ public class AgreementInfoListener implements ReadListener<AgreementInfo> {
      */
     @Override
     public void invoke(AgreementInfo agreementInfo, AnalysisContext analysisContext) {
+//        String deliverContent = agreementInfo.getDeliverContent();
+//        if (deliverContent == null){
+//            throw new RuntimeException("交付内容不能为空");
+//        }
+//        log.info("读取到一条数据：" + deliverContent);
         agreementInfo.setServiceCategoryId(categoryId);
         // 读取一行数据就添加到集合
         list.add(agreementInfo);

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/mapper/ServiceCatalogCategoryMapper.java

@@ -1,8 +1,12 @@
 package org.dromara.platform.mapper;
 
+import org.apache.ibatis.annotations.Select;
 import org.dromara.platform.domain.ServiceCatalogCategory;
 import org.dromara.platform.domain.vo.ServiceCatalogCategoryVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.platform.domain.vo.ServiceCatalogSelectVo;
+
+import java.util.List;
 
 /**
  * 服务目录-类别Mapper接口
@@ -11,5 +15,6 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
  * @date 2025-03-07
  */
 public interface ServiceCatalogCategoryMapper extends BaseMapperPlus<ServiceCatalogCategory, ServiceCatalogCategoryVo> {
-
+    @Select("select id,category_name as categoryName from service_catalog_category")
+    List<ServiceCatalogSelectVo> getServiceCatalogSelectVo();
 }

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/IServiceCatalogCategoryService.java

@@ -1,6 +1,7 @@
 package org.dromara.platform.service;
 
 import org.dromara.platform.domain.ServiceCatalogCategory;
+import org.dromara.platform.domain.vo.ServiceCatalogSelectVo;
 import org.dromara.platform.domain.vo.ServiceCatalogCategoryVo;
 import org.dromara.platform.domain.bo.ServiceCatalogCategoryBo;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
@@ -79,4 +80,8 @@ public interface IServiceCatalogCategoryService {
     List<ServiceCatalogCategoryVo> queryCategory();
 
     List<ServiceCatalogCategory> buildFullTree();
+
+    List<ServiceCatalogSelectVo> queryAllCatalogName();
+
+    boolean saveByBo(ServiceCatalogCategoryBo bo);
 }

ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/ServiceCatalogCategoryServiceImpl.java

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.BeanUtils;
+import org.dromara.platform.domain.vo.ServiceCatalogSelectVo;
 import org.springframework.stereotype.Service;
 import org.dromara.platform.domain.bo.ServiceCatalogCategoryBo;
 import org.dromara.platform.domain.vo.ServiceCatalogCategoryVo;
@@ -225,4 +225,31 @@ public class ServiceCatalogCategoryServiceImpl implements IServiceCatalogCategor
 
         return rootNodes;
     }
+
+    @Override
+    public List<ServiceCatalogSelectVo> queryAllCatalogName() {
+        List<ServiceCatalogSelectVo> serviceCatalogSelectVo = baseMapper.getServiceCatalogSelectVo();
+        return serviceCatalogSelectVo;
+    }
+
+    @Override
+    public boolean saveByBo(ServiceCatalogCategoryBo bo) {
+        ServiceCatalogCategory category = new ServiceCatalogCategory();
+        ServiceCatalogCategory saveEntity = MapstructUtils.convert(bo, category);
+        if (saveEntity != null) {
+            if (StringUtils.isEmpty(saveEntity.getOwnerId())) {
+                saveEntity.setIsChildren(0L);
+                saveEntity.setDescription("目录");
+            }else {
+                saveEntity.setIsChildren(1L);
+                saveEntity.setDescription("小类");
+            }
+            boolean flag = baseMapper.insert(saveEntity) > 0;
+            if (flag) {
+                return true;
+            }
+        }
+        return false;
+
+    }
 }