leo
2022-11-25 a1faebd7b0fda01ff63c8dc01c3c2914093c8f07
特色专利分类列表20221125FX
5个文件已修改
188 ■■■■ 已修改文件
GasolineBlend.BLL/PatentSearchBLL.cs 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
GasolineBlend/Controllers/PatentSearchController.cs 112 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
GasolineBlend/Controllers/SysController.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Pissa.Service/Pissa.Service.csproj 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Pissa.Service/packages.config 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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;
@@ -170,5 +151,36 @@
            //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/Controllers/PatentSearchController.cs
@@ -18,6 +18,15 @@
        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, List<SortFields> sortFields, string keyWordField="", int pageNo=1,int pageSize=10)
@@ -49,6 +58,12 @@
            }
        }
        /// <summary>
        /// 智能/高级搜索
        /// </summary>
        /// <param name="patentSearchAdvance"></param>
        /// <returns></returns>
        [LoginChecked()]
        [HttpPost]
        public ActionResult GetPatentListbyAdvance(PatentSearchAdvance patentSearchAdvance)
@@ -74,6 +89,11 @@
            }
        }
        /// <summary>
        /// 获取专利详情
        /// </summary>
        /// <param name="id"></param>
        /// <returns></returns>
        [LoginChecked()]
        [HttpGet]
        public ActionResult GetPatentListbyId(string id)
@@ -92,26 +112,15 @@
            }
        }
        [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();
            }
        }
        /// <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 GetPatentListbyPatch(string content,string keywordField,List<SortFields> sortFields, int pageNo = 1, int pageSize = 10)
        {
@@ -133,6 +142,11 @@
            }
        }
        /// <summary>
        /// 获取专利列表相关数据
        /// </summary>
        /// <param name="patentSearchCount"></param>
        /// <returns></returns>
        public ActionResult GetPatentListCount(PatentSearchCount patentSearchCount)
        {
            try
@@ -147,9 +161,36 @@
            }
        }
        /// <summary>
        /// 获取特色专利分类列表
        /// </summary>
        /// <returns></returns>
        [LoginChecked(false)]
        [HttpGet]
        public ActionResult GetSpePatentTypeList()
        {
            try
            {
                var list = _acc.GetSpePatentTypeList();
                return !list.success ? Error("获取特色专利分类列表失败!" + 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
@@ -174,7 +215,7 @@
        }
        /// <summary>
        /// 查询搜索记录
        /// 查询搜索记录(待完善)
        /// </summary>
        /// <param name="pageNo"></param>
        /// <param name="pageSize"></param>
@@ -188,5 +229,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
@@ -112,7 +112,7 @@
        [HttpPost]
        public ActionResult AddCarouselImg(string imgName, int sort = 0, bool isDisplay = true)
        {
            LogHelper.Error("文件名Test:"+imgName);
            //LogHelper.Error("文件名Test:"+imgName);
            if (HttpContext.Request.Files.Count == 0)
                return Error("上传文件的数量是0");
            var file = Request.Files[0];
@@ -205,7 +205,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
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>