From 6178513a72c0dbda6f2268c23d057a0db15b7fdf Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Wed, 18 Sep 2024 14:53:31 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=95=86=E5=AD=A6=E9=99=A2=E5=87=AD?= =?UTF-8?q?=E8=AF=81=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/cfgHome/plugin/grpU8/pluginCfg.xml | 6 ++++++ .../cfgHome/plugin/grpU8/spring/spring-buildpackage-dao.xml | 5 +++++ .../plugin/grpU8/spring/spring-buildpackage-plugin.xml | 5 +++++ .../plugin/grpU8/spring/spring-buildpackage-service.xml | 5 +++++ 4 files changed, 21 insertions(+) create mode 100644 buildpackage/src/main/resources/cfgHome/plugin/grpU8/pluginCfg.xml create mode 100644 buildpackage/src/main/resources/cfgHome/plugin/grpU8/spring/spring-buildpackage-dao.xml create mode 100644 buildpackage/src/main/resources/cfgHome/plugin/grpU8/spring/spring-buildpackage-plugin.xml create mode 100644 buildpackage/src/main/resources/cfgHome/plugin/grpU8/spring/spring-buildpackage-service.xml diff --git a/buildpackage/src/main/resources/cfgHome/plugin/grpU8/pluginCfg.xml b/buildpackage/src/main/resources/cfgHome/plugin/grpU8/pluginCfg.xml new file mode 100644 index 00000000..bdd46416 --- /dev/null +++ b/buildpackage/src/main/resources/cfgHome/plugin/grpU8/pluginCfg.xml @@ -0,0 +1,6 @@ + + +GlPzmlPlugin +GlPzmlPlugin插件 +90000001 + diff --git a/buildpackage/src/main/resources/cfgHome/plugin/grpU8/spring/spring-buildpackage-dao.xml b/buildpackage/src/main/resources/cfgHome/plugin/grpU8/spring/spring-buildpackage-dao.xml new file mode 100644 index 00000000..53330083 --- /dev/null +++ b/buildpackage/src/main/resources/cfgHome/plugin/grpU8/spring/spring-buildpackage-dao.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/buildpackage/src/main/resources/cfgHome/plugin/grpU8/spring/spring-buildpackage-plugin.xml b/buildpackage/src/main/resources/cfgHome/plugin/grpU8/spring/spring-buildpackage-plugin.xml new file mode 100644 index 00000000..26e7591f --- /dev/null +++ b/buildpackage/src/main/resources/cfgHome/plugin/grpU8/spring/spring-buildpackage-plugin.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/buildpackage/src/main/resources/cfgHome/plugin/grpU8/spring/spring-buildpackage-service.xml b/buildpackage/src/main/resources/cfgHome/plugin/grpU8/spring/spring-buildpackage-service.xml new file mode 100644 index 00000000..86623f9c --- /dev/null +++ b/buildpackage/src/main/resources/cfgHome/plugin/grpU8/spring/spring-buildpackage-service.xml @@ -0,0 +1,5 @@ + + + + + From 85158a75a9877a35c84e45090f783a8bf3ab05da Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Wed, 18 Sep 2024 15:50:52 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=BA=90=E4=B8=BA=E5=95=86=E5=AD=A6=E9=99=A2=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-hclocal.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/buildpackage/src/main/resources/application-hclocal.yml b/buildpackage/src/main/resources/application-hclocal.yml index 1ec327da..c929cbc3 100644 --- a/buildpackage/src/main/resources/application-hclocal.yml +++ b/buildpackage/src/main/resources/application-hclocal.yml @@ -10,18 +10,28 @@ logging: spring: datasource: dynamic: + druid: + filters: stat,log4j2 + validationQuery: SELECT 1 # 验证数据库服务可用性的sql.用来检测连接是否有效的sql 因数据库方言而差, 例如 oracle 应该写成 SELECT 1 FROM DUAL datasource: master: # url: jdbc:mysql://ufidahz.com.cn:9096/businesscenternew?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true # username: root # password: bd993088e8a7c3dc5f44441617f9b4bf # driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 - url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true - username: root - password: 62e4295b615a30dbf3b8ee96f41c820b - driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 +# url: jdbc:mysql://ufidahz.com.cn:9014/businesscenter?serverTimezone=UTC&useUnicode=true&characterEncoding=UTF8&serverTimezone=GMT%2B8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowLoadLocalInfile=false&autoReconnect=true&failOverReadOnly=false&connectTimeout=30000&socketTimeout=30000&autoReconnectForPools=true +# username: root +# password: 62e4295b615a30dbf3b8ee96f41c820b +# driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 + + url: jdbc:sqlserver://192.168.15.15:1433;DatabaseName=businesscenter;encrypt=false;trustServerCertificate=true + username: sa + password: dec7d858be572746a8432026c0e9312c + driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver savefile: # 文件保存路径 path: D:\yongansystem\kangarooDataCenter\v3\logs + tomcatpath: /Users/apple/Desktop/log/local + pluginpath: /Users/apple/Desktop/log/local zt: url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface From 7e27fe43fc4142ed195592bfb8bf8fae3a33c9eb Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Thu, 26 Sep 2024 10:35:01 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=87=AD=E8=AF=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3ip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java index d010f2c6..f611dd1d 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java @@ -35,7 +35,7 @@ import java.util.UUID; @Service(value = "SenderGlPzmlServiceImpl") public class SenderGlPzmlServiceImpl extends BaseService implements ISenderGlPzmlService { - private static String URLTest="http://39.106.158.149/";//测试环境 + private static String URLTest="http://60.205.205.82/";//测试环境 http://39.106.158.149/ private static String URL="http://192.168.42.22/";//正式环境 private ISenderGlPzmlDao senderGlPzmlDao; @@ -736,7 +736,7 @@ public class SenderGlPzmlServiceImpl extends BaseService Date: Mon, 14 Oct 2024 15:19:57 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=87=AD=E8=AF=81?= =?UTF-8?q?=E6=8E=A8=E9=80=81=E5=9C=B0=E5=9D=80=EF=BC=8C=E6=8C=87=E6=A0=87?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A2=9E=E5=8A=A0=E5=AE=A1=E6=A0=B8=E4=BA=BA?= =?UTF-8?q?id=E7=AD=89=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GbiZbxmbServiceImpl.java | 21 +++++++++++++++++++ .../service/impl/SenderGlPzmlServiceImpl.java | 6 +++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/service/impl/GbiZbxmbServiceImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/service/impl/GbiZbxmbServiceImpl.java index 4f9f177f..e2a4841a 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/service/impl/GbiZbxmbServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/service/impl/GbiZbxmbServiceImpl.java @@ -90,6 +90,27 @@ public class GbiZbxmbServiceImpl extends BaseService imp if(!checkStr(jsonObject.getString("ysfamc"))){ return BaseResult.getFailureMessageEntity("请传递预算方案名称"); } + if(!checkStr(jsonObject.getString("shrid"))){ + return BaseResult.getFailureMessageEntity("请传递审核人id"); + } + if(!checkStr(jsonObject.getString("pfrid"))){ + return BaseResult.getFailureMessageEntity("请传递批复人id"); + } + if(!checkStr(jsonObject.getString("xmdm"))){ + return BaseResult.getFailureMessageEntity("请传递项目代码"); + } + if(!checkStr(jsonObject.getString("xmmc"))){ + return BaseResult.getFailureMessageEntity("请传递项目名称"); + } + if(!checkStr(jsonObject.getString("bmdm"))){ + return BaseResult.getFailureMessageEntity("请传递部门代码"); + } + if(!checkStr(jsonObject.getString("bmmc"))){ + return BaseResult.getFailureMessageEntity("请传递部门名称"); + } + if(!checkStr(jsonObject.getString("ysfadm")) || !("01").equals(jsonObject.getString("ysfadm")) || !("02").equals(jsonObject.getString("ysfadm"))){ + return BaseResult.getFailureMessageEntity("请传递预算方案代码并且值为01或者02"); + } GbiZbxmbEntity gbiZbxmbEntity = jsonObject.toJavaObject(GbiZbxmbEntity.class); /*try { //查询指标id最大值和指标代码最大值 diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java index f611dd1d..71a09333 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java @@ -36,7 +36,7 @@ import java.util.UUID; public class SenderGlPzmlServiceImpl extends BaseService implements ISenderGlPzmlService { private static String URLTest="http://60.205.205.82/";//测试环境 http://39.106.158.149/ - private static String URL="http://192.168.42.22/";//正式环境 + private static String URL="http://192.168.250.71/";//正式环境 http://192.168.42.22/ private ISenderGlPzmlDao senderGlPzmlDao; @@ -736,7 +736,7 @@ public class SenderGlPzmlServiceImpl extends BaseService Date: Tue, 29 Oct 2024 15:35:58 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=8C=87=E6=A0=87?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E5=80=99=E9=A2=84=E7=AE=97=E6=96=B9?= =?UTF-8?q?=E6=A1=88=E4=BB=A3=E7=A0=81=E5=8F=AA=E8=83=BD=E4=B8=BA01?= =?UTF-8?q?=E6=88=96=E8=80=8502?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nxproof/gbizbxmb/service/impl/GbiZbxmbServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/service/impl/GbiZbxmbServiceImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/service/impl/GbiZbxmbServiceImpl.java index e2a4841a..6a26be47 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/service/impl/GbiZbxmbServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/gbizbxmb/service/impl/GbiZbxmbServiceImpl.java @@ -108,7 +108,7 @@ public class GbiZbxmbServiceImpl extends BaseService imp if(!checkStr(jsonObject.getString("bmmc"))){ return BaseResult.getFailureMessageEntity("请传递部门名称"); } - if(!checkStr(jsonObject.getString("ysfadm")) || !("01").equals(jsonObject.getString("ysfadm")) || !("02").equals(jsonObject.getString("ysfadm"))){ + if(!("01").equals(jsonObject.getString("ysfadm")) && !("02").equals(jsonObject.getString("ysfadm"))){ return BaseResult.getFailureMessageEntity("请传递预算方案代码并且值为01或者02"); } GbiZbxmbEntity gbiZbxmbEntity = jsonObject.toJavaObject(GbiZbxmbEntity.class); From 47b511b98b816eb6e13acfab7c844034ebfe8c28 Mon Sep 17 00:00:00 2001 From: hecan <1718492867@qq.com> Date: Thu, 31 Oct 2024 10:14:35 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=87=AD=E8=AF=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glPzml/entity/SenderGlPzmlEntity.xml | 24 +++++++++++++++++-- .../service/impl/SenderGlPzmlServiceImpl.java | 7 +++--- .../glPznr/entity/SenderGlPznrEntity.xml | 2 +- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.xml b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.xml index 46ce768f..f80c46f2 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.xml +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/entity/SenderGlPzmlEntity.xml @@ -261,7 +261,7 @@ diff --git a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java index 71a09333..da361f99 100644 --- a/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java +++ b/service/src/main/java/com/hzya/frame/grpU8/nxproof/glPzml/service/impl/SenderGlPzmlServiceImpl.java @@ -706,12 +706,13 @@ public class SenderGlPzmlServiceImpl extends BaseService senderGlPznrEntities = senderGlPznrDao.queryGlPznrSxy(senderGlPznrEntity); logger.info("=======根据凭证idpzh:{}查询的指标金额和指标id以及部门经济科目数据有{}条",pzmlEntity.getIdpzh(),senderGlPznrEntities.size()); @@ -736,7 +737,7 @@ public class SenderGlPzmlServiceImpl extends BaseService