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

Merge branch 'dev' of http://221.0.232.152:9393/ability-center/share-platform into dev 

* 'dev' of http://221.0.232.152:9393/ability-center/share-platform:
  能力广场-应用资源列表查询
  编目更新
This commit is contained in:
huangweixiong 2022-08-10 11:56:10 +08:00
parent bbefe4fff1 0f493bb87c
commit 201a092ed0
7 changed files with 62 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/db/R__init_tb_data_catagory.sql
View File

@ -1,7 +1,7 @@
-- 涉及到的表：tb_data_category
-- 注意更新时间
/*
2022年8月5日17:32:19
2022年8月9日10:00:46
*/
REPLACE INTO `tb_data_category` VALUES (1514138753379680257, '组件服务', NULL, NULL, 'false', NULL, 'false', 'false', '', 10, 0, 1067246875800000001, '2022-04-13 15:09:45', 1513437369940344833, '2022-07-12 16:16:11', NULL, NULL, NULL, NULL, NULL);
@ -278,7 +278,7 @@ REPLACE INTO `tb_data_category` VALUES (1534472287314432002, '功能介绍', '
REPLACE INTO `tb_data_category` VALUES (1534472374421737473, '部署与应用', '应用资源一', '1534472049895854081', 'false', '', 'false', 'false', '', 4, 0, 1513433270406643713, '2022-06-08 17:48:18', 1513433270406643713, '2022-06-08 17:48:18', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1534472573403713538, '基本信息', '应用资源一', '1534472200869826562', 'false', '', 'false', 'false', '', 1, 0, 1513433270406643713, '2022-06-08 17:49:05', 1513433270406643713, '2022-06-08 17:49:05', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1534472910504120321, '应用名称', '应用资源一', '1534472573403713538', 'true', 'input', 'false', 'false', '', 2, 0, 1513433270406643713, '2022-06-08 17:50:26', 1513433270406643713, '2022-06-08 17:50:26', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1534474777732825089, '应用状态', '应用资源一', '1534472573403713538', 'true', 'select', 'false', 'true', '1513711991655014402', 3, 1, 1513433270406643713, '2022-06-08 17:57:51', 1513433270406643713, '2022-08-05 09:24:02', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1534474777732825089, '应用状态', '应用资源一', '1534472573403713538', 'true', 'select', 'false', 'true', '1513711991655014402', 3, 0, 1513433270406643713, '2022-06-08 17:57:51', 1513433270406643713, '2022-06-08 17:57:51', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1534474826915233794, '应用类型', '应用资源一', '1534472573403713538', 'true', 'select', 'false', 'true', '1513690812521160705', 3, 0, 1513433270406643713, '2022-06-08 17:58:03', 1513433270406643713, '2022-06-08 17:58:03', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1534474860859736065, '应用领域', '应用资源一', '1534472573403713538', 'true', 'checkBox', 'false', 'true', '1513712507692818433', 4, 0, 1513433270406643713, '2022-06-08 17:58:11', 1513433270406643713, '2022-06-08 17:58:11', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1534474893646610434, '应用描述', '应用资源一', '1534472573403713538', 'true', 'textArea', 'false', 'false', '', 5, 0, 1513433270406643713, '2022-06-08 17:58:18', 1513433270406643713, '2022-06-08 17:58:18', NULL, NULL, NULL, NULL, NULL);
@ -527,8 +527,8 @@ REPLACE INTO `tb_data_category` VALUES (1546771601311092737, '技术文档', '
REPLACE INTO `tb_data_category` VALUES (1546772071467405314, '技术文档', '组件服务一', '1538794942825996289', 'true', 'richText', 'false', 'false', '', 8, 0, 1513437369940344833, '2022-07-12 16:22:54', 1513437369940344833, '2022-07-12 16:22:54', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1546774681700872193, '技术文档', '组件服务一', '1538798198415400961', 'true', 'richText', 'false', 'false', '', 3, 0, 1513437369940344833, '2022-07-12 16:33:16', 1513437369940344833, '2022-07-12 16:33:16', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1546774976208121858, '技术文档', '组件服务一', '1539529687759314945', 'true', 'richText', 'false', 'false', '', 8, 0, 1513437369940344833, '2022-07-12 16:34:27', 1513437369940344833, '2022-07-12 16:34:27', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1547116030106525697, 'cpw测试添加新能力目录20220713', NULL, NULL, 'false', NULL, 'false', 'false', '', 8, 1, 1067246875800000001, '2022-07-13 15:09:40', 1067246875800000001, '2022-08-05 09:23:22', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1547118676443914242, '字段1', 'cpw测试添加新能力目录20220713', '1547116030106525697', 'true', 'input', 'true', 'true', '1531163741457014785', 1, 1, 1067246875800000001, '2022-07-13 15:20:11', 1067246875800000001, '2022-08-05 09:23:22', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1547116030106525697, 'cpw测试添加新能力目录20220713', NULL, NULL, 'false', NULL, 'false', 'false', '', 8, 0, 1067246875800000001, '2022-07-13 15:09:40', 1067246875800000001, '2022-07-13 15:09:40', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1547118676443914242, '字段1', 'cpw测试添加新能力目录20220713', '1547116030106525697', 'true', 'input', 'true', 'true', '1531163741457014785', 1, 0, 1067246875800000001, '2022-07-13 15:20:11', 1067246875800000001, '2022-07-13 15:20:11', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1547118846522941442, '字段2', 'cpw测试添加新能力目录20220713', '1547116030106525697', 'true', 'radio', 'true', 'true', '1160061077912858625', 2, 1, 1067246875800000001, '2022-07-13 15:20:52', 1067246875800000001, '2022-07-13 15:33:31', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1547515031268732930, '使用方式', '组件服务一', '1534715784680423426', 'true', 'select', 'false', 'true', '1513714027213660162', 1, 0, 1524924140178481154, '2022-07-14 17:35:10', 1524924140178481154, '2022-07-14 17:35:10', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1547515983509958658, '平台地址', '组件服务一', '1534715784680423426', 'true', 'input', 'false', 'false', '', 4, 0, 1524924140178481154, '2022-07-14 17:38:57', 1524924140178481154, '2022-07-14 17:38:57', NULL, NULL, NULL, NULL, NULL);

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

@ -586,4 +586,13 @@ public class ResourceController {
public Result<List<Map>> selectDevelopDoc() {
return new Result<List<Map>>().ok(resourceService.selectDevelopDoc());
}
@GetMapping("/selectAppList")
@ApiOperation("能力广场-应用资源列表查询")
@LogOperation("能力广场-应用资源列表查询")
public Result selectAppLis(@RequestParam Map params) {
return new Result<>().ok(resourceService.selectAppList(params));
}
}

4
renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java
View File

@ -170,4 +170,8 @@ public interface ResourceDao extends BaseDao<ResourceEntity> {
List<Map<String, Object>> selectDevelopDocResource();
List<Map<String,Object>> resourceInstallationOrDataResourceDetails(Map params);
List<Map> selectAppList(@Param("pageNum") int pageNum, @Param("type") Integer type);
String selectPicByResId(@Param("id") String id);
}

1
renren-admin/src/main/java/io/renren/modules/resource/service/ResourceService.java
View File

@ -135,4 +135,5 @@ public interface ResourceService extends CrudService<ResourceEntity, ResourceDTO
PageData<Map<String,Object>> resourceInstallationOrDataResourceDetails(Map<String, Object> params);
Object selectAppList(Map params);
}

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

@ -1469,6 +1469,15 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
return new PageData<>(result, result2.size());
}
@Override
public Object selectAppList(Map params) {
int pageNum = Integer.parseInt(params.get("pageNum").toString());
Integer type = params.containsKey("type") ? Integer.parseInt(params.get("type").toString()) : null;
List<Map> maps = resourceDao.selectAppList((pageNum - 1) * 9, type);
maps.forEach(x -> x.put("pic", resourceDao.selectPicByResId(x.get("id").toString())));
return maps;
}
@Override
public PageData<Map<String, Object>> resourceInfrastructureDetails(Map<String, Object> params) {
List<Map<String, Object>> result;

8
renren-admin/src/main/resources/db/R__init_tb_data_catagory.sql
View File

@ -1,7 +1,7 @@
-- 涉及到的表：tb_data_category
-- 注意更新时间
/*
2022年8月5日17:32:19
2022年8月9日10:00:46
*/
REPLACE INTO `tb_data_category` VALUES (1514138753379680257, '组件服务', NULL, NULL, 'false', NULL, 'false', 'false', '', 10, 0, 1067246875800000001, '2022-04-13 15:09:45', 1513437369940344833, '2022-07-12 16:16:11', NULL, NULL, NULL, NULL, NULL);
@ -278,7 +278,7 @@ REPLACE INTO `tb_data_category` VALUES (1534472287314432002, '功能介绍', '
REPLACE INTO `tb_data_category` VALUES (1534472374421737473, '部署与应用', '应用资源一', '1534472049895854081', 'false', '', 'false', 'false', '', 4, 0, 1513433270406643713, '2022-06-08 17:48:18', 1513433270406643713, '2022-06-08 17:48:18', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1534472573403713538, '基本信息', '应用资源一', '1534472200869826562', 'false', '', 'false', 'false', '', 1, 0, 1513433270406643713, '2022-06-08 17:49:05', 1513433270406643713, '2022-06-08 17:49:05', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1534472910504120321, '应用名称', '应用资源一', '1534472573403713538', 'true', 'input', 'false', 'false', '', 2, 0, 1513433270406643713, '2022-06-08 17:50:26', 1513433270406643713, '2022-06-08 17:50:26', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1534474777732825089, '应用状态', '应用资源一', '1534472573403713538', 'true', 'select', 'false', 'true', '1513711991655014402', 3, 1, 1513433270406643713, '2022-06-08 17:57:51', 1513433270406643713, '2022-08-05 09:24:02', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1534474777732825089, '应用状态', '应用资源一', '1534472573403713538', 'true', 'select', 'false', 'true', '1513711991655014402', 3, 0, 1513433270406643713, '2022-06-08 17:57:51', 1513433270406643713, '2022-06-08 17:57:51', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1534474826915233794, '应用类型', '应用资源一', '1534472573403713538', 'true', 'select', 'false', 'true', '1513690812521160705', 3, 0, 1513433270406643713, '2022-06-08 17:58:03', 1513433270406643713, '2022-06-08 17:58:03', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1534474860859736065, '应用领域', '应用资源一', '1534472573403713538', 'true', 'checkBox', 'false', 'true', '1513712507692818433', 4, 0, 1513433270406643713, '2022-06-08 17:58:11', 1513433270406643713, '2022-06-08 17:58:11', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1534474893646610434, '应用描述', '应用资源一', '1534472573403713538', 'true', 'textArea', 'false', 'false', '', 5, 0, 1513433270406643713, '2022-06-08 17:58:18', 1513433270406643713, '2022-06-08 17:58:18', NULL, NULL, NULL, NULL, NULL);
@ -527,8 +527,8 @@ REPLACE INTO `tb_data_category` VALUES (1546771601311092737, '技术文档', '
REPLACE INTO `tb_data_category` VALUES (1546772071467405314, '技术文档', '组件服务一', '1538794942825996289', 'true', 'richText', 'false', 'false', '', 8, 0, 1513437369940344833, '2022-07-12 16:22:54', 1513437369940344833, '2022-07-12 16:22:54', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1546774681700872193, '技术文档', '组件服务一', '1538798198415400961', 'true', 'richText', 'false', 'false', '', 3, 0, 1513437369940344833, '2022-07-12 16:33:16', 1513437369940344833, '2022-07-12 16:33:16', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1546774976208121858, '技术文档', '组件服务一', '1539529687759314945', 'true', 'richText', 'false', 'false', '', 8, 0, 1513437369940344833, '2022-07-12 16:34:27', 1513437369940344833, '2022-07-12 16:34:27', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1547116030106525697, 'cpw测试添加新能力目录20220713', NULL, NULL, 'false', NULL, 'false', 'false', '', 8, 1, 1067246875800000001, '2022-07-13 15:09:40', 1067246875800000001, '2022-08-05 09:23:22', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1547118676443914242, '字段1', 'cpw测试添加新能力目录20220713', '1547116030106525697', 'true', 'input', 'true', 'true', '1531163741457014785', 1, 1, 1067246875800000001, '2022-07-13 15:20:11', 1067246875800000001, '2022-08-05 09:23:22', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1547116030106525697, 'cpw测试添加新能力目录20220713', NULL, NULL, 'false', NULL, 'false', 'false', '', 8, 0, 1067246875800000001, '2022-07-13 15:09:40', 1067246875800000001, '2022-07-13 15:09:40', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1547118676443914242, '字段1', 'cpw测试添加新能力目录20220713', '1547116030106525697', 'true', 'input', 'true', 'true', '1531163741457014785', 1, 0, 1067246875800000001, '2022-07-13 15:20:11', 1067246875800000001, '2022-07-13 15:20:11', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1547118846522941442, '字段2', 'cpw测试添加新能力目录20220713', '1547116030106525697', 'true', 'radio', 'true', 'true', '1160061077912858625', 2, 1, 1067246875800000001, '2022-07-13 15:20:52', 1067246875800000001, '2022-07-13 15:33:31', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1547515031268732930, '使用方式', '组件服务一', '1534715784680423426', 'true', 'select', 'false', 'true', '1513714027213660162', 1, 0, 1524924140178481154, '2022-07-14 17:35:10', 1524924140178481154, '2022-07-14 17:35:10', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1547515983509958658, '平台地址', '组件服务一', '1534715784680423426', 'true', 'input', 'false', 'false', '', 4, 0, 1524924140178481154, '2022-07-14 17:38:57', 1524924140178481154, '2022-07-14 17:38:57', NULL, NULL, NULL, NULL, NULL);

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

@ -1477,4 +1477,35 @@
GROUP BY a.dept_id,b.name
ORDER BY a.dept_id,b.name
</select>
<select id="selectAppList" resultType="java.util.Map">
SELECT
tdr.id,
tdr.`name`,
sd.name AS "deptName"
FROM
tb_data_resource tdr
LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id
WHERE
1 = 1
AND tdr.type = '应用资源'
AND tdr.del_flag = 0
<if test=" type != null and type != ''">
AND sd.type = #{type}
</if>
ORDER BY
tdr.visitor
LIMIT ${pageNum}, 9
</select>
<select id="selectPicByResId" resultType="java.lang.String">
SELECT
tda.attr_value
FROM
tb_data_attr tda
LEFT JOIN tb_data_resource tdr ON tda.data_resource_id = tdr.id
WHERE
tda.attr_type = '应用图片'
AND tdr.id = #{id}
AND tda.del_flag = 0
</select>
</mapper>