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

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-12-14 11:46:23 +08:00
parent bc238cf39e edb5c683f8
commit 38e0d6588d
6 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
renren-admin/src/main/java/io/renren/modules/fuse/dto/TbFuseDTO.java
View File

@ -58,8 +58,10 @@ public class TbFuseDTO {
private Integer dataSourceCount;
@ApiModelProperty(value = "组件服务数量")
private Integer componentCount;
@ApiModelProperty(value = "组件服务数量")
@ApiModelProperty(value = "赋能场景类型：0市级，1基层")
private Integer district;
@ApiModelProperty(value = "基层赋能场景所属地区")
private String area;
}

2
renren-admin/src/main/java/io/renren/modules/fuse/entity/TbFuseEntity.java
View File

@ -80,5 +80,5 @@ public class TbFuseEntity extends BaseEntity {
private Integer dataSourceCount;
private Integer componentCount;
private Integer district;
private String area;
}

3
renren-admin/src/main/resources/db/V8.4__tb_fuse_add_col.sql
View File

@ -1 +1,2 @@
ALTER TABLE tb_fuse ADD COLUMN `district` int(2) DEFAULT 0 COMMENT '赋能场景类型：0市级、1基层场景';
ALTER TABLE tb_fuse ADD COLUMN `district` int(2) DEFAULT 0 COMMENT '赋能场景类型：0市级、1基层场景',
ADD COLUMN `area` varchar(128) NULL COMMENT '基层赋能场景所属地区';

1
renren-admin/src/main/resources/mapper/fuse/TbFuseDao.xml
View File

@ -20,6 +20,7 @@
<result property="dataSourceCount" column="data_source_count"/>
<result property="componentCount" column="component_count"/>
<result property="district" column="district"/>
<result property="area" column="area"/>
</resultMap>
<select id="getFuseDTOList" resultMap="fuseDTO">

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

@ -1884,20 +1884,20 @@
FROM
(SELECT IF(d.type='组件服务', A.attr_value, d.type) AS type, d.id, d.del_flag, d.dept_id, d.create_date FROM
tb_data_resource d LEFT JOIN tb_data_attr a ON d.id=a.data_resource_id AND a.attr_type='组件类型' AND
a.del_flag=0 WHERE d.type IN ('应用资源', '组件服务') AND d.del_flag = 0) tdr,
a.del_flag=0 WHERE d.type IN ('应用资源', '组件服务') AND d.del_flag NOT IN (1, 5)) tdr,
sys_dept sd
WHERE
1 = 1
AND tdr.dept_id = sd.id
<choose>
<when test="approveStatus != null and approveStatus == '通过'">
AND tdr.del_flag=0
AND tdr.del_flag = 0
</when>
<when test="approveStatus != null and approveStatus == '审核中'">
AND tdr.del_flag in (2, 3, 4)
</when>
<when test="approveStatus != null and approveStatus == '不通过'">
AND tdr.del_flag=6
AND tdr.del_flag = 6
</when>
<otherwise>
AND tdr.del_flag in (0, 2, 3, 4, 6)
@ -1926,7 +1926,7 @@
tdr.name AS resourceName,
tdr.type,
DATE_FORMAT(tdr.create_date,'%Y-%m-%d %T') AS createDate,
CASE WHEN (tdr.del_flag = 0 OR tdr.del_flag = 5) THEN '通过' WHEN tdr.del_flag = 6 THEN '不通过' ELSE '审核中' END AS approveStatus,
CASE WHEN tdr.del_flag = 0 THEN '通过' WHEN tdr.del_flag = 6 THEN '不通过' ELSE '审核中' END AS approveStatus,
trma.instance_id AS applyNumber
FROM
(SELECT
@ -1938,7 +1938,10 @@
d.name
FROM tb_data_resource d
LEFT JOIN tb_data_attr a ON d.id = a.data_resource_id AND a.attr_type = '组件类型' AND a.del_flag = 0
WHERE d.type IN ('应用资源','组件服务')
WHERE
1 = 1
AND d.del_flag NOT IN (1, 5)
AND d.type IN ('应用资源','组件服务')
) tdr
LEFT JOIN t_resource_mount_apply trma on tdr.id = trma.resource_id,
sys_dept sd

2
renren-admin/src/main/resources/mapper/sys/SysRegionDao.xml
View File

@ -21,7 +21,7 @@
</select>
<select id="getListByLevel" resultType="io.renren.modules.sys.entity.SysRegionEntity">
select id, pid, name from sys_region where level = #{value} order by sort
select id, pid, name from sys_region where tree_level = #{value} order by sort
</select>
<select id="getById" resultType="io.renren.modules.sys.entity.SysRegionEntity">