hzya
/
kangarooDataCenterV3
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改数据查询，匹配sqlservice

This commit is contained in:
lvleigang 2024-08-22 11:10:26 +08:00
parent 442f0f452c
commit 43f01064ee
4 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
buildpackage/src/main/resources/application-llg.yml
View File

@ -23,22 +23,17 @@ spring:
dynamic: dynamic:
druid: druid:
filters: stat,log4j2 filters: stat,log4j2
validationQuery: SELECT 1 # 验证数据库服务可用性的sql.用来检测连接是否有效的sql 因数据库方言而差, 例如 oracle 应该写成 SELECT 1 FROM DUAL
datasource: datasource:
master: master:
# url: jdbc:dm://hzya.ufyct.com:9040?schema=businesscenter&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8&compatibleMode=oracle # 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: hzyazt # username: root
# password: 62e4295b615a30dbf3b8ee96f41c820b # password: 62e4295b615a30dbf3b8ee96f41c820b
# driver-class-name: dm.jdbc.driver.DmDriver # driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置
# type: com.alibaba.druid.pool.DruidDataSource url: jdbc:sqlserver://115.238.48.210:9083;DatabaseName=testAPP;encrypt=false;trustServerCertificate=true
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: sa
username: root
password: 62e4295b615a30dbf3b8ee96f41c820b password: 62e4295b615a30dbf3b8ee96f41c820b
driver-class-name: com.mysql.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
# 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: savefile:
# 文件保存路径 # 文件保存路径
path: /Users/apple/Desktop/log/local path: /Users/apple/Desktop/log/local

2
service/src/main/java/com/hzya/frame/sysnew/application/service/impl/ApplicationCache.java
View File

@ -104,7 +104,7 @@ public class ApplicationCache {
SysApplicationApiAuthEntity sysApplicationApiAuthEntity = new SysApplicationApiAuthEntity(); SysApplicationApiAuthEntity sysApplicationApiAuthEntity = new SysApplicationApiAuthEntity();
sysApplicationApiAuthEntity.setSts("Y"); sysApplicationApiAuthEntity.setSts("Y");
sysApplicationApiAuthEntity.setSystemStatus("1"); sysApplicationApiAuthEntity.setSystemStatus("1");
List<SysApplicationApiAuthEntity> sysApplicationApiAuthEntities = sysApplicationApiAuthDao.queryByLike(sysApplicationApiAuthEntity); List<SysApplicationApiAuthEntity> sysApplicationApiAuthEntities = sysApplicationApiAuthDao.queryBase(sysApplicationApiAuthEntity);
if(sysApplicationApiAuthEntities != null && sysApplicationApiAuthEntities.size() > 0){ if(sysApplicationApiAuthEntities != null && sysApplicationApiAuthEntities.size() > 0){
for (int i = 0; i < sysApplicationApiAuthEntities.size(); i++) { for (int i = 0; i < sysApplicationApiAuthEntities.size(); i++) {
applicationApiAuthMap.put("name"+sysApplicationApiAuthEntities.get(i).getName()+"appId"+sysApplicationApiAuthEntities.get(i).getAppId(), sysApplicationApiAuthEntities.get(i)); applicationApiAuthMap.put("name"+sysApplicationApiAuthEntities.get(i).getName()+"appId"+sysApplicationApiAuthEntities.get(i).getAppId(), sysApplicationApiAuthEntities.get(i));

2
service/src/main/java/com/hzya/frame/sysnew/popedomInterface/service/impl/InterfaceCache.java
View File

@ -153,7 +153,7 @@ public class InterfaceCache {
userRoleMap.clear(); userRoleMap.clear();
SysUserRolesEntity sysUserRolesEntity = new SysUserRolesEntity(); SysUserRolesEntity sysUserRolesEntity = new SysUserRolesEntity();
sysUserRolesEntity.setSts("Y"); sysUserRolesEntity.setSts("Y");
List<SysUserRolesEntity> sysUserRolesEntities = sysUserRolesDao.queryByLike(sysUserRolesEntity); List<SysUserRolesEntity> sysUserRolesEntities = sysUserRolesDao.queryBase(sysUserRolesEntity);
if(sysUserRolesEntities != null && sysUserRolesEntities.size() > 0){ if(sysUserRolesEntities != null && sysUserRolesEntities.size() > 0){
userRoleMap.addAll(sysUserRolesEntities); userRoleMap.addAll(sysUserRolesEntities);
} }

2
webapp/src/main/java/com/hzya/frame/web/init/MyApplicationListener.java
View File

@ -51,7 +51,7 @@ public class MyApplicationListener implements ApplicationListener<ApplicationRea
//任务状态1、启用 //任务状态1、启用
queryEntity.setTaskStatus("1"); queryEntity.setTaskStatus("1");
queryEntity.setSts("Y"); queryEntity.setSts("Y");
List<IntegrationTaskEntity> integrationTaskEntities = integrationTaskDao.queryByLike(queryEntity); List<IntegrationTaskEntity> integrationTaskEntities = integrationTaskDao.queryBase(queryEntity);
//没有任务直接返回 //没有任务直接返回
if (integrationTaskEntities == null || integrationTaskEntities.size() == 0) { if (integrationTaskEntities == null || integrationTaskEntities.size() == 0) {
return; return;