JSU_Pissa_MVC.git

parent: a1faebd7 | 补丁 | 提交 | ignore whitespace

优化备份20221201FX

leo

2022-12-01 824768b0ee2f33bd27225eceb841750ef9fc3a44

优化备份20221201FX

5个文件已修改

	GasolineBlend.BLL/PatentSearchBLL.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	GasolineBlend.Entity/PatentSearchCount.cs	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	GasolineBlend/Controllers/PatentSearchController.cs	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	GasolineBlend/Controllers/SysController.cs	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	GasolineBlend/Pages/index.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 GasolineBlend.BLL/PatentSearchBLL.cs

@@ -144,7 +144,7 @@
        public JavaMsgData GetPatentCountResult(PatentSearchCount patentSearchCount)
        {
            string URL = Configs.GetValue("JavaSiteUrl");
            string Content = JsonHelper.ToJson(patentSearchCount);
            string Content =  JsonHelper.ToJson(patentSearchCount);
            string GetSarchUrl = $"{URL}/jeecg-boot/dianzhi/patent/statisticsList";
            string Result = SendRequest(GetSarchUrl, Content, Encoding.UTF8);
            JavaMsgData javaMsgData = JsonHelper.ToObject<JavaMsgData>(Result);

 GasolineBlend.Entity/PatentSearchCount.cs

@@ -9,10 +9,14 @@
{
    public class PatentSearchCount
    {
       
        public ConditionAnd conditionAnd { get; set; }
        [SugarColumn(IsJson = true)]
        public List<ConditionAnd> conditionAnd { get; set; }

        public ConditionFilter conditionFilter { get; set; }
        [SugarColumn(IsJson = true)]
        public List<ConditionFilter> conditionFilter { get; set; }

        [SugarColumn(IsJson = true)]
        public List<SortFields> sortFields { get; set; }

        public int pageNo { get; set; }


 GasolineBlend/Controllers/PatentSearchController.cs

@@ -147,6 +147,7 @@
        /// </summary>
        /// <param name="patentSearchCount"></param>
        /// <returns></returns>
        [HttpPost]
        public ActionResult GetPatentListCount(PatentSearchCount patentSearchCount)
        {
            try
@@ -172,7 +173,7 @@
            try
            {
                var list = _acc.GetSpePatentTypeList();
                return !list.success ? Error("获取特色专利分类列表失败！" + list.message) : SuccessNoShow(data: list.result);
                return !list.success ? ErrorNoShow("获取特色专利分类列表失败！" + list.message) : SuccessNoShow(data: list.result);
            }
            catch (Exception e)
            {

 GasolineBlend/Controllers/SysController.cs

@@ -1,11 +1,13 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using System.Web.Mvc;
using CommonHelper;
using CommonHelper.Format;
using GasolineBlend.Entity;
using LinqToExcel.Extensions;
using Pissa.Service.DbService;
using Quartz.Util;
using SqlSugar;
@@ -29,6 +31,20 @@
        }

        /// <summary>
        /// 获取主要国家信息
        /// </summary>
        /// <returns></returns>
        [HttpPost]
        public ActionResult GetCountryMain()
        {
            List<string> listNameCH = new List<string>();
            string[] strNameCh = {"中国", "美国", "日本", "韩国", "德国","法国","意大利", "瑞典", "芬兰", "挪威", "英国", "瑞士", "俄罗斯", "印度", "巴西" };
            listNameCH = strNameCh.ToList();
            var res = _countryService.GetListAsync(a=>listNameCH.Contains(a.NameCh), a => a.Sort, OrderByType.Asc, false).Result;
            return SuccessNoShow(data: res);
        }

        /// <summary>
        /// 获取字典信息
        /// </summary>
        /// <param name="dictCode"></param>

 GasolineBlend/Pages/index.html

@@ -1 +1 @@
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/Pages/favicon.ico"><title>探数狗 | 您身边的全球专利服务专家</title><script defer="defer" type="module" src="/Pages/js/chunk-vendors.7f04112a.js"></script><script defer="defer" type="module" src="/Pages/js/app.e95898c1.js"></script><link href="/Pages/css/app.df37c3ce.css" rel="stylesheet"><script defer="defer" src="/Pages/js/chunk-vendors-legacy.fd689395.js" nomodule></script><script defer="defer" src="/Pages/js/app-legacy.01e662ff.js" nomodule></script></head><body><noscript><strong>We're sorry but dianzhi doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/Pages/favicon.ico"><title>探数狗 | 您身边的全球专利服务专家</title><script defer="defer" type="module" src="/Pages/js/chunk-vendors.49dc088a.js"></script><script defer="defer" type="module" src="/Pages/js/app.4d64bf57.js"></script><link href="/Pages/css/app.1f4ce606.css" rel="stylesheet"><script defer="defer" src="/Pages/js/chunk-vendors-legacy.f1bf8091.js" nomodule></script><script defer="defer" src="/Pages/js/app-legacy.a1c909f0.js" nomodule></script></head><body><noscript><strong>We're sorry but dianzhi doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

			@@ -144,7 +144,7 @@
			public JavaMsgData GetPatentCountResult(PatentSearchCount patentSearchCount)
			{
			string URL = Configs.GetValue("JavaSiteUrl");
			string Content = JsonHelper.ToJson(patentSearchCount);
			string Content = JsonHelper.ToJson(patentSearchCount);
			string GetSarchUrl = $"{URL}/jeecg-boot/dianzhi/patent/statisticsList";
			string Result = SendRequest(GetSarchUrl, Content, Encoding.UTF8);
			JavaMsgData javaMsgData = JsonHelper.ToObject<JavaMsgData>(Result);

			@@ -9,10 +9,14 @@
			{
			public class PatentSearchCount
			{

			public ConditionAnd conditionAnd { get; set; }
			[SugarColumn(IsJson = true)]
			public List<ConditionAnd> conditionAnd { get; set; }

			public ConditionFilter conditionFilter { get; set; }
			[SugarColumn(IsJson = true)]
			public List<ConditionFilter> conditionFilter { get; set; }

			[SugarColumn(IsJson = true)]
			public List<SortFields> sortFields { get; set; }

			public int pageNo { get; set; }

			@@ -147,6 +147,7 @@
			/// </summary>
			/// <param name="patentSearchCount"></param>
			/// <returns></returns>
			[HttpPost]
			public ActionResult GetPatentListCount(PatentSearchCount patentSearchCount)
			{
			try
			@@ -172,7 +173,7 @@
			try
			{
			var list = _acc.GetSpePatentTypeList();
			return !list.success ? Error("获取特色专利分类列表失败！" + list.message) : SuccessNoShow(data: list.result);
			return !list.success ? ErrorNoShow("获取特色专利分类列表失败！" + list.message) : SuccessNoShow(data: list.result);
			}
			catch (Exception e)
			{

			@@ -1,11 +1,13 @@
			using System;
			using System.Collections.Generic;
			using System.IO;
			using System.Linq;
			using System.Threading.Tasks;
			using System.Web.Mvc;
			using CommonHelper;
			using CommonHelper.Format;
			using GasolineBlend.Entity;
			using LinqToExcel.Extensions;
			using Pissa.Service.DbService;
			using Quartz.Util;
			using SqlSugar;
			@@ -29,6 +31,20 @@
			}

			/// <summary>
			/// 获取主要国家信息
			/// </summary>
			/// <returns></returns>
			[HttpPost]
			public ActionResult GetCountryMain()
			{
			List<string> listNameCH = new List<string>();
			string[] strNameCh = {"中国", "美国", "日本", "韩国", "德国","法国","意大利", "瑞典", "芬兰", "挪威", "英国", "瑞士", "俄罗斯", "印度", "巴西" };
			listNameCH = strNameCh.ToList();
			var res = _countryService.GetListAsync(a=>listNameCH.Contains(a.NameCh), a => a.Sort, OrderByType.Asc, false).Result;
			return SuccessNoShow(data: res);
			}

			/// <summary>
			/// 获取字典信息
			/// </summary>
			/// <param name="dictCode"></param>

			@@ -1 +1 @@
			<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/Pages/favicon.ico"><title>探数狗 \| 您身边的全球专利服务专家</title><script defer="defer" type="module" src="/Pages/js/chunk-vendors.7f04112a.js"></script><script defer="defer" type="module" src="/Pages/js/app.e95898c1.js"></script><link href="/Pages/css/app.df37c3ce.css" rel="stylesheet"><script defer="defer" src="/Pages/js/chunk-vendors-legacy.fd689395.js" nomodule></script><script defer="defer" src="/Pages/js/app-legacy.01e662ff.js" nomodule></script></head><body><noscript><strong>We're sorry but dianzhi doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
			<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/Pages/favicon.ico"><title>探数狗 \| 您身边的全球专利服务专家</title><script defer="defer" type="module" src="/Pages/js/chunk-vendors.49dc088a.js"></script><script defer="defer" type="module" src="/Pages/js/app.4d64bf57.js"></script><link href="/Pages/css/app.1f4ce606.css" rel="stylesheet"><script defer="defer" src="/Pages/js/chunk-vendors-legacy.f1bf8091.js" nomodule></script><script defer="defer" src="/Pages/js/app-legacy.a1c909f0.js" nomodule></script></head><body><noscript><strong>We're sorry but dianzhi doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>