wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
DingGang 2022-04-25 22:26:33 +08:00
parent 416b27074a a551408bc7
commit 88150d1c63
4 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
renren-admin/src/main/java/io/renren/common/controller/DemandDataController.java
View File

@ -68,6 +68,7 @@ public class DemandDataController {
if (tDemandDataDTO.getId() == null) { if (tDemandDataDTO.getId() == null) {
return null; return null;
} }
logger.info("-------------------1.保存申请表单成功--------------------------"); logger.info("-------------------1.保存申请表单成功--------------------------");
// 仿照请求接口 /act/running/startOfBusinessKey // 仿照请求接口 /act/running/startOfBusinessKey
ProcessStartDTO processStartDTO = new ProcessStartDTO(); ProcessStartDTO processStartDTO = new ProcessStartDTO();

3
renren-admin/src/main/java/io/renren/modules/resource/controller/ResourceController.java
View File

@ -52,7 +52,8 @@ public class ResourceController {
@ApiImplicitParam(name = "type", value = "类型", paramType = "query", required = true, dataType = "String"), @ApiImplicitParam(name = "type", value = "类型", paramType = "query", required = true, dataType = "String"),
//@ApiImplicitParam(name = "name", value = "资源名称", paramType = "query", dataType="String") , //@ApiImplicitParam(name = "name", value = "资源名称", paramType = "query", dataType="String") ,
@ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType = "String"), @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType = "String") @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType = "String"),
@ApiImplicitParam(name = "creator", value = "创建者用户id", paramType = "query", dataType = "String")
}) })
//@RequiresPermissions("resource:resource:page") //@RequiresPermissions("resource:resource:page")
public Result<PageData<ResourceDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params) { public Result<PageData<ResourceDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params) {

36
renren-admin/src/main/java/io/renren/modules/resource/entity/ResourceEntity.java
View File

@ -1,10 +1,10 @@
package io.renren.modules.resource.entity; package io.renren.modules.resource.entity;
import com.baomidou.mybatisplus.annotation.*;
import io.renren.common.entity.BaseEntity;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import com.baomidou.mybatisplus.annotation.*;
import java.io.Serializable;
import java.util.Date; import java.util.Date;
/** /**
@ -16,14 +16,14 @@ import java.util.Date;
@Data @Data
@EqualsAndHashCode(callSuper=false) @EqualsAndHashCode(callSuper=false)
@TableName("tb_data_resource") @TableName("tb_data_resource")
public class ResourceEntity { public class ResourceEntity extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** // /**
* 主键 // * 主键
*/ // */
@TableId(type = IdType.INPUT) // @TableId(type = IdType.INPUT)
private Long id; // private Long id;
/** /**
* 类型：基础设施，数据资源等 * 类型：基础设施，数据资源等
*/ */
@ -84,16 +84,16 @@ public class ResourceEntity {
* 删除标志：0:正常；1:已删除；9其他 * 删除标志：0:正常；1:已删除；9其他
*/ */
private Integer delFlag; private Integer delFlag;
/** // /**
* 创建人 // * 创建人
*/ // */
@TableField(fill = FieldFill.INSERT) // @TableField(fill = FieldFill.INSERT)
private Long creator; // private Long creator;
/** // /**
* 创建时间 // * 创建时间
*/ // */
@TableField(fill = FieldFill.INSERT) // @TableField(fill = FieldFill.INSERT)
private Date createDate; // private Date createDate;
/** /**
* 修改人 * 修改人
*/ */

6
renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
View File

@ -61,9 +61,13 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
public QueryWrapper<ResourceEntity> getWrapper(Map<String, Object> params) { public QueryWrapper<ResourceEntity> getWrapper(Map<String, Object> params) {
QueryWrapper<ResourceEntity> wrapper = new QueryWrapper<>(); QueryWrapper<ResourceEntity> wrapper = new QueryWrapper<>();
wrapper.eq("type", params.get("type").toString()) wrapper.eq("type", params.get("type").toString())
.eq("del_flag", 0)
//.like(StringUtils.isNotBlank(params.get("name").toString()),"name", params.get("name").toString()) //.like(StringUtils.isNotBlank(params.get("name").toString()),"name", params.get("name").toString())
.orderByDesc("create_date"); .orderByDesc("create_date");
if (params.containsKey("creator")) { //查该用户创建的资源
wrapper.eq("creator", params.get("creator").toString());
} else { // 公共页（只出正常的）
wrapper.eq("del_flag", 0);
}
return wrapper; return wrapper;
} }