From 84a38ed58fa4da6d3ece263530f2ba99862c033c Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 18 Jun 2024 19:32:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=9A=90=E6=82=A3=E5=BA=93=E3=80=81?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BA=93=E5=8A=9F=E8=83=BD=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../depository/TextLibraryController.java | 6 +++ .../impl/TextLibraryServiceImpl.java | 12 ++++- .../depository/TextLibraryMapper.xml | 46 +++++++++++++++++-- 3 files changed, 59 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zcloud/controller/depository/TextLibraryController.java b/src/main/java/com/zcloud/controller/depository/TextLibraryController.java index d3b81c71..9e2f0bf5 100644 --- a/src/main/java/com/zcloud/controller/depository/TextLibraryController.java +++ b/src/main/java/com/zcloud/controller/depository/TextLibraryController.java @@ -108,6 +108,7 @@ public class TextLibraryController extends BaseController { } if (StringUtils.isEmpty(pd.getString("CORPINFO_ID")))pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID()); + if ("3".equals(pd.getString("ASSOCIATION"))) { pd.put("TYPE_ONE", "43ed4012090d4614bb35da60d06c8264"); pd.put("plan",pd.getString("CATEGORY_ID")); @@ -124,6 +125,11 @@ public class TextLibraryController extends BaseController { } pd.put("STATUS","1"); + // 标准规范库特殊处理 + if ("~".equals(pd.getString("CORPINFO_ID"))) { + pd.put("CORPINFO_ID", null); + pd.put("STATUS", null); + } page.setPd(pd); List varList = textlibraryService.list(page); diff --git a/src/main/java/com/zcloud/service/depository/impl/TextLibraryServiceImpl.java b/src/main/java/com/zcloud/service/depository/impl/TextLibraryServiceImpl.java index 424b9a73..2459a739 100644 --- a/src/main/java/com/zcloud/service/depository/impl/TextLibraryServiceImpl.java +++ b/src/main/java/com/zcloud/service/depository/impl/TextLibraryServiceImpl.java @@ -54,6 +54,10 @@ public class TextLibraryServiceImpl implements TextLibraryService { @Value("${heBeiQinAnFile}") private String heBeiQinAnFile; + @Value("${biaoZhunShuJuKu}") + private String biaoZhunShuJuKu; + + /** * 新增 * @@ -107,8 +111,12 @@ public class TextLibraryServiceImpl implements TextLibraryService { } // 如果是迁移数据就用河北秦安的路径 for (PageData entity : list) { - if(!"1".equals(entity.getString("MIGRATION_FLAG"))){ - entity.put("PATH",heBeiQinAnFile + entity.getString("PATH")); + String url = entity.getString("PATH"); + if (!"1".equals(entity.getString("MIGRATION_FLAG"))) { + entity.put("PATH", heBeiQinAnFile + url); + } + if ("2".equals(entity.getString("MIGRATION_FLAG"))) { + entity.put("PATH", biaoZhunShuJuKu + url); } } return list; diff --git a/src/main/resources/mybatis/datasource/depository/TextLibraryMapper.xml b/src/main/resources/mybatis/datasource/depository/TextLibraryMapper.xml index 90e65317..17b893e5 100644 --- a/src/main/resources/mybatis/datasource/depository/TextLibraryMapper.xml +++ b/src/main/resources/mybatis/datasource/depository/TextLibraryMapper.xml @@ -32,7 +32,14 @@ f.STATUS, f.BUS_TEXT_LIBRARY_ID, f.MIGRATION_FLAG, - f.CORPINFO_ID + f.CORPINFO_ID, + f.CODE_NAME, + f.PUBLISHES, + f.TEXT_NAME, + f.PUBLICATION_DATE, + f.IMPLEMENTATION_DATE, + f.TYPE_TWO, + f.TYPE_TWO_NAME @@ -54,8 +61,15 @@ ASSOCIATION, STATUS, BUS_TEXT_LIBRARY_ID, + MIGRATION_FLAG, CORPINFO_ID, - MIGRATION_FLAG + CODE_NAME, + PUBLISHES, + TEXT_NAME, + PUBLICATION_DATE, + IMPLEMENTATION_DATE, + TYPE_TWO, + TYPE_TWO_NAME @@ -77,8 +91,15 @@ #{ASSOCIATION}, #{STATUS}, #{BUS_TEXT_LIBRARY_ID}, + #{MIGRATION_FLAG}, #{CORPINFO_ID}, - #{MIGRATION_FLAG} + #{CODE_NAME}, + #{PUBLISHES}, + #{TEXT_NAME}, + #{PUBLICATION_DATE}, + #{IMPLEMENTATION_DATE}, + #{TYPE_TWO}, + #{TYPE_TWO_NAME} @@ -124,6 +145,13 @@ STATUS = #{STATUS}, CORPINFO_ID = #{CORPINFO_ID}, MIGRATION_FLAG = #{MIGRATION_FLAG}, + CODE_NAME = #{CODE_NAME}, + PUBLISHES = #{PUBLISHES}, + TEXT_NAME = #{TEXT_NAME}, + PUBLICATION_DATE = #{PUBLICATION_DATE}, + IMPLEMENTATION_DATE = #{IMPLEMENTATION_DATE}, + TYPE_TWO = #{TYPE_TWO}, + TYPE_TWO_NAME = #{TYPE_TWO_NAME}, BUS_TEXT_LIBRARY_ID = BUS_TEXT_LIBRARY_ID where BUS_TEXT_LIBRARY_ID = #{BUS_TEXT_LIBRARY_ID} @@ -152,6 +180,9 @@ and f.REMARKS LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') + + and (f.TYPE_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORD}),'%') or f.TYPE_TWO_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORD}),'%')) + and exists(select 1 from bus_library_labels b where b.BUS_TEXT_LIBRARY_ID = f.BUS_TEXT_LIBRARY_ID and b.BUS_LABEL_FACTORY_ID in @@ -184,6 +215,15 @@ and (f.MIGRATION_FLAG = '0' or f.MIGRATION_FLAG is null) + + and f.TYPE = #{pd.TYPE} + + + and f.TYPE_TWO like CONCAT('%' #{pd.TYPE_TWO}, '%') + + + and f.TEXT_NAME like CONCAT('%' #{pd.TEXT_NAME}, '%') + order by f.ISTOPTIME desc,f.CREATED_TIME desc From 22b0f9233d26bb81bcd5d55210b0a32a9a022249 Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 18 Jun 2024 19:35:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=9A=90=E6=82=A3=E5=BA=93=E3=80=81?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BA=93=E5=8A=9F=E8=83=BD=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-master.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/application-master.properties b/src/main/resources/application-master.properties index fb62718f..2eacb8de 100644 --- a/src/main/resources/application-master.properties +++ b/src/main/resources/application-master.properties @@ -100,6 +100,7 @@ http.file.url=http://192.168.192.201:8991/file/ #河北秦安文件服务器前缀 heBeiQinAnFile=https://file.zcloudchina.com/YTHFile +biaoZhunShuJuKu=https://file.zcloudchina.com/ liteflow.rule-source=flow.xml liteflow.print-execution-log=false From 6d9a283accb86c067960b7a1ea604e88930ec042 Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 20 Jun 2024 16:14:51 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/xgf/impl/XgfUserServiceImpl.java | 47 +++++++------------ 1 file changed, 17 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index 4fd0fa17..f2408266 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -992,37 +992,24 @@ public class XgfUserServiceImpl implements XgfUserService { @Override public void repulse(PageData flows, XgfFlowDto info) throws Exception { - // add by liu jun 相关方可指定打回至指定节点 -1 为默认打回至相关方端 - if ("-1".equals(info.getBACK_STEP())){ - PageData condition = new PageData(); - condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); - PageData entity = xgfUserMapper.findById(condition); - entity.put("STATUS", "0"); - entity.put("VALID_FLAG", "0"); - entity.put("CHECK_STATUS", "-2"); - PageData key = new PageData(); - key.putAll(entity); - key.put("USER_ID", condition.get("XGF_USER_ID")); - key.put("STATUS", "1"); - key.put("OPINION", flows.get("OPINION")); - Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); - if (result == null || !"succeed".equals(result.get("result"))) { - throw new RuntimeException("请求失败"); - } - xgfUserMapper.edit(entity); - this.clearInfo(flows); - xgfFlowsMapper.edit(flows); - } else { - // 1、判断不能自己打回到自己 - PageData condition = new PageData(); - condition.put("FLOWS_ID",flows.getString("FLOWS_ID")); - PageData flowEntity = xgfFlowsMapper.findById(condition); - if (flowEntity != null && flowEntity.size() > 0 && flowEntity.getString("FLOWS_STEP").equals(info.getBACK_STEP())){ - throw new RuntimeException("不能自己打回到自己"); - } - flowEntity.put("FLOWS_STEP", info.getBACK_STEP()); - xgfFlowsMapper.edit(flowEntity); + PageData condition = new PageData(); + condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); + PageData entity = xgfUserMapper.findById(condition); + entity.put("STATUS", "0"); + entity.put("VALID_FLAG", "0"); + entity.put("CHECK_STATUS", "-2"); + PageData key = new PageData(); + key.putAll(entity); + key.put("USER_ID", condition.get("XGF_USER_ID")); + key.put("STATUS", "1"); + key.put("OPINION", flows.get("OPINION")); + Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); + if (result == null || !"succeed".equals(result.get("result"))) { + throw new RuntimeException("请求失败"); } + xgfUserMapper.edit(entity); + this.clearInfo(flows); + xgfFlowsMapper.edit(flows); } @Override