1

13693261870

2023-03-21 73a1a2b861db44a9519e434152934b627747efcb

1

 ExportMap/Controllers/ConvertController.cs

@@ -15,35 +15,35 @@
        /// 转换为Tileset
        /// </summary>
        [HttpPost]
        public ResponseMsg<int> ToTileset([FromBody]XYZArgs args)
        public ResponseMsg<string> ToTileset([FromBody]XYZArgs args)
        {
            try
            {
                if (null == args || null == args.ids || args.ids.Count == 0)
                {
                    return ResponseMsg<int>.fail("请输入元数据ID");
                    return ResponseMsg<string>.fail("请输入元数据ID");
                }
                if (string.IsNullOrWhiteSpace(args.token))
                {
                    return ResponseMsg<int>.fail("没有令牌");
                    return ResponseMsg<string>.fail("没有令牌");
                }
                if (!ExportUtil.VerifyToken(args.token))
                {
                    return ResponseMsg<int>.fail("令牌无效");
                    return ResponseMsg<string>.fail("令牌无效");
                }

                int count = ConvertUtils.Convert(args);
                if (0 == count)
                {
                    return ResponseMsg<int>.fail("失败");
                    return ResponseMsg<string>.fail("失败");
                }

                return ResponseMsg<int>.success("成功", count);
                return ResponseMsg<string>.success("成功", "ok", count);
            }
            catch (Exception ex)
            {
                LogOut.Error(ex.StackTrace);
                return ResponseMsg<int>.fail(ex.Message);
                return ResponseMsg<string>.fail(ex.Message);
            }
        }

@@ -51,40 +51,40 @@
        /// 转换为瓦片
        /// </summary>
        [HttpPost]
        public ResponseMsg<int> ToTiles([FromBody]XYZArgs args)
        public ResponseMsg<string> ToTiles([FromBody]XYZArgs args)
        {
            try
            {
                if (null == args || null == args.ids || args.ids.Count == 0)
                {
                    return ResponseMsg<int>.fail("请输入元数据ID");
                    return ResponseMsg<string>.fail("请输入元数据ID");
                }
                if (string.IsNullOrWhiteSpace(args.token))
                {
                    return ResponseMsg<int>.fail("没有令牌");
                    return ResponseMsg<string>.fail("没有令牌");
                }
                if (!ExportUtil.VerifyToken(args.token))
                {
                    return ResponseMsg<int>.fail("令牌无效");
                    return ResponseMsg<string>.fail("令牌无效");
                }
                if (args.min < 0 || args.max > 20 || string.IsNullOrWhiteSpace(args.dircode))
                {
                    return ResponseMsg<int>.fail("输入的参数有误");
                    return ResponseMsg<string>.fail("输入的参数有误");
                }

                string err = null;
                int count = XYZUtils.Generate(args, ref err);
                if (0 == count)
                {
                    return ResponseMsg<int>.fail(null == err ? "失败" : err);
                    return ResponseMsg<string>.fail(null == err ? "失败" : err);
                }

                return ResponseMsg<int>.success("成功", count);
                return ResponseMsg<string>.success("成功", "ok", count);
            }
            catch (Exception ex)
            {
                LogOut.Error(ex.StackTrace);
                return ResponseMsg<int>.fail(ex.Message);
                return ResponseMsg<string>.fail(ex.Message);
            }
        }

@@ -92,21 +92,21 @@
        /// 转换为瓦片
        /// </summary>
        [HttpPost]
        public ResponseMsg<int> ToSG([FromBody]XYZArgs args)
        public ResponseMsg<string> ToSG([FromBody]XYZArgs args)
        {
            try
            {
                if (null == args || null == args.ids || args.ids.Count == 0)
                {
                    return ResponseMsg<int>.fail("请输入元数据ID");
                    return ResponseMsg<string>.fail("请输入元数据ID");
                }
                if (string.IsNullOrWhiteSpace(args.token))
                {
                    return ResponseMsg<int>.fail("没有令牌");
                    return ResponseMsg<string>.fail("没有令牌");
                }
                if (!ExportUtil.VerifyToken(args.token))
                {
                    return ResponseMsg<int>.fail("令牌无效");
                    return ResponseMsg<string>.fail("令牌无效");
                }

                SGUtils utils = new SGUtils();
@@ -115,15 +115,15 @@
                int count = utils.Release(args, ref err);
                if (0 == count)
                {
                    return ResponseMsg<int>.fail(null == err ? "失败" : err);
                    return ResponseMsg<string>.fail(null == err ? "失败" : err);
                }

                return ResponseMsg<int>.success("成功", count);
                return ResponseMsg<string>.success("成功", "ok", count);
            }
            catch (Exception ex)
            {
                LogOut.Error(ex.StackTrace);
                return ResponseMsg<int>.fail(ex.Message);
                return ResponseMsg<string>.fail(ex.Message);
            }
        }
    }

 ExportMap/Web.config

@@ -16,8 +16,8 @@
    <!-- SG的DB库 -->
    <add key="sgDB" value="E:\soft\SGConfig\catalog.db"/>
    <!-- PG连接 -->
    <add key="pgConn" value="Server=127.0.0.1;Port=5433;Database=langfang;User Id=postgres;Password=postgres;"/>
    <!--<add key="pgConn" value="Server=192.168.20.205;Port=5433;Database=langfang;User Id=postgres;Password=Postgres!_14_Lf;"/>-->
    <!--<add key="pgConn" value="Server=127.0.0.1;Port=5433;Database=langfang;User Id=postgres;Password=postgres;"/>-->
    <add key="pgConn" value="Server=192.168.20.205;Port=5433;Database=langfang;User Id=postgres;Password=Postgres!_14_Lf;"/>
    <add key="webpages:Version" value="3.0.0.0"/>
    <add key="webpages:Enabled" value="false"/>
    <add key="ClientValidationEnabled" value="true"/>

 ExportMap/cs/ConvertUtils.cs

@@ -131,7 +131,8 @@
            int pubid = PubDBHelper.InsertPublish(sys);
            if (pubid > 0)
            {
                PubDBHelper.InsertLayer(sys, meta);
                sys.id = pubid;
                PubDBHelper.InsertLayer(sys, meta, 100);
                PubDBHelper.InsertMetaPub(meta.id, pubid, args.userId);
            }
        }

 ExportMap/cs/SGUtils.cs

@@ -195,6 +195,7 @@
            int pubid = PubDBHelper.InsertPublish(sys);
            if (pubid > 0)
            {
                sys.id = pubid;
                PubDBHelper.InsertLayer(sys, meta);
                PubDBHelper.InsertMetaPub(meta.id, pubid, args.userId);
            }

 ExportMap/cs/XYZUtils.cs

@@ -191,6 +191,7 @@
            int pubid = PubDBHelper.InsertPublish(sys);
            if (pubid > 0)
            {
                sys.id = pubid;
                PubDBHelper.InsertLayer(sys, new SysMeta()
                {
                    name = args.name,

 ExportMap/db/PubDBHelper.cs

@@ -19,7 +19,7 @@
        private static string insertMetaPubSql = "insert into lf.sys_meta_pub (metaid, pubid, create_user) select {0}, {1}, {2} from (select 1) temp where not exists (select 1 from lf.sys_meta_pub where metaid = {0} and pubid = {1})";

        // 模型-@cnName，model-@enName，自动发布模型-@name，http:// - @url，Tileset-@serve，1-@user，7-@pubid
        private static string insertLayerSql = "insert into lf.sys_layer (pid, cn_name, en_name, url, type, level, order_num, is_show, create_user, data_type, serve_type, pubid) values ((select coalesce(id, 0) from lf.sys_layer where cn_name = @name limit 1), @cnName, @enName, @url, 2, (select coalesce(level, 0) + 1 from lf.sys_layer where cn_name = @name limit 1), (select coalesce(max(order_num), 0) from lf.sys_layer where pid = (select id from lf.sys_layer where cn_name = @name limit 1)), 0, @user, @name, @serve, @pubid);";
        private static string insertLayerSql = "insert into lf.sys_layer (pid, cn_name, en_name, url, type, level, order_num, is_show, create_user, data_type, serve_type, pubid, elev) values ((select coalesce(id, 0) from lf.sys_layer where cn_name = @name limit 1), @cnName, @enName, @url, 2, (select coalesce(level, 0) + 1 from lf.sys_layer where cn_name = @name limit 1), (select coalesce(max(order_num), 0) from lf.sys_layer where pid = (select id from lf.sys_layer where cn_name = @name limit 1)), 0, @user, @name, @serve, @pubid, @elev);";

        /// <summary>
        /// 是/否发布过
@@ -74,7 +74,7 @@
        /// <summary>
        /// 插入图层表记录
        /// </summary>
        public static int InsertLayer(SysPublish sys, SysMeta meta)
        public static int InsertLayer(SysPublish sys, SysMeta meta, double elev = 0)
        {
            bool isImg = imgList.Contains(meta.type);
            string cnName = meta.name.Split(new char[] { '.' })[0];
@@ -89,6 +89,7 @@
            list.Add(new NpgsqlParameter("@serve", serve));
            list.Add(new NpgsqlParameter("@pubid", sys.id));
            list.Add(new NpgsqlParameter("@user", sys.create_user));
            list.Add(new NpgsqlParameter("@elev", elev));

            int rows = Tool.DBHelper.ExecuteNonQuery(insertLayerSql, list.ToArray());


 ExportMap/up.html

@@ -481,7 +481,7 @@
      var vals = $("#selectPubType").find("option:selected").val();
      console.log("测试发布", type, vals);

      var data = { "type": type, "name": "DOM_0.2m", "min": 12, "max": 18, depcode: "000305", dircode: "0102" };
      var data = { "ids": vals.split(","), "type": type, "name": "DOM_0.2m", "min": 12, "max": 18, depcode: "000305", dircode: "0102" };
      ajax(getUrl("publish/insertForPub"), "POST", JSON.stringify(data), null, null, function (rs) {
        console.log(rs);
        alert("code = " + rs.code + ", msg = " + rs.msg + ", result = " + rs.result);