From 6dcee405c5b363a56cb0cdf48f96d2fda21ab2fa Mon Sep 17 00:00:00 2001 From: dinggang <2498628697@qq.com> Date: Fri, 19 Aug 2022 11:59:05 +0800 Subject: [PATCH] =?UTF-8?q?1.cim=E6=A8=A1=E5=9D=97=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=8A=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=202.=E7=BC=96=E7=9B=AE=E5=8F=8A=E5=AD=97=E5=85=B8=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/db/R__init_sys_dic.sql | 14 +++- config/db/R__init_tb_data_catagory.sql | 3 +- .../resource/controller/CIMController.java | 29 +++++++-- .../modules/resource/dao/ResourceDao.java | 4 ++ .../modules/resource/service/CIMService.java | 7 ++ .../resource/service/impl/CIMServiceImpl.java | 64 +++++++++++++++++++ .../src/main/resources/application.yml | 3 + .../src/main/resources/db/R__init_sys_dic.sql | 14 +++- .../resources/db/R__init_tb_data_catagory.sql | 3 +- .../resources/mapper/resource/ResourceDao.xml | 47 ++++++++++++++ 10 files changed, 179 insertions(+), 9 deletions(-) diff --git a/config/db/R__init_sys_dic.sql b/config/db/R__init_sys_dic.sql index f01f2852..6670d934 100644 --- a/config/db/R__init_sys_dic.sql +++ b/config/db/R__init_sys_dic.sql @@ -1,7 +1,7 @@ -- 涉及到的表：sys_dict_data，sys_dict_type -- 注意更新时间 /* - Date: 18/07/2022 17:06:10 +2022年8月19日11:53:59 */ REPLACE INTO `sys_dict_data` VALUES (1160061112075464705, 1160061077912858625, '男', '0', '', 0, 1067246875800000001, '2022-02-25 10:37:18', 1067246875800000001, '2022-02-25 10:37:18', 0); @@ -68,6 +68,7 @@ REPLACE INTO `sys_dict_data` VALUES (1513713864000708610, 1513713662657339394, ' REPLACE INTO `sys_dict_data` VALUES (1513714259091562497, 1513714027213660162, '调用接口', '1', '', 1, 1513435534798127105, '2022-04-12 11:02:57', 1524924140178481154, '2022-07-01 14:26:55', NULL); REPLACE INTO `sys_dict_data` VALUES (1513714288619462658, 1513714027213660162, '平台对接', '2', '', 2, 1513435534798127105, '2022-04-12 11:03:05', 1524924140178481154, '2022-07-01 14:27:15', NULL); REPLACE INTO `sys_dict_data` VALUES (1513714321163067394, 1513714027213660162, 'SDK', '3', '', 3, 1513435534798127105, '2022-04-12 11:03:12', 1524924140178481154, '2022-07-01 14:27:56', NULL); +REPLACE INTO `sys_dict_data` VALUES (1513714443263451137, 1513714403530809346, '接口', '1', '', 1, 1513435534798127105, '2022-04-12 11:03:41', 1513435534798127105, '2022-04-12 11:03:41', NULL); REPLACE INTO `sys_dict_data` VALUES (1513714474334855170, 1513714403530809346, 'SDK', '2', '', 2, 1513435534798127105, '2022-04-12 11:03:49', 1513435534798127105, '2022-04-12 11:03:49', NULL); REPLACE INTO `sys_dict_data` VALUES (1513714504261214210, 1513714403530809346, 'Web页面', '3', '', 3, 1513435534798127105, '2022-04-12 11:03:56', 1513435534798127105, '2022-04-12 11:03:56', NULL); REPLACE INTO `sys_dict_data` VALUES (1513714541603102722, 1513714403530809346, '其他', '99', '', 99, 1513435534798127105, '2022-04-12 11:04:05', 1513435534798127105, '2022-04-12 11:04:05', NULL); @@ -172,6 +173,16 @@ REPLACE INTO `sys_dict_data` VALUES (1543899506717712386, 1531163741457014785, ' REPLACE INTO `sys_dict_data` VALUES (1545342103516487682, 1531163741457014785, '富文本编辑', 'richText', '', 20, 1513433709613187073, '2022-07-08 17:40:43', 1513433709613187073, '2022-07-08 17:40:43', NULL); REPLACE INTO `sys_dict_data` VALUES (1545610536514695170, 1531163741457014785, '多条添加', ' multipleAdditions', '', 20, 1513433709613187073, '2022-07-09 11:27:23', 1513433709613187073, '2022-07-09 11:27:23', NULL); REPLACE INTO `sys_dict_data` VALUES (1547520739196383234, 1531163741457014785, '压缩包', 'package', '', 21, 1524924140178481154, '2022-07-14 17:57:50', 1524924140178481154, '2022-07-14 17:58:03', NULL); +REPLACE INTO `sys_dict_data` VALUES (1560463928171958273, 1560456227954102274, '行政区划', '行政区划', '', 0, 1067246875800000001, '2022-08-19 11:09:27', 1067246875800000001, '2022-08-19 11:09:27', NULL); +REPLACE INTO `sys_dict_data` VALUES (1560463980319739905, 1560456227954102274, '房屋普查', '房屋普查', '', 0, 1067246875800000001, '2022-08-19 11:09:40', 1067246875800000001, '2022-08-19 11:09:40', NULL); +REPLACE INTO `sys_dict_data` VALUES (1560464050129735681, 1560456227954102274, '市政设施', '市政设施', '', 0, 1067246875800000001, '2022-08-19 11:09:56', 1067246875800000001, '2022-08-19 11:09:56', NULL); +REPLACE INTO `sys_dict_data` VALUES (1560464121869111298, 1560456227954102274, '人口数据', '人口数据', '', 0, 1067246875800000001, '2022-08-19 11:10:13', 1067246875800000001, '2022-08-19 11:10:13', NULL); +REPLACE INTO `sys_dict_data` VALUES (1560464163044593666, 1560456227954102274, '地名地址', '地名地址', '', 0, 1067246875800000001, '2022-08-19 11:10:23', 1067246875800000001, '2022-08-19 11:10:23', NULL); +REPLACE INTO `sys_dict_data` VALUES (1560464221148286977, 1560456227954102274, '城市绿区', '城市绿区', '', 0, 1067246875800000001, '2022-08-19 11:10:37', 1067246875800000001, '2022-08-19 11:10:37', NULL); +REPLACE INTO `sys_dict_data` VALUES (1560464295676874754, 1560456227954102274, '海洋河岸', '海洋河岸', '', 0, 1067246875800000001, '2022-08-19 11:10:55', 1067246875800000001, '2022-08-19 11:10:55', NULL); +REPLACE INTO `sys_dict_data` VALUES (1560464354506182658, 1560456227954102274, '规划管控', '规划管控', '', 0, 1067246875800000001, '2022-08-19 11:11:09', 1067246875800000001, '2022-08-19 11:11:09', NULL); +REPLACE INTO `sys_dict_data` VALUES (1560464452883582978, 1560456227954102274, '工程建设', '工程建设', '', 0, 1067246875800000001, '2022-08-19 11:11:32', 1067246875800000001, '2022-08-19 11:11:32', NULL); +REPLACE INTO `sys_dict_data` VALUES (1560464526996934657, 1560456227954102274, '其他', '其他', '', 0, 1067246875800000001, '2022-08-19 11:11:50', 1067246875800000001, '2022-08-19 11:11:50', NULL); REPLACE INTO `sys_dict_type` VALUES (1160061077912858625, 'gender', '性别', '', 0, 1067246875800000001, '2022-02-25 10:37:18', 1067246875800000001, '2022-02-25 10:37:18', NULL); REPLACE INTO `sys_dict_type` VALUES (1225813644059140097, 'notice_type', '站内通知-类型', '', 1, 1067246875800000001, '2022-02-25 10:37:18', 1067246875800000001, '2022-02-25 10:37:18', NULL); REPLACE INTO `sys_dict_type` VALUES (1341593474355838978, 'post_status', '岗位管理状态', '', 0, 1067246875800000001, '2022-02-25 10:37:18', 1067246875800000001, '2022-02-25 10:37:18', NULL); @@ -198,3 +209,4 @@ REPLACE INTO `sys_dict_type` VALUES (1539527547234017282, 'layer_style ', '图 REPLACE INTO `sys_dict_type` VALUES (1539528437391155202, 'Service_type', '服务类型', '', 21, 1515973081575276545, '2022-06-22 16:39:17', 1515973081575276545, '2022-06-22 16:39:17', NULL); REPLACE INTO `sys_dict_type` VALUES (1541336217898848257, 'videoLabel', '视频标签', '', 31, 1513433270406643713, '2022-06-27 16:22:46', 1513433270406643713, '2022-06-27 16:22:46', NULL); REPLACE INTO `sys_dict_type` VALUES (1542788081786019842, 'publishingTerminal', '发布端', '', 0, 1524924140178481154, '2022-07-01 16:31:57', 1524924140178481154, '2022-07-01 16:31:57', NULL); +REPLACE INTO `sys_dict_type` VALUES (1560456227954102274, 'layer_class', '图层分类', '', 0, 1067246875800000001, '2022-08-19 10:38:51', 1067246875800000001, '2022-08-19 10:38:51', NULL); diff --git a/config/db/R__init_tb_data_catagory.sql b/config/db/R__init_tb_data_catagory.sql index f3d2c611..8ff2f9ab 100644 --- a/config/db/R__init_tb_data_catagory.sql +++ b/config/db/R__init_tb_data_catagory.sql @@ -1,7 +1,7 @@ -- 涉及到的表：tb_data_category -- 注意更新时间 /* -2022年8月9日10:00:46 +2022年8月19日11:51: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); @@ -540,3 +540,4 @@ REPLACE INTO `tb_data_category` VALUES (1548960050394947586, '共享条件', ' REPLACE INTO `tb_data_category` VALUES (1548962537742970881, '部门联系人', '组件服务一', '1534718048405012481', 'true', 'input', 'false', 'false', '', 17, 0, 1513437369940344833, '2022-07-18 17:27:02', 1513437369940344833, '2022-07-18 17:27:02', NULL, NULL, NULL, NULL, NULL); REPLACE INTO `tb_data_category` VALUES (1548962613546627073, '部门联系人电话', '组件服务一', '1534718048405012481', 'true', 'input', 'false', 'false', '', 18, 0, 1513437369940344833, '2022-07-18 17:27:20', 1513437369940344833, '2022-07-18 17:27:20', NULL, NULL, NULL, NULL, NULL); REPLACE INTO `tb_data_category` VALUES (1548980404643405825, '使用方式', '组件服务', '1531208527270404097', 'true', 'input', 'true', 'true', '1513714027213660162', 8, 1, 1524924140178481154, '2022-07-18 18:38:02', 1524924140178481154, '2022-07-18 18:43:36', NULL, NULL, NULL, NULL, NULL); +REPLACE INTO `tb_data_category` VALUES (1560464775119376386, '分类', '组件服务一', '1539536463208636417', 'true', 'radio', 'false', 'true', '1560456227954102274', 13, 0, 1067246875800000001, '2022-08-19 11:12:49', 1067246875800000001, '2022-08-19 11:12:49', NULL, NULL, NULL, NULL, NULL); diff --git a/renren-admin/src/main/java/io/renren/modules/resource/controller/CIMController.java b/renren-admin/src/main/java/io/renren/modules/resource/controller/CIMController.java index d8729b81..e3a3644b 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/controller/CIMController.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/controller/CIMController.java @@ -1,14 +1,20 @@ package io.renren.modules.resource.controller; +import io.renren.common.annotation.LogOperation; +import io.renren.common.utils.Result; import io.renren.modules.resource.service.CIMService; -import io.renren.modules.sys.service.SysDeptService; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; +import java.util.Map; + /** * 资源表 * @@ -20,11 +26,24 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = "资源表") public class CIMController { - private static final Logger logger = LoggerFactory.getLogger(ResourceController.class); + private static final Logger logger = LoggerFactory.getLogger(CIMController.class); @Autowired - private io.renren.modules.resource.service.CIMService CIMService; + private CIMService cimService; + + + @GetMapping("/countByType") + @ApiOperation("统计cim各类型资源数量") + @LogOperation(value = "统计cim各类型资源数量") + public Result> countByType() { + return new Result>().ok(cimService.countByType()); + } + + @GetMapping("/getCIMApplyApplicationList") + @ApiOperation("查询CIM平台列表") + @LogOperation(value = "查询CIM平台列表") + public Result> getCIMApplyApplicationList() { + return new Result>().ok(cimService.getCIMApplyApplicationList()); + } - @Autowired - private SysDeptService sysDeptService; } diff --git a/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java b/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java index 3c8dc8b1..95fc2e35 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/dao/ResourceDao.java @@ -176,4 +176,8 @@ public interface ResourceDao extends BaseDao { String selectPicByResId(@Param("id") String id); List selectTypeCountByName(@Param("keyWorld") String keyWorld); + + List countByCIMType(@Param("deptId") Long deptId); + + List getCIMApplyApplicationList(@Param("deptId") Long deptId); } \ No newline at end of file diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/CIMService.java b/renren-admin/src/main/java/io/renren/modules/resource/service/CIMService.java index f8df6b10..6d51eebe 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/CIMService.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/CIMService.java @@ -1,4 +1,11 @@ package io.renren.modules.resource.service; +import java.util.List; +import java.util.Map; + public interface CIMService { + + List countByType(); + + List getCIMApplyApplicationList(); } diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/CIMServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/CIMServiceImpl.java index a7be7bdf..b592517f 100644 --- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/CIMServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/CIMServiceImpl.java @@ -1,8 +1,72 @@ package io.renren.modules.resource.service.impl; +import cn.hutool.core.util.ObjectUtil; +import io.renren.modules.resource.dao.ResourceDao; import io.renren.modules.resource.service.CIMService; +import io.renren.modules.sys.dao.SysDeptDao; +import io.renren.modules.sys.entity.SysDeptEntity; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import java.util.*; + @Service public class CIMServiceImpl implements CIMService { + + @Autowired + private ResourceDao resourceDao; + + @Autowired + private SysDeptDao sysDeptDao; + + private static final String[] cimtype = {"平台","组件","图层"}; + + /** + * 住建局名称 + */ + @Value("${cim.zjj}") + private String zjjName; + + @Override + public List countByType() { + + SysDeptEntity sysDeptEntity = sysDeptDao.getByName(zjjName); + if (ObjectUtil.isEmpty(sysDeptEntity)) { + ArrayList re = new ArrayList<>(); + Arrays.stream(cimtype).forEach(index -> { + Map nullMap = new HashMap() { + { + put("count", 0); + put("type", index); + } + }; + re.add(nullMap); + }); + return re; + } + + List re = resourceDao.countByCIMType(sysDeptEntity.getId()); + List temp = new ArrayList<>(); + re.forEach(map -> temp.add(map.get("type").toString())); + Arrays.stream(cimtype).filter(index -> !temp.contains(index)).forEach(index -> { + Map nullMap = new HashMap() { + { + put("count", 0); + put("type", index); + } + }; + re.add(nullMap); + }); + return re; + } + + @Override + public List getCIMApplyApplicationList() { + SysDeptEntity sysDeptEntity = sysDeptDao.getByName(zjjName); + if (ObjectUtil.isEmpty(sysDeptEntity)) { + return new ArrayList<>(); + } + return resourceDao.getCIMApplyApplicationList(sysDeptEntity.getId()); + } } diff --git a/renren-admin/src/main/resources/application.yml b/renren-admin/src/main/resources/application.yml index f3b9f47a..c083224b 100644 --- a/renren-admin/src/main/resources/application.yml +++ b/renren-admin/src/main/resources/application.yml @@ -3,6 +3,9 @@ project: place: 0 # 是否将资源归为上级 higher: false +# cim 住建局单位名称 +cim: + zjj: 青岛市住房和城乡建设局 # 大数据部门相关配置 big_date: name: 青岛市大数据发展管理局 diff --git a/renren-admin/src/main/resources/db/R__init_sys_dic.sql b/renren-admin/src/main/resources/db/R__init_sys_dic.sql index f01f2852..6670d934 100644 --- a/renren-admin/src/main/resources/db/R__init_sys_dic.sql +++ b/renren-admin/src/main/resources/db/R__init_sys_dic.sql @@ -1,7 +1,7 @@ -- 涉及到的表：sys_dict_data，sys_dict_type -- 注意更新时间 /* - Date: 18/07/2022 17:06:10 +2022年8月19日11:53:59 */ REPLACE INTO `sys_dict_data` VALUES (1160061112075464705, 1160061077912858625, '男', '0', '', 0, 1067246875800000001, '2022-02-25 10:37:18', 1067246875800000001, '2022-02-25 10:37:18', 0); @@ -68,6 +68,7 @@ REPLACE INTO `sys_dict_data` VALUES (1513713864000708610, 1513713662657339394, ' REPLACE INTO `sys_dict_data` VALUES (1513714259091562497, 1513714027213660162, '调用接口', '1', '', 1, 1513435534798127105, '2022-04-12 11:02:57', 1524924140178481154, '2022-07-01 14:26:55', NULL); REPLACE INTO `sys_dict_data` VALUES (1513714288619462658, 1513714027213660162, '平台对接', '2', '', 2, 1513435534798127105, '2022-04-12 11:03:05', 1524924140178481154, '2022-07-01 14:27:15', NULL); REPLACE INTO `sys_dict_data` VALUES (1513714321163067394, 1513714027213660162, 'SDK', '3', '', 3, 1513435534798127105, '2022-04-12 11:03:12', 1524924140178481154, '2022-07-01 14:27:56', NULL); +REPLACE INTO `sys_dict_data` VALUES (1513714443263451137, 1513714403530809346, '接口', '1', '', 1, 1513435534798127105, '2022-04-12 11:03:41', 1513435534798127105, '2022-04-12 11:03:41', NULL); REPLACE INTO `sys_dict_data` VALUES (1513714474334855170, 1513714403530809346, 'SDK', '2', '', 2, 1513435534798127105, '2022-04-12 11:03:49', 1513435534798127105, '2022-04-12 11:03:49', NULL); REPLACE INTO `sys_dict_data` VALUES (1513714504261214210, 1513714403530809346, 'Web页面', '3', '', 3, 1513435534798127105, '2022-04-12 11:03:56', 1513435534798127105, '2022-04-12 11:03:56', NULL); REPLACE INTO `sys_dict_data` VALUES (1513714541603102722, 1513714403530809346, '其他', '99', '', 99, 1513435534798127105, '2022-04-12 11:04:05', 1513435534798127105, '2022-04-12 11:04:05', NULL); @@ -172,6 +173,16 @@ REPLACE INTO `sys_dict_data` VALUES (1543899506717712386, 1531163741457014785, ' REPLACE INTO `sys_dict_data` VALUES (1545342103516487682, 1531163741457014785, '富文本编辑', 'richText', '', 20, 1513433709613187073, '2022-07-08 17:40:43', 1513433709613187073, '2022-07-08 17:40:43', NULL); REPLACE INTO `sys_dict_data` VALUES (1545610536514695170, 1531163741457014785, '多条添加', ' multipleAdditions', '', 20, 1513433709613187073, '2022-07-09 11:27:23', 1513433709613187073, '2022-07-09 11:27:23', NULL); REPLACE INTO `sys_dict_data` VALUES (1547520739196383234, 1531163741457014785, '压缩包', 'package', '', 21, 1524924140178481154, '2022-07-14 17:57:50', 1524924140178481154, '2022-07-14 17:58:03', NULL); +REPLACE INTO `sys_dict_data` VALUES (1560463928171958273, 1560456227954102274, '行政区划', '行政区划', '', 0, 1067246875800000001, '2022-08-19 11:09:27', 1067246875800000001, '2022-08-19 11:09:27', NULL); +REPLACE INTO `sys_dict_data` VALUES (1560463980319739905, 1560456227954102274, '房屋普查', '房屋普查', '', 0, 1067246875800000001, '2022-08-19 11:09:40', 1067246875800000001, '2022-08-19 11:09:40', NULL); +REPLACE INTO `sys_dict_data` VALUES (1560464050129735681, 1560456227954102274, '市政设施', '市政设施', '', 0, 1067246875800000001, '2022-08-19 11:09:56', 1067246875800000001, '2022-08-19 11:09:56', NULL); +REPLACE INTO `sys_dict_data` VALUES (1560464121869111298, 1560456227954102274, '人口数据', '人口数据', '', 0, 1067246875800000001, '2022-08-19 11:10:13', 1067246875800000001, '2022-08-19 11:10:13', NULL); +REPLACE INTO `sys_dict_data` VALUES (1560464163044593666, 1560456227954102274, '地名地址', '地名地址', '', 0, 1067246875800000001, '2022-08-19 11:10:23', 1067246875800000001, '2022-08-19 11:10:23', NULL); +REPLACE INTO `sys_dict_data` VALUES (1560464221148286977, 1560456227954102274, '城市绿区', '城市绿区', '', 0, 1067246875800000001, '2022-08-19 11:10:37', 1067246875800000001, '2022-08-19 11:10:37', NULL); +REPLACE INTO `sys_dict_data` VALUES (1560464295676874754, 1560456227954102274, '海洋河岸', '海洋河岸', '', 0, 1067246875800000001, '2022-08-19 11:10:55', 1067246875800000001, '2022-08-19 11:10:55', NULL); +REPLACE INTO `sys_dict_data` VALUES (1560464354506182658, 1560456227954102274, '规划管控', '规划管控', '', 0, 1067246875800000001, '2022-08-19 11:11:09', 1067246875800000001, '2022-08-19 11:11:09', NULL); +REPLACE INTO `sys_dict_data` VALUES (1560464452883582978, 1560456227954102274, '工程建设', '工程建设', '', 0, 1067246875800000001, '2022-08-19 11:11:32', 1067246875800000001, '2022-08-19 11:11:32', NULL); +REPLACE INTO `sys_dict_data` VALUES (1560464526996934657, 1560456227954102274, '其他', '其他', '', 0, 1067246875800000001, '2022-08-19 11:11:50', 1067246875800000001, '2022-08-19 11:11:50', NULL); REPLACE INTO `sys_dict_type` VALUES (1160061077912858625, 'gender', '性别', '', 0, 1067246875800000001, '2022-02-25 10:37:18', 1067246875800000001, '2022-02-25 10:37:18', NULL); REPLACE INTO `sys_dict_type` VALUES (1225813644059140097, 'notice_type', '站内通知-类型', '', 1, 1067246875800000001, '2022-02-25 10:37:18', 1067246875800000001, '2022-02-25 10:37:18', NULL); REPLACE INTO `sys_dict_type` VALUES (1341593474355838978, 'post_status', '岗位管理状态', '', 0, 1067246875800000001, '2022-02-25 10:37:18', 1067246875800000001, '2022-02-25 10:37:18', NULL); @@ -198,3 +209,4 @@ REPLACE INTO `sys_dict_type` VALUES (1539527547234017282, 'layer_style ', '图 REPLACE INTO `sys_dict_type` VALUES (1539528437391155202, 'Service_type', '服务类型', '', 21, 1515973081575276545, '2022-06-22 16:39:17', 1515973081575276545, '2022-06-22 16:39:17', NULL); REPLACE INTO `sys_dict_type` VALUES (1541336217898848257, 'videoLabel', '视频标签', '', 31, 1513433270406643713, '2022-06-27 16:22:46', 1513433270406643713, '2022-06-27 16:22:46', NULL); REPLACE INTO `sys_dict_type` VALUES (1542788081786019842, 'publishingTerminal', '发布端', '', 0, 1524924140178481154, '2022-07-01 16:31:57', 1524924140178481154, '2022-07-01 16:31:57', NULL); +REPLACE INTO `sys_dict_type` VALUES (1560456227954102274, 'layer_class', '图层分类', '', 0, 1067246875800000001, '2022-08-19 10:38:51', 1067246875800000001, '2022-08-19 10:38:51', NULL); diff --git a/renren-admin/src/main/resources/db/R__init_tb_data_catagory.sql b/renren-admin/src/main/resources/db/R__init_tb_data_catagory.sql index f3d2c611..8ff2f9ab 100644 --- a/renren-admin/src/main/resources/db/R__init_tb_data_catagory.sql +++ b/renren-admin/src/main/resources/db/R__init_tb_data_catagory.sql @@ -1,7 +1,7 @@ -- 涉及到的表：tb_data_category -- 注意更新时间 /* -2022年8月9日10:00:46 +2022年8月19日11:51: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); @@ -540,3 +540,4 @@ REPLACE INTO `tb_data_category` VALUES (1548960050394947586, '共享条件', ' REPLACE INTO `tb_data_category` VALUES (1548962537742970881, '部门联系人', '组件服务一', '1534718048405012481', 'true', 'input', 'false', 'false', '', 17, 0, 1513437369940344833, '2022-07-18 17:27:02', 1513437369940344833, '2022-07-18 17:27:02', NULL, NULL, NULL, NULL, NULL); REPLACE INTO `tb_data_category` VALUES (1548962613546627073, '部门联系人电话', '组件服务一', '1534718048405012481', 'true', 'input', 'false', 'false', '', 18, 0, 1513437369940344833, '2022-07-18 17:27:20', 1513437369940344833, '2022-07-18 17:27:20', NULL, NULL, NULL, NULL, NULL); REPLACE INTO `tb_data_category` VALUES (1548980404643405825, '使用方式', '组件服务', '1531208527270404097', 'true', 'input', 'true', 'true', '1513714027213660162', 8, 1, 1524924140178481154, '2022-07-18 18:38:02', 1524924140178481154, '2022-07-18 18:43:36', NULL, NULL, NULL, NULL, NULL); +REPLACE INTO `tb_data_category` VALUES (1560464775119376386, '分类', '组件服务一', '1539536463208636417', 'true', 'radio', 'false', 'true', '1560456227954102274', 13, 0, 1067246875800000001, '2022-08-19 11:12:49', 1067246875800000001, '2022-08-19 11:12:49', NULL, NULL, NULL, NULL, NULL); diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml index 5cf812c7..365c2db0 100644 --- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml +++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml @@ -1582,4 +1582,51 @@ GROUP BY type ORDER BY type + + \ No newline at end of file