提交了数据修改方法。

core/core-backend/src/main/java/io/gisbi/application/baseinfo/mapper/xml/ApplicationMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="io.gisbi.application.baseinfo.mapper.ApplicationMapper">
-
-</mapper>

core/core-backend/src/main/java/io/gisbi/application/module/mapper/xml/ModuleMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="io.gisbi.application.module.mapper.ModuleMapper">
-
-</mapper>

core/core-backend/src/main/java/io/gisbi/application/module/service/impl/ModuleServiceImpl.java

@@ -47,7 +47,7 @@ public class ModuleServiceImpl extends ServiceImpl<ModuleMapper, Module> impleme
     public boolean createModule(Module module) {
         boolean isok=this.save(module);
         if(isok){
-            if(module.getType().equals("03"))//GIS大屏页面
+            if(module.getType().equals("03"))//GIS大屏页面和数据大屏页面
             {
                 DataVisualizationInfo visualizationInfo = new DataVisualizationInfo();
                 visualizationInfo.setId(Long.parseLong(module.getId()));
@@ -60,6 +60,18 @@ public class ModuleServiceImpl extends ServiceImpl<ModuleMapper, Module> impleme
                 visualizationInfo.setComponentData("[]");
                 long id=coreVisualizationManage.preInnerSave(visualizationInfo);
                 return true;
+            }else if(module.getType().equals("0301")){//数据大屏页面
+                DataVisualizationInfo visualizationInfo = new DataVisualizationInfo();
+                visualizationInfo.setId(Long.parseLong(module.getId()));
+                visualizationInfo.setAppId(module.getAppId());
+                visualizationInfo.setName(module.getName());
+                visualizationInfo.setPid(Long.parseLong(module.getPid()));
+                visualizationInfo.setNodeType("leaf");
+                visualizationInfo.setType("dashboard");
+                visualizationInfo.setCanvasStyleData("{\"width\":1920,\"height\":1080,\"refreshViewEnable\":false,\"refreshViewLoading\":true,\"refreshUnit\":\"minute\",\"refreshTime\":5,\"scale\":78,\"scaleWidth\":78,\"scaleHeight\":78,\"backgroundColorSelect\":true,\"backgroundImageEnable\":false,\"backgroundType\":\"backgroundColor\",\"background\":\"\",\"openCommonStyle\":true,\"opacity\":1,\"fontSize\":14,\"themeId\":\"10002\",\"color\":\"#000000\",\"backgroundColor\":\"rgba(166, 227, 123, 1)\",\"dashboard\":{\"gap\":\"yes\",\"gapSize\":5,\"resultMode\":\"all\",\"resultCount\":1000,\"themeColor\":\"dark\",\"mobileSetting\":{\"customSetting\":false,\"imageUrl\":null,\"backgroundType\":\"image\",\"color\":\"#000\"},\"showGrid\":false,\"matrixBase\":4},\"component\":{\"chartTitle\":{\"show\":true,\"fontSize\":16,\"hPosition\":\"left\",\"vPosition\":\"top\",\"isItalic\":false,\"isBolder\":true,\"remarkShow\":false,\"remark\":\"\",\"fontFamily\":\"\",\"letterSpace\":\"0\",\"fontShadow\":false,\"color\":\"#FFFFFF\",\"remarkBackgroundColor\":\"#5A5C62\"},\"chartColor\":{\"basicStyle\":{\"colorScheme\":\"default\",\"colors\":[\"#1E90FF\",\"#90EE90\",\"#00CED1\",\"#E2BD84\",\"#7A90E0\",\"#3BA272\",\"#2BE7FF\",\"#0A8ADA\",\"#FFD700\"],\"alpha\":100,\"gradient\":false,\"mapStyle\":\"darkblue\",\"areaBaseColor\":\"#5470C6\",\"areaBorderColor\":\"#EBEEF5\",\"gaugeStyle\":\"default\",\"tableBorderColor\":\"#CCCCCC\",\"tableScrollBarColor\":\"#FFFFFF80\",\"zoomButtonColor\":\"#fff\",\"zoomBackground\":\"#000\"},\"misc\":{\"flowMapConfig\":{\"lineConfig\":{\"mapLineGradient\":false,\"mapLineSourceColor\":\"#146C94\",\"mapLineTargetColor\":\"#576CBC\"}},\"nameFontColor\":\"#ffffff\",\"valueFontColor\":\"#5470c6\"},\"tableHeader\":{\"tableHeaderBgColor\":\"#1E90FF\",\"tableHeaderCornerBgColor\":\"#1E90FF\",\"tableHeaderColBgColor\":\"#1E90FF\",\"tableHeaderFontColor\":\"#FFFFFF\",\"tableHeaderCornerFontColor\":\"#FFFFFF\",\"tableHeaderColFontColor\":\"#FFFFFF\"},\"tableCell\":{\"tableItemBgColor\":\"#131E42\",\"tableFontColor\":\"#FFFFFF\",\"tableItemSubBgColor\":\"#EEEEEE\"}},\"chartCommonStyle\":{\"backgroundColorSelect\":true,\"backdropFilterEnable\":true,\"backgroundImageEnable\":false,\"backgroundType\":\"innerImage\",\"innerImage\":\"board/board_1.svg\",\"outerImage\":null,\"innerPadding\":1,\"borderRadius\":0,\"backdropFilter\":4,\"backgroundColor\":\"rgba(19,28,66,1)\",\"innerImageColor\":\"#1094E5\"},\"filterStyle\":{\"layout\":\"vertical\",\"titleLayout\":\"left\",\"labelColor\":\"#FFFFFF\",\"titleColor\":\"#FFFFFF\",\"color\":\"#FFFFFF\",\"borderColor\":\"#484747\",\"text\":\"#AFAFAF\",\"bgColor\":\"#131C42\"},\"tabStyle\":{\"headPosition\":\"left\",\"headFontColor\":\"#FFFFFF\",\"headFontActiveColor\":\"#FFFFFF\",\"headBorderColor\":\"#131E42\",\"headBorderActiveColor\":\"#131E42\"},\"seniorStyleSetting\":{\"linkageIconColor\":\"#FFFFFF\",\"drillLayerColor\":\"#FFFFFF\",\"pagerColor\":\"#FFFFFFFF\"}},\"fontFamily\":\"PingFang\",\"suspensionButtonAvailable\":false,\"screenAdaptor\":\"widthFirst\",\"dashboardAdaptor\":\"keepHeightAndWidth\",\"refreshBrowserEnable\":false,\"refreshBrowserUnit\":\"minute\",\"refreshBrowserTime\":5,\"popupAvailable\":true,\"popupButtonAvailable\":true}");
+                visualizationInfo.setComponentData("[]");
+                long id=coreVisualizationManage.preInnerSave(visualizationInfo);
+                return true;
             }
         }
         return false;
@@ -79,9 +91,10 @@ public class ModuleServiceImpl extends ServiceImpl<ModuleMapper, Module> impleme
         list.add(createInitModule(appId,"登录页面","01",1));
         list.add(createInitModule(appId,"主框架页面","02",2));
         list.add(createInitModule(appId,"GIS大屏页面","03",3));
-        list.add(createInitModule(appId,"二级弹窗页面","04",4));
+        list.add(createInitModule(appId,"数据看板页面","0301",4));
-        list.add(createInitModule(appId,"数据填报页面","05",5));
+        list.add(createInitModule(appId,"二级弹窗页面","04",5));
-        list.add(createInitModule(appId,"文档资源页面","06",6));
+        list.add(createInitModule(appId,"数据填报页面","05",6));
+        list.add(createInitModule(appId,"文档资源页面","06",7));
         list.add(createInitModule(appId,"自定义页面","09",9));
         boolean isok=this.saveBatch(list);
         return isok;

core/core-backend/src/main/java/io/gisbi/application/system/mapper/xml/MenuMapper.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="io.gisbi.application.system.mapper.MenuMapper">
-
-
-</mapper>

core/core-backend/src/main/java/io/gisbi/application/system/mapper/xml/OrganizationMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="io.gisbi.application.system.mapper.OrganizationMapper">
-
-</mapper>

core/core-backend/src/main/java/io/gisbi/application/system/mapper/xml/RoleMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="io.gisbi.application.system.mapper.RoleMapper">
-
-</mapper>

core/core-backend/src/main/java/io/gisbi/application/system/mapper/xml/UserMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="io.gisbi.application.system.mapper.UserMapper">
-
-</mapper>

core/core-backend/src/main/java/io/gisbi/dataset/dao/ext/mapper/CoreDataSetExtMapper.java

@@ -14,7 +14,7 @@ import java.util.List;
 public interface CoreDataSetExtMapper {
 
     @Select("""
-            select id, name, node_type, pid from core_dataset_group
+            select id, name, node_type, pid,app_id from core_dataset_group
             ${ew.customSqlSegment}
             """)
     List<DataSetNodePO> query(@Param("ew") QueryWrapper queryWrapper);

core/core-backend/src/main/java/io/gisbi/dataset/dao/ext/po/DataSetNodePO.java

@@ -14,7 +14,7 @@ public class DataSetNodePO implements Serializable {
 
     @Serial
     private static final long serialVersionUID = -4457506330575500164L;
-
+    private String appId;
     private Long id;
     private String name;
     private String nodeType;

core/core-backend/src/main/java/io/gisbi/dataset/dto/DataSetNodeBO.java

@@ -15,7 +15,7 @@ public class DataSetNodeBO implements TreeBaseModel {
 
     @Serial
     private static final long serialVersionUID = 728340676442387790L;
-
+    private String appId;
     private Long id;
     private String name;
     private Boolean leaf;

core/core-backend/src/main/java/io/gisbi/dataset/manage/DatasetGroupManage.java

@@ -228,7 +228,7 @@ public class DatasetGroupManage {
         queryWrapper.orderByDesc("create_time");
         List<DataSetNodePO> pos = coreDataSetExtMapper.query(queryWrapper);
         List<DataSetNodeBO> nodes = new ArrayList<>();
-        if (ObjectUtils.isEmpty(request.getLeaf()) || !request.getLeaf()) nodes.add(rootNode());
+        if (ObjectUtils.isEmpty(request.getLeaf()) || !request.getLeaf()) nodes.add(rootNode(request.getAppId()));
         List<DataSetNodeBO> bos = pos.stream().map(this::convert).toList();
         if (CollectionUtils.isNotEmpty(bos)) {
             nodes.addAll(bos);
@@ -275,12 +275,12 @@ public class DatasetGroupManage {
         return datasourceDTOList;
     }
 
-    private DataSetNodeBO rootNode() {
+    private DataSetNodeBO rootNode(String appId) {
-        return new DataSetNodeBO(0L, "root", false, 7, -1L, 0);
+        return new DataSetNodeBO(appId,0L, "root", false, 7, -1L, 0);
     }
 
     private DataSetNodeBO convert(DataSetNodePO po) {
-        return new DataSetNodeBO(po.getId(), po.getName(), StringUtils.equals(po.getNodeType(), leafType), 9, po.getPid(), 0);
+        return new DataSetNodeBO(po.getAppId(),po.getId(), po.getName(), StringUtils.equals(po.getNodeType(), leafType), 9, po.getPid(), 0);
     }
 
     public void checkName(DatasetGroupInfoDTO dto) {

core/core-frontend/config/dev.ts

@@ -2,13 +2,13 @@ export default {
   server: {
     proxy: {
       '/api/f': {
-        target: 'http://192.168.1.38:8100',
+        target: 'http://192.168.1.58:8100',
         changeOrigin: true,
         rewrite: path => path.replace(/^\/api\/f/, '')
       },
       // 使用 proxy 实例
       '/api': {
-        target: 'http://192.168.1.38:8100',
+        target: 'http://192.168.1.58:8100',
         changeOrigin: true,
         rewrite: path => path.replace(/^\/api/, '')
       }

sdk/common/src/main/java/io/gisbi/utils/TokenUtils.java

@@ -8,8 +8,6 @@ import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 
 public class TokenUtils {
-
-
     public static TokenUserBO userBOByToken(String token) {
         DecodedJWT jwt = JWT.decode(token);
         Long userId = jwt.getClaim("uid").asLong();