用户常用工具配置的优化20230517FX

leo

2023-05-17 08c34bb32b3171cf6ec97d006c4d879f98167e3e

用户常用工具配置的优化20230517FX

 .vs/RiskControlRR/v15/Server/sqlite3/storage.ide

Binary files differ

 GasolineBlend.BLL/GasolineBlend.BLL.csproj

@@ -284,6 +284,7 @@
    <Compile Include="SubjectGroupExBLL.cs" />
    <Compile Include="CrawlerMonitorBLL.cs" />
    <Compile Include="SysAccountMenuBLL.cs" />
    <Compile Include="SysAccountNewsBLL.cs" />
    <Compile Include="SysBusinessPlanBLL.cs" />
    <Compile Include="TushareNewsBLL.cs" />
    <Compile Include="TushareReportBLL.cs" />

 GasolineBlend.BLL/SysAccountMenuBLL.cs

@@ -13,6 +13,92 @@
        private SysAccountMenuDAL _acc = new SysAccountMenuDAL();

        /// <summary>
        /// 查询已选择的菜单信息(根据用户id)
        /// </summary>
        /// <returns></returns>
        public List<SysAccountMenu> GetSysAccountMenuList(int UserId)
        {
            var listAll = _acc.GetSysAccountMenuList(UserId);
            if (listAll != null &&listAll.Count>0)
            {
                for (int i = 0; i < listAll.Count; i++)
                {
                    listAll[i].IsSelected = true;
                }
            }
            //else //如果为空那么默认赋值4项
            //{
            //    var menuAll = _acc.GetSysAccountMenuList(0);
            //    for (int i = 0; i < menuAll.Count&&i<4; i++)
            //    {
            //        menuAll[i].IsSelected = true;
            //        listAll.Add(menuAll[i]);
            //    }
            //}

            return listAll;
        }

        /// <summary>
        /// 查询所有的菜单列表(根据用户id)
        /// </summary>
        /// <param name="UserId"></param>
        /// <returns></returns>
        public List<SysAccountMenuItemAll> GetSysAccountMenuListSel(int UserId)
        {
            List<SysAccountMenuItemAll> listSysAccountMenuItemAll=new List<SysAccountMenuItemAll>();
            string[] TopTitle = { "宏观数据", "行业数据", "公司数据", "特色数据", "智能风控" };
            var menuAll= _acc.GetSysAccountMenuList(0);
            var menuUser= _acc.GetSysAccountMenuList(UserId);
            for (int m = 0; m < TopTitle.Length; m++)
            {
                string[] Title = null;
                if (TopTitle[m].Contains("宏观数据"))
                {
                    Title=new string[]{"新闻大数据"};
                }
                else if (TopTitle[m].Contains("行业数据"))
                {
                    Title = new string[] { "半导体行业", "光伏行业" };
                }
                else if (TopTitle[m].Contains("公司数据"))
                {
                    Title = new string[] { "企业大数据", "融资大数据", "信用大数据" };
                }
                else if (TopTitle[m].Contains("特色数据"))
                {
                    Title = new string[] { "地区产业" };
                }
                else
                {
                    Title = new string[] { "风控工具", "风控应用" };
                }

                List<SysAccountMenuItem> listSysAccountMenuItems = new List<SysAccountMenuItem>();
                for (int i = 0; i < Title.Length; i++)
                {
                    SysAccountMenuItem sysAccountMenuItem = new SysAccountMenuItem();
                    sysAccountMenuItem.Title = Title[i];
                    sysAccountMenuItem.ListSysAccountMenus = menuAll.Where(a => a.TypeName == Title[i]).ToList();
                    for (int j = 0; j < sysAccountMenuItem.ListSysAccountMenus.Count; j++)
                    {
                        var result = menuUser
                            .FirstOrDefault(a => a.ToolName == sysAccountMenuItem.ListSysAccountMenus[j].ToolName);
                        sysAccountMenuItem.ListSysAccountMenus[j].IsSelected = result == null ? false : true;
                    }

                    listSysAccountMenuItems.Add(sysAccountMenuItem);
                }
                SysAccountMenuItemAll sysAccountMenuItemAll=new SysAccountMenuItemAll();
                sysAccountMenuItemAll.TopTitle = TopTitle[m];
                sysAccountMenuItemAll.ListsyAccountMenuItems = listSysAccountMenuItems;
                listSysAccountMenuItemAll.Add(sysAccountMenuItemAll);
            }

            return listSysAccountMenuItemAll;
        }

        /// <summary>
        /// 添加一条常用工具信息
        /// </summary>
        /// <param name="sysAccountMenu"></param>
@@ -23,12 +109,24 @@
        }

        /// <summary>
        /// 查询所有信息(根据用户id)
        /// 是否存在已添加项目
        /// </summary>
        /// <param name="sysAccountMenu"></param>
        /// <param name="ModifyFlag"></param>
        /// <returns></returns>
        public List<SysAccountMenu> GetSysAccountMenulist(int UserId)
        public bool ExistSysAccountMenu(SysAccountMenu sysAccountMenu, bool ModifyFlag)
        {
            return _acc.GetSysAccountMenulist(UserId);
            return _acc.ExistSysAccountMenu(sysAccountMenu, ModifyFlag);
        }

        /// <summary>
        /// 删除一条常用工具信息
        /// </summary>
        /// <param name="id"></param>
        /// <returns></returns>
        public bool DeleteSysAccountMenubyId(int id)
        {
            return _acc.DeleteSysAccountMenubyId(id);
        }
    }
}

 GasolineBlend.DAL/GasolineBlend.DAL.csproj

@@ -263,6 +263,7 @@
    <Compile Include="FinFileAffDAL.cs" />
    <Compile Include="SubjectGroupExDAL.cs" />
    <Compile Include="SysAccountMenuDAL.cs" />
    <Compile Include="SysAccountNewsDAL.cs" />
    <Compile Include="SysBusinessPlanDAL.cs" />
    <Compile Include="TushareNewsDAL.cs" />
    <Compile Include="TushareReportDAL.cs" />

 GasolineBlend.DAL/RRMonitorGroupDAL.cs

@@ -16,7 +16,7 @@

        public List<RRMonitorGroup> GetRRMonitorGroupListTop2(int UserId)
        {
            var sql = $"select top 2.* from RRMonitorGroup where CreateUserId={UserId} order by CreateTime desc";
            var sql = $"select top 3.* from RRMonitorGroup where CreateUserId={UserId} order by CreateTime desc";
            return Conn.Query<RRMonitorGroup>(sql).ToList();
        }


 GasolineBlend.DAL/SysAccountMenuDAL.cs

@@ -11,24 +11,50 @@
    public class SysAccountMenuDAL:BaseDAL
    {
        /// <summary>
        /// 查询所有信息(根据用户id)
        /// </summary>
        /// <returns></returns>
        public List<SysAccountMenu> GetSysAccountMenuList(int UserId)
        {
            var sql = $"SELECT * FROM sysAccountMenu WHERE UserId={UserId}";
            return Conn.Query<SysAccountMenu>(sql).ToList();
        }

        /// <summary>
        /// 添加一条常用工具信息
        /// </summary>
        /// <param name="sysAccountMenu"></param>
        /// <returns></returns>
        public int AddSysAccountMenu(SysAccountMenu sysAccountMenu)
        {
            string sql = "INSERT INTO sysAccountMenu VALUES (@UserId,@ToolName,default,default)";
            //var sql = $"insert into assessFile (FileName,FileType,FileRemark,CapitalId,FilePath,DebtId,GageId,WaterfallInnerId,DebtOutId,ProjPartId,SubjectId,UserId) Values(@FileName,@FileType,@FileRemark,@CapitalId,@FilePath,@DebtId,@GageId,@WaterfallInnerId,@DebtOutId,@ProjPartId,@SubjectId,@UserId);select @@IDENTITY;";
            string sql = "INSERT INTO sysAccountMenu (UserId,ToolName) VALUES (@UserId,@ToolName);select @@IDENTITY;";
            return Conn.ExecuteScalar<int>(sql, sysAccountMenu);
        }

        /// <summary>
        /// 查询所有信息(根据用户id)
        /// 是否存在已添加项目
        /// </summary>
        /// <param name="sysAccountMenu"></param>
        /// <param name="ModifyFlag"></param>
        /// <returns></returns>
        public List<SysAccountMenu> GetSysAccountMenulist(int UserId)
        public bool ExistSysAccountMenu(SysAccountMenu sysAccountMenu, bool ModifyFlag)
        {
            var sql = $"SELECT * FROM sysAccountMenu WHERE UserId={UserId}";
            return Conn.Query<SysAccountMenu>(sql).ToList();
            string strCompareSQL = (ModifyFlag == false ? "" : " and id<>@id");
            var sql = $"select * from sysAccountMenu where UserId=@UserId and ToolName=@ToolName" + strCompareSQL;
            return Conn.ExecuteScalar<int>(sql, sysAccountMenu) > 0;
        }

        /// <summary>
        /// 删除一条常用工具信息
        /// </summary>
        /// <param name="id"></param>
        /// <param name="UserId"></param>
        /// <returns></returns>
        public bool DeleteSysAccountMenubyId(int id)
        {
            var sql = $"delete from sysAccountMenu where id={id}";
            return Conn.Execute(sql) > 0;
        }
    }
}

 GasolineBlend.Entity/GasolineBlend.Entity.csproj

@@ -212,6 +212,7 @@
    <Compile Include="SubjectGroupEx.cs" />
    <Compile Include="EvaNatureCor.cs" />
    <Compile Include="SysAccountMenu.cs" />
    <Compile Include="SysAccountNews.cs" />
    <Compile Include="SysOwnerChangeEquity.cs" />
    <Compile Include="TrustNetworkInfo.cs" />
    <Compile Include="TushareBalanceSheet.cs" />

 GasolineBlend.Entity/SysAccountMenu.cs

@@ -13,5 +13,23 @@
        public string ToolName { get; set; }
        public DateTime CreateTime { get; set; }
        public int OrderNo { get; set; }

        public string TypeName { get; set; }

        public bool IsSelected { get; set; }
    }

    public class SysAccountMenuItem
    {
        public  string Title { get; set; }

        public List<SysAccountMenu> ListSysAccountMenus { get; set; }=new List<SysAccountMenu>();
    }

    public class SysAccountMenuItemAll
    {
        public string TopTitle { get; set; }

        public List<SysAccountMenuItem> ListsyAccountMenuItems { get; set; }=new List<SysAccountMenuItem>();
}
}

 GasolineBlend/Controllers/SysAccountMenuController.cs

@@ -14,6 +14,45 @@
        private SysAccountMenuBLL _acc = new SysAccountMenuBLL();

        /// <summary>
        /// 查询已选择的菜单信息(根据用户id)
        /// </summary>
        /// <returns></returns>
        [HttpPost]
        public ActionResult GetSysAccountMenuList(int UserId)
        {
            try
            {
                var list = _acc.GetSysAccountMenuList(UserId);
                return SuccessNoShow(data: list);
            }
            catch (Exception e)
            {
                LogHelper.Write(Level.Error, "查询所有信息(根据用户id) GetSysAccountMenulist", e, OperatorProvider.Instance.Current == null ? "GuestEx" : OperatorProvider.Instance.Current.LoginName);
                return Error();
            }
        }

        /// <summary>
        /// 查询所有的菜单列表(根据用户id)
        /// </summary>
        /// <param name="UserId"></param>
        /// <returns></returns>
        [HttpPost]
        public ActionResult GetSysAccountMenuListSel(int UserId)
        {
            try
            {
                var list = _acc.GetSysAccountMenuListSel(UserId);
                return SuccessNoShow(data: list);
            }
            catch (Exception e)
            {
                LogHelper.Write(Level.Error, "查询所有的菜单列表(根据用户id) GetSysAccountMenulistSel", e, OperatorProvider.Instance.Current == null ? "GuestEx" : OperatorProvider.Instance.Current.LoginName);
                return Error();
            }
        }

        /// <summary>
        /// 添加一条常用工具信息
        /// </summary>
        /// <param name="UserId"></param>
@@ -27,14 +66,14 @@
                SysAccountMenu sysAccountMenu = new SysAccountMenu();
                sysAccountMenu.UserId = UserId;
                sysAccountMenu.ToolName = ToolName;
                int res= _acc.AddSysAccountMenu(sysAccountMenu);
                if (UserId > 0)
                if (_acc.ExistSysAccountMenu(sysAccountMenu, false) == false)
                {
                    return Error(message: "添加成功！");
                    int res = _acc.AddSysAccountMenu(sysAccountMenu);
                    return res>0?Success(message: "添加成功！"):Error();
                }
                else
                {
                    return Error(message: "添加失败！");
                    return Error(message: "添加失败！已经存在重复项！");
                }
            }
            catch (Exception e)
@@ -46,23 +85,24 @@
        }

        /// <summary>
        /// 查询所有信息(根据用户id)
        /// 删除一条常用工具信息
        /// </summary>
        /// <param name="id"></param>
        /// <returns></returns>
        [HttpPost]
        public ActionResult GetSysAccountMenulist(int UserId)
        public ActionResult DeleteSysAccountMenubyId(int id)
        {
            try
            {
                var list = _acc.GetSysAccountMenulist(UserId);
                return SuccessNoShow(data: list);
                var rev = _acc.DeleteSysAccountMenubyId(id);
                return rev ? Success() : Error();
            }
            catch (Exception e)
            {

                LogHelper.Write(Level.Error, "查询所有信息(根据用户id) GetSysAccountMenulist", e, OperatorProvider.Instance.Current == null ? "GuestEx" : OperatorProvider.Instance.Current.LoginName);
                LogHelper.Write(Level.Error, "删除一条常用工具信息 DeleteSysAccountMenubyId", e, OperatorProvider.Instance.Current == null ? "GuestEx" : OperatorProvider.Instance.Current.LoginName);
                return Error();
            }
        }

    }
}

 GasolineBlend/Controllers/TianYanChaController.cs

@@ -483,7 +483,7 @@
            return result.IsSuccess ? SuccessNoShow(data: result.Data) : ErrorNoShow(result.Message);
        }
        /// <summary>
        /// 法律诉讼
        /// 法律诉讼详情
        /// </summary>
        /// <returns></returns>
        [HttpPost]
@@ -523,7 +523,7 @@
            return result.IsSuccess ? SuccessNoShow(data: result.Data) : ErrorNoShow(result.Message);
        }
        /// <summary>
        /// 历史司法协助
        /// 历史司法协助详情
        /// </summary>
        /// <returns></returns>
        [HttpPost]

 GasolineBlend/GasolineBlend.csproj

@@ -374,6 +374,7 @@
    <Compile Include="Controllers\SubjectGroupController.cs" />
    <Compile Include="Controllers\SubjectGroupExController.cs" />
    <Compile Include="Controllers\SysAccountMenuController.cs" />
    <Compile Include="Controllers\SysAccountNewsController.cs" />
    <Compile Include="Controllers\SysController.cs" />
    <Compile Include="Controllers\TianYanChaController.cs" />
    <Compile Include="Controllers\CrawlerMonitorController.cs" />

 RiskControl.NewService/Extension/Page.cs

@@ -24,6 +24,7 @@
        /// 数据集
        /// </summary>
        public List<T> Items { get; set; }

    }

}