Merge branch 'master' of http://123.132.248.154:10000/HC_YFZX/feixian_weifajianguan

OpenAuth.App/OpenAuth.App.csproj

@@ -52,6 +52,7 @@
     <Folder Include="BaseApp\Permission\" />
     <Folder Include="BaseApp\WFTask\Response\新文件夹\" />
     <Folder Include="ServiceApp\DroneCaseInfoTaskManage\Response\" />
+    <Folder Include="ServiceApp\MiManager\Response\" />
   </ItemGroup>
 
 </Project>

OpenAuth.App/ServiceApp/MiManager/MiViolationReportApp.cs

@@ -1,9 +1,11 @@
 
+using DocumentFormat.OpenXml.Office.CustomUI;
 using Infrastructure;
 using OpenAuth.App.BaseApp.Base;
 using OpenAuth.App.Interface;
 using OpenAuth.App.Request;
 using OpenAuth.App.Response;
+using OpenAuth.App.ServiceApp.Request;
 using OpenAuth.Repository;
 using OpenAuth.Repository.Domain;
 using SqlSugar;
@@ -116,5 +118,61 @@ namespace OpenAuth.App
             }
         }
 
+        public async Task<Response<bool>> Report(MiViolationReportRequest request)
+        {
+            using (var uwo = UnitWork.CreateContext())
+            {
+                //上报信息
+                var model = request.MapTo<MiViolationReport>();
+                model.Id = Guid.NewGuid().ToString();
+                model.Status = "待处理";
+
+                //现场照片
+                var photos = request.SencePhotos.MapToList<MiScenePhoto>();
+                photos.ForEach(a =>
+                {
+                    a.Id = Guid.NewGuid().ToString();
+                    a.ViolationReportId = model.Id;
+                });
+
+                var vehicleList = new List<MiVehicle>();
+                var vehicleImageList = new List<MiVehicleImage>();
+                foreach (var item in request.Vehicles)
+                {
+                    //车辆信息
+                    var vehicle = item.MapTo<MiVehicle>();
+                    vehicle.Id = Guid.NewGuid().ToString();
+                    vehicle.ViolationReportId = model.Id;
+
+                    //车辆图片
+                    var images = item.VehicleImages.MapToList<MiVehicleImage>();
+                    images.ForEach(a =>
+                    {
+                        a.Id = Guid.NewGuid().ToString();
+                        a.ViolationReportId = model.Id;
+                        a.ParkingId = model.ParkingId;
+                        a.VehicleId = vehicle.Id;
+                        vehicleImageList.Add(a);
+
+                    });
+
+                    vehicleList.Add(vehicle);
+                }
+
+                await uwo.MiViolationReport.InsertAsync(model);
+                await uwo.MiScenePhoto.InsertRangeAsync(photos);
+                await uwo.MiVehicle.InsertRangeAsync(vehicleList);
+                await uwo.MiVehicleImage.InsertRangeAsync(vehicleImageList);
+
+
+                var flag = uwo.Commit();
+                return new Response<bool>
+                {
+                    Result = flag,
+                    Message = flag == true ? "success" : "error"
+                };
+            }
+        }
+
     }
 }

OpenAuth.App/ServiceApp/MiManager/Request/MiViolationReportRequest.cs

@@ -0,0 +1,129 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenAuth.App.ServiceApp.Request
+{
+    public class MiViolationReportRequest
+    {
+        /// <summary>
+        /// Desc:标题
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        public string Title { get; set; }
+        /// <summary>
+        /// Desc:当事人姓名
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string PartyName { get; set; }
+
+        /// <summary>
+        /// Desc:当事人电话
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string PartyPhone { get; set; }
+
+        /// <summary>
+        /// Desc:违法类型
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string ViolationType { get; set; }
+
+        /// <summary>
+        /// Desc:问题描述
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string ProblemDescription { get; set; }
+
+        /// <summary>
+        /// Desc:处理意见
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string HandlingOpinion { get; set; }
+
+        /// <summary>
+        /// Desc:停车场 id
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string ParkingId { get; set; }
+
+        /// <summary>
+        /// Desc:经度
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public decimal? Lng { get; set; }
+
+        /// <summary>
+        /// Desc:纬度
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public decimal? Lat { get; set; }
+
+        /// <summary>
+        /// Desc:处理单位
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string HandlingUnit { get; set; }
+
+        /// <summary>
+        /// Desc:处理人
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string Handler { get; set; }
+
+        /// <summary>
+        /// Desc:处理时间
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public DateTime? HandlingTime { get; set; }
+
+        /// <summary>
+        /// Desc:上报时间
+        /// Default:DateTime.Now
+        /// Nullable:True
+        /// </summary>           
+        public DateTime? ReportTime { get; set; }
+
+        /// <summary>
+        /// Desc:上报人
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string Reporter { get; set; }
+
+        /// <summary>
+        /// Desc:盗采点id
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string MinePointId { get; set; }
+        /// <summary>
+        /// 上报单位
+        /// </summary>
+        public string ReportUnit { get; set; }
+
+        /// <summary>
+        /// 现场图片
+        /// </summary>
+        public List<SencePhoto> SencePhotos { get; set; }
+        /// <summary>
+        /// 车辆信息
+        /// </summary>
+        public List<Vehicle> Vehicles { get; set; }
+
+    }
+}

OpenAuth.App/ServiceApp/MiManager/Request/SencePhoto.cs

@@ -0,0 +1,22 @@
+using DocumentFormat.OpenXml.Bibliography;
+using DocumentFormat.OpenXml.Office2010.Excel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenAuth.App.ServiceApp.Request
+{
+    /// <summary>
+    /// 现场图片
+    /// </summary>
+    public class SencePhoto
+    {
+        public string Image { get; set; }
+        public double Lng { get; set; }
+        public double Lat { get; set; }
+        public double Angle { get; set; }
+        public DateTime CreateTime { get; set; }
+    }
+}

OpenAuth.App/ServiceApp/MiManager/Request/Vehicle.cs

@@ -0,0 +1,47 @@
+using DocumentFormat.OpenXml.Office2010.Excel;
+using OpenAuth.App.ServiceApp.MiManager.Request;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenAuth.App.ServiceApp.Request
+{
+    /// <summary>
+    /// 车辆信息
+    /// </summary>
+    public class Vehicle
+    {
+        /// <summary>
+        /// 牌照/编码
+        /// </summary>
+        public string LicensePlate { get; set; }
+        /// <summary>
+        /// 类型
+        /// </summary>
+        public string Type { get; set; }
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        public string Name { get; set; }
+        /// <summary>
+        /// 身份证
+        /// </summary>
+        public string IdCard { get; set; }
+        /// <summary>
+        /// 电话
+        /// </summary>
+        public string Phone { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public string CreateTime { get; set; }
+
+        /// <summary>
+        /// 图片
+        /// </summary>
+        public List<VehicleImage> VehicleImages { get; set; }
+
+    }
+}

OpenAuth.App/ServiceApp/MiManager/Request/VehicleImage.cs

@@ -0,0 +1,31 @@
+using DocumentFormat.OpenXml.Bibliography;
+using DocumentFormat.OpenXml.Office2010.Excel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenAuth.App.ServiceApp.MiManager.Request
+{
+    /// <summary>
+    /// 车辆图片
+    /// </summary>
+    public class VehicleImage
+    {
+        /// <summary>
+        /// 图片
+        /// </summary>
+        public string Image { get; set; }
+        public string Lng { get; set; }
+        public string Lat { get; set; }
+        /// <summary>
+        /// 角度
+        /// </summary>
+        public string Angle { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public string CreateTime { get; set; }
+    }
+}

OpenAuth.Repository/Domain/MiVehicleImage.cs

@@ -11,7 +11,8 @@ namespace OpenAuth.Repository.Domain
     [SugarTable("mi_vehicle_image")]
     public partial class MiVehicleImage
     {
-           public MiVehicleImage(){
+        public MiVehicleImage()
+        {
 
 
         }
@@ -71,5 +72,9 @@ namespace OpenAuth.Repository.Domain
         /// </summary>           
         public DateTime? CreateTime { get; set; }
 
+        /// <summary>
+        /// 车辆 Id
+        /// </summary>
+        public string VehicleId { get; set; }
     }
 }

OpenAuth.Repository/Domain/MiViolationReport.cs

@@ -11,7 +11,8 @@ namespace OpenAuth.Repository.Domain
     [SugarTable("mi_violation_report")]
     public partial class MiViolationReport
     {
-           public MiViolationReport(){
+        public MiViolationReport()
+        {
 
 
         }
@@ -133,6 +134,10 @@ namespace OpenAuth.Repository.Domain
         /// Nullable:True
         /// </summary>           
         public string MinePointId { get; set; }
+        /// <summary>
+        /// 上报单位
+        /// </summary>
+        public string ReportUnit { get; set; }
 
     }
 }

OpenAuth.WebApi/Controllers/ServiceControllers/MiViolationReportController.cs

@@ -1,13 +1,15 @@
-using System;
+using DocumentFormat.OpenXml.EMMA;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 using Infrastructure;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using OpenAuth.App;
 using OpenAuth.App.Request;
 using OpenAuth.App.Response;
+using OpenAuth.App.ServiceApp.Request;
 using OpenAuth.Repository.Domain;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace OpenAuth.WebApi.Controllers
 {
@@ -130,6 +132,31 @@ namespace OpenAuth.WebApi.Controllers
             return result;
         }
         #endregion
+
+        #region 上报
+        /// <summary>
+        /// 上报
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public async Task<Response<bool>> Report(MiViolationReportRequest request)
+        {
+            var result = new Response<bool>();
+            try
+            {
+                result = await _app.Report(request);
+
+            }
+            catch (Exception ex)
+            {
+                result.Code = 500;
+                result.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+
+            return result;
+        }
+        #endregion
+
         #endregion
     }
 }