From af146be8bba82115370352b59f1337217d96598b Mon Sep 17 00:00:00 2001 From: guo Date: Mon, 15 Apr 2024 15:39:20 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...nicalEquipmentPositionAlarmController.java | 5 +++- ...anicalEquipmentPositionDataController.java | 5 ++++ ...echanicalEquipmentPositionAlarmMapper.java | 4 ++++ ...MechanicalEquipmentPositionDataMapper.java | 2 ++ ...MechanicalEquipmentPositionAlarmMapper.xml | 11 +++++++++ .../MechanicalEquipmentPositionDataMapper.xml | 17 +++++++++++++ ...chanicalEquipmentPositionAlarmService.java | 3 +++ ...echanicalEquipmentPositionDataService.java | 7 ++++-- ...icalEquipmentPositionAlarmServiceImpl.java | 5 ++++ ...nicalEquipmentPositionDataServiceImpl.java | 6 +++++ .../controller/SafetyHatAlarmController.java | 4 ++++ .../controller/SafetyHatDataController.java | 3 +++ .../mapper/SafetyHatAlarmMapper.java | 3 +++ .../safetyhat/mapper/SafetyHatDataMapper.java | 2 ++ .../mapper/xml/SafetyHatAlarmMapper.xml | 13 ++++++++++ .../mapper/xml/SafetyHatDataMapper.xml | 14 +++++++++++ .../service/ISafetyHatAlarmService.java | 2 ++ .../service/ISafetyHatDataService.java | 3 +++ .../impl/SafetyHatAlarmServiceImpl.java | 5 ++++ .../impl/SafetyHatDataServiceImpl.java | 5 ++++ .../java/com/zhgd/xmgl/util/DateUtils.java | 24 +++++-------------- .../application-gsx-t-dev.properties | 2 +- 22 files changed, 123 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/controller/MechanicalEquipmentPositionAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/controller/MechanicalEquipmentPositionAlarmController.java index 53af1892d..2b10db5a5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/controller/MechanicalEquipmentPositionAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/controller/MechanicalEquipmentPositionAlarmController.java @@ -1,7 +1,11 @@ package com.zhgd.xmgl.modules.mechanicalequipmentposition.controller; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.zhgd.xmgl.modules.mechanicalequipmentposition.entity.MechanicalEquipmentPositionAlarm; import com.zhgd.xmgl.modules.mechanicalequipmentposition.service.IMechanicalEquipmentPositionAlarmService; +import com.zhgd.xmgl.util.DateUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -129,5 +133,4 @@ public class MechanicalEquipmentPositionAlarmController { } return result; } - } diff --git a/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/controller/MechanicalEquipmentPositionDataController.java b/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/controller/MechanicalEquipmentPositionDataController.java index 788b954e1..f14c6b536 100644 --- a/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/controller/MechanicalEquipmentPositionDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/controller/MechanicalEquipmentPositionDataController.java @@ -1,10 +1,14 @@ package com.zhgd.xmgl.modules.mechanicalequipmentposition.controller; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.xmgl.modules.environment.entity.DustNoiseData; import com.zhgd.xmgl.modules.mechanicalequipmentposition.entity.MechanicalEquipmentPositionData; import com.zhgd.xmgl.modules.mechanicalequipmentposition.service.IMechanicalEquipmentPositionDataService; +import com.zhgd.xmgl.util.DateUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -151,4 +155,5 @@ public class MechanicalEquipmentPositionDataController { return Result.ok(); } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/mapper/MechanicalEquipmentPositionAlarmMapper.java b/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/mapper/MechanicalEquipmentPositionAlarmMapper.java index c22ca5ae8..69b79220b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/mapper/MechanicalEquipmentPositionAlarmMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/mapper/MechanicalEquipmentPositionAlarmMapper.java @@ -3,6 +3,9 @@ package com.zhgd.xmgl.modules.mechanicalequipmentposition.mapper; import org.apache.ibatis.annotations.Mapper; import com.zhgd.xmgl.modules.mechanicalequipmentposition.entity.MechanicalEquipmentPositionAlarm; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * @Description: 机械设备定位-实时报警 @@ -12,5 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ @Mapper public interface MechanicalEquipmentPositionAlarmMapper extends BaseMapper { + int batchInsert(@Param("list") List list); } diff --git a/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/mapper/MechanicalEquipmentPositionDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/mapper/MechanicalEquipmentPositionDataMapper.java index b5f190e3d..c2436dd99 100644 --- a/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/mapper/MechanicalEquipmentPositionDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/mapper/MechanicalEquipmentPositionDataMapper.java @@ -25,4 +25,6 @@ public interface MechanicalEquipmentPositionDataMapper extends BaseMapper queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); List getNewestData(String projectSn); + + int batchInsert(@Param("list") List list); } diff --git a/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/mapper/xml/MechanicalEquipmentPositionAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/mapper/xml/MechanicalEquipmentPositionAlarmMapper.xml index 42ec2a0da..bbb0231fa 100644 --- a/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/mapper/xml/MechanicalEquipmentPositionAlarmMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/mapper/xml/MechanicalEquipmentPositionAlarmMapper.xml @@ -1,4 +1,15 @@ + + + insert into mechanical_equipment_position_alarm + (id, dev_sn, equipment_name, alarm_time, alarm_info, project_sn + ) + values + + (#{item.id,jdbcType=BIGINT}, #{item.devSn,jdbcType=VARCHAR}, #{item.equipmentName,jdbcType=VARCHAR}, + #{item.alarmTime,jdbcType=TIMESTAMP}, #{item.alarmInfo,jdbcType=VARCHAR},#{item.projectSn,jdbcType=VARCHAR}) + + diff --git a/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/mapper/xml/MechanicalEquipmentPositionDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/mapper/xml/MechanicalEquipmentPositionDataMapper.xml index 1d9a6a712..b47615030 100644 --- a/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/mapper/xml/MechanicalEquipmentPositionDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/mapper/xml/MechanicalEquipmentPositionDataMapper.xml @@ -19,4 +19,21 @@ group by dev_sn) t on t.create_time = shd.create_time and t.dev_sn=shd.dev_sn group by shd.dev_sn + + + insert into mechanical_equipment_position_data + (id, dev_sn, latitude, longitude, upload_time, speed, work_status, equipment_power, + equipment_voltage, project_sn, address, direction, mileage + ) + values + + (#{item.id,jdbcType=BIGINT}, #{item.devSn,jdbcType=VARCHAR}, #{item.latitude,jdbcType=DOUBLE}, + #{item.longitude,jdbcType=DOUBLE}, #{item.uploadTime,jdbcType=TIMESTAMP}, #{item.speed,jdbcType=DOUBLE}, + #{item.workStatus,jdbcType=INTEGER}, #{item.equipmentPower,jdbcType=DOUBLE}, + #{item.equipmentVoltage,jdbcType=DOUBLE}, + #{item.projectSn,jdbcType=VARCHAR}, #{item.address,jdbcType=VARCHAR}, #{item.direction,jdbcType=VARCHAR}, + #{item.mileage,jdbcType=DOUBLE} + ) + + diff --git a/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/IMechanicalEquipmentPositionAlarmService.java b/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/IMechanicalEquipmentPositionAlarmService.java index 2e58ab3b8..dd712ef91 100644 --- a/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/IMechanicalEquipmentPositionAlarmService.java +++ b/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/IMechanicalEquipmentPositionAlarmService.java @@ -24,4 +24,7 @@ public interface IMechanicalEquipmentPositionAlarmService extends IService list); + } diff --git a/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/IMechanicalEquipmentPositionDataService.java b/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/IMechanicalEquipmentPositionDataService.java index 7b8206508..67ac88afc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/IMechanicalEquipmentPositionDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/IMechanicalEquipmentPositionDataService.java @@ -1,8 +1,8 @@ package com.zhgd.xmgl.modules.mechanicalequipmentposition.service; -import com.zhgd.xmgl.modules.mechanicalequipmentposition.entity.MechanicalEquipmentPositionData; -import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.zhgd.xmgl.modules.mechanicalequipmentposition.entity.MechanicalEquipmentPositionData; import java.util.HashMap; import java.util.List; @@ -28,4 +28,7 @@ public interface IMechanicalEquipmentPositionDataService extends IService paramMap); void jxzhgUpdateStatus(HashMap paramMap); + + int batchInsert(List list); + } diff --git a/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/impl/MechanicalEquipmentPositionAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/impl/MechanicalEquipmentPositionAlarmServiceImpl.java index b888ad45d..cc5164262 100644 --- a/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/impl/MechanicalEquipmentPositionAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/impl/MechanicalEquipmentPositionAlarmServiceImpl.java @@ -100,5 +100,10 @@ public class MechanicalEquipmentPositionAlarmServiceImpl extends ServiceImpl list) { + return baseMapper.batchInsert(list); + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/impl/MechanicalEquipmentPositionDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/impl/MechanicalEquipmentPositionDataServiceImpl.java index 3e9def587..479f66aa5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/impl/MechanicalEquipmentPositionDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/impl/MechanicalEquipmentPositionDataServiceImpl.java @@ -238,6 +238,12 @@ public class MechanicalEquipmentPositionDataServiceImpl extends ServiceImpl list) { + return baseMapper.batchInsert(list); + } + + private Integer getWorkStatusJzhg(String hardwareState) { /* 'working'：工作； diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatAlarmController.java index 344753f21..b3e62c143 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatAlarmController.java @@ -1,8 +1,11 @@ package com.zhgd.xmgl.modules.safetyhat.controller; +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.gexin.fastjson.JSON; import com.zhgd.xmgl.base.entity.vo.TrendVo; import com.zhgd.xmgl.modules.safetyhat.service.ISafetyHatAlarmService; +import com.zhgd.xmgl.util.DateUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -139,4 +142,5 @@ public class SafetyHatAlarmController { public Result> getRecentWeekAlarm(@ApiIgnore @RequestBody HashMap paramMap) { return Result.success(safetyHatAlarmService.getRecentWeekAlarm(paramMap)); } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatDataController.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatDataController.java index 707b7a70a..d9a582fad 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatDataController.java @@ -1,5 +1,7 @@ package com.zhgd.xmgl.modules.safetyhat.controller; +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.gexin.fastjson.JSON; import com.zhgd.jeecg.common.api.vo.Result; @@ -7,6 +9,7 @@ import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatData; import com.zhgd.xmgl.modules.safetyhat.entity.SafetyHatDev; import com.zhgd.xmgl.modules.safetyhat.service.ISafetyHatDataService; import com.zhgd.xmgl.modules.worker.entity.WorkerInfo; +import com.zhgd.xmgl.util.DateUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatAlarmMapper.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatAlarmMapper.java index 66acb394c..7871393f3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatAlarmMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatAlarmMapper.java @@ -27,4 +27,7 @@ public interface SafetyHatAlarmMapper extends BaseMapper { List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); List getRecentWeekAlarm(HashMap paramMap); + + int batchInsert(@Param("list") List list); + } diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatDataMapper.java index 4f83fc552..67e049175 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatDataMapper.java @@ -30,4 +30,6 @@ public interface SafetyHatDataMapper extends BaseMapper { List getNewestList(HashMap paramMap); + int batchInsert(@Param("list") List list); + } diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatAlarmMapper.xml index 8dbc76dd0..dde40884b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatAlarmMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatAlarmMapper.xml @@ -18,4 +18,17 @@ and alarm_type is not null group by alarm_type, date_format(alarm_time, '%Y-%m-%d') + + + insert into safety_hat_alarm + (id, worker_info_id, dev_sn, alarm_time, alarm_info, project_sn, + alarm_type, latitude, longitude) + values + + (#{item.id,jdbcType=BIGINT}, #{item.workerInfoId,jdbcType=BIGINT}, #{item.devSn,jdbcType=VARCHAR}, + #{item.alarmTime,jdbcType=TIMESTAMP}, #{item.alarmInfo,jdbcType=VARCHAR}, + #{item.projectSn,jdbcType=VARCHAR}, #{item.alarmType,jdbcType=INTEGER}, + #{item.latitude,jdbcType=DOUBLE}, #{item.longitude,jdbcType=DOUBLE}) + + diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml index 64aaf1c47..aaca9ca51 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/xml/SafetyHatDataMapper.xml @@ -37,4 +37,18 @@ left join worker_info wi on wi.id = shd.worker_info_id group by t.dev_sn + + + + insert into safety_hat_data + (id, worker_info_id, dev_sn, latitude, longitude, upload_time, + project_sn) + values + + (#{item.id,jdbcType=BIGINT}, #{item.workerInfoId,jdbcType=BIGINT}, #{item.devSn,jdbcType=VARCHAR}, + #{item.latitude,jdbcType=DOUBLE}, #{item.longitude,jdbcType=DOUBLE}, #{item.uploadTime,jdbcType=TIMESTAMP}, + #{item.projectSn,jdbcType=VARCHAR} + ) + + diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatAlarmService.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatAlarmService.java index b4216fa36..6df779172 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatAlarmService.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatAlarmService.java @@ -27,4 +27,6 @@ public interface ISafetyHatAlarmService extends IService { void delete(String id); List getRecentWeekAlarm(HashMap paramMap); + + int batchInsert(List list); } diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatDataService.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatDataService.java index 93187fe87..0ae380ec5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatDataService.java @@ -32,4 +32,7 @@ public interface ISafetyHatDataService extends IService { void updateStatus(SafetyHatDev safetyHatDev); List newestList(HashMap paramMap); + + int batchInsert(List list); + } diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatAlarmServiceImpl.java index 82163eadf..da7920cc0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatAlarmServiceImpl.java @@ -116,5 +116,10 @@ public class SafetyHatAlarmServiceImpl extends ServiceImpl list) { + return baseMapper.batchInsert(list); + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java index add6916a3..f1d54117b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java @@ -251,5 +251,10 @@ public class SafetyHatDataServiceImpl extends ServiceImpl list) { + return baseMapper.batchInsert(list); + } + } diff --git a/src/main/java/com/zhgd/xmgl/util/DateUtils.java b/src/main/java/com/zhgd/xmgl/util/DateUtils.java index 62b408ae6..c340bb6d8 100644 --- a/src/main/java/com/zhgd/xmgl/util/DateUtils.java +++ b/src/main/java/com/zhgd/xmgl/util/DateUtils.java @@ -98,10 +98,10 @@ public class DateUtils { } /** - * 获取两个时间段所有天数 + * 获取两个时间段所有天数，2024-01-01到2024-01-02...到2025-01-01 * - * @param beginTime - * @param endTime + * @param beginTime 2024-01-01 + * @param endTime 2025-01-01 * @return */ public static List getDiffTimeDayList(String beginTime, String endTime) { @@ -622,21 +622,9 @@ public class DateUtils { } public static void main(String[] args) { - try { - checkLegalDate19("2024-04-10"); - } catch (Exception e) { - log.error("error：", e); + List diffTimeDayList = getDiffTimeDayList("2024-01-01", "2025-01-01"); + for (String s : diffTimeDayList) { + System.out.println(s); } - try { - checkLegalDate19("2024-04-10 00-00:00"); - } catch (Exception e) { - log.error("error：", e); - } - try { - checkLegalDate19("2024-04-10 00:00:00"); - } catch (Exception e) { - log.error("error：", e); - } - } } diff --git a/src/main/resources/application-gsx-t-dev.properties b/src/main/resources/application-gsx-t-dev.properties index 22db91a73..e684db3e3 100644 --- a/src/main/resources/application-gsx-t-dev.properties +++ b/src/main/resources/application-gsx-t-dev.properties @@ -1,6 +1,6 @@ #http.port=30250 http.port=28887 -spring.datasource.db1.jdbc-url=jdbc:mysql://192.168.34.221:3306/wisdomsite_other_env_show?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false +spring.datasource.db1.jdbc-url=jdbc:mysql://192.168.34.221:3306/wisdomsite_other_env_show?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false&rewriteBatchedStatements=true spring.datasource.db1.driver-class-name=com.mysql.jdbc.Driver spring.datasource.db1.username=ENC(XR4C/hvTYCUqudS49Wh/jA==) spring.datasource.db1.password=ENC(LsKaVL2ycDu+uUNoPndYLA==)