diff --git a/.flattened-pom.xml b/.flattened-pom.xml new file mode 100644 index 00000000..7af03473 --- /dev/null +++ b/.flattened-pom.xml @@ -0,0 +1,434 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 2.7.18 + + + com.hzya.frame + kangarooDataCenterV3 + 0.0.1-SNAPSHOT + pom + kangarooDataCenterV3 + kangarooDataCenterV3 + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + + base-buildpackage + base-service + base-common + base-webapp + base-core + + + 2.3.0 + 1.8 + 2.7.18 + 4.12 + 2.8.5 + 1.9.4 + 3.9.1 + 2.0.20 + 3.3.0 + 1.18.22 + 2.0.33 + UTF-8 + 2.7.18 + 4.5.13 + 2.7.18 + 1.30.0 + 1.4.6 + 5.8.19 + 3.5.6 + 1.8 + 3.5.2 + 2.6 + 1.1.22 + 8.0.13 + 1.30.0 + 8.0.3 + 3.13.0 + 42.2.6 + 1.3.1 + 1.2.18 + 2.1.46 + 2.7.18 + 2.7.18 + 4.12 + 1.7.4 + 1.30.0 + 2.7.18 + 2.6.0 + 1.3.7 + 32.0.1-jre + 6.1.0.jre8 + 5.3.23 + 2.6 + 11.2.0.4 + 0.0.1-SNAPSHOT + + + + net.sourceforge.jtds + jtds + ${net.sourceforge.jtds.version} + + + org.springframework.boot + spring-boot-starter-aop + ${spring-boot-starter-aop.version} + + + org.apache.httpcomponents + httpclient + ${httpclient.version} + + + org.springframework.boot + spring-boot-starter-cache + ${spring-boot-starter-cache.version} + + + org.springframework.boot + spring-boot-starter-test + ${spring-boot-starter-test.version} + + + spring-core + org.springframework + + + + + junit + junit + ${unit.version} + + + com.alibaba + fastjson + ${fastjson.version} + + + p6spy + p6spy + ${p6spy.version} + + + com.google.code.gson + gson + ${gson.version} + + + com.google.zxing + core + ${zxing.version} + + + com.google.guava + guava + ${guava.version} + + + mysql + mysql-connector-java + ${mysql-connector-java} + + + org.springframework.boot + spring-boot-starter-data-jdbc + + + com.github.pagehelper + pagehelper-spring-boot-starter + ${pagehelper-spring-boot-starter.version} + + + mybatis + org.mybatis + + + spring-boot-autoconfigure + org.springframework.boot + + + spring-boot-starter + org.springframework.boot + + + + + com.baomidou + mybatis-plus-boot-starter + ${mybatis-plus-boot-starter.version} + + + cn.hutool + hutool-all + ${hutool.version} + + + cn.dev33 + sa-token-spring-boot-starter + ${sa.token.version} + + + cn.dev33 + sa-token-oauth2 + ${sa-token-oauth2.version} + + + cn.dev33 + sa-token-jwt + ${sa-token-jwt.version} + + + com.baomidou + dynamic-datasource-spring-boot-starter + ${dynamic-datasource-spring-boot-starter.version} + + + com.alibaba + druid-spring-boot-starter + ${druid-spring-boot-starter.version} + + + spring-boot-autoconfigure + org.springframework.boot + + + + + com.dameng + Dm8JdbcDriver18 + 8.1.1.49 + + + commons-beanutils + commons-beanutils + ${beanutils.version} + + + org.apache.commons + commons-pool2 + ${commons.pool2.version} + + + org.apache.commons + commons-lang3 + ${lang3.version} + + + org.projectlombok + lombok + ${lombok.version} + true + + + com.microsoft.sqlserver + mssql-jdbc + 6.4.0.jre8 + + + org.apache.pdfbox + pdfbox + ${pdfbox.version} + + + com.oracle.database.jdbc + ojdbc6 + ${ojdbc6.version} + + + org.quartz-scheduler + quartz + ${quartz.version} + + + org.springframework + spring-context-support + ${org.springframework.version} + + + commons-io + commons-io + ${commons.io.version} + + + dom4j + dom4j + 1.6.1 + + + org.postgresql + postgresql + ${postgresql.version} + runtime + + + org.apache.groovy + groovy-all + 4.0.21 + pom + + + org.flywaydb + flyway-core + 8.5.13 + + + org.flywaydb + flyway-mysql + 8.5.13 + + + com.yomahub + tlog-all-spring-boot-starter + 1.5.2 + + + org.springframework.boot + spring-boot-starter-data-mongodb + + + com.dingtalk.open + app-stream-client + ${dingtalk-stream-sdk.version} + + + com.aliyun + dingtalk + ${dingtalk-sdk.version} + + + com.aliyun + alibaba-dingtalk-service-sdk + 2.0.0 + + + commons-net + commons-net + 3.8.0 + + + com.jcraft + jsch + 0.1.53 + + + + + + false + + aliyun + aliyun Repository + https://maven.aliyun.com/repository/public + + + + false + + jeecg + jeecg Repository + https://maven.jeecg.org/nexus/content/repositories/jeecg + + + + + + src/main/java + + **/*.xml + + + + true + src/main/resources + + **/*.yml + **/*.properties + **/*.xml + **/*.xmreport + **/*.xlsx + **/*.json + **/*.xdb + **/*.txt + **/*.sql + + + + true + src/ + + **/*.yml + **/*.properties + **/*.xml + **/*.json + **/*.txt + **/*.sql + + + + + + org.codehaus.mojo + flatten-maven-plugin + 1.2.7 + + + flatten + process-resources + + flatten + + + + + resolveCiFriendliesOnly + + + + maven-resources-plugin + 2.6 + + UTF-8 + + + + maven-compiler-plugin + 3.10.1 + + 1.8 + 1.8 + UTF-8 + + + + org.springframework.boot + spring-boot-maven-plugin + 2.7.18 + + ${project.artifactId} + none + execute + true + + + + maven-surefire-plugin + 2.18.1 + + true + + + + + diff --git a/base-buildpackage/.flattened-pom.xml b/base-buildpackage/.flattened-pom.xml new file mode 100644 index 00000000..ad2fa1ab --- /dev/null +++ b/base-buildpackage/.flattened-pom.xml @@ -0,0 +1,48 @@ + + + 4.0.0 + + com.hzya.frame + kangarooDataCenterV3 + 0.0.1-SNAPSHOT + + com.hzya.frame + base-buildpackage + 0.0.1-SNAPSHOT + war + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + + + com.hzya.frame + base-webapp + ${revision} + + + + kangarooDataCenterV3 + + + maven-war-plugin + 3.3.2 + + + + + + + dev + + true + + + dev + + + + diff --git a/base-buildpackage/pom.xml b/base-buildpackage/pom.xml index 2467d45d..718ed2d5 100644 --- a/base-buildpackage/pom.xml +++ b/base-buildpackage/pom.xml @@ -2,16 +2,18 @@ + - kangarooDataCenterV3 com.hzya.frame + kangarooDataCenterV3 ${revision} + ../pom.xml + 4.0.0 base-buildpackage war - ${revision} - + com.hzya.frame @@ -22,7 +24,7 @@ - dev + dev dev @@ -30,30 +32,21 @@ true - - - - llg - - llg - - - - xel - - xel - - - - zqtlocal - - zqtlocal - - - + kangarooDataCenterV3 + + + org.apache.maven.plugins + maven-war-plugin + 3.3.2 + + + + + + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/BackUpDatabase/plugin/BackUpDatabaseInitializer.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/BackUpDatabase/plugin/BackUpDatabaseInitializer.java index 7a98112a..93edf5d6 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/BackUpDatabase/plugin/BackUpDatabaseInitializer.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/BackUpDatabase/plugin/BackUpDatabaseInitializer.java @@ -4,27 +4,12 @@ import com.alibaba.fastjson.JSONObject; import com.hzya.frame.base.PluginBaseEntity; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; - -import com.jcraft.jsch.Channel; -import com.jcraft.jsch.ChannelSftp; -import com.jcraft.jsch.JSch; -import com.jcraft.jsch.Session; -import com.jcraft.jsch.SftpATTRS; -import com.jcraft.jsch.SftpException; -import org.apache.commons.net.ftp.FTPClient; +import com.jcraft.jsch.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.PrintWriter; -import java.nio.file.Files; +import java.io.*; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Properties; diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/SubjectAssBalancePlugin.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/SubjectAssBalancePlugin.java new file mode 100644 index 00000000..b55befab --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/SubjectAssBalancePlugin.java @@ -0,0 +1,193 @@ +package com.hzya.frame.plugin.gm; + +import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; +import com.google.common.collect.Lists; +import com.hzya.frame.base.PluginBaseEntity; +import com.hzya.frame.plugin.gm.constant.ProfilesActiveConstant; +import com.hzya.frame.plugin.gm.dao.IMdmGmSubjectBalanceDao; +import com.hzya.frame.plugin.gm.entity.MdmGmSubjectBalanceEntity; +import com.hzya.frame.plugin.gm.utils.SaveOrUpdateBusinessLogUtil; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; +import com.hzya.frame.web.entity.BaseResult; +import com.hzya.frame.web.entity.JsonResultEntity; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; + +import java.time.LocalDate; +import java.time.LocalTime; +import java.util.Date; +import java.util.List; +import java.util.concurrent.locks.ReentrantLock; + +/** + * Created by zydd on 2025-08-01 14:31 + * 广脉：科目辅助余额表 同步 + * 根据科目同步余额 + * table:mdm_gm_subject_balance + */ +public class SubjectAssBalancePlugin extends PluginBaseEntity { + + Logger logger = LoggerFactory.getLogger(SubjectAssBalancePlugin.class); + + private static final ReentrantLock LOCK = new ReentrantLock(true); + + @Override + public void initialize() { + logger.info(getPluginLabel() + "執行初始化方法initialize()"); + } + + @Override + public void destroy() { + logger.info(getPluginLabel() + "執行銷毀方法destroy()"); + } + + @Override + public String getPluginId() { + return "gm.SubjectAssBalancePlugin"; + } + + @Override + public String getPluginName() { + return "广脉：科目辅助余额表同步"; + } + + @Override + public String getPluginLabel() { + return "广脉：科目辅助余额表同步"; + } + + @Override + public String getPluginType() { + return "1"; + } + + @Override + public JsonResultEntity executeBusiness(JSONObject requestJson) throws Exception { + try { + logger.info("调用：" + getPluginName() + "-插件"); + String prod = "prod"; + String param = String.valueOf(requestJson.get("param")); + if (requestJson != null && ProfilesActiveConstant.TYPE_DATE.equals(requestJson.get("type"))) { + //按日期 + if (param != null && !"".equals(param)) { + String[] split = param.split("/"); + if (!(split.length == 2)) { + Assert.state(false, "时间格式传递不正确"); + } + Assert.notNull(split[0], "开始时间不能为空"); + Assert.notNull(split[1], "结束时间不能为空"); +// start(split[0], split[1]); + } + } else if (ProfilesActiveConstant.LETS_PROFILES_ACTIVE.equals(prod)) { + //默认 + start(); + } + } catch (Exception e) { + e.printStackTrace(); + logger.error("executeBusiness方法抛出异常", e); + } + return BaseResult.getSuccessMessageEntity("插件执行成功"); + } + + @Autowired + private IIntegrationTaskLivingDetailsDao iIntegrationTaskLivingDetailsDao; + @Autowired + private SaveOrUpdateBusinessLogUtil saveOrUpdateBusinessLogUtil; + + @Autowired + private IMdmGmSubjectBalanceDao mdmGmSubjectBalanceDao; + + + /** + * 科目： + * 54010501 + * 54010601 + * 54010701 + * 220202 + * 54010502 + * 54010602 + * 54010702 + * '54010501','54010601','54010701','220202','54010502','54010602','54010702' + */ + public void start() { + LocalDate now = LocalDate.now(); + LocalTime time = LocalTime.now(); + String subjCodes = "'54010501','54010601','54010701','220202','54010502','54010602','54010702'"; + try { + logger.info("调用：" + getPluginName() + "-插件"); + + MdmGmSubjectBalanceEntity mdmGmSubjectBalanceEntity = new MdmGmSubjectBalanceEntity(); + mdmGmSubjectBalanceEntity.setPkCorp("1001"); + mdmGmSubjectBalanceEntity.setSubjcodes(subjCodes); + List mdmGmSubjectBalanceEntities = mdmGmSubjectBalanceDao.queryBalanceBySubjectCodesAndPkCorp(mdmGmSubjectBalanceEntity); + if (mdmGmSubjectBalanceEntities != null && mdmGmSubjectBalanceEntities.size() != 0) { + this.delete(); + List> batches = Lists.partition(mdmGmSubjectBalanceEntities, 500); + for (List batch : batches) { + mdmGmSubjectBalanceDao.saveList(batch); + } + + //成功 + IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity(); + integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_Y); + integrationTaskLivingDetailsEntity.setRootAppNewData(subjCodes); + integrationTaskLivingDetailsEntity.setNewTransmitInfo(subjCodes); + integrationTaskLivingDetailsEntity.setNewPushDate(new Date()); + integrationTaskLivingDetailsEntity.setBusinessDate(now.toString()); + integrationTaskLivingDetailsEntity.setRootAppPk(now + " " + time); + integrationTaskLivingDetailsEntity.setRootAppBill(now + " " + time); + integrationTaskLivingDetailsEntity.setNewSystemPrimary(null); + integrationTaskLivingDetailsEntity.setNewSystemNumber(null); + integrationTaskLivingDetailsEntity.setPluginId(getPluginId()); + saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity); + } + + } catch (Exception e) { + e.printStackTrace(); + //失败 + IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity(); + integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_N); + integrationTaskLivingDetailsEntity.setRootAppNewData(subjCodes); + integrationTaskLivingDetailsEntity.setNewTransmitInfo(e.getMessage()); + integrationTaskLivingDetailsEntity.setNewPushDate(new Date()); + integrationTaskLivingDetailsEntity.setBusinessDate(now.toString()); + integrationTaskLivingDetailsEntity.setRootAppPk(now + " " + time); + integrationTaskLivingDetailsEntity.setRootAppBill(now + " " + time); + integrationTaskLivingDetailsEntity.setPluginId(getPluginId()); + saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity); + } + + + } + + public List start(MdmGmSubjectBalanceEntity mdmGmSubjectBalanceEntity) { + try { + Assert.notNull(mdmGmSubjectBalanceEntity.getPkCorp(), "pkCorp不能为空"); + Assert.notNull(mdmGmSubjectBalanceEntity.getSubjcode(), "subjcode不能为空"); + List mdmGmSubjectBalanceEntities = mdmGmSubjectBalanceDao.queryBalanceBySubjectCodeAndPkCorp(mdmGmSubjectBalanceEntity); + // 切割成每 500 条一组 + List> batches = Lists.partition(mdmGmSubjectBalanceEntities, 500); + for (List batch : batches) { + mdmGmSubjectBalanceDao.saveList(batch); + } + + } catch (Exception e) { + e.printStackTrace(); + } + + return null; + + + } + + public List delete() { + mdmGmSubjectBalanceDao.clearTable(); + return null; + + } + + +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/TestController.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/TestController.java new file mode 100644 index 00000000..4fb5af6b --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/TestController.java @@ -0,0 +1,8 @@ +package com.hzya.frame.plugin.gm; + +/** + * Created by zydd on 2025-08-02 13:59 + */ + +public class TestController { +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/constant/ProfilesActiveConstant.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/constant/ProfilesActiveConstant.java new file mode 100644 index 00000000..3472eaad --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/constant/ProfilesActiveConstant.java @@ -0,0 +1,24 @@ +package com.hzya.frame.plugin.gm.constant; + +public class ProfilesActiveConstant { + + public static final String LETS_DATE_SOURCE = "gm_u8c_prod"; + + public static final String LETS_PROFILES_ACTIVE = "prod"; + + public static final String LOG_STATUS_Y = "Y"; + + public static final String LOG_STATUS_N = "N"; + + public static final String LOG_STATUS_Y_H = "'Y','H'"; + + public static final String TYPE_DATE = "date"; + + public static final String TYPE_VBILLCODE = "vbillcode"; + + public static final String TYPE_DETAIL_ERROR = "details_error"; + + public static final String TYPE_TIME_FRAME = "time_frame"; + + +} \ No newline at end of file diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/IMdmGmSubjectBalanceDao.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/IMdmGmSubjectBalanceDao.java new file mode 100644 index 00000000..58f45b70 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/IMdmGmSubjectBalanceDao.java @@ -0,0 +1,24 @@ +package com.hzya.frame.plugin.gm.dao; + +import com.hzya.frame.basedao.dao.IBaseDao; +import com.hzya.frame.plugin.gm.entity.MdmGmSubjectBalanceEntity; + +import java.util.List; + +/** + * 广脉科目辅助余额表(mdm_gm_subject_balance: table)表数据库访问层 + * + * @author zydd + * @since 2025-08-02 13:39:24 + */ +public interface IMdmGmSubjectBalanceDao extends IBaseDao { + + public List queryBalanceBySubjectCodesAndPkCorp(MdmGmSubjectBalanceEntity entity); + public List queryBalanceBySubjectCodeAndPkCorp(MdmGmSubjectBalanceEntity entity); + + + void saveList(List mdmGmSubjectBalanceEntities); + + void clearTable(); +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/MdmGmSubjectBalanceDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/MdmGmSubjectBalanceDaoImpl.java new file mode 100644 index 00000000..0f4c74ab --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/dao/impl/MdmGmSubjectBalanceDaoImpl.java @@ -0,0 +1,45 @@ +package com.hzya.frame.plugin.gm.dao.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.plugin.gm.constant.ProfilesActiveConstant; +import com.hzya.frame.plugin.gm.dao.IMdmGmSubjectBalanceDao; +import com.hzya.frame.plugin.gm.entity.MdmGmSubjectBalanceEntity; + +import java.util.List; + +/** + * 广脉科目辅助余额表(MdmGmSubjectBalance)表数据库访问层 + * + * @author zydd + * @since 2025-08-02 13:39:24 + */ +public class MdmGmSubjectBalanceDaoImpl extends MybatisGenericDao implements IMdmGmSubjectBalanceDao { + + @DS(ProfilesActiveConstant.LETS_DATE_SOURCE) + @Override + public List queryBalanceBySubjectCodesAndPkCorp(MdmGmSubjectBalanceEntity entity) { + List mdmGmSubjectBalanceEntityList = + (List) super.selectList("com.hzya.frame.plugin.gm.dao.impl.MdmGmSubjectBalanceDaoImpl.queryBalanceBySubjectCodesAndPkCorp", entity); + return mdmGmSubjectBalanceEntityList; + + } + + @Override + public List queryBalanceBySubjectCodeAndPkCorp(MdmGmSubjectBalanceEntity entity) { + List mdmGmSubjectBalanceEntityList = + (List) super.selectList("com.hzya.frame.plugin.gm.dao.impl.MdmGmSubjectBalanceDaoImpl.queryBalanceBySubjectCodeAndPkCorp", entity); + return mdmGmSubjectBalanceEntityList; + } + + @Override + public void saveList(List mdmGmSubjectBalanceEntities) { + this.insert("com.hzya.frame.plugin.gm.dao.impl.MdmGmSubjectBalanceDaoImpl.saveList", mdmGmSubjectBalanceEntities); + } + + @Override + public void clearTable() { + this.delete("com.hzya.frame.plugin.gm.dao.impl.MdmGmSubjectBalanceDaoImpl.clearTable",null); + } +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/MdmGmSubjectBalanceEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/MdmGmSubjectBalanceEntity.java new file mode 100644 index 00000000..4f50dc1e --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/MdmGmSubjectBalanceEntity.java @@ -0,0 +1,353 @@ +package com.hzya.frame.plugin.gm.entity; + +import com.hzya.frame.web.entity.BaseEntity; +/** + * 广脉科目辅助余额表(MdmGmSubjectBalance)实体类 + * + * @author zydd + * @since 2025-08-02 13:39:24 + */ +public class MdmGmSubjectBalanceEntity extends BaseEntity { + + /** 单据规则 */ + private String documentRule; + /** 单据规则流水号 */ + private Long documentRuleNum; + /** 数据状态 Y正常 N删除 F修改 */ + private String dataStatus; + /** 新增数据状态 0待下发 1已下发 */ + private String addStatus; + /** 修改数据状态 0待下发 1已下发 */ + private String updateStatus; + /** 删除数据状态 0待下发 1已下发 */ + private String deleteStatus; + /** 公司id */ + private String companyId; + /** data_id */ + private String dataId; + /** mdm_up_id */ + private String mdmUpId; + /** 公司主键 */ + private String pkCorp; + /** 科目编码 */ + private String subjcode; + private String subjcodes; + /** 科目名称 */ + private String subjname; + /** code1 */ + private String code1; + /** code2 */ + private String code2; + /** code3 */ + private String code3; + /** code4 */ + private String code4; + /** code5 */ + private String code5; + /** code6 */ + private String code6; + /** code7 */ + private String code7; + /** code8 */ + private String code8; + /** code9 */ + private String code9; + /** code10 */ + private String code10; + /** def1 */ + private String def1; + /** def2 */ + private String def2; + /** def3 */ + private String def3; + /** def4 */ + private String def4; + /** def5 */ + private String def5; + /** def6 */ + private String def6; + /** def7 */ + private String def7; + /** def8 */ + private String def8; + /** def9 */ + private String def9; + /** def10 */ + private String def10; + /** 余额 */ + private String balance; + + public String getSubjcodes() { + return subjcodes; + } + + public void setSubjcodes(String subjcodes) { + this.subjcodes = subjcodes; + } + + public String getDocumentRule() { + return documentRule; + } + + public void setDocumentRule(String documentRule) { + this.documentRule = documentRule; + } + + public Long getDocumentRuleNum() { + return documentRuleNum; + } + + public void setDocumentRuleNum(Long documentRuleNum) { + this.documentRuleNum = documentRuleNum; + } + + public String getDataStatus() { + return dataStatus; + } + + public void setDataStatus(String dataStatus) { + this.dataStatus = dataStatus; + } + + public String getAddStatus() { + return addStatus; + } + + public void setAddStatus(String addStatus) { + this.addStatus = addStatus; + } + + public String getUpdateStatus() { + return updateStatus; + } + + public void setUpdateStatus(String updateStatus) { + this.updateStatus = updateStatus; + } + + public String getDeleteStatus() { + return deleteStatus; + } + + public void setDeleteStatus(String deleteStatus) { + this.deleteStatus = deleteStatus; + } + + public String getCompanyId() { + return companyId; + } + + public void setCompanyId(String companyId) { + this.companyId = companyId; + } + + public String getDataId() { + return dataId; + } + + public void setDataId(String dataId) { + this.dataId = dataId; + } + + public String getMdmUpId() { + return mdmUpId; + } + + public void setMdmUpId(String mdmUpId) { + this.mdmUpId = mdmUpId; + } + + public String getPkCorp() { + return pkCorp; + } + + public void setPkCorp(String pkCorp) { + this.pkCorp = pkCorp; + } + + public String getSubjcode() { + return subjcode; + } + + public void setSubjcode(String subjcode) { + this.subjcode = subjcode; + } + + public String getSubjname() { + return subjname; + } + + public void setSubjname(String subjname) { + this.subjname = subjname; + } + + public String getCode1() { + return code1; + } + + public void setCode1(String code1) { + this.code1 = code1; + } + + public String getCode2() { + return code2; + } + + public void setCode2(String code2) { + this.code2 = code2; + } + + public String getCode3() { + return code3; + } + + public void setCode3(String code3) { + this.code3 = code3; + } + + public String getCode4() { + return code4; + } + + public void setCode4(String code4) { + this.code4 = code4; + } + + public String getCode5() { + return code5; + } + + public void setCode5(String code5) { + this.code5 = code5; + } + + public String getCode6() { + return code6; + } + + public void setCode6(String code6) { + this.code6 = code6; + } + + public String getCode7() { + return code7; + } + + public void setCode7(String code7) { + this.code7 = code7; + } + + public String getCode8() { + return code8; + } + + public void setCode8(String code8) { + this.code8 = code8; + } + + public String getCode9() { + return code9; + } + + public void setCode9(String code9) { + this.code9 = code9; + } + + public String getCode10() { + return code10; + } + + public void setCode10(String code10) { + this.code10 = code10; + } + + public String getDef1() { + return def1; + } + + public void setDef1(String def1) { + this.def1 = def1; + } + + public String getDef2() { + return def2; + } + + public void setDef2(String def2) { + this.def2 = def2; + } + + public String getDef3() { + return def3; + } + + public void setDef3(String def3) { + this.def3 = def3; + } + + public String getDef4() { + return def4; + } + + public void setDef4(String def4) { + this.def4 = def4; + } + + public String getDef5() { + return def5; + } + + public void setDef5(String def5) { + this.def5 = def5; + } + + public String getDef6() { + return def6; + } + + public void setDef6(String def6) { + this.def6 = def6; + } + + public String getDef7() { + return def7; + } + + public void setDef7(String def7) { + this.def7 = def7; + } + + public String getDef8() { + return def8; + } + + public void setDef8(String def8) { + this.def8 = def8; + } + + public String getDef9() { + return def9; + } + + public void setDef9(String def9) { + this.def9 = def9; + } + + public String getDef10() { + return def10; + } + + public void setDef10(String def10) { + this.def10 = def10; + } + + public String getBalance() { + return balance; + } + + public void setBalance(String balance) { + this.balance = balance; + } + +} + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/MdmGmSubjectBalanceEntity.xml b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/MdmGmSubjectBalanceEntity.xml new file mode 100644 index 00000000..cae418c5 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/entity/MdmGmSubjectBalanceEntity.xml @@ -0,0 +1,712 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id + ,document_rule + ,document_rule_num + ,data_status + ,add_status + ,update_status + ,delete_status + ,sorts + ,create_user_id + ,create_time + ,modify_user_id + ,modify_time + ,sts + ,org_id + ,company_id + ,data_id + ,mdm_up_id + ,pk_corp + ,subjcode + ,subjname + ,code1 + ,code2 + ,code3 + ,code4 + ,code5 + ,code6 + ,code7 + ,code8 + ,code9 + ,code10 + ,def1 + ,def2 + ,def3 + ,def4 + ,def5 + ,def6 + ,def7 + ,def8 + ,def9 + ,def10 + ,balance + + + + + + + + + + + + + + + + insert into mdm_gm_subject_balance( + + id , + document_rule , + document_rule_num , + data_status , + add_status , + update_status , + delete_status , + sorts , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + org_id , + company_id , + data_id , + mdm_up_id , + pk_corp , + subjcode , + subjname , + code1 , + code2 , + code3 , + code4 , + code5 , + code6 , + code7 , + code8 , + code9 , + code10 , + def1 , + def2 , + def3 , + def4 , + def5 , + def6 , + def7 , + def8 , + def9 , + def10 , + balance , + sorts, + sts, + + )values( + + #{id} , + #{documentRule} , + #{documentRuleNum} , + #{dataStatus} , + #{addStatus} , + #{updateStatus} , + #{deleteStatus} , + #{sorts} , + #{create_user_id} , + #{create_time} , + #{modify_user_id} , + #{modify_time} , + #{sts} , + #{org_id} , + #{companyId} , + #{dataId} , + #{mdmUpId} , + #{pkCorp} , + #{subjcode} , + #{subjname} , + #{code1} , + #{code2} , + #{code3} , + #{code4} , + #{code5} , + #{code6} , + #{code7} , + #{code8} , + #{code9} , + #{code10} , + #{def1} , + #{def2} , + #{def3} , + #{def4} , + #{def5} , + #{def6} , + #{def7} , + #{def8} , + #{def9} , + #{def10} , + #{balance} , + (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from mdm_gm_subject_balance a + WHERE a.sts = 'Y' ), + + 'Y', + + ) + + + + insert into mdm_gm_subject_balance(document_rule, document_rule_num, data_status, add_status, update_status, + delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, data_id, + mdm_up_id, pk_corp, subjcode, subjname, code1, code2, code3, code4, code5, code6, code7, code8, code9, code10, + def1, def2, def3, def4, def5, def6, def7, def8, def9, def10, balance, sts) + values + + (#{entity.documentRule},#{entity.documentRuleNum},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},#{entity.dataId},#{entity.mdmUpId},#{entity.pkCorp},#{entity.subjcode},#{entity.subjname},#{entity.code1},#{entity.code2},#{entity.code3},#{entity.code4},#{entity.code5},#{entity.code6},#{entity.code7},#{entity.code8},#{entity.code9},#{entity.code10},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5},#{entity.def6},#{entity.def7},#{entity.def8},#{entity.def9},#{entity.def10},#{entity.balance}, + 'Y') + + + + + insert into mdm_gm_subject_balance(document_rule, document_rule_num, data_status, add_status, update_status, + delete_status, create_user_id, create_time, modify_user_id, modify_time, sts, org_id, company_id, data_id, + mdm_up_id, pk_corp, subjcode, subjname, code1, code2, code3, code4, code5, code6, code7, code8, code9, code10, + def1, def2, def3, def4, def5, def6, def7, def8, def9, def10, balance) + values + + (#{entity.documentRule},#{entity.documentRuleNum},#{entity.dataStatus},#{entity.addStatus},#{entity.updateStatus},#{entity.deleteStatus},#{entity.create_user_id},#{entity.create_time},#{entity.modify_user_id},#{entity.modify_time},#{entity.sts},#{entity.org_id},#{entity.companyId},#{entity.dataId},#{entity.mdmUpId},#{entity.pkCorp},#{entity.subjcode},#{entity.subjname},#{entity.code1},#{entity.code2},#{entity.code3},#{entity.code4},#{entity.code5},#{entity.code6},#{entity.code7},#{entity.code8},#{entity.code9},#{entity.code10},#{entity.def1},#{entity.def2},#{entity.def3},#{entity.def4},#{entity.def5},#{entity.def6},#{entity.def7},#{entity.def8},#{entity.def9},#{entity.def10},#{entity.balance}) + + on duplicate key update + document_rule = values(document_rule), + document_rule_num = values(document_rule_num), + data_status = values(data_status), + add_status = values(add_status), + update_status = values(update_status), + delete_status = values(delete_status), + create_user_id = values(create_user_id), + create_time = values(create_time), + modify_user_id = values(modify_user_id), + modify_time = values(modify_time), + sts = values(sts), + org_id = values(org_id), + company_id = values(company_id), + data_id = values(data_id), + mdm_up_id = values(mdm_up_id), + pk_corp = values(pk_corp), + subjcode = values(subjcode), + subjname = values(subjname), + code1 = values(code1), + code2 = values(code2), + code3 = values(code3), + code4 = values(code4), + code5 = values(code5), + code6 = values(code6), + code7 = values(code7), + code8 = values(code8), + code9 = values(code9), + code10 = values(code10), + def1 = values(def1), + def2 = values(def2), + def3 = values(def3), + def4 = values(def4), + def5 = values(def5), + def6 = values(def6), + def7 = values(def7), + def8 = values(def8), + def9 = values(def9), + def10 = values(def10), + balance = values(balance) + + + + update mdm_gm_subject_balance set + + document_rule = #{documentRule}, + document_rule_num = #{documentRuleNum}, + data_status = #{dataStatus}, + add_status = #{addStatus}, + update_status = #{updateStatus}, + delete_status = #{deleteStatus}, + create_user_id = #{create_user_id}, + create_time = #{create_time}, + modify_user_id = #{modify_user_id}, + modify_time = #{modify_time}, + sts = #{sts}, + org_id = #{org_id}, + company_id = #{companyId}, + data_id = #{dataId}, + mdm_up_id = #{mdmUpId}, + pk_corp = #{pkCorp}, + subjcode = #{subjcode}, + subjname = #{subjname}, + code1 = #{code1}, + code2 = #{code2}, + code3 = #{code3}, + code4 = #{code4}, + code5 = #{code5}, + code6 = #{code6}, + code7 = #{code7}, + code8 = #{code8}, + code9 = #{code9}, + code10 = #{code10}, + def1 = #{def1}, + def2 = #{def2}, + def3 = #{def3}, + def4 = #{def4}, + def5 = #{def5}, + def6 = #{def6}, + def7 = #{def7}, + def8 = #{def8}, + def9 = #{def9}, + def10 = #{def10}, + balance = #{balance}, + + where id = #{id} + + + + update mdm_gm_subject_balance + set sts= 'N', + modify_time = #{modify_time}, + modify_user_id = #{modify_user_id} + where id = #{id} + + + + update mdm_gm_subject_balance set sts= 'N' ,modify_time = #{modify_time},modify_user_id = #{modify_user_id} + + and id = #{id} + and document_rule = #{documentRule} + and document_rule_num = #{documentRuleNum} + and data_status = #{dataStatus} + and add_status = #{addStatus} + and update_status = #{updateStatus} + and delete_status = #{deleteStatus} + and sorts = #{sorts} + and sts = #{sts} + and company_id = #{companyId} + and data_id = #{dataId} + and mdm_up_id = #{mdmUpId} + and pk_corp = #{pkCorp} + and subjcode = #{subjcode} + and subjname = #{subjname} + and code1 = #{code1} + and code2 = #{code2} + and code3 = #{code3} + and code4 = #{code4} + and code5 = #{code5} + and code6 = #{code6} + and code7 = #{code7} + and code8 = #{code8} + and code9 = #{code9} + and code10 = #{code10} + and def1 = #{def1} + and def2 = #{def2} + and def3 = #{def3} + and def4 = #{def4} + and def5 = #{def5} + and def6 = #{def6} + and def7 = #{def7} + and def8 = #{def8} + and def9 = #{def9} + and def10 = #{def10} + and balance = #{balance} + and sts='Y' + + + + + delete + from mdm_gm_subject_balance + where id = #{id} + + + + + + + + + INSERT INTO mdm_gm_subject_balance ( + id, + pk_corp, + subjcode, + subjname, + code1, + code3, + code5, + code8, + balance, + sts, + data_status + ) VALUES + + ( + UUID(), + #{item.pkCorp}, + #{item.subjcode}, + #{item.subjname}, + #{item.code1}, + #{item.code3}, + #{item.code5}, + #{item.code8}, + #{item.balance}, + 'Y', + 'Y' + ) + + + + + TRUNCATE TABLE mdm_gm_subject_balance; + + + + diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/service/IMdmGmSubjectBalanceService.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/service/IMdmGmSubjectBalanceService.java new file mode 100644 index 00000000..fba5eb30 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/service/IMdmGmSubjectBalanceService.java @@ -0,0 +1,12 @@ +package com.hzya.frame.plugin.gm.service; + +import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.plugin.gm.entity.MdmGmSubjectBalanceEntity; +/** + * 广脉科目辅助余额表(MdmGmSubjectBalance)表服务接口 + * + * @author zydd + * @since 2025-08-02 13:39:24 + */ +public interface IMdmGmSubjectBalanceService extends IBaseService{ +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/service/impl/MdmGmSubjectBalanceServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/service/impl/MdmGmSubjectBalanceServiceImpl.java new file mode 100644 index 00000000..2d0701f3 --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/service/impl/MdmGmSubjectBalanceServiceImpl.java @@ -0,0 +1,23 @@ +package com.hzya.frame.plugin.gm.service.impl; + +import com.hzya.frame.basedao.service.impl.BaseService; +import com.hzya.frame.plugin.gm.dao.IMdmGmSubjectBalanceDao; +import com.hzya.frame.plugin.gm.entity.MdmGmSubjectBalanceEntity; +import com.hzya.frame.plugin.gm.service.IMdmGmSubjectBalanceService; +import org.springframework.beans.factory.annotation.Autowired; +/** + * 广脉科目辅助余额表(MdmGmSubjectBalance)表服务实现类 + * + * @author zydd + * @since 2025-08-02 13:39:24 + */ +public class MdmGmSubjectBalanceServiceImpl extends BaseService implements IMdmGmSubjectBalanceService { + + private IMdmGmSubjectBalanceDao mdmGmSubjectBalanceDao; + + @Autowired + public void setMdmGmSubjectBalanceDao(IMdmGmSubjectBalanceDao dao) { + this.mdmGmSubjectBalanceDao = dao; + this.dao = dao; + } +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/utils/SaveOrUpdateBusinessLogUtil.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/utils/SaveOrUpdateBusinessLogUtil.java new file mode 100644 index 00000000..f1f8675d --- /dev/null +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/gm/utils/SaveOrUpdateBusinessLogUtil.java @@ -0,0 +1,178 @@ +package com.hzya.frame.plugin.gm.utils; + +import cn.hutool.core.lang.Assert; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao; +import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; +import com.hzya.frame.uuid.UUIDLong; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * 保存或者更新业务日志 + */ +@Component +public class SaveOrUpdateBusinessLogUtil { + + Logger logger = LoggerFactory.getLogger(SaveOrUpdateBusinessLogUtil.class); + + @Autowired + private IIntegrationTaskLivingDetailsDao iIntegrationTaskLivingDetailsDao; + + private static final Object insertOrUpdateLock = new Object(); + + private static final Object queryDetailsLock = new Object(); + + private static final String successY = "Y"; + + private static final String failN = "N"; + + private static final Object OBJECT_LOCK = new Object(); + + /** + * 保存或者更新 + * + * @param integrationTaskLivingDetailsEntity 提交参数 + */ + public void saveOrUpdate(IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity) { + Assert.notNull(integrationTaskLivingDetailsEntity, "integrationTaskLivingDetailsEntity不能为空"); + Assert.notNull(integrationTaskLivingDetailsEntity.getRootAppPk(), "源系统单号不能为空"); + Assert.notNull(integrationTaskLivingDetailsEntity.getPluginId(), "场景id不能为空"); + + synchronized (OBJECT_LOCK) { + Thread n = new Thread(new Runnable() { + @Override + public void run() { + try { + IntegrationTaskLivingDetailsEntity integrationTaskLivingDetails = null; + IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity1 = new IntegrationTaskLivingDetailsEntity(); + integrationTaskLivingDetailsEntity1.setNewState("N"); + integrationTaskLivingDetailsEntity1.setRootAppPk(integrationTaskLivingDetailsEntity.getRootAppPk()); + integrationTaskLivingDetailsEntity1.setPluginId(integrationTaskLivingDetailsEntity.getPluginId()); + List integrationTaskLivingDetailsEntities = iIntegrationTaskLivingDetailsDao.query(integrationTaskLivingDetailsEntity1); + if (integrationTaskLivingDetailsEntities != null && integrationTaskLivingDetailsEntities.size() > 0) { + integrationTaskLivingDetails = integrationTaskLivingDetailsEntities.get(0); + } + + if (integrationTaskLivingDetails != null) { + //存在，则更新，可能是N→Y / N→N + integrationTaskLivingDetailsEntity.setId(integrationTaskLivingDetails.getId()); + updateSuccessMessage(integrationTaskLivingDetailsEntity); + } else { + //不存在，则新增，可能是→Y / →N + Long uuid = UUIDLong.longUUID(); + integrationTaskLivingDetailsEntity.setId(String.valueOf(uuid)); + saveSuccessMessage(integrationTaskLivingDetailsEntity); +// logger.info("integration_task_living_details->日志保存成功，主键：{}", save.getId()); + } + } catch (Exception e) { + logger.error("SaveOrUpdateBusinessLogUtil对应的saveOrUpdate方法抛出异常，日志详情保存失败！", e); + //2024年9月3日 10:26:45 如果这里往上抛出异常，没有功能搭配处理 + } + } + }); + n.start(); + try{ + n.join(); + }catch (Exception e){ + logger.error("",e); + } + } + } + + /** + * 更新日志 存在，则更新，可能是N→Y / N→N + * 肯定有id + * + * @param integrationTaskLivingDetailsEntity + */ + private void updateSuccessMessage(IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity) { + IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity1 = queryIntegrationTaskLivingDetailsEntityN(integrationTaskLivingDetailsEntity.getId()); + if (successY.equals(integrationTaskLivingDetailsEntity.getNewState())) { + //N→Y + iIntegrationTaskLivingDetailsDao.deleteEntity(integrationTaskLivingDetailsEntity1); + + String successIdentification = "success"; + integrationTaskLivingDetailsEntity.setRootAppNewData(successIdentification); + integrationTaskLivingDetailsEntity.setNewTransmitInfo(successIdentification); + iIntegrationTaskLivingDetailsDao.saveSuccessLog(integrationTaskLivingDetailsEntity); + + } else if (failN.equals(integrationTaskLivingDetailsEntity.getNewState())) { + //N→N + String rootAppNewData = integrationTaskLivingDetailsEntity.getRootAppNewData(); + if (integrationTaskLivingDetailsEntity.getRootAppNewData() != null && !integrationTaskLivingDetailsEntity.getRootAppNewData().trim().equals("") && integrationTaskLivingDetailsEntity.getRootAppNewData().length() >= 500) { + rootAppNewData = integrationTaskLivingDetailsEntity.getRootAppNewData().substring(0, 500); + } + String newTransmitInfo = integrationTaskLivingDetailsEntity.getNewTransmitInfo(); + if (integrationTaskLivingDetailsEntity.getNewTransmitInfo() != null && !integrationTaskLivingDetailsEntity.getNewTransmitInfo().trim().equals("") && integrationTaskLivingDetailsEntity.getNewTransmitInfo().length() >= 500) { + newTransmitInfo = integrationTaskLivingDetailsEntity.getNewTransmitInfo().substring(0, 500); + } + integrationTaskLivingDetailsEntity.setRootAppNewData(rootAppNewData); + integrationTaskLivingDetailsEntity.setNewTransmitInfo(newTransmitInfo); + iIntegrationTaskLivingDetailsDao.update(integrationTaskLivingDetailsEntity); + } + } + + /** + * 新增日志 不存在，则新增，可能是→Y / →N + * + * @param integrationTaskLivingDetailsEntity + */ + private void saveSuccessMessage(IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity) { + if (successY.equals(integrationTaskLivingDetailsEntity.getNewState())) { + //→Y + String successIdentification = "success"; + integrationTaskLivingDetailsEntity.setRootAppNewData(successIdentification); + integrationTaskLivingDetailsEntity.setNewTransmitInfo(successIdentification); + iIntegrationTaskLivingDetailsDao.saveSuccessLog(integrationTaskLivingDetailsEntity); + + } else if (failN.equals(integrationTaskLivingDetailsEntity.getNewState())) { + //→N + String rootAppNewData = integrationTaskLivingDetailsEntity.getRootAppNewData(); + if (integrationTaskLivingDetailsEntity.getRootAppNewData() != null && !integrationTaskLivingDetailsEntity.getRootAppNewData().trim().equals("") && integrationTaskLivingDetailsEntity.getRootAppNewData().length() >= 500) { + rootAppNewData = integrationTaskLivingDetailsEntity.getRootAppNewData().substring(0, 500); + } + String newTransmitInfo = integrationTaskLivingDetailsEntity.getNewTransmitInfo(); + if (integrationTaskLivingDetailsEntity.getNewTransmitInfo() != null && !integrationTaskLivingDetailsEntity.getNewTransmitInfo().trim().equals("") && integrationTaskLivingDetailsEntity.getNewTransmitInfo().length() >= 500) { + newTransmitInfo = integrationTaskLivingDetailsEntity.getNewTransmitInfo().substring(0, 500); + } + integrationTaskLivingDetailsEntity.setRootAppNewData(rootAppNewData); + integrationTaskLivingDetailsEntity.setNewTransmitInfo(newTransmitInfo); + iIntegrationTaskLivingDetailsDao.save(integrationTaskLivingDetailsEntity); + } + + } + + + private static final Object queryIntegrationTaskLivingDetailsEntityLock = new Object(); + + + /** + * 根据明细id查询明细信息，成功表 integration_task_living_details_success + */ + public IntegrationTaskLivingDetailsEntity queryIntegrationTaskLivingDetailsEntityY(IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity) { +// Assert.notNull(integration_task_living_details_id, "业务明细id不能为空"); +// IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity(); +// integrationTaskLivingDetailsEntity.setId(integration_task_living_details_id); +// integrationTaskLivingDetailsEntity.setNewState("Y");//查询成功表 + IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity1 = iIntegrationTaskLivingDetailsDao.queryEntity(integrationTaskLivingDetailsEntity); + Assert.notNull(integrationTaskLivingDetailsEntity1, "根据主键id没有查询到明细信息"); + return integrationTaskLivingDetailsEntity1; + } + + /** + * 根据明细id查询明细信息，错误表 integration_task_living_details + */ + public IntegrationTaskLivingDetailsEntity queryIntegrationTaskLivingDetailsEntityN(String integration_task_living_details_id) { + Assert.notNull(integration_task_living_details_id, "业务明细id不能为空"); + IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity(); + integrationTaskLivingDetailsEntity.setId(integration_task_living_details_id); + integrationTaskLivingDetailsEntity.setNewState("N");//查询失败表 + IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity1 = iIntegrationTaskLivingDetailsDao.queryEntity(integrationTaskLivingDetailsEntity); + Assert.notNull(integrationTaskLivingDetailsEntity1, "根据主键id没有查询到明细信息"); + return integrationTaskLivingDetailsEntity1; + } +} diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/dao/impl/MdmDaoImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/dao/impl/MdmDaoImpl.java index 05e95b1e..114022ba 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/dao/impl/MdmDaoImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/dao/impl/MdmDaoImpl.java @@ -1,8 +1,8 @@ package com.hzya.frame.plugin.masterData.dao.impl; -import com.hzya.frame.plugin.masterData.entity.MdmEntity; -import com.hzya.frame.plugin.masterData.dao.IMdmDao; import com.hzya.frame.basedao.dao.MybatisGenericDao; +import com.hzya.frame.plugin.masterData.dao.IMdmDao; +import com.hzya.frame.plugin.masterData.entity.MdmEntity; /** * 客户档案(MdmCustomer)表数据库访问层 * diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/entity/MdmEntity.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/entity/MdmEntity.java index e8d7f6f9..dc4e65d6 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/entity/MdmEntity.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/entity/MdmEntity.java @@ -1,6 +1,5 @@ package com.hzya.frame.plugin.masterData.entity; -import java.util.Date; import com.hzya.frame.web.entity.BaseEntity; /** * 客户档案(MdmCustomer)实体类 diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/service/IMdmService.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/service/IMdmService.java index 175d0616..594fba9f 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/service/IMdmService.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/service/IMdmService.java @@ -1,7 +1,7 @@ package com.hzya.frame.plugin.masterData.service; -import com.hzya.frame.plugin.masterData.entity.MdmEntity; import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.plugin.masterData.entity.MdmEntity; /** * 客户档案(MdmCustomer)表服务接口 * diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/service/impl/MdmServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/service/impl/MdmServiceImpl.java index e1016019..79a111ed 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/service/impl/MdmServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/masterData/service/impl/MdmServiceImpl.java @@ -1,11 +1,10 @@ package com.hzya.frame.plugin.masterData.service.impl; -import com.hzya.frame.plugin.masterData.entity.MdmEntity; +import com.hzya.frame.basedao.service.impl.BaseService; import com.hzya.frame.plugin.masterData.dao.IMdmDao; -import com.hzya.frame.plugin.masterData.service.IMdmService; +import com.hzya.frame.plugin.masterData.entity.MdmEntity; import com.hzya.frame.plugin.masterData.service.IMdmService; import org.springframework.beans.factory.annotation.Autowired; -import com.hzya.frame.basedao.service.impl.BaseService; /** * 客户档案(MdmCustomer)表服务实现类 * diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java index beb4c48e..a6c3f6be 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/mdmDistribute/plugin/MdmModulePluginInitializer.java @@ -1,6 +1,5 @@ package com.hzya.frame.plugin.mdmDistribute.plugin; -import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSON; diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/pushMessage/plugin/PushMessagePluginInitializer.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/pushMessage/plugin/PushMessagePluginInitializer.java index 3bc07a67..2be77c48 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/pushMessage/plugin/PushMessagePluginInitializer.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/pushMessage/plugin/PushMessagePluginInitializer.java @@ -2,12 +2,8 @@ package com.hzya.frame.plugin.pushMessage.plugin; import com.alibaba.fastjson.JSONObject; import com.hzya.frame.base.PluginBaseEntity; -import com.hzya.frame.plugin.pushMessage.dao.IPushMessageDao; -import com.hzya.frame.plugin.pushMessage.entity.PushMessageEntity; -import com.hzya.frame.sysnew.comparison.masterData.service.IMasterDataService; import com.hzya.frame.sysnew.pushMessage.dao.ISysPushMessageDao; import com.hzya.frame.sysnew.pushMessage.entity.SysPushMessageEntity; -import com.hzya.frame.sysnew.pushMessage.service.ISysPushMessageService; import com.hzya.frame.sysnew.sendMessageLog.service.ISysSendMessageLogService; import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/pushMessage/service/IPushMessageService.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/pushMessage/service/IPushMessageService.java index 1109a5bd..663994c6 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/pushMessage/service/IPushMessageService.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/pushMessage/service/IPushMessageService.java @@ -1,9 +1,7 @@ package com.hzya.frame.plugin.pushMessage.service; -import com.alibaba.fastjson.JSONObject; import com.hzya.frame.basedao.service.IBaseService; import com.hzya.frame.plugin.pushMessage.entity.PushMessageEntity; -import com.hzya.frame.web.entity.JsonResultEntity; public interface IPushMessageService extends IBaseService { diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/pushMessage/service/impl/PushMessageServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/pushMessage/service/impl/PushMessageServiceImpl.java index 8101cda9..805c3350 100644 --- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/pushMessage/service/impl/PushMessageServiceImpl.java +++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/pushMessage/service/impl/PushMessageServiceImpl.java @@ -1,16 +1,10 @@ package com.hzya.frame.plugin.pushMessage.service.impl; -import com.alibaba.fastjson.JSONObject; import com.hzya.frame.basedao.service.impl.BaseService; import com.hzya.frame.plugin.pushMessage.dao.IPushMessageDao; import com.hzya.frame.plugin.pushMessage.entity.PushMessageEntity; import com.hzya.frame.plugin.pushMessage.service.IPushMessageService; -import com.hzya.frame.web.entity.BaseResult; -import com.hzya.frame.web.entity.JsonResultEntity; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; public class PushMessageServiceImpl extends BaseService implements IPushMessageService { diff --git a/base-buildpackage/src/main/resources/application-ax.yml b/base-buildpackage/src/main/resources/application-ax.yml deleted file mode 100644 index fda31564..00000000 --- a/base-buildpackage/src/main/resources/application-ax.yml +++ /dev/null @@ -1,23 +0,0 @@ -#######################澳星环境####################### -logging: - #日志级别 指定目录级别 - level: - root: info - encodings: GBK - file: -# 日志保存路径 - path: E:\yongansystem\log -spring: - datasource: - dynamic: - datasource: - master: - url: jdbc:mysql://127.0.0.1:3306/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可省略此配置 -savefile: - # 文件保存路径 - path: E:\yongansystem\file -zt: - url: http://127.0.0.1:9081/kangarooDataCenterV3/entranceController/externalCallInterface \ No newline at end of file diff --git a/base-buildpackage/src/main/resources/application-dev.yml b/base-buildpackage/src/main/resources/application-dev.yml deleted file mode 100644 index 5e9c4b36..00000000 --- a/base-buildpackage/src/main/resources/application-dev.yml +++ /dev/null @@ -1,42 +0,0 @@ -#######################dev环境####################### -logging: - #日志级别 指定目录级别 - level: - root: warn - encodings: UTF-8 - file: - # 日志保存路径 - path: /home/webservice/zt/log -spring: - datasource: - dynamic: - datasource: - master: - 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可省略此配置 -savefile: - # 文件保存路径 - path: /home/webservice/zt/file -# path: D:\webservice\file -# pluginpath: D:\webservice\plugin - pluginpath: /home/webservice/zt/plugin -# tomcatpath: D:\apache-tomcat-9.0.69\webapps\kangarooDataCenter\WEB-INF\classes\ - tomcatpath: /home/webservice/zt/tomcatV3/webapps/kangarooDataCenterV3/WEB-INF/classes/ -cbs8: - appId: 1P4AGrpz - appSecret: 2c2369ae5dc04382844bbe3a5abf39e1bea9cd3a - url: https://cbs8-openapi-reprd.csuat.cmburl.cn - # 测试用这个 这个是银行给的，和下面的公钥不是一对密钥 - ya_private_key: 83BA7EC821D35F4CB31FF9A51C1EFA520FC52AF828C2337F88E91CF119B07F44 - # 这个私钥到时候上传到cbs，和下面到是同一对 - #ya_private_key: e1eacfdee9b8d4184437d5a2071e17ce31befc3d93395f9f05709ed562e8dc46 - ya_public_key: 044fa399d2223760f17b81b863cb482b009294c4516f8a605dea1475ec09e720eaa98468715e5ad509a592a0b426061551c5a3df236966c23253a7d894eac0dcde - cbs_public_key: 0469146F06BF3B01236E84632441E826 - #电子回单下载临时存放位置 - elec_path: /Users/xiangerlin/Downloads/ -OA: - data_source_code: yc_oa -zt: - url: http://127.0.0.1:9082/kangarooDataCenterV3/entranceController/externalCallInterface \ No newline at end of file diff --git a/base-buildpackage/src/main/resources/application-hclocal.yml b/base-buildpackage/src/main/resources/application-hclocal.yml deleted file mode 100644 index 1ec327da..00000000 --- a/base-buildpackage/src/main/resources/application-hclocal.yml +++ /dev/null @@ -1,27 +0,0 @@ -#######################本地环境####################### -logging: - #日志级别 指定目录级别 - level: - root: info - encodings: UTF-8 - file: -# 日志保存路径 - path: D:\yongansystem\kangarooDataCenter\v3\logs -spring: - datasource: - dynamic: - 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可省略此配置 -savefile: - # 文件保存路径 - path: D:\yongansystem\kangarooDataCenter\v3\logs -zt: - url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface diff --git a/base-buildpackage/src/main/resources/application-llg.yml b/base-buildpackage/src/main/resources/application-llg.yml deleted file mode 100644 index 11273505..00000000 --- a/base-buildpackage/src/main/resources/application-llg.yml +++ /dev/null @@ -1,82 +0,0 @@ -#######################本地环境####################### -logging: - #日志级别 指定目录级别 - level: - root: info - encodings: UTF-8 - file: - # 日志保存路径 - path: /Users/apple/Desktop/log/local -spring: - data: - mongodb: -# host: 192.168.2.237 -# port: 27017 -# database: businesscenter -# auto-index-creation: true -# password: hzya1314 -# username: hzya - flyway: - # 启动flyway migration, 默认为true - enabled: false - datasource: - dynamic: - druid: - filters: stat,log4j2 - datasource: - master: -# url: jdbc:dm://hzya.ufyct.com:9040?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle -# username: hzyazt -# password: 62e4295b615a30dbf3b8ee96f41c820b -# driver-class-name: dm.jdbc.driver.DmDriver -# type: com.alibaba.druid.pool.DruidDataSource - 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:dm://hzya.ufyct.com:9040/businesscenter?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8 -# url: jdbc:dm://hzya.ufyct.com:9040?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle -# username: hzyazt -# password: 62e4295b615a30dbf3b8ee96f41c820b -# driver-class-name: dm.jdbc.driver.DmDriver -savefile: - # 文件保存路径 - path: /Users/apple/Desktop/log/local - tomcatpath: /Users/apple/Desktop/log/local - pluginpath: /Users/apple/Desktop/log/local -zt: - url: http://127.0.0.1:10086/kangarooDataCenterV3/entranceController/externalCallInterface -cbs8: - appId: 1P4AGrpz - appSecret: 2c2369ae5dc04382844bbe3a5abf39e1bea9cd3a - url: https://cbs8-openapi-reprd.csuat.cmburl.cn - # 测试用这个 这个是银行给的，和下面的公钥不是一对密钥 - ya_private_key: 83BA7EC821D35F4CB31FF9A51C1EFA520FC52AF828C2337F88E91CF119B07F44 - # 这个私钥到时候上传到cbs，和下面到是同一对 - #ya_private_key: e1eacfdee9b8d4184437d5a2071e17ce31befc3d93395f9f05709ed562e8dc46 - ya_public_key: 044fa399d2223760f17b81b863cb482b009294c4516f8a605dea1475ec09e720eaa98468715e5ad509a592a0b426061551c5a3df236966c23253a7d894eac0dcde - cbs_public_key: 0469146F06BF3B01236E84632441E826 - #电子回单下载临时存放位置 - elec_path: /Users/xiangerlin/Downloads/ -OA: - data_source_code: yc_oa -server: - port: 10086 - -# mysqldump -d mylm -hhzya.ufyct.com -p9096 -uroot -phzya1314 >%dirName%\table_view.sql - - -database: - databaseName: businesscenter - host: 192.168.2.237 - port: 3306 - username: root - password: hzya@1314 - filePase: /Users/apple/Desktop/log - fileName: data.sql -#sftp: -# host: 192.168.2.237 -# port: 9091 -# username: cs237 -# password: hzya@1314 -# filePase: /databaseBack diff --git a/base-buildpackage/src/main/resources/application-local.yml b/base-buildpackage/src/main/resources/application-local.yml deleted file mode 100644 index 66d151f2..00000000 --- a/base-buildpackage/src/main/resources/application-local.yml +++ /dev/null @@ -1,23 +0,0 @@ -#######################本地环境####################### -logging: - #日志级别 指定目录级别 - level: - root: info - encodings: UTF-8 - file: -# 日志保存路径 - path: /Users/apple/Desktop/log/local -spring: - datasource: - dynamic: - datasource: - master: - 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可省略此配置 -savefile: - # 文件保存路径 - path: /Users/apple/Desktop/log/local -zt: - url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface diff --git a/base-buildpackage/src/main/resources/application-xel.yml b/base-buildpackage/src/main/resources/application-xel.yml deleted file mode 100644 index e5d2197f..00000000 --- a/base-buildpackage/src/main/resources/application-xel.yml +++ /dev/null @@ -1,23 +0,0 @@ -#######################本地环境####################### -logging: - #日志级别 指定目录级别 - level: - root: info - encodings: UTF-8 - file: -# 日志保存路径 - path: /Users/xiangerlin/work/app/logs/dev -spring: - datasource: - dynamic: - datasource: - master: - 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: bd993088e8a7c3dc5f44441617f9b4bf - driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 -savefile: - # 文件保存路径 - path: /Users/xiangerlin/work/app/file/dev - pluginpath: /Users/xiangerlin/work/app/file/dev - tomcatpath: /Users/xiangerlin/work/app/file/dev diff --git a/base-buildpackage/src/main/resources/application-yc.yml b/base-buildpackage/src/main/resources/application-yc.yml deleted file mode 100644 index b2e3e2cf..00000000 --- a/base-buildpackage/src/main/resources/application-yc.yml +++ /dev/null @@ -1,90 +0,0 @@ -#logging: -# #日志级别 指定目录级别 -# level: -# root: info -# encodings: UTF-8 -# file: -# # 日志保存路径 -# path: /zt/log -#spring: -# flyway: -# # 启动flyway migration, 默认为true -# enabled: false -# datasource: -# dynamic: -# druid: -# filters: stat,log4j2 -# datasource: -# master: -# url: jdbc:dm://10.75.51.82:5238?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle -# username: businesscenter -# password: 6842568689469adad597d144ee104063 -# driver-class-name: dm.jdbc.driver.DmDriver -#savefile: -# # 文件保存路径 -# path: /zt/file -#公司mysql -#ax: -# url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface -#logging: -# #日志级别 指定目录级别warn -# level: -# root: info -# encodings: UTF-8 -# file: -# # 日志保存路径 -# path: /home/webservice/zt/log -#spring: -# datasource: -# dynamic: -# datasource: -# master: -# 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可省略此配置 -#savefile: -# # 文件保存路径 -# path: /home/webservice/zt/file - - -#公司服务器达梦 -logging: - #日志级别 指定目录级别 - level: - root: info - encodings: UTF-8 - file: - # 日志保存路径 - path: /zt/log -spring: - flyway: - # 启动flyway migration, 默认为true - enabled: false - datasource: - dynamic: - druid: - filters: stat,log4j2 - datasource: - master: - url: jdbc:dm://ufidahz.com.cn:9040?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle - username: hzyazt - password: 62e4295b615a30dbf3b8ee96f41c820b - driver-class-name: dm.jdbc.driver.DmDriver -savefile: - # 文件保存路径 - path: /zt/file -cbs8: - appId: 1P4AGrpz - appSecret: 2c2369ae5dc04382844bbe3a5abf39e1bea9cd3a - url: https://cbs8-openapi-reprd.csuat.cmburl.cn - # 测试用这个 这个是银行给的，和下面的公钥不是一对密钥 - ya_private_key: 83BA7EC821D35F4CB31FF9A51C1EFA520FC52AF828C2337F88E91CF119B07F44 - # 这个私钥到时候上传到cbs，和下面到是同一对 - #ya_private_key: e1eacfdee9b8d4184437d5a2071e17ce31befc3d93395f9f05709ed562e8dc46 - ya_public_key: 044fa399d2223760f17b81b863cb482b009294c4516f8a605dea1475ec09e720eaa98468715e5ad509a592a0b426061551c5a3df236966c23253a7d894eac0dcde - cbs_public_key: 0469146F06BF3B01236E84632441E826 - #电子回单下载临时存放位置 - elec_path: /zt/elecfile -OA: - data_source_code: yc_oa diff --git a/base-buildpackage/src/main/resources/application-ydc.yml b/base-buildpackage/src/main/resources/application-ydc.yml deleted file mode 100644 index 3038dda0..00000000 --- a/base-buildpackage/src/main/resources/application-ydc.yml +++ /dev/null @@ -1,21 +0,0 @@ -#######################本地环境####################### -logging: - #日志级别 指定目录级别 - level: - root: info - encodings: UTF-8 - file: -# 日志保存路径 - path: /Users/xiangerlin/work/app/logs/ydc -spring: - datasource: - dynamic: - 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可省略此配置 -savefile: - # 文件保存路径 - path: /Users/xiangerlin/work/app/logs/ydc diff --git a/base-buildpackage/src/main/resources/application-yuecheng.yml b/base-buildpackage/src/main/resources/application-yuecheng.yml deleted file mode 100644 index 7e081ecb..00000000 --- a/base-buildpackage/src/main/resources/application-yuecheng.yml +++ /dev/null @@ -1,31 +0,0 @@ -#######################本地环境####################### -logging: - #日志级别 指定目录级别 - level: - root: info - encodings: UTF-8 - file: -# 日志保存路径 - path: /Users/xiangerlin/work/app/logs/yuecheng -spring: - datasource: - dynamic: - datasource: - master: - 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可省略此配置 -savefile: - # 文件保存路径 - path: /Users/xiangerlin/work/app/logs/yuecheng -cbs8: - appId: 1P4AGrpz - appSecret: 2c2369ae5dc04382844bbe3a5abf39e1bea9cd3a - url: https://cbs8-openapi-reprd.csuat.cmburl.cn - # 测试用这个 这个是银行给的，和下面的公钥不是一对密钥 - ya_private_key: 83BA7EC821D35F4CB31FF9A51C1EFA520FC52AF828C2337F88E91CF119B07F44 - # 这个私钥到时候上传到cbs，和下面到是同一对 - #ya_private_key: e1eacfdee9b8d4184437d5a2071e17ce31befc3d93395f9f05709ed562e8dc46 - ya_public_key: 044fa399d2223760f17b81b863cb482b009294c4516f8a605dea1475ec09e720eaa98468715e5ad509a592a0b426061551c5a3df236966c23253a7d894eac0dcde - cbs_public_key: 0469146F06BF3B01236E84632441E826F3067A6B93BC3839C836A06007869CD351FBBE388B51F742859388BBC1DE089923AAFBC69E448F15141DDF30EE6CE90185 diff --git a/base-buildpackage/src/main/resources/application-yuqh.yml b/base-buildpackage/src/main/resources/application-yuqh.yml deleted file mode 100644 index d114d224..00000000 --- a/base-buildpackage/src/main/resources/application-yuqh.yml +++ /dev/null @@ -1,23 +0,0 @@ -#######################本地环境####################### -logging: - #日志级别 指定目录级别 - level: - root: info - encodings: UTF-8 - file: -# 日志保存路径 - path: E:\yongansystem\log -spring: - datasource: - dynamic: - 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可省略此配置 -savefile: - # 文件保存路径 - path: E:\yongansystem\log -zt: - url: http://127.0.0.1:9999/kangarooDataCenterV3/entranceController/externalCallInterface diff --git a/base-buildpackage/src/main/resources/application-zqtlocal.yml b/base-buildpackage/src/main/resources/application-zqtlocal.yml deleted file mode 100644 index 5aeac683..00000000 --- a/base-buildpackage/src/main/resources/application-zqtlocal.yml +++ /dev/null @@ -1,39 +0,0 @@ -#######################zqtlocal环境####################### -logging: - #日志级别 指定目录级别 - level: - root: info - encodings: UTF-8 - file: - # 日志保存路径 - path: D:/local/logs/ -spring: - datasource: - dynamic: - datasource: - master: - 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可省略此配置 -savefile: - # 文件保存路径 - path: D:/local/upload/ - pluginpath : D:/local/plugin/ - tomcatpath: E:\apache-tomcat-9.0.27\webapps\kangarooDataCenterV3\WEB-INF\classes\ -cbs8: - appId: 1P4AGrpz - appSecret: 2c2369ae5dc04382844bbe3a5abf39e1bea9cd3a - url: https://cbs8-openapi-reprd.csuat.cmburl.cn - # 测试用这个 这个是银行给的，和下面的公钥不是一对密钥 - ya_private_key: 83BA7EC821D35F4CB31FF9A51C1EFA520FC52AF828C2337F88E91CF119B07F44 - # 这个私钥到时候上传到cbs，和下面到是同一对 - #ya_private_key: e1eacfdee9b8d4184437d5a2071e17ce31befc3d93395f9f05709ed562e8dc46 - ya_public_key: 044fa399d2223760f17b81b863cb482b009294c4516f8a605dea1475ec09e720eaa98468715e5ad509a592a0b426061551c5a3df236966c23253a7d894eac0dcde - cbs_public_key: 0469146F06BF3B01236E84632441E826 - #电子回单下载临时存放位置 - elec_path: /Users/xiangerlin/Downloads/ -OA: - data_source_code: yc_oa -zt: - url: http://127.0.0.1:10086/kangarooDataCenterV3/entranceController/externalCallInterface \ No newline at end of file diff --git a/base-buildpackage/src/main/resources/application.yml b/base-buildpackage/src/main/resources/application.yml index b87e5bf7..36ab943d 100644 --- a/base-buildpackage/src/main/resources/application.yml +++ b/base-buildpackage/src/main/resources/application.yml @@ -36,15 +36,15 @@ spring: # use-suffix-pattern: true profiles: # active: @profileActive@ - active: @profile.active@ + active: cocodev # active: dev servlet: multipart: enabled: true #单个文件的大小 - max-file-size: 100MB + max-file-size: 300MB #单次请求的文件的总大小 - max-request-size: 100MB + max-request-size: 300MB # 默认数据源设置 datasource: dynamic: diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/gm/pluginCfg.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/gm/pluginCfg.xml new file mode 100644 index 00000000..8b38a5c8 --- /dev/null +++ b/base-buildpackage/src/main/resources/cfgHome/plugin/gm/pluginCfg.xml @@ -0,0 +1,6 @@ + + +GmPlugin +GmPlugin插件 +20250801 + diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/gm/spring/spring-buildpackage-dao.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/gm/spring/spring-buildpackage-dao.xml new file mode 100644 index 00000000..f6448b5f --- /dev/null +++ b/base-buildpackage/src/main/resources/cfgHome/plugin/gm/spring/spring-buildpackage-dao.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/gm/spring/spring-buildpackage-plugin.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/gm/spring/spring-buildpackage-plugin.xml new file mode 100644 index 00000000..bdf1d2d5 --- /dev/null +++ b/base-buildpackage/src/main/resources/cfgHome/plugin/gm/spring/spring-buildpackage-plugin.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/base-buildpackage/src/main/resources/cfgHome/plugin/gm/spring/spring-buildpackage-service.xml b/base-buildpackage/src/main/resources/cfgHome/plugin/gm/spring/spring-buildpackage-service.xml new file mode 100644 index 00000000..ea8506cb --- /dev/null +++ b/base-buildpackage/src/main/resources/cfgHome/plugin/gm/spring/spring-buildpackage-service.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/base-buildpackage/src/main/resources/logback-spring.xml b/base-buildpackage/src/main/resources/logback-spring.xml index fed8a49d..d6f2f6fe 100644 --- a/base-buildpackage/src/main/resources/logback-spring.xml +++ b/base-buildpackage/src/main/resources/logback-spring.xml @@ -1,170 +1,120 @@ - - - - logback - - + + + + - - - - - - - - - + + ${CONSOLE_LOG_PATTERN} - - ${encodings} + ${encodings} - + + - INFO ACCEPT DENY - ${MAX_FILE_SIZE} - ${MAX_HISTORY} - ${LOG_PATH}/%d{yyyy-MM-dd}/info/info_%d{yyyyMMdd}.%i.log - ${MAX_FILE_SIZE} - - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + ${encodings} - + - - ${MAX_FILE_SIZE} - ${MAX_HISTORY} ${LOG_PATH}/%d{yyyy-MM-dd}/warn/warn_%d{yyyyMMdd}.%i.log - ${MAX_FILE_SIZE} - WARN ACCEPT DENY - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + ${encodings} - + - - ${MAX_FILE_SIZE} - ${MAX_HISTORY} ${LOG_PATH}/%d{yyyy-MM-dd}/error/error_%d{yyyyMMdd}.%i.log - ${MAX_FILE_SIZE} - ERROR ACCEPT DENY - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + ${encodings} - - - + - - - ${MAX_FILE_SIZE} - ${MAX_HISTORY} ${LOG_PATH}/%d{yyyy-MM-dd}/all/all_%d{yyyyMMdd}.%i.log - ${MAX_FILE_SIZE} - - - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n + ${encodings} - + - - - - diff --git a/base-common/.flattened-pom.xml b/base-common/.flattened-pom.xml new file mode 100644 index 00000000..7c2f7417 --- /dev/null +++ b/base-common/.flattened-pom.xml @@ -0,0 +1,39 @@ + + + 4.0.0 + + com.hzya.frame + kangarooDataCenterV3 + 0.0.1-SNAPSHOT + + com.hzya.frame + base-common + 0.0.1-SNAPSHOT + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + none + execute + true + + + + + diff --git a/base-common/src/main/java/com/hzya/frame/util/AESUtil.java b/base-common/src/main/java/com/hzya/frame/util/AESUtil.java index c1dbc059..9027eb5f 100644 --- a/base-common/src/main/java/com/hzya/frame/util/AESUtil.java +++ b/base-common/src/main/java/com/hzya/frame/util/AESUtil.java @@ -80,7 +80,7 @@ public class AESUtil { } public static void main(String[] args) { - String data = "U8C241231"; + String data = "hzya1314"; String encrypt1 = encrypt(data); System.out.println(encrypt1); } diff --git a/base-common/src/main/java/com/hzya/frame/util/bipV3/Base64Util.java b/base-common/src/main/java/com/hzya/frame/util/bipV3/Base64Util.java index 233803cd..952582c4 100644 --- a/base-common/src/main/java/com/hzya/frame/util/bipV3/Base64Util.java +++ b/base-common/src/main/java/com/hzya/frame/util/bipV3/Base64Util.java @@ -1,31 +1,28 @@ package com.hzya.frame.util.bipV3; -import sun.misc.BASE64Decoder; -import sun.misc.BASE64Encoder; - -import java.io.IOException; +import java.util.Base64; /** - * Base64工具类 + * Base64工具类（使用Java标准库，替代sun.misc） * * @author liyang - * */ public class Base64Util { /** - * Base64编码 + * Base64编码（字节数组 -> 字符串） */ public static String encryptBASE64(byte[] key) { - return (new BASE64Encoder()).encodeBuffer(key); + // 使用标准Base64编码器 + return Base64.getEncoder().encodeToString(key); } /** - * Base64解码 - * @throws IOException + * Base64解码（字符串 -> 字节数组） */ - public static byte[] decryptBASE64(String key) throws IOException { - return (new BASE64Decoder()).decodeBuffer(key); + public static byte[] decryptBASE64(String key) { + // 使用标准Base64解码器 + return Base64.getDecoder().decode(key); } } diff --git a/base-common/src/main/java/com/hzya/frame/util/oldNcc/Base64Util.java b/base-common/src/main/java/com/hzya/frame/util/oldNcc/Base64Util.java index 4757712c..df797b1c 100644 --- a/base-common/src/main/java/com/hzya/frame/util/oldNcc/Base64Util.java +++ b/base-common/src/main/java/com/hzya/frame/util/oldNcc/Base64Util.java @@ -1,31 +1,29 @@ package com.hzya.frame.util.oldNcc; -import java.io.IOException; - -import sun.misc.BASE64Decoder; -import sun.misc.BASE64Encoder; +import java.util.Base64; /** - * Base64������ - * - * @author liyang + * Base64工具类 * + * @author liyang */ public class Base64Util { - + /** - * Base64���� + * Base64编码 */ - public static String encryptBASE64(byte[] key) { - return (new BASE64Encoder()).encodeBuffer(key); + public static String encryptBASE64(byte[] key) { + // 标准Base64编码器：将字节数组编码为字符串 + return Base64.getEncoder().encodeToString(key); } /** - * Base64���� - * @throws IOException + * Base64解码 */ - public static byte[] decryptBASE64(String key) throws IOException { - return (new BASE64Decoder()).decodeBuffer(key); + public static byte[] decryptBASE64(String key) { + // 标准Base64解码器：将字符串解码为字节数组 + // 注意：此处不再抛出IOException，标准库会抛出IllegalArgumentException（参数无效时） + return Base64.getDecoder().decode(key); } } diff --git a/base-common/src/main/java/com/hzya/frame/util/oldNcc/CompressUtil.java b/base-common/src/main/java/com/hzya/frame/util/oldNcc/CompressUtil.java index e5f2671c..0962e261 100644 --- a/base-common/src/main/java/com/hzya/frame/util/oldNcc/CompressUtil.java +++ b/base-common/src/main/java/com/hzya/frame/util/oldNcc/CompressUtil.java @@ -27,7 +27,6 @@ public class CompressUtil { * ԭ�� * @return * @throws IOException - * @throws BizException * @throws Exception */ public static String deflaterCompress(String source) throws Exception { @@ -87,7 +86,7 @@ public class CompressUtil { } value = new String(bos.toByteArray(), StandardCharsets.UTF_8); - } catch (IOException | DataFormatException e) { + } catch (DataFormatException e) { throw new Exception("��ѹ�쳣 " + e.getMessage()); } finally { bos.close(); @@ -103,8 +102,7 @@ public class CompressUtil { * ԭ�� * @return * @throws IOException - * @throws BizException - * @throws Exception += * @throws Exception */ public static String gzipCompress(String source) throws Exception { String value = null; @@ -135,7 +133,6 @@ public class CompressUtil { * @param source * ѹ�����ı� * @return - * @throws BizException * @throws Exception */ public static String gzipDecompress(String source) throws Exception { diff --git a/base-core/.flattened-pom.xml b/base-core/.flattened-pom.xml new file mode 100644 index 00000000..4e780da3 --- /dev/null +++ b/base-core/.flattened-pom.xml @@ -0,0 +1,46 @@ + + + 4.0.0 + + com.hzya.frame + kangarooDataCenterV3 + 0.0.1-SNAPSHOT + + com.hzya.frame + base-core + 0.0.1-SNAPSHOT + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + + + com.hzya.frame + base-common + ${revision} + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + none + execute + true + + + + + diff --git a/base-service/.flattened-pom.xml b/base-service/.flattened-pom.xml new file mode 100644 index 00000000..43145c11 --- /dev/null +++ b/base-service/.flattened-pom.xml @@ -0,0 +1,51 @@ + + + 4.0.0 + + com.hzya.frame + kangarooDataCenterV3 + 0.0.1-SNAPSHOT + + com.hzya.frame + base-service + 0.0.1-SNAPSHOT + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + + + com.hzya.frame + base-core + ${revision} + + + mysql + mysql-connector-java + ${mysql-connector-java} + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + none + execute + true + + + + + diff --git a/base-service/pom.xml b/base-service/pom.xml index 57c17cea..4fc991bb 100644 --- a/base-service/pom.xml +++ b/base-service/pom.xml @@ -13,16 +13,21 @@ ${revision} - - com.hzya.frame - base-core - ${revision} - + + com.hzya.frame + base-core + ${revision} + mysql mysql-connector-java ${mysql-connector-java} + + com.alibaba + easyexcel + 3.0.5 + diff --git a/base-service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java b/base-service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java index 5afcadef..887618f1 100644 --- a/base-service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java +++ b/base-service/src/main/java/com/hzya/frame/sysnew/application/service/impl/SysApplicationServiceImpl.java @@ -56,7 +56,6 @@ import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; @@ -74,7 +73,6 @@ import org.apache.http.util.EntityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.core.task.TaskExecutor; -import org.springframework.http.client.MultipartBodyBuilder; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; diff --git a/base-webapp/.flattened-pom.xml b/base-webapp/.flattened-pom.xml new file mode 100644 index 00000000..67e24455 --- /dev/null +++ b/base-webapp/.flattened-pom.xml @@ -0,0 +1,45 @@ + + + 4.0.0 + + com.hzya.frame + kangarooDataCenterV3 + 0.0.1-SNAPSHOT + + com.hzya.frame + base-webapp + 0.0.1-SNAPSHOT + + + Apache License, Version 2.0 + https://www.apache.org/licenses/LICENSE-2.0 + + + + + com.hzya.frame + base-service + ${revision} + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + none + execute + + + + + diff --git a/base-webapp/pom.xml b/base-webapp/pom.xml index afa4acb1..4502083e 100644 --- a/base-webapp/pom.xml +++ b/base-webapp/pom.xml @@ -18,69 +18,69 @@ base-service ${revision} - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - + + + + + + + + + + diff --git a/pom.xml b/pom.xml index 857e7f56..b0c2df63 100644 --- a/pom.xml +++ b/pom.xml @@ -7,19 +7,8 @@ base-common base-webapp base-core - - - - - - - - - - - - + com.hzya.frame kangarooDataCenterV3 kangarooDataCenterV3 @@ -27,12 +16,13 @@ kangarooDataCenterV3 4.0.0 pom + - 0.0.1-SNAPSHOT - UTF-8 + 0.0.1-SNAPSHOT UTF-8 1.8 1.8 + 4.12 2.0.33 2.7.18 @@ -42,10 +32,7 @@ 3.3.0 5.8.19 1.1.22 - 3.5.6 - - 8.0.33 1.4.6 2.7.18 @@ -77,27 +64,19 @@ 1.7.4 1.3.7 2.1.46 - + org.springframework.boot spring-boot-starter-parent 2.7.18 - - + - - - - - - - - - + + net.sourceforge.jtds jtds @@ -108,18 +87,12 @@ spring-boot-starter-aop ${spring-boot-starter-aop.version} - - org.apache.httpcomponents httpclient ${httpclient.version} - - org.apache.httpcomponents - httpmime - 4.5.13 - + org.springframework.boot spring-boot-starter-cache @@ -141,20 +114,16 @@ junit ${unit.version} - com.alibaba fastjson ${fastjson.version} - - p6spy p6spy ${p6spy.version} - com.google.code.gson gson @@ -165,30 +134,11 @@ core ${zxing.version} - com.google.guava guava ${guava.version} - - - - - - - - - - - - - - - - - - mysql mysql-connector-java @@ -217,7 +167,6 @@ - com.baomidou mybatis-plus-boot-starter @@ -228,7 +177,6 @@ hutool-all ${hutool.version} - cn.dev33 sa-token-spring-boot-starter @@ -262,15 +210,12 @@ - com.dameng Dm8JdbcDriver18 8.1.1.49 - - commons-beanutils commons-beanutils @@ -281,13 +226,11 @@ commons-pool2 ${commons.pool2.version} - org.apache.commons commons-lang3 ${lang3.version} - org.projectlombok lombok @@ -299,44 +242,18 @@ mssql-jdbc 6.4.0.jre8 - - - - - - - - - - - - - - - - - - - org.apache.pdfbox pdfbox ${pdfbox.version} - - - - - - com.oracle.database.jdbc ojdbc6 ${ojdbc6.version} - org.quartz-scheduler quartz ${quartz.version} @@ -356,28 +273,19 @@ dom4j 1.6.1 - - - - org.springframework.boot - spring-boot-starter-cache - - + org.postgresql postgresql ${postgresql.version} runtime - - org.apache.groovy groovy-all 4.0.21 pom - org.flywaydb flyway-core @@ -415,7 +323,7 @@ commons-net commons-net - 3.8.0 + 3.8.0 com.jcraft @@ -423,14 +331,34 @@ 0.1.53 - com.alibaba - easyexcel - 3.0.5 + org.apache.httpcomponents + httpmime + 4.5.13 + + + + org.codehaus.mojo + flatten-maven-plugin + 1.2.7 + + + flatten + process-resources + + flatten + + + + + resolveCiFriendliesOnly + + + org.apache.maven.plugins @@ -440,6 +368,7 @@ UTF-8 + org.apache.maven.plugins @@ -458,13 +387,13 @@ 2.7.18 ${project.artifactId} - none - execute - true + none + execute + true + - org.apache.maven.plugins maven-surefire-plugin 2.18.1 @@ -472,43 +401,11 @@ true - - org.apache.maven.plugins - maven-war-plugin - - - - ${basedir}/../base-service/src/main/webapp/WEB-INF/lib - WEB-INF/lib/ - false - - - **/*.jar - - - - ${basedir}/../fw-bip/src/main/webapp/WEB-INF/lib - WEB-INF/lib/ - false - - - **/*.jar - - - - ${basedir}/../fw-ningbobank/src/main/webapp/WEB-INF/lib - WEB-INF/lib/ - false - - - **/*.jar - - - - - + + - + + src/main/java @@ -526,14 +423,11 @@ **/*.xlsx **/*.json **/*.xdb - **/*.txt **/*.sql true - - src/ @@ -542,25 +436,14 @@ **/*.xml **/*.json **/*.txt - **/*.sql - true - - - - - - - - - - + aliyun aliyun Repository @@ -577,7 +460,5 @@ false - -