diff --git a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/common/wsdl/WebServiceUtil.java b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/common/wsdl/WebServiceUtil.java index 6bfa35d..6b4b0c7 100644 --- a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/common/wsdl/WebServiceUtil.java +++ b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/common/wsdl/WebServiceUtil.java @@ -38,13 +38,13 @@ public class WebServiceUtil { return StringUtils.collectionToCommaDelimitedString(xmlStr); } - public static void main(String[] args) { - Collection objects = new ArrayList<>(); - objects.add("18437762352"); - try { - sendMessage(objects,"ceshi"); - } catch (Exception e) { - e.printStackTrace(); - } - } +// public static void main(String[] args) { +// Collection objects = new ArrayList<>(); +// objects.add("18437762352"); +// try { +// sendMessage(objects,"ceshi"); +// } catch (Exception e) { +// e.printStackTrace(); +// } +// } } diff --git a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/ISysSendInfoService.java b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/ISysSendInfoService.java index 92e03c0..e12b136 100644 --- a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/ISysSendInfoService.java +++ b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/ISysSendInfoService.java @@ -18,7 +18,7 @@ public interface ISysSendInfoService { * @param sendMessageDTO * @return */ - int sendMessage(SendMessageDTO sendMessageDTO); + int sendMessage(SendMessageDTO sendMessageDTO) throws Exception; /** * 查询消息列表 diff --git a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/impl/SysSendInfoServiceImpl.java b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/impl/SysSendInfoServiceImpl.java index 4d64484..a7b6e31 100644 --- a/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/impl/SysSendInfoServiceImpl.java +++ b/RuoYi-Vue-Oracle/src/main/java/com/ruoyi/project/oil/service/impl/SysSendInfoServiceImpl.java @@ -3,6 +3,7 @@ package com.ruoyi.project.oil.service.impl; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.common.wsdl.WebServiceUtil; import com.ruoyi.project.oil.domain.SendInfo; import com.ruoyi.project.oil.domain.SendMessageDTO; import com.ruoyi.project.oil.mapper.SysSendInfoMapper; @@ -10,6 +11,8 @@ import com.ruoyi.project.oil.service.ISysSendInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.Collection; import java.util.List; @Service @@ -23,7 +26,7 @@ public class SysSendInfoServiceImpl implements ISysSendInfoService { return sysSendInfoMapper.queryMsgNum(userName); } @Override - public int sendMessage(SendMessageDTO sendMessageDTO) { + public int sendMessage(SendMessageDTO sendMessageDTO) throws Exception { sendMessageDTO.setSender(SecurityUtils.getUsername()); sendMessageDTO.setCreateTime(DateUtils.getNowDate()); @@ -34,9 +37,12 @@ public class SysSendInfoServiceImpl implements ISysSendInfoService { if(sendMessageDTO.getIsSendPhone() !=null && sendMessageDTO.getIsSendPhone()){//发送短信 List phoneList= sendMessageDTO.getPhoneList(); String phone = String.join(",", phoneList); + Collection phones = new ArrayList<>(phoneList); + String msg=sendMessageDTO.getSendText(); String dwdm="SGJT-山港集团"; //todo 调用发送短信接口 + WebServiceUtil.sendMessage(phones,msg); } diff --git a/RuoYi-Vue-Oracle/src/main/resources/application-druid.yml b/RuoYi-Vue-Oracle/src/main/resources/application-druid.yml deleted file mode 100644 index 6fe6bb2..0000000 --- a/RuoYi-Vue-Oracle/src/main/resources/application-druid.yml +++ /dev/null @@ -1,64 +0,0 @@ -# 数据源配置 -spring: - datasource: - type: com.alibaba.druid.pool.DruidDataSource - driverClassName: oracle.jdbc.driver.OracleDriver - druid: - # 主库数据源 - master: -# url: jdbc:oracle:thin:@127.0.0.1:1521/orcl -# username: root -# password: password - url: jdbc:oracle:thin:@10.169.28.44:1521/orcl - username: spg_voc - password: SPG$spgvoc_24! - # 从库数据源 - slave: - # 从数据源开关/默认关闭 - enabled: false - url: - username: - password: - # 初始连接数 - initialSize: 5 - # 最小连接池数量 - minIdle: 10 - # 最大连接池数量 - maxActive: 20 - # 配置获取连接等待超时的时间 - maxWait: 60000 - # 配置连接超时时间 - connectTimeout: 30000 - # 配置网络超时时间 - socketTimeout: 60000 - # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 - timeBetweenEvictionRunsMillis: 60000 - # 配置一个连接在池中最小生存的时间，单位是毫秒 - minEvictableIdleTimeMillis: 300000 - # 配置一个连接在池中最大生存的时间，单位是毫秒 - maxEvictableIdleTimeMillis: 900000 - # 配置检测连接是否有效 - validationQuery: SELECT 1 FROM DUAL - testWhileIdle: true - testOnBorrow: false - testOnReturn: false - webStatFilter: - enabled: true - statViewServlet: - enabled: true - # 设置白名单，不填则允许所有访问 - allow: - url-pattern: /druid/* - # 控制台管理用户名和密码 - login-username: ruoyi - login-password: 123456 - filter: - stat: - enabled: true - # 慢SQL记录 - log-slow-sql: true - slow-sql-millis: 1000 - merge-sql: false - wall: - config: - multi-statement-allow: true \ No newline at end of file diff --git a/RuoYi-Vue-Oracle/src/main/resources/application.yml b/RuoYi-Vue-Oracle/src/main/resources/application.yml deleted file mode 100644 index 377777c..0000000 --- a/RuoYi-Vue-Oracle/src/main/resources/application.yml +++ /dev/null @@ -1,147 +0,0 @@ -# 项目相关配置 -ruoyi: - # 名称 - name: RuoYi - # 版本 - version: 3.8.8 - # 版权年份 - copyrightYear: 2024 - # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profile: D:/ruoyi/uploadPath - # 获取ip地址开关 - addressEnabled: false - # 验证码类型 math 数字计算 char 字符验证 - captchaType: math -# 本地文件上传 -file: - domain: -# path: /home/file/upload - path: D:/ruoyi/uploadPath - prefix: /statics -# 开发环境配置 -server: - # 服务器的HTTP端口，默认为8080 - port: 8080 - servlet: - # 应用的访问路径 - context-path: / - tomcat: - # tomcat的URI编码 - uri-encoding: UTF-8 - # 连接数满后的排队数，默认为100 - accept-count: 1000 - threads: - # tomcat最大线程数，默认为200 - max: 800 - # Tomcat启动初始化的线程数，默认值10 - min-spare: 100 - -# 日志配置 -logging: - level: - com.ruoyi: debug - org.springframework: warn - -# 用户配置 -user: - password: - # 密码最大错误次数 - maxRetryCount: 5 - # 密码锁定时间（默认10分钟） - lockTime: 10 - -# Spring配置 -spring: - # 资源信息 - messages: - # 国际化资源文件路径 - basename: i18n/messages - profiles: - active: druid - # 文件上传 - servlet: - multipart: - # 单个文件大小 - max-file-size: 10MB - # 设置总上传的文件大小 - max-request-size: 20MB - # 服务模块 - devtools: - restart: - # 热部署开关 - enabled: true - # redis 配置 - redis: - # 地址 -# host: 192.168.31.105 - host: 127.0.0.1 - # 端口，默认为6379 - port: 6379 - # 数据库索引 - database: 0 - # 密码 - password: 123456 -# password: admin123! - # 连接超时时间 - timeout: 10s - lettuce: - pool: - # 连接池中的最小空闲连接 - min-idle: 0 - # 连接池中的最大空闲连接 - max-idle: 8 - # 连接池的最大数据库连接数 - max-active: 8 - # #连接池最大阻塞等待时间（使用负值表示没有限制） - max-wait: -1ms - -# token配置 -token: - # 令牌自定义标识 - header: Authorization - # 令牌密钥 - secret: abcdefghijklmnopqrstuvwxyz - # 令牌有效期（默认30分钟） - expireTime: 30 - -# MyBatis配置 -mybatis: - # 搜索指定包别名 - typeAliasesPackage: com.ruoyi.project.**.domain - # 配置mapper的扫描，找到所有的mapper.xml映射文件 - mapperLocations: classpath*:mybatis/**/*Mapper.xml - # 加载全局的配置文件 - configLocation: classpath:mybatis/mybatis-config.xml - -# PageHelper分页插件 -pagehelper: - helperDialect: oracle - supportMethodsArguments: true - params: count=countSql - -# Swagger配置 -swagger: - # 是否开启swagger - enabled: true - # 请求前缀 - pathMapping: /dev-api - -# 防止XSS攻击 -xss: - # 过滤开关 - enabled: true - # 排除链接（多个用逗号分隔） - excludes: /system/notice - # 匹配链接 - urlPatterns: /system/*,/monitor/*,/tool/* - -# 代码生成 -gen: - # 作者 - author: ruoyi - # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool - packageName: com.ruoyi.project.system - # 自动去除表前缀，默认是true - autoRemovePre: false - # 表前缀（生成类名不会包含表前缀，多个用逗号分隔） - tablePrefix: sys_ \ No newline at end of file diff --git a/ruoyi-ui/src/views/dataStatistics/daily/index.vue b/ruoyi-ui/src/views/dataStatistics/daily/index.vue index 930e1cd..1f4acd3 100644 --- a/ruoyi-ui/src/views/dataStatistics/daily/index.vue +++ b/ruoyi-ui/src/views/dataStatistics/daily/index.vue @@ -36,7 +36,7 @@