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

Merge branch 'dev'

This commit is contained in:
wangliwen 2022-10-26 18:04:38 +08:00
parent 2292e1c984 27d2f13fc5
commit b8c95f30f5
4 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config/db/V7.0__enke_hostinfo_add_table.sql
View File

@ -39,6 +39,16 @@ VALUES (11, '市公安局', '市公安局', '127.0.0.1', '127.0.0.1', '2022-09-1
INSERT INTO `enke_hostinfo`
VALUES (12, '市交通运输局', '市交通运输局', '127.0.0.1', '127.0.0.1', '2022-09-11 09:20:07');
INSERT INTO `enke_hostinfo`
VALUES (13, '一网统揽平台组', '一网统揽平台组', '127.0.0.1', '127.0.0.1', '2022-09-10 09:20:07');
VALUES (13, '一网统揽平台组', '一网统揽平台组', '127.0.0.1', '127.0.0.1', '2022-09-29 09:20:07');
INSERT INTO `enke_hostinfo`
VALUES (14, '青岛市一网统揽项目组', '青岛市一网统揽项目组', '127.0.0.1', '127.0.0.1', '2022-09-09 09:20:07');
VALUES (14, '青岛市一网统揽项目组', '青岛市一网统揽项目组', '127.0.0.1', '127.0.0.1', '2022-09-30 09:20:07');
INSERT INTO `enke_hostinfo`
VALUES (15, '市北区一网统揽项目组', '市北区一网统揽项目组', '127.0.0.1', '127.0.0.1', '2022-09-28 09:20:07');
INSERT INTO `enke_hostinfo`
VALUES (16, '李沧区一网统揽项目组', '李沧区一网统揽项目组', '127.0.0.1', '127.0.0.1', '2022-09-27 09:20:07');
INSERT INTO `enke_hostinfo`
VALUES (17, '崂山区一网统揽项目组', '崂山区一网统揽项目组', '127.0.0.1', '127.0.0.1', '2022-09-26 09:20:07');
INSERT INTO `enke_hostinfo`
VALUES (18, ' 西海岸新区一网统揽项目组', ' 西海岸新区一网统揽项目组', '127.0.0.1', '127.0.0.1', '2022-09-25 09:20:07');
INSERT INTO `enke_hostinfo`
VALUES (19, ' 城阳区一网统揽项目组', ' 城阳区一网统揽项目组', '127.0.0.1', '127.0.0.1', '2022-09-24 09:20:07');

14
renren-admin/src/main/java/io/renren/modules/activiti/service/impl/ActivitiServiceImpl.java
View File

@ -93,16 +93,16 @@ public class ActivitiServiceImpl extends BaseServiceImpl<ProcessActivityDao, Pro
StringBuilder builder = new StringBuilder();
Duration duration = Duration.ofSeconds(second);
if (duration.toDays() > 0) {
builder.append(duration.toDays() + "d ");
builder.append(duration.minus(Duration.ofDays(duration.toDays())).toHours() + "h");
builder.append(duration.toDays() + "天 ");
builder.append(duration.minus(Duration.ofDays(duration.toDays())).toHours() + "时");
} else if (duration.toHours() > 0) {
builder.append(duration.toHours() + "h ");
builder.append(duration.minus(Duration.ofHours(duration.toHours())).toMinutes() + "m");
builder.append(duration.toHours() + "时 ");
builder.append(duration.minus(Duration.ofHours(duration.toHours())).toMinutes() + "分");
} else if (duration.toMinutes() > 0) {
builder.append(duration.toMinutes() + "m ");
builder.append(duration.minus(Duration.ofMinutes(duration.toMinutes())).getSeconds() + "s");
builder.append(duration.toMinutes() + "分 ");
builder.append(duration.minus(Duration.ofMinutes(duration.toMinutes())).getSeconds() + "秒");
} else {
builder.append(second + "s");
builder.append(second + "秒");
}
return builder.toString();
}

1
renren-admin/src/main/java/io/renren/modules/security/config/ShiroConfig.java
View File

@ -85,6 +85,7 @@ public class ShiroConfig {
filterMap.put("/census/center/**", "anon"); // 全局各类统计 包含 /census/center/v2
filterMap.put("/metrics/**", "anon");
filterMap.put("/gateway-monitor/**", "anon");
filterMap.put("/enke/**", "anon");
filterMap.put("/**", "oauth2");
shiroFilter.setFilterChainDefinitionMap(filterMap);

12
renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
View File

@ -1855,16 +1855,16 @@
tdr.type = '业务组件')
<choose>
<when test="approveStatus != null and approveStatus == '通过'">
AND tdr.del_flag in (0, 5)
AND tdr.del_flag=0
</when>
<when test="approveStatus != null and approveStatus == '审核中'">
AND tdr.del_flag not in (0, 1, 5, 6)
AND tdr.del_flag in (2, 3, 4)
</when>
<when test="approveStatus != null and approveStatus == '不通过'">
AND tdr.del_flag=6
</when>
<otherwise>
AND tdr.del_flag != 1
AND tdr.del_flag in (0, 2, 3, 4, 6)
</otherwise>
</choose>
<if test="deptId != null and deptId != ''">
@ -1899,16 +1899,16 @@
WHERE 1=1 AND tdr.dept_id=sd.id
<choose>
<when test="approveStatus != null and approveStatus == '通过'">
AND tdr.del_flag in (0, 5)
AND tdr.del_flag=0
</when>
<when test="approveStatus != null and approveStatus == '审核中'">
AND tdr.del_flag not in (0, 1, 5, 6)
AND tdr.del_flag in (2, 3, 4)
</when>
<when test="approveStatus != null and approveStatus == '不通过'">
AND tdr.del_flag=6
</when>
<otherwise>
AND tdr.del_flag != 1
AND tdr.del_flag in (0, 2, 3, 4, 6)
</otherwise>
</choose>
<if test="deptId != null and deptId != ''">