Merge remote-tracking branch 'origin/master'

sst-manager/db/add_db.sql

@@ -332,4 +332,15 @@ CREATE TABLE mortals_xhx_accept(
     `updateTime` datetime      COMMENT '更新时间',
 PRIMARY KEY  (`id`)
 ,KEY `storageInfo` (`storageInfo`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='综窗接件信息';
\ No newline at end of file
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='综窗接件信息';
+
+
+
+-- ----------------------------
+-- 字段长度修改 （2024-09-04）
+-- ----------------------------
+ALTER TABLE `mortals_xhx_sst_apps_desk` MODIFY `describe` varchar(2048) DEFAULT NULL COMMENT '应用描述',
+MODIFY `url` varchar(512) DEFAULT NULL COMMENT '应用访问地址';
+
+ALTER TABLE `mortals_xhx_sst_apps` MODIFY `describe` varchar(2048) DEFAULT NULL COMMENT '应用描述',
+MODIFY `url` varchar(512) DEFAULT NULL COMMENT '应用访问地址';

sst-manager/src/main/java/com/mortals/xhx/module/sst/web/SstBasicController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.net.url.UrlBuilder;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.ap.GlobalSysInfo;
 import com.mortals.framework.common.Rest;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.IUser;
@@ -252,8 +253,14 @@ public class SstBasicController extends BaseCRUDJsonBodyMappingController<SstBas
                 rootNode.setType("area");
                 rootNode.setIcon("el-icon-folder");
                 rootNode.setIsLeaf(false);
-                rootNode.setLatitude("28.732286");
-                rootNode.setLongitude("104.623552");
+                String longitude = "104.082823";
+                String latitude = "30.657042";
+                if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(resultList)) {
+                    longitude = resultList.get(0).getLongitude();
+                    latitude = resultList.get(0).getLatitude();
+                }
+                rootNode.setLatitude(latitude);
+                rootNode.setLongitude(longitude);
                 rootNode.setSiteCount(getChildrenCount(resultList,2,siteMap,siteDeviceMap)-1);
                 rootNode.setChildren(resultList);
                 rootNode.setLevel(1);