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-08-24 13:39:50 +08:00
parent b83db53c6a 0ac54c1207
commit 0d63eec758
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/db/R__init_tb_data_catagory.sql
View File

@ -1,7 +1,7 @@
-- 涉及到的表：tb_data_category
-- 注意更新时间
/*
2022年8月19日11:51:46
2022年8月24日10:27:24
*/
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);
@ -70,7 +70,7 @@ REPLACE INTO `tb_data_category` VALUES (1514428953217581058, '共享方式', '
REPLACE INTO `tb_data_category` VALUES (1514428979914326018, '共享条件', '应用资源', '1514418051789471745', 'true', NULL, 'false', 'false', '', 1, 1, 1513437369940344833, '2022-04-14 10:23:00', 1513437369940344833, '2022-05-31 17:39:26', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1514429049392971777, '应用名称', '应用资源', '1514417974589112321', 'true', NULL, 'false', 'false', '', 1, 1, 1513437369940344833, '2022-04-14 10:23:17', 1513437369940344833, '2022-05-31 17:34:26', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1514429081416482818, '应用状态', '应用资源', '1514417974589112321', 'true', 'select', 'false', 'true', '1513711991655014402', 7, 0, 1513437369940344833, '2022-04-14 10:23:24', 1513437369940344833, '2022-04-14 10:23:24', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1514429108071284738, '应用类型', '应用资源', '1514417974589112321', 'true', 'select', 'true', 'true', '1513690812521160705', 2, 0, 1513437369940344833, '2022-04-14 10:23:31', 1513437369940344833, '2022-04-14 10:23:31', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1514429108071284738, '应用类型', '应用资源', '1514417974589112321', 'true', 'select', 'false', 'true', '1513690812521160705', 2, 0, 1513437369940344833, '2022-04-14 10:23:31', 1513437369940344833, '2022-04-14 10:23:31', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1514429134558314497, '应用领域', '应用资源', '1514417974589112321', 'true', 'select', 'true', 'true', '1513712507692818433', 1, 0, 1513437369940344833, '2022-04-14 10:23:37', 1513437369940344833, '2022-04-14 10:23:37', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1514429164702777346, '应用描述', '应用资源', '1514417974589112321', 'true', NULL, 'false', 'false', '', 1, 1, 1513437369940344833, '2022-04-14 10:23:44', 1513437369940344833, '2022-05-31 17:34:30', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1514429196948586498, '部署位置', '应用资源', '1514417974589112321', 'true', 'input', 'false', 'false', '', 3, 0, 1513437369940344833, '2022-04-14 10:23:52', 1513437369940344833, '2022-04-14 10:23:52', NULL, NULL, NULL, NULL, NULL);
@ -485,7 +485,7 @@ REPLACE INTO `tb_data_category` VALUES (1539538615381483522, '切片策略', '
REPLACE INTO `tb_data_category` VALUES (1539538660365393922, '最小级别', '组件服务一', '1539537928253825026', 'true', 'input', 'false', 'false', '', 10, 0, 1515973081575276545, '2022-06-22 17:19:55', 1515973081575276545, '2022-06-22 17:19:55', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1539538689041850370, '最大级别', '组件服务一', '1539537928253825026', 'true', 'input', 'false', 'false', '', 11, 0, 1515973081575276545, '2022-06-22 17:20:01', 1515973081575276545, '2022-06-22 17:20:01', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1539538721136664578, '是否可预览', '组件服务一', '1539537928253825026', 'true', 'radio', 'false', 'true', '1529028127496343554', 13, 0, 1515973081575276545, '2022-06-22 17:20:09', 1515973081575276545, '2022-06-22 17:20:09', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1539538762714800130, '预览服务地址', '组件服务一', '1539537928253825026', 'true', 'input', 'false', 'false', '', 14, 0, 1515973081575276545, '2022-06-22 17:20:19', 1515973081575276545, '2022-06-22 17:20:19', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1539538762714800130, '图层服务地址', '组件服务一', '1539537928253825026', 'true', 'input', 'false', 'false', '', 14, 0, 1515973081575276545, '2022-06-22 17:20:19', 1515973081575276545, '2022-06-22 17:20:19', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1541958011009875969, '数据范围', '组件服务一', '1539537928253825026', 'true', 'input', 'false', 'false', '', 12, 0, 1524924140178481154, '2022-06-29 09:33:33', 1524924140178481154, '2022-06-29 09:33:33', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1541958848058736642, '样式服务地址', '组件服务一', '1539529687759314945', 'true', 'input', 'false', 'false', '', 4, 0, 1524924140178481154, '2022-06-29 09:36:52', 1524924140178481154, '2022-06-29 09:36:52', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1542755260526624769, '能力类型', '组件服务一', '1534718048405012481', 'true', 'AbilityType', 'false', 'false', '', 1, 0, 1524924140178481154, '2022-07-01 14:21:32', 1524924140178481154, '2022-07-01 14:21:32', NULL, NULL, NULL, NULL, NULL);

3
renren-admin/src/main/java/io/renren/modules/resourceCar/service/impl/ResourceCarServiceImpl.java
View File

@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
/**
* 申购记录表
@ -59,7 +60,7 @@ public class ResourceCarServiceImpl extends CrudServiceImpl<ResourceCarDao, Reso
selectMap.put("user_id", userId);
selectMap.put("del_flag", 0);
List<ResourceCarEntity> carEntities = resourceCarDao.selectByMap(selectMap);
if (carEntities.isEmpty() || dto.getResourceId() == Constant.CEMERALISTID) {
if (carEntities.isEmpty() || Objects.equals(dto.getResourceId(), Constant.CEMERALISTID)) {
ResourceCarEntity carEntity = new ResourceCarEntity();
dto.setUserId(userId);
BeanUtils.copyProperties(dto, carEntity);

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

@ -1,7 +1,7 @@
-- 涉及到的表：tb_data_category
-- 注意更新时间
/*
2022年8月19日11:51:46
2022年8月24日10:27:24
*/
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);
@ -70,7 +70,7 @@ REPLACE INTO `tb_data_category` VALUES (1514428953217581058, '共享方式', '
REPLACE INTO `tb_data_category` VALUES (1514428979914326018, '共享条件', '应用资源', '1514418051789471745', 'true', NULL, 'false', 'false', '', 1, 1, 1513437369940344833, '2022-04-14 10:23:00', 1513437369940344833, '2022-05-31 17:39:26', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1514429049392971777, '应用名称', '应用资源', '1514417974589112321', 'true', NULL, 'false', 'false', '', 1, 1, 1513437369940344833, '2022-04-14 10:23:17', 1513437369940344833, '2022-05-31 17:34:26', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1514429081416482818, '应用状态', '应用资源', '1514417974589112321', 'true', 'select', 'false', 'true', '1513711991655014402', 7, 0, 1513437369940344833, '2022-04-14 10:23:24', 1513437369940344833, '2022-04-14 10:23:24', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1514429108071284738, '应用类型', '应用资源', '1514417974589112321', 'true', 'select', 'true', 'true', '1513690812521160705', 2, 0, 1513437369940344833, '2022-04-14 10:23:31', 1513437369940344833, '2022-04-14 10:23:31', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1514429108071284738, '应用类型', '应用资源', '1514417974589112321', 'true', 'select', 'false', 'true', '1513690812521160705', 2, 0, 1513437369940344833, '2022-04-14 10:23:31', 1513437369940344833, '2022-04-14 10:23:31', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1514429134558314497, '应用领域', '应用资源', '1514417974589112321', 'true', 'select', 'true', 'true', '1513712507692818433', 1, 0, 1513437369940344833, '2022-04-14 10:23:37', 1513437369940344833, '2022-04-14 10:23:37', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1514429164702777346, '应用描述', '应用资源', '1514417974589112321', 'true', NULL, 'false', 'false', '', 1, 1, 1513437369940344833, '2022-04-14 10:23:44', 1513437369940344833, '2022-05-31 17:34:30', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1514429196948586498, '部署位置', '应用资源', '1514417974589112321', 'true', 'input', 'false', 'false', '', 3, 0, 1513437369940344833, '2022-04-14 10:23:52', 1513437369940344833, '2022-04-14 10:23:52', NULL, NULL, NULL, NULL, NULL);
@ -485,7 +485,7 @@ REPLACE INTO `tb_data_category` VALUES (1539538615381483522, '切片策略', '
REPLACE INTO `tb_data_category` VALUES (1539538660365393922, '最小级别', '组件服务一', '1539537928253825026', 'true', 'input', 'false', 'false', '', 10, 0, 1515973081575276545, '2022-06-22 17:19:55', 1515973081575276545, '2022-06-22 17:19:55', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1539538689041850370, '最大级别', '组件服务一', '1539537928253825026', 'true', 'input', 'false', 'false', '', 11, 0, 1515973081575276545, '2022-06-22 17:20:01', 1515973081575276545, '2022-06-22 17:20:01', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1539538721136664578, '是否可预览', '组件服务一', '1539537928253825026', 'true', 'radio', 'false', 'true', '1529028127496343554', 13, 0, 1515973081575276545, '2022-06-22 17:20:09', 1515973081575276545, '2022-06-22 17:20:09', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1539538762714800130, '预览服务地址', '组件服务一', '1539537928253825026', 'true', 'input', 'false', 'false', '', 14, 0, 1515973081575276545, '2022-06-22 17:20:19', 1515973081575276545, '2022-06-22 17:20:19', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1539538762714800130, '图层服务地址', '组件服务一', '1539537928253825026', 'true', 'input', 'false', 'false', '', 14, 0, 1515973081575276545, '2022-06-22 17:20:19', 1515973081575276545, '2022-06-22 17:20:19', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1541958011009875969, '数据范围', '组件服务一', '1539537928253825026', 'true', 'input', 'false', 'false', '', 12, 0, 1524924140178481154, '2022-06-29 09:33:33', 1524924140178481154, '2022-06-29 09:33:33', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1541958848058736642, '样式服务地址', '组件服务一', '1539529687759314945', 'true', 'input', 'false', 'false', '', 4, 0, 1524924140178481154, '2022-06-29 09:36:52', 1524924140178481154, '2022-06-29 09:36:52', NULL, NULL, NULL, NULL, NULL);
REPLACE INTO `tb_data_category` VALUES (1542755260526624769, '能力类型', '组件服务一', '1534718048405012481', 'true', 'AbilityType', 'false', 'false', '', 1, 0, 1524924140178481154, '2022-07-01 14:21:32', 1524924140178481154, '2022-07-01 14:21:32', NULL, NULL, NULL, NULL, NULL);