Merge branch 'master' of http://47.92.245.94:8000/r/JSU_Pissa_MVC

wx

2022-12-16 166c797e454ac1985f101b5b0b1f94a1b4574a8b

Merge branch 'master' of http://47.92.245.94:8000/r/JSU_Pissa_MVC

 GasolineBlend.BLL/PatentSearchBLL.cs

@@ -89,7 +89,7 @@
        }

        /// <summary>
        /// 高级搜索
        /// 智能/高级搜索
        /// </summary>
        /// <param name="patentSearchAll"></param>
        /// <returns></returns>
@@ -105,7 +105,7 @@
        }

        /// <summary>
        /// 详细搜索
        /// 获取专利详情
        /// </summary>
        /// <param name="patentSearchAll"></param>
        /// <returns></returns>
@@ -115,25 +115,6 @@
            //string Content = JsonHelper.ToJson(patentSearchDetail);
            string GetSarchUrl = $"{URL}/jeecg-boot/dianzhi/patent/queryById?id="+patentSearchDetail.id;
            string Result = SendRequest(GetSarchUrl, Encoding.UTF8);
            JavaMsgData javaMsgData = JsonHelper.ToObject<JavaMsgData>(Result);
            //return (JObject)JsonConvert.DeserializeObject(Result);
            return javaMsgData;
        }

        /// <summary>
        /// 法律搜索(暂时不用)
        /// </summary>
        /// <param name="patentSearchAll"></param>
        /// <returns></returns>
        public JavaMsgData GetLawSearchResult(PatentSearchAll patentSearchAll)
        {
            string URL = Configs.GetValue("JavaSiteUrl");
            //针对lawStatus转换--待优化
            patentSearchAll.lawStatus = patentSearchAll.lawStatus.Replace("审查中", "pending")
                .Replace("有效", "active,granted").Replace("失效", "expired,ceased,abandoned");
            string Content = JsonHelper.ToJson(patentSearchAll);
            string GetSarchUrl = $"{URL}/jeecg-boot/dianzhi/legalStatus/patentPageByLaw";
            string Result = SendRequest(GetSarchUrl, Content, Encoding.UTF8);
            JavaMsgData javaMsgData = JsonHelper.ToObject<JavaMsgData>(Result);
            //return (JObject)JsonConvert.DeserializeObject(Result);
            return javaMsgData;
@@ -163,12 +144,43 @@
        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);
            //return (JObject)JsonConvert.DeserializeObject(Result);
            return javaMsgData;
        }

        /// <summary>
        /// 获取特色专利分类列表
        /// </summary>
        /// <returns></returns>
        public JavaMsgData GetSpePatentTypeList()
        {
            string URL = Configs.GetValue("JavaSiteUrl");
            string GetSarchUrl = $"{URL}/jeecg-boot/dianzhi/patent/getSpecialKind";
            string Result = SendRequest(GetSarchUrl, Encoding.UTF8);
            JavaMsgData javaMsgData = JsonHelper.ToObject<JavaMsgData>(Result);
            return javaMsgData;
        }

        /// <summary>
        /// 法律搜索(暂时不用)
        /// </summary>
        /// <param name="patentSearchAll"></param>
        /// <returns></returns>
        public JavaMsgData GetLawSearchResult(PatentSearchAll patentSearchAll)
        {
            string URL = Configs.GetValue("JavaSiteUrl");
            //针对lawStatus转换--待优化
            patentSearchAll.lawStatus = patentSearchAll.lawStatus.Replace("审查中", "pending")
                .Replace("有效", "active,granted").Replace("失效", "expired,ceased,abandoned");
            string Content = JsonHelper.ToJson(patentSearchAll);
            string GetSarchUrl = $"{URL}/jeecg-boot/dianzhi/legalStatus/patentPageByLaw";
            string Result = SendRequest(GetSarchUrl, Content, Encoding.UTF8);
            JavaMsgData javaMsgData = JsonHelper.ToObject<JavaMsgData>(Result);
            return javaMsgData;
        }
    }
}

 GasolineBlend.Entity/PatentSearchAdvance.cs

@@ -3,17 +3,21 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using SqlSugar;

namespace GasolineBlend.Entity
{

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

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

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

        public int pageNo { get; set; }


 GasolineBlend.Entity/PatentSearchAll.cs

@@ -3,6 +3,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using SqlSugar;

namespace GasolineBlend.Entity
{
@@ -20,7 +21,10 @@

        public int pageSize { get; set; }

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


    }

   public class PatentSearchDetail

 GasolineBlend.Entity/PatentSearchCount.cs

@@ -3,14 +3,20 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using SqlSugar;

namespace GasolineBlend.Entity
{
    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; }

@@ -35,18 +41,19 @@

    public class ConditionFilter
    {
        public string countryCode { get; set; }
        public string countryCode { get; set; } = "";

        public string countryText { get; set; }
        public string countryText { get; set; } = "";

        public string kindText { get; set; }
        public string kindText { get; set; } = "";
    }

     //[SugarColumn(IsJson = true)]
    public class SortFields
    {
        public string direction { get; set; }
        public string direction { get; set; } = "desc";

        public string field { get; set; }
        public string field { get; set; } = "_score";

    }
}

 GasolineBlend/CarouselImg/03abe287-31e3-47c0-9c8d-8e036bde238a.png

 GasolineBlend/CarouselImg/11f1d8d9-35ee-466b-957b-d1f7cff0fbd5.png

 GasolineBlend/Controllers/PatentSearchController.cs

@@ -18,15 +18,25 @@
        private PatentSearchBLL _acc = new PatentSearchBLL();
        private SysService _sysService = new SysService();

        /// <summary>
        /// 简单搜索
        /// </summary>
        /// <param name="keyWord"></param>
        /// <param name="sortFields"></param>
        /// <param name="keyWordField"></param>
        /// <param name="pageNo"></param>
        /// <param name="pageSize"></param>
        /// <returns></returns>
        [LoginChecked()]
        [HttpPost]
        public ActionResult GetPatentList(string keyWord, string keyWordField="", int pageNo=1,int pageSize=10)
        public ActionResult GetPatentList(string keyWord, List<SortFields> sortFields, string keyWordField="", int pageNo=1,int pageSize=10)
        {
            try
            {
                PatentSearchAll patentSearchAll = new PatentSearchAll();
                patentSearchAll.keyword = keyWord;
                patentSearchAll.keywordField = keyWordField;
                patentSearchAll.sortFields = sortFields;
                patentSearchAll.pageNo = pageNo;
                patentSearchAll.pageSize = pageSize;
                var list = _acc.GetPatentSearchResult(patentSearchAll);
@@ -48,6 +58,12 @@
            }
        }

        /// <summary>
        /// 智能/高级搜索
        /// </summary>
        /// <param name="patentSearchAdvance"></param>
        /// <returns></returns>

        [LoginChecked()]
        [HttpPost]
        public ActionResult GetPatentListbyAdvance(PatentSearchAdvance patentSearchAdvance)
@@ -60,7 +76,7 @@
                    var log = new SysPatentSearchLog();
                    log.UserId = OperatorProvider.Instance.Current.UserId;
                    log.Keyword = "";
                    log.KeywordField = patentSearchAdvance.ToJson();
                    log.KeywordField = "";//待优化patentSearchAdvance.ToJson();
                    log.SearchType = "高级搜索";
                    _sysService.AddPatentSearchLog(log);
                }
@@ -73,6 +89,11 @@
            }
        }

        /// <summary>
        /// 获取专利详情
        /// </summary>
        /// <param name="id"></param>
        /// <returns></returns>
        [LoginChecked()]
        [HttpGet]
        public ActionResult GetPatentListbyId(string id)
@@ -91,34 +112,24 @@
            }
        }

        /// <summary>
        /// 批量搜索
        /// </summary>
        /// <param name="content"></param>
        /// <param name="keywordField"></param>
        /// <param name="sortFields"></param>
        /// <param name="pageNo"></param>
        /// <param name="pageSize"></param>
        /// <returns></returns>
        [HttpPost]
        public ActionResult GetPatentListbyLaw(string lawStatus, int pageNo = 1, int pageSize = 10)
        {
            try
            {
                PatentSearchAll patentSearchAll = new PatentSearchAll();
                patentSearchAll.lawStatus= lawStatus;
                patentSearchAll.keywordField = "";
                patentSearchAll.pageNo = pageNo;
                patentSearchAll.pageSize = pageSize;
                var list = _acc.GetLawSearchResult(patentSearchAll);
                return !list.success ? Error("获取法律搜索专利列表失败！" + list.message) : SuccessNoShow(data: list.result);
            }
            catch (Exception e)
            {
                LogHelper.Write(Level.Error, "获取法律搜索专利列表失败 GetPatentListbyLaw", e, OperatorProvider.Instance.Current.LoginName);
                return Error();
            }
        }

        [HttpPost]
        public ActionResult GetPatentListbyPatch(string content,string keywordField, int pageNo = 1, int pageSize = 10)
        public ActionResult GetPatentListbyPatch(string content,string keywordField,List<SortFields> sortFields, int pageNo = 1, int pageSize = 10)
        {
            try
            {
                PatentSearchAll patentSearchAll = new PatentSearchAll();
                patentSearchAll.content=content;
                patentSearchAll.keywordField = keywordField;
                patentSearchAll.sortFields = sortFields;
                patentSearchAll.pageNo = pageNo;
                patentSearchAll.pageSize = pageSize;
                var list = _acc.GetPatchSearchResult(patentSearchAll);
@@ -131,6 +142,12 @@
            }
        }

        /// <summary>
        /// 获取专利列表相关数据
        /// </summary>
        /// <param name="patentSearchCount"></param>
        /// <returns></returns>
        [HttpPost]
        public ActionResult GetPatentListCount(PatentSearchCount patentSearchCount)
        {
            try
@@ -145,9 +162,36 @@
            }
        }

        /// <summary>
        /// 获取特色专利分类列表
        /// </summary>
        /// <returns></returns>
        [LoginChecked(false)]
        [HttpGet]
        public ActionResult GetSpePatentTypeList()
        {
            try
            {
                var list = _acc.GetSpePatentTypeList();
                return !list.success ? ErrorNoShow("获取特色专利分类列表失败！" + list.message) : SuccessNoShow(data: list.result);
            }
            catch (Exception e)
            {
                LogHelper.Write(Level.Error, "获取特色专利分类列表失败 GetSpePatentTypeList", e, OperatorProvider.Instance.Current.LoginName);
                return Error();
            }
        }

        /// <summary>
        /// 专利下载(待完善)
        /// </summary>
        /// <param name="keyWord"></param>
        /// <param name="keyWordField"></param>
        /// <param name="startNo"></param>
        /// <param name="endNo"></param>
        /// <returns></returns>
        [LoginChecked()]
        [HttpPost]
        //待完善
        public ActionResult GetPatentDownload(string keyWord, string keyWordField = "", int startNo = 1, int endNo = 10)
        {
            try
@@ -172,7 +216,7 @@
        }

        /// <summary>
        /// 查询搜索记录
        /// 查询搜索记录(待完善)
        /// </summary>
        /// <param name="pageNo"></param>
        /// <param name="pageSize"></param>
@@ -186,5 +230,32 @@
            var page = _sysService.GetPatentSearchLog(userId, pageNo, pageSize,searchType);
            return Success(data: page);
        }

        /// <summary>
        /// 法律搜索(暂时不用)
        /// </summary>
        /// <param name="lawStatus"></param>
        /// <param name="pageNo"></param>
        /// <param name="pageSize"></param>
        /// <returns></returns>
        [HttpPost]
        public ActionResult GetPatentListbyLaw(string lawStatus, int pageNo = 1, int pageSize = 10)
        {
            try
            {
                PatentSearchAll patentSearchAll = new PatentSearchAll();
                patentSearchAll.lawStatus = lawStatus;
                patentSearchAll.keywordField = "";
                patentSearchAll.pageNo = pageNo;
                patentSearchAll.pageSize = pageSize;
                var list = _acc.GetLawSearchResult(patentSearchAll);
                return !list.success ? Error("获取法律搜索专利列表失败！" + list.message) : SuccessNoShow(data: list.result);
            }
            catch (Exception e)
            {
                LogHelper.Write(Level.Error, "获取法律搜索专利列表失败 GetPatentListbyLaw", e, OperatorProvider.Instance.Current.LoginName);
                return Error();
            }
        }
    }
}

 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;
@@ -26,6 +28,20 @@
        {
            var res = _countryService.GetListAsync(null, a => a.Sort, OrderByType.Asc, false).Result;
            return SuccessNoShow(data:res);
        }

        /// <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>
@@ -99,7 +115,7 @@
                .WhereIF(isDisplay != null, a => a.IsDisplay == isDisplay)
                .OrderBy(a => a.Sort)
                .ToList();
            return Success(data: res);
            return SuccessNoShow(data: res);
        }

        /// <summary>
@@ -112,9 +128,12 @@
        [HttpPost]
        public ActionResult AddCarouselImg(string imgName, int sort = 0, bool isDisplay = true)
        {
            var file = Request.Files["img"];
            //LogHelper.Error("文件名Test："+imgName);
            if (HttpContext.Request.Files.Count == 0)
                return Error("上传文件的数量是0");
            var file = Request.Files[0];
            if (file == null)
                return Error("请上传文件");
                return Error("请上传图像文件");
            if (imgName.IsNullOrWhiteSpace())
                imgName = file.FileName;
            if (!Directory.Exists(Server.MapPath("/CarouselImg")))
@@ -214,7 +233,7 @@
        public async Task<ActionResult> GetHotWordList()
        {
            var res = await _hotWordService.GetListAsync(null, a => a.Sort, OrderByType.Asc);
            return Success(data:res);
            return SuccessNoShow(data:res);
        }

        #endregion

 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.5f448aee.js"></script><script defer="defer" type="module" src="/Pages/js/app.e4ea72db.js"></script><link href="/Pages/css/app.d0dc7aa7.css" rel="stylesheet"><script defer="defer" src="/Pages/js/chunk-vendors-legacy.dfe1550d.js" nomodule></script><script defer="defer" src="/Pages/js/app-legacy.12badc4e.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>

 GasolineBlend/Pages/legacy-assets-index.html.json

File was deleted

 Pissa.Service/Pissa.Service.csproj

@@ -58,11 +58,11 @@
    <Reference Include="Aliyun.Credentials, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\Aliyun.Credentials.1.3.1\lib\net45\Aliyun.Credentials.dll</HintPath>
    </Reference>
    <Reference Include="Flurl, Version=3.0.5.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\Flurl.3.0.5\lib\net461\Flurl.dll</HintPath>
    <Reference Include="Flurl, Version=2.8.2.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\Flurl.2.8.2\lib\net40\Flurl.dll</HintPath>
    </Reference>
    <Reference Include="Flurl.Http, Version=3.2.3.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\Flurl.Http.3.2.3\lib\net461\Flurl.Http.dll</HintPath>
    <Reference Include="Flurl.Http, Version=2.4.2.0, Culture=neutral, processorArchitecture=MSIL">
      <HintPath>..\packages\Flurl.Http.2.4.2\lib\net46\Flurl.Http.dll</HintPath>
    </Reference>
    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -83,8 +83,8 @@
    </Reference>
    <Reference Include="System.Net.Http.WebRequest" />
    <Reference Include="System.Security" />
    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
    <Reference Include="System.ValueTuple, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
    </Reference>
    <Reference Include="System.Web" />
    <Reference Include="System.Xml.Linq" />

 Pissa.Service/packages.config

@@ -9,13 +9,13 @@
  <package id="AlibabaCloud.SDK.Dysmsapi20170525" version="2.0.9" targetFramework="net461" />
  <package id="AlibabaCloud.TeaUtil" version="0.1.12" targetFramework="net461" />
  <package id="Aliyun.Credentials" version="1.3.1" targetFramework="net461" />
  <package id="Flurl" version="3.0.5" targetFramework="net461" />
  <package id="Flurl.Http" version="3.2.3" targetFramework="net461" />
  <package id="Flurl" version="2.8.2" targetFramework="net461" />
  <package id="Flurl.Http" version="2.4.2" targetFramework="net461" />
  <package id="Microsoft.Bcl" version="1.1.10" targetFramework="net461" />
  <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net461" />
  <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net461" />
  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net461" />
  <package id="SqlSugar" version="5.0.7.7" targetFramework="net461" />
  <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
  <package id="System.ValueTuple" version="4.3.1" targetFramework="net461" />
  <package id="Tea" version="1.0.11" targetFramework="net461" />
</packages>