From 927475696dae8c30e18e6a919789464546f7cdd4 Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Fri, 2 Aug 2024 10:36:03 +0800 Subject: [PATCH] =?UTF-8?q?TCP=20=E6=9C=8D=E5=8A=A1=E7=AB=AF=20=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aqd/base/service/impl/IndexServiceImpl.java | 17 +++++++++++++---- src/main/resources/application.yml | 14 ++++++++------ src/main/resources/mappers/base/IndexMapper.xml | 12 ++++++------ 3 files changed, 27 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/bonus/aqd/base/service/impl/IndexServiceImpl.java b/src/main/java/com/bonus/aqd/base/service/impl/IndexServiceImpl.java index 8361389..679dbd7 100644 --- a/src/main/java/com/bonus/aqd/base/service/impl/IndexServiceImpl.java +++ b/src/main/java/com/bonus/aqd/base/service/impl/IndexServiceImpl.java @@ -8,6 +8,7 @@ import com.bonus.aqd.base.entity.vo.WarnInfoVo; import com.bonus.aqd.base.service.IndexService; import com.bonus.aqd.manager.advice.ValidatorsUtils; import com.bonus.aqd.manager.common.util.DateTimeHelper; +import com.bonus.aqd.manager.common.util.StringHelper; import com.bonus.aqd.manager.webResult.HttpStatus; import com.bonus.aqd.manager.webResult.ServerResponse; import com.github.pagehelper.PageInfo; @@ -54,9 +55,13 @@ public class IndexServiceImpl implements IndexService { list.forEach(vo->{ try { if("1".equals(vo.getDevStatus().toString())){ - Date date = sdf.parse(vo.getStateTime()); - String time =getDatePoor(date); - vo.setOnlineTime(time); + if(StringHelper.isNotEmpty(vo.getStateTime())){ + Date date = sdf.parse(vo.getStateTime()); + String time =getDatePoor(date); + vo.setOnlineTime(time); + }else { + vo.setOnlineTime("00:00:00"); + } }else{ vo.setOnlineTime("00:00:00"); } @@ -192,6 +197,9 @@ public class IndexServiceImpl implements IndexService { @Override public ServerResponse deviceAnalysis(ParamsDto dto) { + if(dto==null){ + dto=new ParamsDto(); + } DeviceAnalysisVo vo = new DeviceAnalysisVo(); try { List deviceStatusNum = mapper.getDeviceStatusNum(dto); @@ -201,11 +209,12 @@ public class IndexServiceImpl implements IndexService { vo.setOfflineDeviceNum(deviceStatusNum.get(2)); } // 当天、本周、本月 单钩、双钩告警数量 + String day=DateTimeHelper.getNowDate(); dto.setNowDate(DateTimeHelper.getNowDate()); String weekStr = DateTimeHelper.getCurrentWeekTime(); String[] weekArr = weekStr.split(","); dto.setStartWeekTime(weekArr[0]); - dto.setStartWeekTime(weekArr[1]); + dto.setEndWeekTime(weekArr[1]); Map nowOneMonthDay = DateTimeHelper.getNowOneMonthDay(); dto.setStartMonthTime(nowOneMonthDay.get("beginDate")); dto.setEndMonthTime(nowOneMonthDay.get("endDate")); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index cb09c44..2faa143 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,6 +1,6 @@ # 配置端口 server: - port: 18080 + port: 21995 servlet: context-path: /aqd_screen max-http-header-size: 10240 @@ -8,13 +8,15 @@ spring: # 配置数据源 datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/aqdsb?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false - username: mroot - password: bonus@admin123 + url: jdbc:mysql://192.168.0.7:13306/aqdsb?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false + username: root + password: Bonus@admin123! type: com.alibaba.druid.pool.DruidDataSource redis: - host: 127.0.0.1 - port: 6379 + host: 192.168.0.14 + port: 2003 + password: Fyzbns@Redis123! + database: 7 servlet: multipart: max-file-size: -1 diff --git a/src/main/resources/mappers/base/IndexMapper.xml b/src/main/resources/mappers/base/IndexMapper.xml index 23da20c..8132559 100644 --- a/src/main/resources/mappers/base/IndexMapper.xml +++ b/src/main/resources/mappers/base/IndexMapper.xml @@ -89,32 +89,32 @@ SELECT COUNT(*) FROM tb_warn tw LEFT JOIN tb_device td ON tw.dev_code = td.dev_code - WHERE DATE_FORMAT(tw.warn_time, '%Y-%m-%d') = #{nowDate} AND INSTR(dev_module,'单双') > 0 + WHERE DATE_FORMAT(tw.warn_time, '%Y-%m-%d') = #{nowDate} AND INSTR(tw.dev_module,'单钩') > 0 UNION ALL SELECT COUNT(*) FROM tb_warn tw LEFT JOIN tb_device td ON tw.dev_code = td.dev_code - WHERE DATE_FORMAT(tw.warn_time, '%Y-%m-%d') = #{nowDate} AND INSTR(dev_module,'双钩') > 0 + WHERE DATE_FORMAT(tw.warn_time, '%Y-%m-%d') = #{nowDate} AND INSTR(tw.dev_module,'双钩') > 0 UNION ALL SELECT COUNT(*) FROM tb_warn tw LEFT JOIN tb_device td ON tw.dev_code = td.dev_code - WHERE DATE_FORMAT(tw.warn_time, '%Y-%m-%d') BETWEEN #{startWeekTime} AND #{endWeekTime} AND INSTR(dev_module,'单双') > 0 + WHERE DATE_FORMAT(tw.warn_time, '%Y-%m-%d') BETWEEN #{startWeekTime} AND #{endWeekTime} AND INSTR(tw.dev_module,'单钩') > 0 UNION ALL SELECT COUNT(*) FROM tb_warn tw LEFT JOIN tb_device td ON tw.dev_code = td.dev_code - WHERE DATE_FORMAT(tw.warn_time, '%Y-%m-%d') BETWEEN #{startWeekTime} AND #{endWeekTime} AND INSTR(dev_module,'双钩') > 0 + WHERE DATE_FORMAT(tw.warn_time, '%Y-%m-%d') BETWEEN #{startWeekTime} AND #{endWeekTime} AND INSTR(tw.dev_module,'双钩') > 0 UNION ALL SELECT COUNT(*) FROM tb_warn tw LEFT JOIN tb_device td ON tw.dev_code = td.dev_code - WHERE DATE_FORMAT(tw.warn_time, '%Y-%m-%d') BETWEEN #{startMonthTime} AND #{endMonthTime} AND INSTR(dev_module,'单双') > 0 + WHERE DATE_FORMAT(tw.warn_time, '%Y-%m-%d') BETWEEN #{startMonthTime} AND #{endMonthTime} AND INSTR(tw.dev_module,'单钩') > 0 UNION ALL SELECT COUNT(*) FROM tb_warn tw LEFT JOIN tb_device td ON tw.dev_code = td.dev_code - WHERE DATE_FORMAT(tw.warn_time, '%Y-%m-%d') BETWEEN #{startMonthTime} AND #{endMonthTime} AND INSTR(dev_module,'双钩') > 0 + WHERE DATE_FORMAT(tw.warn_time, '%Y-%m-%d') BETWEEN #{startMonthTime} AND #{endMonthTime} AND INSTR(tw.dev_module,'双钩') > 0