新增演示环境,修改门户查询逻辑
This commit is contained in:
parent
ddc5932938
commit
dda2c6c6b5
|
@ -50,9 +50,9 @@ public class ResourceController {
|
||||||
@ApiImplicitParam(name = "creator", value = "创建者用户id", paramType = "query", dataType = "String")
|
@ApiImplicitParam(name = "creator", value = "创建者用户id", paramType = "query", dataType = "String")
|
||||||
})
|
})
|
||||||
public Result<PageData<ResourceDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params) {
|
public Result<PageData<ResourceDTO>> page(@ApiIgnore @RequestParam Map<String, Object> params) {
|
||||||
if (!params.containsKey("del_flag")) {
|
//if (!params.containsKey("del_flag")) {
|
||||||
params.put("del_flag", 0);
|
// params.put("del_flag", 0);
|
||||||
}
|
//}
|
||||||
PageData<ResourceDTO> page = resourceService.page(params);
|
PageData<ResourceDTO> page = resourceService.page(params);
|
||||||
page.getList().forEach(item -> {
|
page.getList().forEach(item -> {
|
||||||
item.setInfoList(resourceService.selectAttrsByResourceId(item.getId()));
|
item.setInfoList(resourceService.selectAttrsByResourceId(item.getId()));
|
||||||
|
|
|
@ -72,9 +72,9 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
||||||
wrapper.eq(StringUtils.isNotBlank(params.get("creator").toString()), "creator", params.get("creator").toString())
|
wrapper.eq(StringUtils.isNotBlank(params.get("creator").toString()), "creator", params.get("creator").toString())
|
||||||
.ne("del_flag", 1);
|
.ne("del_flag", 1);
|
||||||
break;
|
break;
|
||||||
case "del_flag":
|
//case "del_flag":
|
||||||
wrapper.eq("del_flag", params.get("del_flag"));
|
// wrapper.eq("del_flag", params.get("del_flag"));
|
||||||
break;
|
// break;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
wrapper.orderByDesc("create_date");
|
wrapper.orderByDesc("create_date");
|
||||||
|
|
|
@ -0,0 +1,46 @@
|
||||||
|
server:
|
||||||
|
port: 8888
|
||||||
|
spring:
|
||||||
|
datasource:
|
||||||
|
druid:
|
||||||
|
#MySQL
|
||||||
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
|
url: jdbc:mysql://15.2.21.238:3310/share_platform_show?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
|
||||||
|
username: root
|
||||||
|
password: Hisense2019
|
||||||
|
initial-size: 10
|
||||||
|
max-active: 100
|
||||||
|
min-idle: 10
|
||||||
|
max-wait: 60000
|
||||||
|
pool-prepared-statements: true
|
||||||
|
max-pool-prepared-statement-per-connection-size: 20
|
||||||
|
time-between-eviction-runs-millis: 60000
|
||||||
|
min-evictable-idle-time-millis: 300000
|
||||||
|
#Oracle需要打开注释
|
||||||
|
#validation-query: SELECT 1 FROM DUAL
|
||||||
|
test-while-idle: true
|
||||||
|
test-on-borrow: false
|
||||||
|
test-on-return: false
|
||||||
|
stat-view-servlet:
|
||||||
|
enabled: true
|
||||||
|
url-pattern: /druid/*
|
||||||
|
#login-username: admin
|
||||||
|
#login-password: admin
|
||||||
|
filter:
|
||||||
|
stat:
|
||||||
|
log-slow-sql: true
|
||||||
|
slow-sql-millis: 1000
|
||||||
|
merge-sql: false
|
||||||
|
wall:
|
||||||
|
config:
|
||||||
|
multi-statement-allow: true
|
||||||
|
|
||||||
|
#上传的静态资源配置
|
||||||
|
resource:
|
||||||
|
root_url: 15.2.21.238
|
||||||
|
path: /home/yth/files/
|
||||||
|
devModelFilePath: /home/yth/files/devModelFile
|
||||||
|
# 大数据部门相关配置
|
||||||
|
big_date:
|
||||||
|
name: 青岛市大数据发展管理局
|
||||||
|
assignee_role_name: 部门审批人
|
Loading…
Reference in New Issue