From d26bfcea75f5bf7448657759d69162ef17a705e6 Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Sat, 07 Sep 2024 18:54:13 +0800
Subject: [PATCH] 下载、删除接口优化

---
 dyh-service/dyh-mediate/src/main/java/cn/huge/module/ai/controller/AiController.java |   14 ++++++--------
 dyh-service/dyh-mediate/src/main/resources/config/application-test.yml               |    2 +-
 dyh-service/dyh-mediate/src/main/assembly/assembly.xml                               |    6 ++++++
 dyh-service/dyh-mediate/pom.xml                                                      |    6 ++----
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/dyh-service/dyh-mediate/pom.xml b/dyh-service/dyh-mediate/pom.xml
index c5348e6..98cf495 100644
--- a/dyh-service/dyh-mediate/pom.xml
+++ b/dyh-service/dyh-mediate/pom.xml
@@ -234,10 +234,7 @@
                         <exclude>/**/*.properties</exclude>
                         <exclude>/**/*.conf</exclude>
                     </excludes>
-                    <includes>
-                        <!-- 只打包指定目录的文件 -->
-                        <include>cn/huge/**</include>
-                    </includes>
+
                     <archive>
                         <manifest>
                             <addClasspath>true</addClasspath>
@@ -291,6 +288,7 @@
                                         <include>*.yml</include>
                                         <include>*.properties</include>
                                         <include>*.conf</include>
+                                        <include>*.json</include>
                                     </includes>
                                 </resource>
                                 <resource>
diff --git a/dyh-service/dyh-mediate/src/main/assembly/assembly.xml b/dyh-service/dyh-mediate/src/main/assembly/assembly.xml
index 221909b..84dc95c 100644
--- a/dyh-service/dyh-mediate/src/main/assembly/assembly.xml
+++ b/dyh-service/dyh-mediate/src/main/assembly/assembly.xml
@@ -47,6 +47,12 @@
             <fileMode>0755</fileMode>
         </fileSet>
 
+        <fileSet>
+            <directory>${project.basedir}/src/main/resources/stencilset</directory>
+            <outputDirectory>stencilset</outputDirectory>
+            <fileMode>0755</fileMode>
+        </fileSet>
+
         <!-- 指定输出templates中的文件到templates目录中 -->
         <fileSet>
             <directory>${project.basedir}/src/main/resources/templates</directory>
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/ai/controller/AiController.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/ai/controller/AiController.java
index 6a04848..e931965 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/ai/controller/AiController.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/ai/controller/AiController.java
@@ -62,8 +62,8 @@
                 for (int i = 0; i < data.size(); i++) {
                     JSONObject jsonObject = data.getJSONObject(i);
                     CaseInfoDto caseInfoDto = new CaseInfoDto();
-                    caseInfoDto.setCaseId(jsonObject.getString("id"));
-                    caseInfoDto.setCaseName(jsonObject.getString("case_title"));
+                    caseInfoDto.setCaseId(jsonObject.getString("cpws_case_info_id"));
+                    caseInfoDto.setCaseName(jsonObject.getString("case_name"));
                     caseInfoDto.setCaseType(2);//表示判决类案件
                     caseInfoDtoList.add(caseInfoDto);
                     if (caseInfoDtoList.size() == 3)
@@ -102,15 +102,13 @@
 
     @RequestMapping("/get-case-detail")
     public Object getCaseLawDetail(@RequestParam String caseId, @RequestParam int type) {
-        Map<String, String> params = new HashMap<>();
-        params.put("caseId", caseId);
         String s = "";
         CaseInfoDetailDto caseInfoDetailDto = new CaseInfoDetailDto();
         if (type == 1) {//表示纠纷类案件
-            s = HttpClientUtils.httpGet(aiUrl + "/getConciliationCaseText", new HashMap<>(), "utf-8");
+            s = HttpClientUtils.httpGet(aiUrl + "/getConciliationCaseText?caseId="+caseId, new HashMap<>(), "utf-8");
             JSONObject object = JSONObject.parseObject(s);
             int code = object.getIntValue("code");
-            if (code == 1) {
+            if (code == 200) {
                 JSONObject data = object.getJSONObject("data");
                 caseInfoDetailDto.setCaseId(data.getString("id"));
                 caseInfoDetailDto.setCaseTitle(data.getString("case_title"));
@@ -119,10 +117,10 @@
                 caseInfoDetailDto.setAgreeContent(data.getString("agree_content"));
             }
         } else {
-            s = HttpClientUtils.httpGet(aiUrl + "/getJudgmentCaseText", new HashMap<>(), "utf-8");
+            s = HttpClientUtils.httpGet(aiUrl + "/getJudgmentCaseText?caseId="+caseId, new HashMap<>(), "utf-8");
             JSONObject object = JSONObject.parseObject(s);
             int code = object.getIntValue("code");
-            if (code == 1) {
+            if (code == 200) {
                 JSONObject data = object.getJSONObject("data");
                 caseInfoDetailDto.setCaseId(data.getString("idcpws_case_info_id"));
                 caseInfoDetailDto.setCaseTitle(data.getString("basic_case_info"));
diff --git a/dyh-service/dyh-mediate/src/main/resources/config/application-test.yml b/dyh-service/dyh-mediate/src/main/resources/config/application-test.yml
index f327225..417465a 100644
--- a/dyh-service/dyh-mediate/src/main/resources/config/application-test.yml
+++ b/dyh-service/dyh-mediate/src/main/resources/config/application-test.yml
@@ -10,7 +10,7 @@
     name: dyh-mediate
   #数据源配置
   datasource:
-    url: jdbc:dm://183.2.142.46:9006?schema=gzdyh_dev
+    url: jdbc:dm://183.2.142.46:9016?schema=gzdyh_dev
     username: SYSDBA
     password: SYSDBA
     driver-class-name: dm.jdbc.driver.DmDriver

--
Gitblit v1.8.0