fetch:资源修改

adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java

@@ -31,8 +31,8 @@ public class TsResourceController extends BaseController<TsResource> {
     
     @ApiOperation("查询所有资源")
     @GetMapping
-    public ResponseMessage<List<TsResource>> getAll(){
-        List<TsResource> tsResources=tsResourceService.getAll();
+    public ResponseMessage<List<TsResource>> getAll(TsResource tsResource){
+        List<TsResource> tsResources=tsResourceService.getAll(tsResource);
         return Result.success(tsResources);
     }
 

adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java

@@ -1,6 +1,9 @@
 package com.adc.da.slrs.sarResource.entity;
 
 import com.adc.da.base.entity.BaseEntity;
+import com.adc.da.slrs.sarMenu.entity.SarMenu;
+import com.adc.da.utils.treetool.annotation.TreeNodeName;
+import com.adc.da.utils.treetool.annotation.TreeNodeParentId;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -11,6 +14,7 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import javax.validation.constraints.NotNull;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -31,23 +35,54 @@ public class TsResource extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "路径")
-    private String href;
 
-    @ApiModelProperty(value = "父节点ID")
-    private String parentId;
 
-    @ApiModelProperty(value = "资源名称")
-    private String name;
-
-    @TableId(type = IdType.UUID)
-    @NotNull(message = "id不能为空",groups = {update.class})
-    @ApiModelProperty(value = "ID")
+    @NotNull(message = "id不能为空",groups = {SarMenu.update.class})
+    @ApiModelProperty(value = "主键")
+    @TableId(value = "ID",type = IdType.UUID)
     private String id;
 
+    @ApiModelProperty(value = "标准法规划分")
+    @TableField("SOR_DIVIDE")
+    private String sorDivide;
+
+    @TreeNodeName
+    @ApiModelProperty(value = "目录名称")
+    @TableField("MENU_NAME")
+    private String menuName;
+
+    @TreeNodeParentId
+    @ApiModelProperty(value = "父级ID")
+    @TableField("PARENT_ID")
+    private String parentId;
+
+    @ApiModelProperty(value = "父级ID集合")
+    @TableField("PARENT_IDS")
+    private String parentIds;
+
+    @ApiModelProperty(value = "排序序号")
+    @TableField("DISPLAY_SEQ")
+    private Integer displaySeq;
+    
+
+    @ApiModelProperty(value = "是否有效")
+    @TableField("VALID_FLAG")
+    private Integer validFlag;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("CREATION_TIME")
+    private Date creationTime;
+
+    @ApiModelProperty(value = "修改时间")
+    @TableField("MODIFY_TIME")
+    private Date modifyTime;
+
+    @ApiModelProperty(value = "备注")
+    @TableField("REMARKS")
+    private String remarks;
+
+    @ApiModelProperty(value = "子菜单")
     @TableField(exist = false)
-    @ApiModelProperty("子节点")
     private List<TsResource> children;
 
-
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java

@@ -16,7 +16,7 @@ import java.util.List;
  */
 public interface ITsResourceService extends IService<TsResource> {
 
-    List<TsResource> getAll();
+    List<TsResource> getAll(TsResource tsResource);
 
     ResponseMessage<Object> addResource(TsResource tsResource);
 
@@ -27,7 +27,8 @@ public interface ITsResourceService extends IService<TsResource> {
     /**
      * 通过Ids查询menu
      * @param resourceIds :菜单Ids
+     * @param sorDivide
      * @return List<Menu>
      */
-    List<TsResource> getResourceByIds(List<String> resourceIds);
+    List<TsResource> getResourceByIds(List<String> resourceIds, String sorDivide);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java

@@ -28,12 +28,16 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
     private TsResourceDao dao;
     /**
      * 查询所有菜单
+     * @param tsResource
      */
     @Override
-    public List<TsResource> getAll() {
-        QueryWrapper<TsResource> TsResourceQueryWrapper=new QueryWrapper<>();
-        TsResourceQueryWrapper.isNull("PARENT_ID");
-        List<TsResource> TsResources=dao.selectList(TsResourceQueryWrapper);
+    public List<TsResource> getAll(TsResource tsResource) {
+        QueryWrapper<TsResource> tsResourceQueryWrapper=new QueryWrapper<>();
+        if(tsResource.getSorDivide()!=null){
+            tsResourceQueryWrapper.eq("sor_divide",tsResource.getSorDivide());
+        }
+        tsResourceQueryWrapper.isNull("PARENT_ID");
+        List<TsResource> TsResources=dao.selectList(tsResourceQueryWrapper);
         for(TsResource TsResource:TsResources){
             TsResource.setChildren(recursionGetChildren((TsResource)));
         }
@@ -98,12 +102,16 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
     /**
      * 通过Ids查询Resource
      * @param resourceIds :菜单Ids
+     * @param sorDivide
      * @return List<Resource>
      */
     @Override
-    public List<TsResource> getResourceByIds(List<String> resourceIds) {
+    public List<TsResource> getResourceByIds(List<String> resourceIds, String sorDivide) {
         if(resourceIds!=null&&resourceIds.size()>0){
             QueryWrapper<TsResource> TsResourceQueryWrapper=new QueryWrapper<>();
+            if(sorDivide!=null){
+                TsResourceQueryWrapper.eq("sor_divide",sorDivide);
+            }
             TsResourceQueryWrapper.in("id",resourceIds);
             return dao.selectList(TsResourceQueryWrapper);
         }