bug修复

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;
 	}
-
 }

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();
     }
 
+
 }

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<MechanicalEquipmentPositionAlarm> {
+    int batchInsert(@Param("list") List<MechanicalEquipmentPositionAlarm> list);
 
 }

src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/mapper/MechanicalEquipmentPositionDataMapper.java

@@ -25,4 +25,6 @@ public interface MechanicalEquipmentPositionDataMapper extends BaseMapper<Mechan
     List<MechanicalEquipmentPositionData> queryList(@Param(Constants.WRAPPER) QueryWrapper<MechanicalEquipmentPositionData> queryWrapper);
 
     List<MechanicalEquipmentPositionData> getNewestData(String projectSn);
+
+    int batchInsert(@Param("list") List<MechanicalEquipmentPositionData> list);
 }

src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/mapper/xml/MechanicalEquipmentPositionAlarmMapper.xml

@@ -1,4 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhgd.xmgl.modules.mechanicalequipmentposition.mapper.MechanicalEquipmentPositionAlarmMapper">
+    <insert id="batchInsert" parameterType="map">
+        <!--@mbg.generated-->
+        insert into mechanical_equipment_position_alarm
+        (id, dev_sn, equipment_name, alarm_time, alarm_info, project_sn
+        )
+        values
+        <foreach collection="list" item="item" separator=",">
+            (#{item.id,jdbcType=BIGINT}, #{item.devSn,jdbcType=VARCHAR}, #{item.equipmentName,jdbcType=VARCHAR},
+            #{item.alarmTime,jdbcType=TIMESTAMP}, #{item.alarmInfo,jdbcType=VARCHAR},#{item.projectSn,jdbcType=VARCHAR})
+        </foreach>
+    </insert>
 </mapper>

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
     </select>
+
+    <insert id="batchInsert" parameterType="map">
+        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
+        <foreach collection="list" item="item" separator=",">
+            (#{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}
+            )
+        </foreach>
+    </insert>
 </mapper>

src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/IMechanicalEquipmentPositionAlarmService.java

@@ -24,4 +24,7 @@ public interface IMechanicalEquipmentPositionAlarmService extends IService<Mecha
     void edit(MechanicalEquipmentPositionAlarm mechanicalEquipmentPositionAlarm);
 
     void delete(String id);
+
+    int batchInsert(List<MechanicalEquipmentPositionAlarm> list);
+
 }

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<Mechan
     void addData(HashMap<String, Object> paramMap);
 
     void jxzhgUpdateStatus(HashMap<String, Object> paramMap);
+
+    int batchInsert(List<MechanicalEquipmentPositionData> list);
+
 }

src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/impl/MechanicalEquipmentPositionAlarmServiceImpl.java

@@ -100,5 +100,10 @@ public class MechanicalEquipmentPositionAlarmServiceImpl extends ServiceImpl<Mec
         baseMapper.deleteById(id);
     }
 
+    @Override
+    public int batchInsert(List<MechanicalEquipmentPositionAlarm> list) {
+        return baseMapper.batchInsert(list);
+    }
+
 
 }

src/main/java/com/zhgd/xmgl/modules/mechanicalequipmentposition/service/impl/MechanicalEquipmentPositionDataServiceImpl.java

@@ -238,6 +238,12 @@ public class MechanicalEquipmentPositionDataServiceImpl extends ServiceImpl<Mech
                 .eq(MechanicalEquipmentPositionDev::getDevSn, sn));
     }
 
+    @Override
+    public int batchInsert(List<MechanicalEquipmentPositionData> list) {
+        return baseMapper.batchInsert(list);
+    }
+
+
     private Integer getWorkStatusJzhg(String hardwareState) {
         /*
         'working'：工作；

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<List<TrendVo>> getRecentWeekAlarm(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
         return Result.success(safetyHatAlarmService.getRecentWeekAlarm(paramMap));
     }
+
 }

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;

src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatAlarmMapper.java

@@ -27,4 +27,7 @@ public interface SafetyHatAlarmMapper extends BaseMapper<SafetyHatAlarm> {
     List<SafetyHatAlarm> queryList(@Param(Constants.WRAPPER) QueryWrapper<SafetyHatAlarm> queryWrapper);
 
     List<TrendOneVo> getRecentWeekAlarm(HashMap<String, Object> paramMap);
+
+    int batchInsert(@Param("list") List<SafetyHatAlarm> list);
+
 }

src/main/java/com/zhgd/xmgl/modules/safetyhat/mapper/SafetyHatDataMapper.java

@@ -30,4 +30,6 @@ public interface SafetyHatDataMapper extends BaseMapper<SafetyHatData> {
 
     List<SafetyHatData> getNewestList(HashMap<String, Object> paramMap);
 
+    int batchInsert(@Param("list") List<SafetyHatData> list);
+
 }

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')
     </select>
+    <insert id="batchInsert" parameterType="map">
+        <!--@mbg.generated-->
+        insert into safety_hat_alarm
+        (id, worker_info_id, dev_sn, alarm_time, alarm_info, project_sn,
+        alarm_type, latitude, longitude)
+        values
+        <foreach collection="list" item="item" separator=",">
+            (#{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})
+        </foreach>
+    </insert>
 </mapper>

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
     </select>
+
+    <insert id="batchInsert" parameterType="map">
+        <!--@mbg.generated-->
+        insert into safety_hat_data
+        (id, worker_info_id, dev_sn, latitude, longitude, upload_time,
+        project_sn)
+        values
+        <foreach collection="list" item="item" separator=",">
+            (#{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}
+            )
+        </foreach>
+    </insert>
 </mapper>

src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatAlarmService.java

@@ -27,4 +27,6 @@ public interface ISafetyHatAlarmService extends IService<SafetyHatAlarm> {
     void delete(String id);
 
     List<TrendVo> getRecentWeekAlarm(HashMap<String, Object> paramMap);
+
+    int batchInsert(List<SafetyHatAlarm> list);
 }

src/main/java/com/zhgd/xmgl/modules/safetyhat/service/ISafetyHatDataService.java

@@ -32,4 +32,7 @@ public interface ISafetyHatDataService extends IService<SafetyHatData> {
     void updateStatus(SafetyHatDev safetyHatDev);
 
     List<SafetyHatData> newestList(HashMap<String, Object> paramMap);
+
+    int batchInsert(List<SafetyHatData> list);
+
 }

src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatAlarmServiceImpl.java

@@ -116,5 +116,10 @@ public class SafetyHatAlarmServiceImpl extends ServiceImpl<SafetyHatAlarmMapper,
         return TrendVo.getTrendVos(l, list, dateTimeStrList, format);
     }
 
+    @Override
+    public int batchInsert(List<SafetyHatAlarm> list) {
+        return baseMapper.batchInsert(list);
+    }
+
 
 }

src/main/java/com/zhgd/xmgl/modules/safetyhat/service/impl/SafetyHatDataServiceImpl.java

@@ -251,5 +251,10 @@ public class SafetyHatDataServiceImpl extends ServiceImpl<SafetyHatDataMapper, S
         }
     }
 
+    @Override
+    public int batchInsert(List<SafetyHatData> list) {
+        return baseMapper.batchInsert(list);
+    }
+
 
 }

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 beginTime 2024-01-01
-     * @param endTime
+     * @param endTime   2025-01-01
      * @return
      */
     public static List<String> getDiffTimeDayList(String beginTime, String endTime) {
@@ -622,21 +622,9 @@ public class DateUtils {
     }
 
     public static void main(String[] args) {
-        try {
+        List<String> diffTimeDayList = getDiffTimeDayList("2024-01-01", "2025-01-01");
-            checkLegalDate19("2024-04-10");
+        for (String s : diffTimeDayList) {
-        } catch (Exception e) {
+            System.out.println(s);
-            log.error("error：", e);
         }
-        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);
-        }
-
     }
 }

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==)