From 90d5ddcf127036e3572e5e2479b5818a8df4be6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Tue, 15 Oct 2024 17:37:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=96=E9=83=A8=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/mapper/LawsSysApiInfoMapper.java      |  8 ++++++--
 .../api/mapper/xml/LawsSysApiInfoMapper.xml   | 10 ++++------
 .../impl/LawsSysApiInfoServiceImpl.java       | 19 ++++++++++++++++---
 .../modules/docking/api/vo/StandardData.java  | 16 ++++++++++++++--
 .../src/main/resources/application-dev.yml    |  9 +++++++++
 .../src/main/resources/application-prod.yml   |  8 ++++++++
 .../src/main/resources/application-test.yml   |  8 ++++++++
 7 files changed, 65 insertions(+), 13 deletions(-)

diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/api/mapper/LawsSysApiInfoMapper.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/api/mapper/LawsSysApiInfoMapper.java
index 840b58ce..58a0122c 100644
--- a/laws-modules-docking/src/main/java/com/jero/modules/docking/api/mapper/LawsSysApiInfoMapper.java
+++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/api/mapper/LawsSysApiInfoMapper.java
@@ -16,9 +16,13 @@ import java.util.List;
 public interface LawsSysApiInfoMapper extends BaseMapper<LawsSysApiInfo> {
 
     IPage<StandardData> getStandardData(Page<StandardData> page,
-                                            @Param(Constants.WRAPPER) QueryWrapper<StandardData> queryWrapper);
+                                            @Param(Constants.WRAPPER) QueryWrapper<StandardData> queryWrapper,
+                                        @Param("foreignStandardReturnUrl") String foreignStandardReturnUrl,
+                                        @Param("enterpriseStandardReturnUrl")String enterpriseStandardReturnUrl);
 
-    List<StandardData> getStandardData(@Param(Constants.WRAPPER) QueryWrapper<StandardData> queryWrapper);
+    List<StandardData> getStandardData(@Param(Constants.WRAPPER) QueryWrapper<StandardData> queryWrapper,
+                                       @Param("foreignStandardReturnUrl") String foreignStandardReturnUrl,
+                                       @Param("enterpriseStandardReturnUrl")String enterpriseStandardReturnUrl);
 }
 
 
diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/api/mapper/xml/LawsSysApiInfoMapper.xml b/laws-modules-docking/src/main/java/com/jero/modules/docking/api/mapper/xml/LawsSysApiInfoMapper.xml
index 949507ca..151bb1ac 100644
--- a/laws-modules-docking/src/main/java/com/jero/modules/docking/api/mapper/xml/LawsSysApiInfoMapper.xml
+++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/api/mapper/xml/LawsSysApiInfoMapper.xml
@@ -6,13 +6,11 @@
 
     <select id="getStandardData" resultType="com.jero.modules.docking.api.vo.StandardData">
         select * from (
-            select standard_number, standard_name, '1' as resource_type,GROUP_CONCAT(o.url) as url from laws_domestic_standard l
-            left join oss_file o on o.standard_id = l.id
-            where l.del_flag = 0 group by l.id
+            select standard_number, standard_name, '1' as resource_type, concat(#{foreignStandardReturnUrl},id) as returnUrl
+            from laws_domestic_standard where del_flag = 0
             union all
-            select standard_number, standard_name, '2' as resource_type,GROUP_CONCAT(o1.url) from laws_enterprise_standard l1
-            left join oss_file o1 on o1.standard_id = l1.id
-            where l1.del_flag = 0 group by l1.id
+            select standard_number, standard_name, '2' as resource_type, concat(#{enterpriseStandardReturnUrl},id) as returnUrl
+            from laws_enterprise_standard where del_flag = 0
         ) a
         ${ew.customSqlSegment}
     </select>
diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/api/service/impl/LawsSysApiInfoServiceImpl.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/api/service/impl/LawsSysApiInfoServiceImpl.java
index f4cbeff6..d734f7ec 100644
--- a/laws-modules-docking/src/main/java/com/jero/modules/docking/api/service/impl/LawsSysApiInfoServiceImpl.java
+++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/api/service/impl/LawsSysApiInfoServiceImpl.java
@@ -34,17 +34,24 @@ public class LawsSysApiInfoServiceImpl extends ServiceImpl<LawsSysApiInfoMapper,
 
     @Resource
     private LawsSysApiInfoMapper lawsSysApiInfoMapper;
+    @Value("api.enterprise_standard_return_url")
+    private String enterpriseStandardReturnUrl;
+
+    @Value("api.foreign_standard_return_url")
+    private String foreignStandardReturnUrl;
+
 
     @Override
     public Result<IPage<StandardData>> getStandardDataPage(StandardData standardData,Integer pageNo,Integer pageSize) {
-        // todo  未变更url
+
+        // todo  未添加其他系统访问校验
         QueryWrapper<StandardData> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(!StringUtils.isEmpty(standardData.getStandardNumber()),"standard_number",standardData.getStandardNumber());
         queryWrapper.like(!StringUtils.isEmpty(standardData.getStandardName()),"standard_name",standardData.getStandardName());
         queryWrapper.eq(!StringUtils.isEmpty(standardData.getResourceType()),"resource_type",standardData.getResourceType());
         queryWrapper.orderByDesc("create_time");
         Page<StandardData> page = new Page<>(pageNo, pageSize);
-        return Result.OK(lawsSysApiInfoMapper.getStandardData(page,queryWrapper));
+        return Result.OK(lawsSysApiInfoMapper.getStandardData(page,queryWrapper, foreignStandardReturnUrl, enterpriseStandardReturnUrl));
     }
 
     @Override
@@ -54,7 +61,13 @@ public class LawsSysApiInfoServiceImpl extends ServiceImpl<LawsSysApiInfoMapper,
         queryWrapper.like(!StringUtils.isEmpty(standardData.getStandardName()),"standard_name",standardData.getStandardName());
         queryWrapper.eq(!StringUtils.isEmpty(standardData.getResourceType()),"resource_type",standardData.getResourceType());
         queryWrapper.orderByDesc("create_time");
-        return Result.OK(lawsSysApiInfoMapper.getStandardData(queryWrapper));
+        return Result.OK(lawsSysApiInfoMapper.getStandardData(queryWrapper, foreignStandardReturnUrl, enterpriseStandardReturnUrl));
+    }
+
+    public String checkSysInfo(String appKey,String secret){
+
+
+        return null;
     }
 }
 
diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/api/vo/StandardData.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/api/vo/StandardData.java
index 82b3126c..49769e2a 100644
--- a/laws-modules-docking/src/main/java/com/jero/modules/docking/api/vo/StandardData.java
+++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/api/vo/StandardData.java
@@ -1,5 +1,6 @@
 package com.jero.modules.docking.api.vo;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -25,11 +26,22 @@ public class StandardData implements Serializable {
      */
     private String resourceType;
     /**
-     * url
+     * 详情页跳转url
      */
-    private String url;
+    private String returnUrl;
     /**
      *
      */
+    @JsonIgnore
     private String id;
+    /**
+     * key
+     */
+    @JsonIgnore
+    private String appKey;
+    /**
+     * secret
+     */
+    @JsonIgnore
+    private String secret;
 }
diff --git a/laws-single-startup/src/main/resources/application-dev.yml b/laws-single-startup/src/main/resources/application-dev.yml
index 7ea4ff97..fab6f3d9 100644
--- a/laws-single-startup/src/main/resources/application-dev.yml
+++ b/laws-single-startup/src/main/resources/application-dev.yml
@@ -605,3 +605,12 @@ feishu:
   promoter_pc_link: ${feishu.redirect_prefix}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId}
   # 飞书PC端发起流程地址
   review_pc_link: ${feishu.redirect_prefix}{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId}
+
+# 外部对接相关信息
+api:
+  ip: http://localhost:3344/
+  # 外标详情跳转路径
+  foreign_standard_return_url: ${api.ip}standardRegulationLibrary/foreignStandardDetailPage?id=
+  # 企标详情路径
+  enterprise_standard_return_url: ${api.ip}enterpriseStandardLibrary/enterpriseStandardDetail?id=
+
diff --git a/laws-single-startup/src/main/resources/application-prod.yml b/laws-single-startup/src/main/resources/application-prod.yml
index 71fca51a..ddaf5ef2 100644
--- a/laws-single-startup/src/main/resources/application-prod.yml
+++ b/laws-single-startup/src/main/resources/application-prod.yml
@@ -612,3 +612,11 @@ feishu:
   # 飞书PC端发起流程地址
   review_pc_link: ${feishu.redirect_prefix}{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId}
 
+
+# 外部对接相关信息
+api:
+  ip: https://cgrsm.mychery.com:3344/
+  # 外标详情跳转路径
+  foreign_standard_return_url: ${api.ip}standardRegulationLibrary/foreignStandardDetailPage?id=
+  # 企标详情路径
+  enterprise_standard_return_url: ${api.ip}enterpriseStandardLibrary/enterpriseStandardDetail?id=
diff --git a/laws-single-startup/src/main/resources/application-test.yml b/laws-single-startup/src/main/resources/application-test.yml
index 9c4e989b..df5fe91d 100644
--- a/laws-single-startup/src/main/resources/application-test.yml
+++ b/laws-single-startup/src/main/resources/application-test.yml
@@ -611,3 +611,11 @@ feishu:
   # 飞书PC端发起流程地址
   review_pc_link: ${feishu.redirect_prefix}{url}?projectId={projectId}&taskName={taskName}&taskId={taskId}&processInstanceId={processInstanceId}&nodeId={nodeId}
 
+
+# 外部对接相关信息
+api:
+  ip: https://cgrsmuat.mychery.com:3344/
+  # 外标详情跳转路径
+  foreign_standard_return_url: ${api.ip}standardRegulationLibrary/foreignStandardDetailPage?id=
+  # 企标详情路径
+  enterprise_standard_return_url: ${api.ip}enterpriseStandardLibrary/enterpriseStandardDetail?id=