From 73d3af71aa8348cbb9d3cfb2761d994ab095caa7 Mon Sep 17 00:00:00 2001 From: republicline <1464474399@qq.com> Date: Tue, 15 Oct 2024 10:02:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20mysql=E5=A4=87=E4=BB=BD=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/rax/RaxAdminApplication.java | 1 - .../rax/admin/service/impl/SysLogServiceImpl.java | 8 ++++++-- .../java/com/rax/admin/timmer/MySqlTimer.java | 15 +++++++++++---- upms/upms-biz/src/main/resources/application.yml | 2 +- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/upms/upms-biz/src/main/java/com/rax/RaxAdminApplication.java b/upms/upms-biz/src/main/java/com/rax/RaxAdminApplication.java index f48fcc8..4add956 100644 --- a/upms/upms-biz/src/main/java/com/rax/RaxAdminApplication.java +++ b/upms/upms-biz/src/main/java/com/rax/RaxAdminApplication.java @@ -4,7 +4,6 @@ import com.rax.common.security.annotation.EnableRaxResourceServer; import com.rax.common.swagger.annotation.EnableRaxDoc; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; import org.springframework.context.annotation.ComponentScan; diff --git a/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysLogServiceImpl.java b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysLogServiceImpl.java index a81fb21..350fd6e 100644 --- a/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysLogServiceImpl.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/service/impl/SysLogServiceImpl.java @@ -66,7 +66,7 @@ public class SysLogServiceImpl extends ServiceImpl impleme .le(SysLog::getCreateTime, lastDayOfMonth) .eq(sysLog.getLogType() != null, SysLog::getLogType, sysLog.getLogType()) .orderByDesc(SysLog::getCreateTime).list(); - }else { + } else { list = this.lambdaQuery() .eq(SysLog::getHospitalId, currentHospital) .eq(sysLog.getLogType() != null, SysLog::getLogType, sysLog.getLogType()) @@ -120,7 +120,11 @@ public class SysLogServiceImpl extends ServiceImpl impleme userLambdaQueryWrapper.eq(SysUser::getUsername, sysLog.getCreateBy()); SysUser sysUser = sysUserMapper.selectOne(userLambdaQueryWrapper); // 设置到日志对象中 - sysLog.setHospitalId(sysUser.getHospitalId()); + if (sysUser != null) { + sysLog.setHospitalId(sysUser.getHospitalId()); + }else { + return Boolean.FALSE; + } } baseMapper.insert(sysLog); return Boolean.TRUE; diff --git a/upms/upms-biz/src/main/java/com/rax/admin/timmer/MySqlTimer.java b/upms/upms-biz/src/main/java/com/rax/admin/timmer/MySqlTimer.java index 77846cf..88395ef 100644 --- a/upms/upms-biz/src/main/java/com/rax/admin/timmer/MySqlTimer.java +++ b/upms/upms-biz/src/main/java/com/rax/admin/timmer/MySqlTimer.java @@ -1,5 +1,9 @@ package com.rax.admin.timmer; +import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + import java.io.File; import java.sql.*; import java.text.SimpleDateFormat; @@ -12,14 +16,17 @@ import java.util.concurrent.TimeUnit; * @author: republicline * @description: mysql定时备份 */ +@Slf4j +@Component public class MySqlTimer { public static void main(String[] args) throws Exception { - backup(); + MySqlTimer mySqlTimer = new MySqlTimer(); + mySqlTimer.backup(); } - - public static void backup() throws Exception { + @Scheduled(cron = "0 0 15 * * 1") + public void backup() throws Exception { String connectionUrl = "jdbc:mysql://110.41.142.124:3306"; String ip = "110.41.142.124"; String port = "3306"; @@ -62,7 +69,7 @@ public class MySqlTimer { * @param dbName 数据库名 * @throws Exception */ - public static void dbBackUpMysql(String ip, String port, String username, String pwd, String path, String dbName) throws Exception { + public void dbBackUpMysql(String ip, String port, String username, String pwd, String path, String dbName) throws Exception { //mysqldump -uroot -pldeSpQEL0Pbz5A61dCNb --host=123.56.234.243 --port=3309 edc > /opt/2024-10-08/edc.sql SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); String time = simpleDateFormat.format(new Date()); diff --git a/upms/upms-biz/src/main/resources/application.yml b/upms/upms-biz/src/main/resources/application.yml index f4a1b95..48eb1e6 100644 --- a/upms/upms-biz/src/main/resources/application.yml +++ b/upms/upms-biz/src/main/resources/application.yml @@ -165,7 +165,7 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver username: root password: root - url: jdbc:mysql://localhost:3306/rax_backend1?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true # 一期 + url: jdbc:mysql://110.41.142.124:3306/rax_backend1?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true # 一期 # url: jdbc:mysql://localhost:3306/rax_backend?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true # 二期 server: