From 9fb4d2bfea510a0c183d856fb67a52c2be7d5a56 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Sat, 24 May 2025 16:49:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E6=95=B0=E6=8D=AE=E7=94=9F?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AmmeterRecordDetailController.java | 13 ++- .../mapper/xml/AmmeterRecordDetailMapper.xml | 2 +- .../mapper/xml/TowerCurrentDataMapper.xml | 8 ++ .../car/entity/CarWashCurrentData.java | 43 +++++---- .../mapper/xml/CarWashCurrentDataMapper.xml | 15 ++-- .../entity/ConcreteMonitorCurrentData.java | 3 + .../xml/ConcreteMonitorCurrentDataMapper.xml | 2 + ...anicalEquipmentPositionDataController.java | 37 +++++--- .../controller/SafetyHatAlarmController.java | 57 +++++++----- .../controller/SafetyHatDataController.java | 55 +++++++----- .../generator/CircleTrajectoryGenerator.java | 42 +++++++++ .../generator/PolygonTrajectoryGenerator.java | 90 ++++++++++++++++++- .../xml/VehiclePositionDayRecordMapper.xml | 9 ++ .../WaterMeterRecordDetailController.java | 12 ++- .../xml/WaterMeterRecordDetailMapper.xml | 2 +- 15 files changed, 300 insertions(+), 90 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/ammeter/controller/AmmeterRecordDetailController.java b/src/main/java/com/zhgd/xmgl/modules/ammeter/controller/AmmeterRecordDetailController.java index a11da33c8..09579bd47 100644 --- a/src/main/java/com/zhgd/xmgl/modules/ammeter/controller/AmmeterRecordDetailController.java +++ b/src/main/java/com/zhgd/xmgl/modules/ammeter/controller/AmmeterRecordDetailController.java @@ -179,10 +179,19 @@ public class AmmeterRecordDetailController { List devIdList = StrUtil.split(config.getDevSns(), ","); ThreadLocalRandom random = ThreadLocalRandom.current(); List datas = new ArrayList<>(); - DateUtil.range(config.getStartTime(), config.getEndTime(), DateField.DAY_OF_MONTH) + DateField unit = null; + if (config.getDataVolume() == 1) { + unit = DateField.DAY_OF_MONTH; + } else if (config.getDataVolume() == 2) { + unit = DateField.WEEK_OF_YEAR; + } else if (config.getDataVolume() == 3) { + unit = DateField.MONTH; + } else if (config.getDataVolume() == 4) { + unit = DateField.YEAR; + } + DateUtil.range(config.getStartTime(), config.getEndTime(), unit) .forEach(date -> { BigDecimal use = NumberUtil.roundDown(random.nextDouble(config.getDegreeBegin().doubleValue(), Math.nextUp(config.getDegreeEnd().doubleValue())), 2); - BigDecimal useTotal = BigDecimal.ZERO; for (String devId : devIdList) { AmmeterRecordDetail data = new AmmeterRecordDetail(); data.setAmmeterNo(devId); diff --git a/src/main/java/com/zhgd/xmgl/modules/ammeter/mapper/xml/AmmeterRecordDetailMapper.xml b/src/main/java/com/zhgd/xmgl/modules/ammeter/mapper/xml/AmmeterRecordDetailMapper.xml index e4d15dd56..12db0c6ec 100644 --- a/src/main/java/com/zhgd/xmgl/modules/ammeter/mapper/xml/AmmeterRecordDetailMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/ammeter/mapper/xml/AmmeterRecordDetailMapper.xml @@ -23,7 +23,7 @@ AND a.add_time <= CONCAT(DATE_FORMAT(#{param.addTime_end}, '%Y-%m-%d'), ' 23:59:59') - order by a.mock_time desc + order by a.mock_time desc,a.id desc order by a.add_time desc diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerCurrentDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerCurrentDataMapper.xml index cb61e0fc2..d6b10e624 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerCurrentDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerCurrentDataMapper.xml @@ -53,6 +53,14 @@ AND a.recive_time <=#{param.endTime} + + + AND a.recive_time >=#{param.reciveTime_begin} + + + + AND a.recive_time <=#{param.reciveTime_end} + order by a.mock_time desc diff --git a/src/main/java/com/zhgd/xmgl/modules/car/entity/CarWashCurrentData.java b/src/main/java/com/zhgd/xmgl/modules/car/entity/CarWashCurrentData.java index 6d2307031..b35069622 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/entity/CarWashCurrentData.java +++ b/src/main/java/com/zhgd/xmgl/modules/car/entity/CarWashCurrentData.java @@ -1,18 +1,16 @@ package com.zhgd.xmgl.modules.car.entity; -import java.io.Serializable; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; /** * @Description: 车辆冲洗实时数据 * @author： pds @@ -24,7 +22,7 @@ import io.swagger.annotations.ApiModelProperty; @ApiModel(value="CarWashCurrentData实体类",description="CarWashCurrentData") public class CarWashCurrentData implements Serializable { private static final long serialVersionUID = 1L; - + /**车辆冲洗实时数据*/ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value="车辆冲洗实时数据") @@ -69,14 +67,23 @@ public class CarWashCurrentData implements Serializable { private java.lang.String vedioUrl ; /**告警类型,1：车辆绕行,2：冲洗时间不足,3：未冲洗,4：其他,5：正常冲洗*/ @Excel(name = "告警类型,1：车辆绕行,2：冲洗时间不足,3：未冲洗,4：其他,5：正常冲洗", width = 15) - @ApiModelProperty(value="告警类型,1：车辆绕行,2：冲洗时间不足,3：未冲洗,4：其他,5：正常冲洗") - private java.lang.String alarmType ; - /**离开工地视频地址*/ - @Excel(name = "离开工地视频地址", width = 15) - @ApiModelProperty(value="离开工地视频地址") - private java.lang.String leaveVedioUrl ; - /**车型*/ - @Excel(name = "车型", width = 15) - @ApiModelProperty(value="车型") - private java.lang.String vehicleType ; + @ApiModelProperty(value = "告警类型,1：车辆绕行,2：冲洗时间不足,3：未冲洗,4：其他,5：正常冲洗") + private java.lang.String alarmType; + /** + * 离开工地视频地址 + */ + @Excel(name = "离开工地视频地址", width = 15) + @ApiModelProperty(value = "离开工地视频地址") + private java.lang.String leaveVedioUrl; + /** + * 车型 + */ + @Excel(name = "车型", width = 15) + @ApiModelProperty(value = "车型") + private java.lang.String vehicleType; + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "模拟生成时间") + private java.util.Date mockTime; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarWashCurrentDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarWashCurrentDataMapper.xml index db0f5007c..9108b0e88 100644 --- a/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarWashCurrentDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarWashCurrentDataMapper.xml @@ -12,15 +12,20 @@ AND a.alarm_type =#{param.alarmType} - + and a.car_number like CONCAT(CONCAT('%',#{param.carNumber}),'%') - + AND a.capture_time >=CONCAT(DATE_FORMAT(#{param.startTime},'%Y-%m-%d'),' 00:00:00') - + AND a.capture_time <=CONCAT(DATE_FORMAT(#{param.endTime},'%Y-%m-%d'),' 23:59:59') - order by a.capture_time desc + + order by a.mock_time desc + + + order by a.capture_time desc + - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/entity/ConcreteMonitorCurrentData.java b/src/main/java/com/zhgd/xmgl/modules/concrete/entity/ConcreteMonitorCurrentData.java index 41293b94c..b93955cac 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/entity/ConcreteMonitorCurrentData.java +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/entity/ConcreteMonitorCurrentData.java @@ -70,4 +70,7 @@ public class ConcreteMonitorCurrentData implements Serializable { @ApiModelProperty(value = "报警等级，1 紧急告警，2 重要告警，3 次要告警，4 提示告警，5 正常") private Integer alarmLevel; + @TableField(exist = false) + @ApiModelProperty(value = "设备名称") + private String devName; } diff --git a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorCurrentDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorCurrentDataMapper.xml index bdc6f440c..5dc78ded1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorCurrentDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorCurrentDataMapper.xml @@ -67,7 +67,9 @@ 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 ecf910ede..13732e9a8 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 @@ -194,24 +194,33 @@ public class MechanicalEquipmentPositionDataController { List devSnList = StrUtil.split(config.getDevSns(), ","); ThreadLocalRandom random = ThreadLocalRandom.current(); List datas = new ArrayList<>(); - List trajectorys = new ArrayList<>(); - List points = new ArrayList<>(); - if (config.getRangeType() == 1) { - trajectorys = CircleTrajectoryGenerator.generateSpiralTrajectory(config.getLatitude(), config.getLongitude(), config.getAreaRadius(), config.getDevGenerateNum()); - } else { - points = PolygonTrajectoryGenerator.generateTrajectoryInPolygon(config.getFenceShape(), config.getDevGenerateNum(), 0.001); - } - List randomTimes = new ArrayList<>(); - for (int i = 0; i < config.getDevGenerateNum(); i++) { - randomTimes.add(new Date(random.nextLong(config.getStartTime().getTime(), config.getEndTime().getTime() + 1))); - } - randomTimes.sort(Comparator.comparing(Date::getTime)); + List> trajectorys = new ArrayList<>(); + List> points = new ArrayList<>(); + List> randomTimeLists = new ArrayList<>(); for (String devSn : devSnList) { + if (config.getRangeType() == 1) { + trajectorys.add(CircleTrajectoryGenerator.generateRandomCircleTrajectory(config.getLatitude(), config.getLongitude(), config.getAreaRadius(), config.getDevGenerateNum())); + } else { + points.add(PolygonTrajectoryGenerator.generateRandomTrajectoryInPolygon(config.getFenceShape(), config.getDevGenerateNum(), 0.001)); + } + List randomTimes = new ArrayList<>(); + for (int i = 0; i < config.getDevGenerateNum(); i++) { + randomTimes.add(new Date(random.nextLong(config.getStartTime().getTime(), config.getEndTime().getTime() + 1))); + } + randomTimes.sort(Comparator.comparing(Date::getTime)); + randomTimeLists.add(randomTimes); + } + int j = 0; + for (String devSn : devSnList) { + List doubles = trajectorys.size() > 0 ? trajectorys.get(j) : new ArrayList<>(); + List points1 = points.size() > 0 ? points.get(j) : new ArrayList<>(); + List randomTimes = randomTimeLists.get(j); + j++; for (int i = 0; i < config.getDevGenerateNum(); i++) { MechanicalEquipmentPositionData data = new MechanicalEquipmentPositionData(); data.setDevSn(devSn); - data.setLatitude(config.getRangeType() == 1 ? trajectorys.get(i)[0] : points.get(i).getLat()); - data.setLongitude(config.getRangeType() == 1 ? trajectorys.get(i)[1] : points.get(i).getLng()); + data.setLatitude(config.getRangeType() == 1 ? doubles.get(i)[0] : points1.get(i).getLat()); + data.setLongitude(config.getRangeType() == 1 ? doubles.get(i)[1] : points1.get(i).getLng()); data.setUploadTime(randomTimes.get(i)); EntityUtils.setRandomDoubleInt(config.getSpeedBegin(), config.getSpeedEnd(), data::setSpeed, random); EntityUtils.setRandomDoubleInt(config.getEquipmentPowerBegin(), config.getEquipmentPowerEnd(), data::setEquipmentPower, random); 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 0cc85bdca..dcdd2c9ab 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 @@ -195,40 +195,49 @@ public class SafetyHatAlarmController { List devSnList = StrUtil.split(config.getDevSns(), ","); ThreadLocalRandom random = ThreadLocalRandom.current(); List datas = new ArrayList<>(); - List trajectorys = new ArrayList<>(); - List points = new ArrayList<>(); - if (config.getRangeType() == 1) { - trajectorys = CircleTrajectoryGenerator.generateSpiralTrajectory(config.getLatitude(), config.getLongitude(), config.getAreaRadius(), config.getDevGenerateNum()); - } else { - points = PolygonTrajectoryGenerator.generateTrajectoryInPolygon(config.getFenceShape(), config.getDevGenerateNum(), 0.001); + List> trajectorys = new ArrayList<>(); + List> points = new ArrayList<>(); + List> randomTimeLists = new ArrayList<>(); + for (String devSn : devSnList) { + if (config.getRangeType() == 1) { + trajectorys.add(CircleTrajectoryGenerator.generateRandomCircleTrajectory(config.getLatitude(), config.getLongitude(), config.getAreaRadius(), config.getDevGenerateNum())); + } else { + points.add(PolygonTrajectoryGenerator.generateRandomTrajectoryInPolygon(config.getFenceShape(), config.getDevGenerateNum(), 0.001)); + } + List randomTimes = new ArrayList<>(); + for (int i = 0; i < config.getDevGenerateNum(); i++) { + randomTimes.add(new Date(random.nextLong(config.getStartTime().getTime(), config.getEndTime().getTime() + 1))); + } + randomTimes.sort(Comparator.comparing(Date::getTime)); + randomTimeLists.add(randomTimes); } + int j = 0; List alarmTypes = new ArrayList<>(); if (StrUtil.isNotBlank(config.getAlarmTypes())) { alarmTypes = StrUtil.split(config.getAlarmTypes(), ","); } - List randomTimes = new ArrayList<>(); - for (int i = 0; i < config.getDevGenerateNum(); i++) { - randomTimes.add(new Date(random.nextLong(config.getStartTime().getTime(), config.getEndTime().getTime() + 1))); - } - randomTimes.sort(Comparator.comparing(Date::getTime)); for (String devSn : devSnList) { + List doubles = trajectorys.size() > 0 ? trajectorys.get(j) : new ArrayList<>(); + List points1 = points.size() > 0 ? points.get(j) : new ArrayList<>(); + List randomTimes = randomTimeLists.get(j); + j++; SafetyHatDev dev = devSnMap.get(devSn); for (int i = 0; i < config.getDevGenerateNum(); i++) { - SafetyHatAlarm alarm = new SafetyHatAlarm(); - alarm.setWorkerInfoId(Optional.ofNullable(dev).map(SafetyHatDev::getWorkerInfoId).orElse(null)); - alarm.setWorkerInfoName(Optional.ofNullable(dev).map(SafetyHatDev::getWorkerInfoName).orElse(null)); - alarm.setDevSn(devSn); - alarm.setAlarmTime(randomTimes.get(i)); + SafetyHatAlarm data = new SafetyHatAlarm(); + data.setWorkerInfoId(Optional.ofNullable(dev).map(SafetyHatDev::getWorkerInfoId).orElse(null)); + data.setWorkerInfoName(Optional.ofNullable(dev).map(SafetyHatDev::getWorkerInfoName).orElse(null)); + data.setDevSn(devSn); + data.setAlarmTime(randomTimes.get(i)); if (alarmTypes.size() > 0) { - alarm.setAlarmType(Integer.valueOf(alarmTypes.get(random.nextInt(alarmTypes.size())))); + data.setAlarmType(Integer.valueOf(alarmTypes.get(random.nextInt(alarmTypes.size())))); } - alarm.setAlarmInfo(ParamEnum.getStr(ParamEnum.SafetyHatAlarmAlarmType.values(), alarm.getAlarmType())); - alarm.setProjectSn(config.getProjectSn()); - alarm.setLatitude(config.getRangeType() == 1 ? trajectorys.get(i)[0] : points.get(i).getLat()); - alarm.setLongitude(config.getRangeType() == 1 ? trajectorys.get(i)[1] : points.get(i).getLng()); - alarm.setFenceId(dev.getFenceId()); - alarm.setType(1); - datas.add(alarm); + data.setAlarmInfo(ParamEnum.getStr(ParamEnum.SafetyHatAlarmAlarmType.values(), data.getAlarmType())); + data.setProjectSn(config.getProjectSn()); + data.setLatitude(config.getRangeType() == 1 ? doubles.get(i)[0] : points1.get(i).getLat()); + data.setLongitude(config.getRangeType() == 1 ? doubles.get(i)[1] : points1.get(i).getLng()); + data.setFenceId(dev.getFenceId()); + data.setType(1); + datas.add(data); } } if (CollUtil.isNotEmpty(datas)) { 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 eacf83546..30364f187 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 @@ -301,32 +301,41 @@ public class SafetyHatDataController { List devSnList = StrUtil.split(config.getDevSns(), ","); ThreadLocalRandom random = ThreadLocalRandom.current(); List datas = new ArrayList<>(); - List trajectorys = new ArrayList<>(); - List points = new ArrayList<>(); - if (config.getRangeType() == 1) { - trajectorys = CircleTrajectoryGenerator.generateSpiralTrajectory(config.getLatitude(), config.getLongitude(), config.getAreaRadius(), config.getDevGenerateNum()); - } else { - points = PolygonTrajectoryGenerator.generateTrajectoryInPolygon(config.getFenceShape(), config.getDevGenerateNum(), 0.001); - } - List randomTimes = new ArrayList<>(); - for (int i = 0; i < config.getDevGenerateNum(); i++) { - randomTimes.add(new Date(random.nextLong(config.getStartTime().getTime(), config.getEndTime().getTime() + 1))); - } - randomTimes.sort(Comparator.comparing(Date::getTime)); + List> trajectorys = new ArrayList<>(); + List> points = new ArrayList<>(); + List> randomTimeLists = new ArrayList<>(); for (String devSn : devSnList) { + if (config.getRangeType() == 1) { + trajectorys.add(CircleTrajectoryGenerator.generateRandomCircleTrajectory(config.getLatitude(), config.getLongitude(), config.getAreaRadius(), config.getDevGenerateNum())); + } else { + points.add(PolygonTrajectoryGenerator.generateRandomTrajectoryInPolygon(config.getFenceShape(), config.getDevGenerateNum(), 0.001)); + } + List randomTimes = new ArrayList<>(); + for (int i = 0; i < config.getDevGenerateNum(); i++) { + randomTimes.add(new Date(random.nextLong(config.getStartTime().getTime(), config.getEndTime().getTime() + 1))); + } + randomTimes.sort(Comparator.comparing(Date::getTime)); + randomTimeLists.add(randomTimes); + } + int j = 0; + for (String devSn : devSnList) { + List doubles = trajectorys.size() > 0 ? trajectorys.get(j) : new ArrayList<>(); + List points1 = points.size() > 0 ? points.get(j) : new ArrayList<>(); + List randomTimes = randomTimeLists.get(j); + j++; SafetyHatDev dev = devSnMap.get(devSn); for (int i = 0; i < config.getDevGenerateNum(); i++) { - SafetyHatData hatData = new SafetyHatData(); - hatData.setWorkerInfoId(Optional.ofNullable(dev).map(SafetyHatDev::getWorkerInfoId).orElse(null)); - hatData.setWorkerInfoName(Optional.ofNullable(dev).map(SafetyHatDev::getWorkerInfoName).orElse(null)); - hatData.setDevSn(devSn); - hatData.setLatitude(config.getRangeType() == 1 ? trajectorys.get(i)[0] : points.get(i).getLat()); - hatData.setLongitude(config.getRangeType() == 1 ? trajectorys.get(i)[1] : points.get(i).getLng()); - hatData.setUploadTime(randomTimes.get(i)); - hatData.setProjectSn(config.getProjectSn()); - hatData.setIsPlatformData(0); - hatData.setType(1); - datas.add(hatData); + SafetyHatData data = new SafetyHatData(); + data.setWorkerInfoId(Optional.ofNullable(dev).map(SafetyHatDev::getWorkerInfoId).orElse(null)); + data.setWorkerInfoName(Optional.ofNullable(dev).map(SafetyHatDev::getWorkerInfoName).orElse(null)); + data.setDevSn(devSn); + data.setLatitude(config.getRangeType() == 1 ? doubles.get(i)[0] : points1.get(i).getLat()); + data.setLongitude(config.getRangeType() == 1 ? doubles.get(i)[1] : points1.get(i).getLng()); + data.setUploadTime(randomTimes.get(i)); + data.setProjectSn(config.getProjectSn()); + data.setIsPlatformData(0); + data.setType(1); + datas.add(data); } } if (CollUtil.isNotEmpty(datas)) { diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/generator/CircleTrajectoryGenerator.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/generator/CircleTrajectoryGenerator.java index be4a3cc22..714b04538 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/generator/CircleTrajectoryGenerator.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/generator/CircleTrajectoryGenerator.java @@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.safetyhat.generator; import java.util.ArrayList; import java.util.List; +import java.util.Random; public class CircleTrajectoryGenerator { private static final double EARTH_RADIUS = 6371000; // 地球半径（米） @@ -43,4 +44,45 @@ public class CircleTrajectoryGenerator { } return trajectory; } + + /** + * 生成圆内随机轨迹（均匀分布在圆内） + * + * @param latCenter 圆心纬度 + * @param lngCenter 圆心经度 + * @param radius 半径（米） + * @param numPoints 生成点数 + * @return 轨迹点列表 [[lat1,lng1], [lat2,lng2], ...] + */ + public static List generateRandomCircleTrajectory( + double latCenter, double lngCenter, double radius, int numPoints) { + List trajectory = new ArrayList<>(); + double latRad = Math.toRadians(latCenter); + Random random = new Random(); + + for (int i = 0; i < numPoints; i++) { + // 1. 生成均匀分布的随机距离和角度 + double distance = radius * Math.sqrt(random.nextDouble()); + double angle = 2 * Math.PI * random.nextDouble(); + + // 2. 球面坐标转换（与螺旋方法相同） + double angularDistance = distance / EARTH_RADIUS; + + // 计算新纬度 + double latNew = Math.toDegrees(Math.asin( + Math.sin(latRad) * Math.cos(angularDistance) + + Math.cos(latRad) * Math.sin(angularDistance) * Math.cos(angle) + )); + + // 计算新经度 + double deltaLng = Math.atan2( + Math.sin(angle) * Math.sin(angularDistance) * Math.cos(latRad), + Math.cos(angularDistance) - Math.sin(latRad) * Math.sin(Math.toRadians(latNew)) + ); + double lngNew = lngCenter + Math.toDegrees(deltaLng); + + trajectory.add(new double[]{latNew, lngNew}); + } + return trajectory; + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/safetyhat/generator/PolygonTrajectoryGenerator.java b/src/main/java/com/zhgd/xmgl/modules/safetyhat/generator/PolygonTrajectoryGenerator.java index e8b52e1d1..fb4973559 100644 --- a/src/main/java/com/zhgd/xmgl/modules/safetyhat/generator/PolygonTrajectoryGenerator.java +++ b/src/main/java/com/zhgd/xmgl/modules/safetyhat/generator/PolygonTrajectoryGenerator.java @@ -100,9 +100,97 @@ public class PolygonTrajectoryGenerator { return inside; } + /** + * 生成随机的多边形内的轨迹 + * + * @param polygonPoints 多边形顶点（格式："lng|lat,lng|lat,..."） + * @param numPoints 生成的点数 + * @param stepSize 步长（单位：度，控制轨迹密度） + * @return 轨迹点列表 + */ + public static List generateRandomTrajectoryInPolygon(String polygonPoints, int numPoints, double stepSize) { + // 解析多边形顶点 + List polygon = parsePolygon(polygonPoints); + if (polygon.isEmpty() || numPoints <= 0) { + return new ArrayList<>(); + } + + // 计算多边形边界 + double minLng = Double.MAX_VALUE, maxLng = Double.MIN_VALUE; + double minLat = Double.MAX_VALUE, maxLat = Double.MIN_VALUE; + for (Point p : polygon) { + minLng = Math.min(minLng, p.getLng()); + maxLng = Math.max(maxLng, p.getLng()); + minLat = Math.min(minLat, p.getLat()); + maxLat = Math.max(maxLat, p.getLat()); + } + + Random random = new Random(); + List trajectory = new ArrayList<>(); + + // 1. 在多边形内随机选择一个起点 + Point currentPoint = getRandomPointInPolygon(polygon, minLng, maxLng, minLat, maxLat, random); + trajectory.add(currentPoint); + + // 2. 随机行走生成轨迹 + for (int i = 1; i < numPoints; i++) { + // 随机方向 (0到2π之间的角度) + double angle = random.nextDouble() * 2 * Math.PI; + // 计算新点的位置 + double newLng = currentPoint.getLng() + Math.cos(angle) * stepSize; + double newLat = currentPoint.getLat() + Math.sin(angle) * stepSize; + + Point newPoint = new Point(newLng, newLat); + + // 检查新点是否在多边形内，如果不在则重新生成方向 + int attempts = 0; + while (!isPointInPolygon(newPoint, polygon) && attempts < 100) { + angle = random.nextDouble() * 2 * Math.PI; + newLng = currentPoint.getLng() + Math.cos(angle) * stepSize; + newLat = currentPoint.getLat() + Math.sin(angle) * stepSize; + newPoint = new Point(newLng, newLat); + attempts++; + } + + // 如果在多次尝试后仍然找不到多边形内的点，则减小步长 + if (attempts >= 100) { + stepSize *= 0.9; + i--; // 重试当前点 + continue; + } + + trajectory.add(newPoint); + currentPoint = newPoint; + } + + return trajectory; + } + + /** + * 在多边形内随机生成一个点 + */ + private static Point getRandomPointInPolygon(List polygon, double minLng, double maxLng, + double minLat, double maxLat, Random random) { + Point point; + int attempts = 0; + do { + double lng = minLng + random.nextDouble() * (maxLng - minLng); + double lat = minLat + random.nextDouble() * (maxLat - minLat); + point = new Point(lng, lat); + attempts++; + // 防止无限循环，设置最大尝试次数 + if (attempts > 1000) { + // 如果无法找到多边形内的随机点，返回多边形第一个点作为后备 + return new Point(polygon.get(0).getLng(), polygon.get(0).getLat()); + } + } while (!isPointInPolygon(point, polygon)); + return point; + } + + public static void main(String[] args) { String polygon = "114.147143|22.674244,114.163176|22.673248,114.159862|22.665211,114.141131|22.667274,114.142904|22.669692"; - List trajectory = PolygonTrajectoryGenerator.generateTrajectoryInPolygon(polygon, 50, 0.001); + List trajectory = PolygonTrajectoryGenerator.generateRandomTrajectoryInPolygon(polygon, 50, 0.001); for (Point p : trajectory) { System.out.printf("经度: %.6f, 纬度: %.6f%n", p.getLng(), p.getLat()); diff --git a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/xml/VehiclePositionDayRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/xml/VehiclePositionDayRecordMapper.xml index 46b83aedf..a801692a6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/xml/VehiclePositionDayRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/vehicleposition/mapper/xml/VehiclePositionDayRecordMapper.xml @@ -20,6 +20,15 @@ and t.day >= concat(#{p.month},'-01') and t.day concat(#{p.month},'31') + + and t.day >= #{p.day_begin} + + + and t.day <= if(LENGTH(#{p.day_end}) = 10, + CONCAT(DATE_FORMAT( + #{p.day_end}, '%Y-%m-%d'), ' 23:59:59'), + #{p.day_end}) + order by t.mock_time desc diff --git a/src/main/java/com/zhgd/xmgl/modules/water/controller/WaterMeterRecordDetailController.java b/src/main/java/com/zhgd/xmgl/modules/water/controller/WaterMeterRecordDetailController.java index 9e9ce9f97..126c62a79 100644 --- a/src/main/java/com/zhgd/xmgl/modules/water/controller/WaterMeterRecordDetailController.java +++ b/src/main/java/com/zhgd/xmgl/modules/water/controller/WaterMeterRecordDetailController.java @@ -172,7 +172,17 @@ public class WaterMeterRecordDetailController { List devIdList = StrUtil.split(config.getDevSns(), ","); ThreadLocalRandom random = ThreadLocalRandom.current(); List datas = new ArrayList<>(); - DateUtil.range(config.getStartTime(), config.getEndTime(), DateField.DAY_OF_MONTH) + DateField unit = null; + if (config.getDataVolume() == 1) { + unit = DateField.DAY_OF_MONTH; + } else if (config.getDataVolume() == 2) { + unit = DateField.WEEK_OF_YEAR; + } else if (config.getDataVolume() == 3) { + unit = DateField.MONTH; + } else if (config.getDataVolume() == 4) { + unit = DateField.YEAR; + } + DateUtil.range(config.getStartTime(), config.getEndTime(), unit) .forEach(date -> { BigDecimal use = NumberUtil.roundDown(random.nextDouble(config.getUseTonnageBegin().doubleValue(), Math.nextUp(config.getUseTonnageEnd().doubleValue())), 2); BigDecimal useTotal = BigDecimal.ZERO; diff --git a/src/main/java/com/zhgd/xmgl/modules/water/mapper/xml/WaterMeterRecordDetailMapper.xml b/src/main/java/com/zhgd/xmgl/modules/water/mapper/xml/WaterMeterRecordDetailMapper.xml index 00cbde7a9..0440af6ad 100644 --- a/src/main/java/com/zhgd/xmgl/modules/water/mapper/xml/WaterMeterRecordDetailMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/water/mapper/xml/WaterMeterRecordDetailMapper.xml @@ -22,7 +22,7 @@ AND a.add_time <= CONCAT(DATE_FORMAT(#{param.addTime_end}, '%Y-%m-%d'), ' 23:59:59') - order by a.mock_time desc + order by a.mock_time desc,a.id desc order by a.add_time desc