1

OpenAuth.App/Common/CommonData.cs

@@ -178,5 +178,93 @@ namespace OpenAuth.App.Common
 
         }
 
+
+        /// <summary>
+        /// 格式化wkt数据，兼容多个地块
+        /// </summary>
+        /// <param name="_wkt"></param>
+        /// <param name="_newType"></param>
+        /// <param name="_len"></param>
+        /// <returns></returns>
+        public string WktDataConvert(string _wkt, string _newType, int _len)
+        {
+            //使用逗号分割
+            var list = _wkt.Split(",");
+
+            //返回值
+            StringBuilder res = new StringBuilder();
+
+            //扩展的维度，用 0补齐
+            string extStr = "";
+            for (int i = 0; i < list.Length; i++)
+            {
+                //当前项
+                var item = list[i];
+                extStr = GetWktDemension(item, _len);
+                if (i == 0)
+                {
+                    //第一项数据先去除前缀
+                    item = item.Substring(item.IndexOf("(")).TrimStart('(');
+                    if (_newType == "MULTIPOLYGON ZM")
+                        item = "(((" + item;
+                    else if (_newType == "MULTILINESTRING")
+                        item = "((" + item;
+
+                    //扩展后的值
+                    item = _newType + item + extStr;
+                }
+                else if (i == list.Length - 1)
+                {
+                    //最后一项
+                    item = item.TrimEnd(')');
+                    if (_newType == "MULTIPOLYGON ZM")
+                        item = item + extStr + ")))";
+                    else if (_newType == "MULTILINESTRING")
+                        item = item + extStr + "))";
+                }
+                else
+                {
+                    //判断是否存在右括号
+                    if (item.IndexOf(")") > -1)
+                    {
+                        //在第一个右括号前插入维度数据
+                        item = item.Insert(item.IndexOf(")"), extStr);
+                    }
+                    else
+                    {
+                        //在后面追加维度数据
+                        item = item + extStr;
+                    }
+                }
+
+                //追加数据
+                res.Append($"{item},");
+            }
+
+            string strRes = res.ToString();
+
+            //把最后一个逗号截取掉
+            return strRes.Substring(0, strRes.Length - 1);
+        }
+
+        private string GetWktDemension(string item, int _len)
+        {
+            if (item.IndexOf("(") > -1)
+            {
+                item = item.Substring(item.IndexOf("("));
+                item = item.TrimStart('(');
+            }
+            string extStr = "";
+            //数据的维度
+            var _count = _len - item.Split(" ", StringSplitOptions.RemoveEmptyEntries).Length;
+
+            //扩展维度
+            if (_count == 1)
+                extStr = " 0";
+            else if (_count == 2)
+                extStr = " 0 0";
+            return extStr;
+        }
+
     }
 }

OpenAuth.App/ServiceApp/DroneCaseinfo/Request/CloseCaseInfo.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenAuth.App.ServiceApp.Request
+{
+    public class CloseCaseInfo
+    {
+        //案件编号
+        public string CaseNo { get; set; }
+        //复提说明
+        public string Reason { get; set; }
+    }
+}

OpenAuth.App/ServiceApp/DroneCaseinfo/Request/QueryCaseInfoListReq.cs

@@ -0,0 +1,147 @@
+using OpenAuth.App.BaseApp.Base;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenAuth.App.ServiceApp.Request
+{
+    public class QueryCaseInfoListReq : PageReq
+    {
+        public void Init()
+        {
+            if (this.handle_status_id < 0) handle_status_id = null;
+        }
+
+        /// <summary>
+        /// 村id
+        /// </summary>
+        public string communityname { get; set; }
+
+        /// <summary>
+        /// 案件编号
+        /// </summary>
+        public string case_no { get; set; }
+
+        /// <summary>
+        /// 案件类型
+        /// </summary>
+        public string typeid { get; set; }
+
+        /// <summary>
+        /// 地址
+        /// </summary>
+        public string address { get; set; }
+
+        /// <summary>
+        /// 案件描述
+        /// </summary>
+        public string case_description { get; set; }
+
+        /// <summary>
+        /// 是否完整
+        /// </summary>
+        public int? is_intact { get; set; }
+
+        /// <summary>
+        /// 是否关闭
+        /// </summary>
+        public int? is_closed { get; set; }
+
+        /// <summary>
+        /// 是否上报人
+        /// </summary>
+        public int? is_reporter { get; set; }
+
+        /// <summary>
+        /// 是否执法人
+        /// </summary>
+        public int? is_dealer { get; set; }
+
+        /// <summary>
+        /// 处理状态
+        /// </summary>
+        public int? handle_status_id { get; set; }
+
+        /// <summary>
+        /// 案件状态
+        /// </summary>
+        public string case_status_id { get; set; }
+
+        /// <summary>
+        /// 上报时间
+        /// </summary>
+        public DateTime? report_start_time { get; set; }
+
+        /// <summary>
+        /// 上报时间
+        /// </summary>
+        public DateTime? report_end_time { get; set; }
+
+        /// <summary>
+        /// 上报人姓名
+        /// </summary>
+        public string report_name { get; set; }
+
+        /// <summary>
+        /// 执行人姓名
+        /// </summary>
+        public string deal_username { get; set; }
+
+        /// <summary>
+        /// 判读时间
+        /// </summary>
+        public DateTime? identification_start_time { get; set; }
+
+        /// <summary>
+        /// 判读时间
+        /// </summary>
+        public DateTime? identification_end_time { get; set; }
+
+        /// <summary>
+        /// 县id
+        /// </summary>
+        public string countyid { get; set; }
+
+        /// <summary>
+        /// 镇id
+        /// </summary>
+        public string streetid { get; set; }
+
+        /// <summary>
+        /// 村id
+        /// </summary>
+        public string communityid { get; set; }
+
+        /// <summary>
+        /// 判读人id
+        /// </summary>
+        public string identification_userid { get; set; }
+
+        /// <summary>
+        /// 判读人
+        /// </summary>
+        public string identification_user { get; set; }
+
+        /// <summary>
+        /// 判读人账号
+        /// </summary>
+        public string identification_account { get; set; }
+
+        /// <summary>
+        /// 是否违法
+        /// </summary>
+        public int? is_illegal { get; set; }
+
+        /// <summary>
+        /// 是否判读审核
+        /// </summary>
+        public int? is_review { get; set; }
+
+        /// <summary>
+        /// 是否是判读审核人
+        /// </summary>
+        public int? is_Reviewer { get; set; }
+    }
+}

OpenAuth.App/ServiceApp/DroneCaseinfo/Request/QueryDealCaseInfoListReq.cs

@@ -0,0 +1,87 @@
+using OpenAuth.App.BaseApp.Base;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenAuth.App.ServiceApp.Request
+{
+    public class QueryDealCaseInfoListReq : PageReq
+    {
+        public void Init()
+        {
+            if (this.handle_status_id < 0) handle_status_id = null;
+        }
+
+        /// <summary>
+        /// 村名称
+        /// </summary>
+        public string communityname { get; set; }
+
+        /// <summary>
+        /// 案件编号
+        /// </summary>
+        public string case_no { get; set; }
+
+        /// <summary>
+        /// 案件类型
+        /// </summary>
+        public string typeid { get; set; }
+
+        /// <summary>
+        /// 地址
+        /// </summary>
+        public string address { get; set; }
+
+        /// <summary>
+        /// 案件描述
+        /// </summary>
+        public string case_description { get; set; }
+
+        /// <summary>
+        /// 处理状态
+        /// </summary>
+        public int? handle_status_id { get; set; }
+
+        /// <summary>
+        /// 案件状态
+        /// </summary>
+        public string case_status_id { get; set; }
+
+        /// <summary>
+        /// 上报时间
+        /// </summary>
+        public DateTime? report_start_time { get; set; }
+
+        /// <summary>
+        /// 上报时间
+        /// </summary>
+        public DateTime? report_end_time { get; set; }
+
+        /// <summary>
+        /// 上报人姓名
+        /// </summary>
+        public string report_name { get; set; }
+
+        /// <summary>
+        /// 执行人姓名
+        /// </summary>
+        public string deal_username { get; set; }
+
+        /// <summary>
+        /// 判读时间
+        /// </summary>
+        public DateTime? identification_start_time { get; set; }
+
+        /// <summary>
+        /// 判读时间
+        /// </summary>
+        public DateTime? identification_end_time { get; set; }
+
+        /// <summary>
+        /// 是否违法
+        /// </summary>
+        public int? is_illegal { get; set; }
+    }
+}

OpenAuth.App/ServiceApp/DroneCaseinfo/Request/ReSubmitInfo.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenAuth.App.ServiceApp.Request
+{
+    public class ReSubmitInfo
+    {
+        //案件编号
+        public string CaseNo { get; set; }
+        //复提说明
+        public string Remark { get; set; }
+    }
+}

OpenAuth.App/ServiceApp/DroneCaseinfo/Response/DroneCaseInfoExt.cs

@@ -0,0 +1,14 @@
+using OpenAuth.Repository.Domain;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenAuth.App.ServiceApp.Response
+{
+    public class DroneCaseInfoExt : DroneCaseinfo
+    {
+        public List<string> case_pic_list { get; set; }
+    }
+}

OpenAuth.WebApi/Controllers/ServiceControllers/DroneCaseinfoController.cs

@@ -1,11 +1,14 @@
 using Infrastructure;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json.Linq;
+using OpenAuth.App.Response;
 using OpenAuth.App.ServiceApp.DroneCaseInfo;
 using OpenAuth.App.ServiceApp.InsTaskHallManager;
 using OpenAuth.App.ServiceApp.Request;
 using OpenAuth.App.ServiceApp.Response;
+using OpenAuth.Repository.Domain;
 
 namespace OpenAuth.WebApi.Controllers.ServiceControllers
 {
@@ -142,5 +145,180 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
             }
             return response;
         }
+
+        /// <summary>
+        /// 删除文件 - 通过路径删除
+        /// </summary>
+        /// <param name="paths"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public Response<string> DeleteDroneFilesByPath(string[] paths)
+        {
+            Response<string> response = new Response<string>();
+            try
+            {
+                response.Result = _app.DeleteDroneFilesByPath(paths);
+            }
+            catch (Exception ex)
+            {
+                response.Code = 500;
+                response.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return response;
+        }
+
+        /// <summary>
+        /// 关闭案件（判读用）
+        /// </summary>
+        /// <param name="id">案件id</param>
+        /// <returns></returns>
+        [HttpGet]
+        public Response<string> CloseDroneCaseInfo(string id)
+        {
+            Response<string> response = new Response<string>();
+            try
+            {
+                response.Result = _app.CloseDroneCaseInfo(id);
+            }
+            catch (Exception ex)
+            {
+                response.Code = 500;
+                response.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return response;
+        }
+
+        /// <summary>
+        /// 添加违建图层
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public Response<string> AddIllegalBuildeLayer([FromBody] DroneShpData model)
+        {
+            var res = new Response<string>();
+            try
+            {
+                res.Result = _app.AddIllegalBuildeLayer(model);
+            }
+            catch (Exception ex)
+            {
+                res.Code = 500;
+                res.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return res;
+        }
+
+
+        /// <summary>
+        /// 删除图斑
+        /// </summary>
+        /// <param name="gid"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Response<string> DeleteDroneLayers(int gid)
+        {
+            var res = new Response<string>();
+            try
+            {
+                res.Result = _app.DeleteDroneLayers(gid);
+            }
+            catch (Exception ex)
+            {
+                res.Code = 500;
+                res.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return res;
+        }
+
+        /// <summary>
+        /// 根据经纬度获取组织机构
+        /// </summary>
+        /// <param name="lng"></param>
+        /// <param name="lat"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public Response<JObject> GetOrgAreaByPoint(decimal lng, decimal lat)
+        {
+            Response<JObject> response = new Response<JObject>();
+            try
+            {
+                response.Result = _app.GetOrgAreaByPoint(lng, lat);
+            }
+            catch (Exception ex)
+            {
+                response.Code = 500;
+                response.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return response;
+        }
+
+        /// <summary>
+        /// 查询处理案件列表
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        [HttpGet]
+        public TableData LoadDealCaseInfoList([FromQuery] QueryDealCaseInfoListReq obj)
+        {
+            TableData response = new TableData();
+            try
+            {
+                response = _app.LoadDealCaseInfoList(obj);
+            }
+            catch (Exception ex)
+            {
+                response.code = 500;
+                response.msg = ex.InnerException?.Message ?? ex.Message;
+            }
+            return response;
+        }
+
+        #region 复提案件
+        /// <summary>
+        /// 复提案件
+        /// </summary>
+        /// <param name="id">案件id</param>
+        /// <returns></returns>
+        [AllowAnonymous]
+        [HttpPost]
+        public Response<bool> ReSubmitCaseInfo([FromBody] ReSubmitInfo submitInfo)
+        {
+            Response<bool> response = new Response<bool>();
+            try
+            {
+                response.Result = _app.ReSubmitCaseInfo(submitInfo);
+            }
+            catch (Exception ex)
+            {
+                response.Code = 500;
+                response.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return response;
+        }
+        #endregion
+
+        #region 关闭案件
+        /// <summary>
+        /// 关闭案件
+        /// </summary>
+        /// <returns></returns>
+        [AllowAnonymous]
+        [HttpPost]
+        public Response<bool> CloseCaseInfo([FromBody] CloseCaseInfo submitInfo)
+        {
+            Response<bool> response = new Response<bool>();
+            try
+            {
+                response.Result = _app.CloseCaseInfo(submitInfo);
+            }
+            catch (Exception ex)
+            {
+                response.Code = 500;
+                response.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return response;
+        }
+        #endregion
     }
 }