提交代码

Edu.Model/Entity/Advertising/Rb_Advertising.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Advertising
+{
+
+    /// <summary>
+    /// 广告基础信息
+    /// </summary> 
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class Rb_Advertising
+    {
+
+        /// <summary>
+        /// 编号
+        /// </summary>        
+        public int ID
+        {
+            get;
+            set;
+        }
+
+
+
+        /// <summary>
+        /// 图片路径
+        /// </summary>        
+
+        public string PictureUrl
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 示例图片
+        /// </summary>  
+
+        public string SamplePicturesUrl
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 状态
+        /// </summary>        
+        public int? Status
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 名称
+        /// </summary>      
+
+        public string Title
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 标签
+        /// </summary>
+        public string Lable { get; set; }
+        /// <summary>
+		/// 集团编号
+		/// </summary>
+		public int Group_Id { get; set; }
+
+        /// <summary>
+        /// 学校编号
+        /// </summary>
+       // public int School_Id { get; set; }
+
+        /// <summary>
+        /// 收费金额
+        /// </summary>        
+        public decimal? ChargeAmount
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 是否收费 1收2不收
+        /// </summary>     
+
+        public int? IsFee
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreateDate { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public int? CreateBy { get; set; }
+    }
+}

Edu.Model/Entity/Advertising/Rb_Advertising_Make.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using VT.FW.DB;
+
+namespace Edu.Model.Entity.Advertising
+{
+    /// <summary>
+    /// 广告制作
+    /// </summary> 
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class Rb_Advertising_Make
+    {
+
+        /// <summary>
+        /// 编号
+        /// </summary>        
+        public int ID
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 操作时间
+        /// </summary>        
+        public DateTime? UpdateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+		/// 集团编号
+		/// </summary>
+		public int Group_Id { get; set; }
+
+        /// <summary>
+        /// 学校编号
+        /// </summary>
+        public int School_Id { get; set; }
+        /// <summary>
+        /// 状态
+        /// </summary>        
+        public Common.Enum.DateStateEnum? Status
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 操作人
+        /// </summary>        
+        public int? UpdateBy
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 关联广告id
+        /// </summary>        
+        public int? AdvertisingID
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 内容
+        /// </summary>        
+        public string Content
+        {
+            get;
+            set;
+        }
+
+
+        /// <summary>
+        /// 广告图片路径
+        /// </summary>
+        public string AdvertisingPicUrl { get; set; }
+
+        /// <summary>
+        /// 文件MD5
+        /// </summary>
+        public string SecretKey { get; set; }
+
+    }
+}

Edu.Model/ViewModel/Advertising/Rb_Advertising_Extend.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Edu.Model.Entity.Advertising;
+
+namespace Edu.Model.ViewModel.Advertising
+{
+    public class Rb_Advertising_Extend : Rb_Advertising
+    {
+        /// <summary>
+        /// 标签
+        /// </summary>
+        public List<string> LableList { get; set; }
+
+        /// <summary>
+        /// 广告数量
+        /// </summary>
+        public int AdvertisingCount { get; set; }
+    }
+}

Edu.Model/ViewModel/Advertising/Rb_Advertising_Make_Extend.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Edu.Model.Entity.Advertising;
+
+namespace Edu.Model.ViewModel.Advertising
+{
+  public  class Rb_Advertising_Make_Extend: Rb_Advertising_Make
+    {
+        /// <summary>
+        /// 基础广告名称
+        /// </summary>
+        public string Title { get; set; }
+
+      
+        /// <summary>
+        /// 图片路径
+        /// </summary>        
+        public string PictureUrl
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 示例图片
+        /// </summary>        
+        public string SamplePicturesUrl
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 收费金额
+        /// </summary>        
+        public decimal? ChargeAmount
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 是否收费
+        /// </summary>        
+        public int? IsFee
+        {
+            get;
+            set;
+        }
+       
+    }
+}

Edu.Module.Advertising/AdvertisingModule.cs

+using System;
+using System.Collections.Generic;
+using Edu.Common.Plugin;
+using Edu.Model.Entity.Advertising;
+using Edu.Model.ViewModel.Advertising;
+using Edu.Repository.Advertising;
+using VT.FW.DB;
+
+namespace Edu.Module.Advertising
+{
+    public class AdvertisingModule
+    {
+        private Rb_AdvertisingRepository repository = new Rb_AdvertisingRepository();
+
+        /// <summary>
+        /// 广告基础信息处理类
+        /// </summary>
+        private Rb_Advertising_MakeRepository advertisingMakeRepository = new Rb_Advertising_MakeRepository();
+
+
+        #region 广告制作
+        /// <summary>
+        /// 获取创建的广告信息
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="model"></param>
+        /// <param name="count"></param>
+        /// <returns></returns>
+        public List<Rb_Advertising_Make_Extend> GetPageList(int pageIndex, int pageSize, Rb_Advertising_Make_Extend model, out long count)
+        {
+            return advertisingMakeRepository.GetPage(pageIndex, pageSize, model, out count);
+        }
+
+        /// <summary>
+        /// 获取广告信息
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public List<Rb_Advertising_Make_Extend> GetList(Rb_Advertising_Make_Extend model)
+        {
+            return advertisingMakeRepository.Get(model);
+        }
+
+        /// <summary>
+        /// 添加修改
+        /// </summary>
+        /// <param name="model"></param>
+        /// <param name="fileName"></param>
+        /// <param name="fileSize"></param>
+        /// <returns></returns>
+        public int Set(Rb_Advertising_Make_Extend model, string fileName, long fileSize)
+        {
+            int Id = 0;
+            if (model.ID > 0)
+            {
+                Id = model.ID;
+                IDictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    { nameof(Rb_Advertising_Make.SecretKey),model.SecretKey},
+                    { nameof(Rb_Advertising_Make.AdvertisingPicUrl),model.AdvertisingPicUrl},
+                    { nameof(Rb_Advertising_Make.Content),model.Content},
+                };
+                IList<WhereHelper> whereHelpers = new List<WhereHelper>()
+                {
+                    new WhereHelper (){ FiledName=nameof(Rb_Advertising_Make.ID),FiledValue=model.ID,OperatorEnum=OperatorEnum.Equal}
+                };
+                advertisingMakeRepository.Update(fileds, whereHelpers);
+            }
+            else
+            {
+                Id = advertisingMakeRepository.Insert(model);
+            }
+            return Id;
+        }
+
+
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        /// <param name="ID"></param>
+        /// <param name="EmployeeId"></param>
+        /// <returns></returns>
+        public bool Remove(int ID, int EmployeeId)
+        {
+            IDictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                { nameof(Rb_Advertising_Make_Extend.Status),(int) Common.Enum.DateStateEnum.Delete},
+            };
+            IList<WhereHelper> whereHelpers = new List<WhereHelper>()
+            {
+                new WhereHelper (){ FiledName=nameof(Rb_Advertising_Make_Extend.ID),FiledValue=ID,OperatorEnum=OperatorEnum.Equal}
+            };
+            bool flag = advertisingMakeRepository.Update(fileds, whereHelpers);
+            return flag;
+        }
+
+
+        #endregion
+
+
+        #region 广告管理
+        /// <summary>
+        /// 新增修改广告基础信息
+        /// </summary>
+        /// <param name="dmodel"></param>
+        public bool SetAdvertising(Rb_Advertising_Extend dmodel)
+        {
+            bool flag = false;
+            int ID = 0;
+            try
+            {
+                if (dmodel.ID > 0)
+                {
+                    ID = dmodel.ID;
+                    var bamodel = repository.GetEntity(dmodel.ID);
+                    bamodel.ChargeAmount = dmodel.ChargeAmount;
+                    bamodel.IsFee = dmodel.IsFee;
+                    bamodel.Title = dmodel.Title;
+                    bamodel.Lable = dmodel.Lable;
+                  //  bamodel.PictureUrl = dmodel.PictureUrl;
+                   // bamodel.SamplePicturesUrl = dmodel.SamplePicturesUrl;
+                    flag = repository.Update(bamodel);
+                }
+                else
+                {
+                    Rb_Advertising model = dmodel.RefMapperTo<Rb_Advertising>();
+                    model.Status = 0;
+                    ID = repository.Insert(model);
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "SetAdvertising");
+                return false;
+            }
+            return true;
+        }
+        /// <summary>
+        /// 获取广告列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="lineId"></param>
+        /// <param name="seriesId"></param>
+        /// <param name="countryId"></param>
+        /// <param name="advName"></param>
+        /// <param name="IsFee"></param>
+        /// <param name="RB_Group_id"></param>
+        /// <returns></returns>
+        public List<Rb_Advertising_Extend> GetAdvertisingList(int pageIndex, int pageSize, out long count, string advName, int IsFee, int RB_Group_id)
+        {
+            var list = repository.GetAdvertisingList(pageIndex, pageSize, out count, advName, IsFee, RB_Group_id);
+            return list;
+        }
+
+        /// <summary>
+        /// 根据where 查询列表
+        /// </summary>
+        /// <param name="lineId"></param>
+        /// <param name="seriesId"></param>
+        /// <param name="countryId"></param>
+        /// <param name="advName"></param>
+        /// <param name="RB_Group_id"></param>
+        /// <returns></returns>
+        public List<Rb_Advertising_Extend> GetAdvertsingListForComboBox( string advName, int RB_Group_id)
+        {
+            var list = repository.GetAdvertsingListForComboBox( advName, RB_Group_id);
+            return list;
+        }
+
+        /// <summary>
+        /// 删除广告
+        /// </summary>
+        /// <param name="bAID"></param>
+        public bool DelAdvertising(int bAID)
+        {
+            try
+            {
+                var fileds = new Dictionary<string, object>
+                {
+                    { nameof(Rb_Advertising.Status), 1},
+                };
+                var whereHelpers = new List<WhereHelper>
+                {
+                    new WhereHelper()
+                    {
+                        FiledName = nameof(Rb_Advertising.ID),
+                        FiledValue = bAID,
+                        OperatorEnum = OperatorEnum.Equal
+                    }
+                };
+                var flag = repository.Update(fileds, whereHelpers);
+            }
+            catch (Exception ex)
+            {
+                LogHelper.Write(ex, "DelAdvertising");
+                return false;
+            }
+            return true;
+        }
+
+        /// <summary>
+        /// 获取实体详情
+        /// </summary>
+        /// <param name="bAID"></param>
+        /// <returns></returns>
+        public Rb_Advertising GetAdvertsingInfo(int bAID)
+        {
+            return repository.GetEntity(bAID);
+        }
+        #endregion
+    }
+}

Edu.Module.Advertising/Edu.Module.Advertising.csproj

+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Edu.Model\Edu.Model.csproj" />
+    <ProjectReference Include="..\Edu.Repository\Edu.Repository.csproj" />
+  </ItemGroup>
+
+</Project>

Edu.Repository/Advertising/Rb_AdvertisingRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Edu.Model.Entity.Advertising;
+using Edu.Model.ViewModel.Advertising;
+
+namespace Edu.Repository.Advertising
+{
+    /// <summary>
+    /// 广告仓储层
+    /// </summary>
+    public class Rb_AdvertisingRepository : BaseRepository<Rb_Advertising>
+    {
+        /// <summary>
+        /// 广告列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="lineId"></param>
+        /// <param name="seriesId"></param>
+        /// <param name="countryId"></param>
+        /// <param name="advName"></param>
+        /// <param name="IsFee"></param>
+        /// <param name="RB_Group_id"></param>
+        /// <returns></returns>
+        public List<Rb_Advertising_Extend> GetAdvertisingList(int pageIndex, int pageSize, out long count,   string advName, int IsFee, int RB_Group_id)
+        {
+            string where = $@" where 1=1 and A.{nameof(Rb_Advertising.Group_Id)}={RB_Group_id} and A.{nameof(Rb_Advertising.Status)}=0";
+           
+           
+            if (IsFee > 0)
+            {
+                where += $@" and A.{nameof(Rb_Advertising.IsFee)}={IsFee}";
+            }
+            if (!string.IsNullOrWhiteSpace(advName))
+            {
+                where += $@" and A.{nameof(Rb_Advertising.Title)} like '%{advName}%'";
+            }
+            string sql = $@"select *,(SELECT count(*) from Rb_Advertising_Make where `Status`=0 and AdvertisingID=A.ID) as AdvertisingCount from {nameof(Rb_Advertising)}  AS A {where} order by A.{nameof(Rb_Advertising.CreateDate)} desc";
+            return GetPage<Rb_Advertising_Extend>(pageIndex, pageSize, out count, sql).ToList();
+        }
+
+        /// <summary>
+        /// 根据where 查询列表
+        /// </summary>
+        /// <param name="lineId"></param>
+        /// <param name="seriesId"></param>
+        /// <param name="countryId"></param>
+        /// <param name="advName"></param>
+        /// <param name="RB_Group_id"></param>
+        /// <returns></returns>
+        public List<Rb_Advertising_Extend> GetAdvertsingListForComboBox( string advName, int RB_Group_id)
+        {
+            string where = $@" where 1=1 and {nameof(Rb_Advertising.Group_Id)}={RB_Group_id} and {nameof(Rb_Advertising.Status)}=0";
+          
+            if (!string.IsNullOrWhiteSpace(advName))
+            {
+                where += $@" and {nameof(Rb_Advertising.Title)} like '%{advName}%'";
+            }
+            return Get<Rb_Advertising_Extend>($@"select * from {nameof(Rb_Advertising)} {where} order by {nameof(Rb_Advertising.CreateDate)} desc").ToList();
+        }
+    }
+}

Edu.Repository/Advertising/Rb_Advertising_MakeRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Edu.Model.Entity.Advertising;
+using Edu.Model.ViewModel.Advertising;
+
+namespace Edu.Repository.Advertising
+{
+    public class Rb_Advertising_MakeRepository : BaseRepository<Rb_Advertising_Make>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(Rb_Advertising_Make); } }
+
+
+        /// <summary>
+        /// 获取创建的广告信息
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="model"></param>
+        /// <param name="count"></param>
+        /// <returns></returns>
+        public List<Rb_Advertising_Make_Extend> GetPage(int pageIndex, int pageSize, Rb_Advertising_Make_Extend model, out long count)
+        {
+
+            string where = $@" where 1=1 and {nameof(Rb_Advertising_Make.Status)}={(int)Common.Enum.DateStateEnum.Normal}";
+
+            if (model.School_Id > 0)
+            {
+                where += $@" and {nameof(Rb_Advertising_Make.School_Id)}={model.School_Id}";
+            }
+            if (model.Group_Id > 0)
+            {
+
+                where += $@" and {nameof(Rb_Advertising_Make.Group_Id)}={model.Group_Id}";
+            }
+            if (model.UpdateBy > 0)
+            {
+
+                where += $@" and {nameof(Rb_Advertising_Make.UpdateBy)}={model.UpdateBy}";
+            }
+
+            string sql = $@"  select * from {TableName} {where} ";
+            return GetPage<Rb_Advertising_Make_Extend>(pageIndex, pageSize, out count, sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取广告信息
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public List<Rb_Advertising_Make_Extend> Get(Rb_Advertising_Make_Extend model)
+        {
+            string where = $@" where 1=1 and A.{nameof(Rb_Advertising_Make.Status)}={(int)Common.Enum.DateStateEnum.Normal}";
+
+            if (model.School_Id > 0)
+            {
+
+                where += $@" and {nameof(Rb_Advertising_Make.School_Id)}={model.School_Id}";
+            }
+            if (model.Group_Id > 0)
+            {
+
+                where += $@" and {nameof(Rb_Advertising_Make.Group_Id)}={model.Group_Id}";
+            }
+            if (model.UpdateBy > 0)
+            {
+                where += $@" and A.{nameof(Rb_Advertising_Make.UpdateBy)}={model.UpdateBy}";
+            }
+            if (model.ID > 0)
+            {
+                where += $@" and A.{nameof(Rb_Advertising_Make.ID)}={model.ID}";
+            }
+            string sql = $@" SELECT A.*,B.Title,b.PictureUrl,b.SamplePicturesUrl,b.ChargeAmount,b.IsFee from {TableName}  AS A LEFT JOIN rb_advertising as B
+ ON A.AdvertisingID = B.ID {where}";
+            return Get<Rb_Advertising_Make_Extend>(sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取广告信息
+        /// </summary>
+        /// <param name="ids">广告id</param>
+        /// <returns></returns>
+        public List<Rb_Advertising_Make_Extend> GetListByIds(List<int> ids)
+        {
+            List<Rb_Advertising_Make_Extend> sellAdvertisingList = new List<Rb_Advertising_Make_Extend>();
+            if (ids.Count > 0)
+            {
+                string sql = $@" SELECT * from Rb_Advertising_Make a where a.ID in ({string.Join(",", ids)}) and a.`Status` = 0";
+                sellAdvertisingList = Get<Rb_Advertising_Make_Extend>(sql).ToList();
+            }
+            return sellAdvertisingList;
+        }
+
+    }
+}

Edu.WebApi/Edu.WebApi.csproj

@@ -37,6 +37,7 @@
     <ProjectReference Include="..\Edu.Cache\Edu.Cache.csproj" />
     <ProjectReference Include="..\Edu.Common\Edu.Common.csproj" />
     <ProjectReference Include="..\Edu.Model\Edu.Model.csproj" />
+    <ProjectReference Include="..\Edu.Module.Advertising\Edu.Module.Advertising.csproj" />
     <ProjectReference Include="..\Edu.Module.Course\Edu.Module.Course.csproj" />
     <ProjectReference Include="..\Edu.Module.Duty\Edu.Module.Duty.csproj" />
     <ProjectReference Include="..\Edu.Module.Finance\Edu.Module.Finance.csproj" />