diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/device/service/impl/DeviceIotServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/device/service/impl/DeviceIotServiceImpl.java index 8916db1..9e5ae67 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/device/service/impl/DeviceIotServiceImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/device/service/impl/DeviceIotServiceImpl.java @@ -109,7 +109,7 @@ public class DeviceIotServiceImpl implements DeviceIotService { query.setStatusList(DeviceStatus.canBackUnlock()); } - Integer result = transactionTemplate.execute(status -> { + transactionTemplate.execute(status -> { // 更新数据库 int rows = deviceMapper.updateByQuery(data, query); vo.setDb(rows); diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/order/service/impl/OrderServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/bst/order/service/impl/OrderServiceImpl.java index 443aee1..e3f7437 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/order/service/impl/OrderServiceImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/order/service/impl/OrderServiceImpl.java @@ -486,8 +486,10 @@ public class OrderServiceImpl implements OrderService { LogParamHolder.set(LogParamHolder.PARAM_LAT, lat); if (device != null) { LogParamHolder.set(LogParamHolder.DEVICE_ID, device.getId()); - LogParamHolder.set(LogParamHolder.DEVICE_LON, device.getLongitude()); - LogParamHolder.set(LogParamHolder.DEVICE_LAT, device.getLatitude()); + if (DeviceLocationType.DEVICE.getCode().equals(device.getLocationType())) { + LogParamHolder.set(LogParamHolder.DEVICE_LON, device.getLongitude()); + LogParamHolder.set(LogParamHolder.DEVICE_LAT, device.getLatitude()); + } } } @@ -498,6 +500,7 @@ public class OrderServiceImpl implements OrderService { device.setLongitude(lon); device.setLatitude(lat); device.setLocationType(DeviceLocationType.PHONE.getCode()); + device.setLastLocationTime(LocalDateTime.now()); // 更新设备定位 Device data = new Device(); @@ -505,6 +508,7 @@ public class OrderServiceImpl implements OrderService { data.setLongitude(device.getLongitude()); data.setLatitude(device.getLatitude()); data.setLocationType(device.getLocationType()); + data.setLastLocationTime(LocalDateTime.now()); int rows = deviceService.updateDevice(data); if (rows != 1) { log.error("通过手机定位修改设备定位失败deviceId={}", device.getId()); @@ -651,6 +655,7 @@ public class OrderServiceImpl implements OrderService { if (device == null) { return null; } + this.setLogParam(dto.getLon(), dto.getLat(), device); // 查询运营区 AreaVO area = areaService.selectAreaById(order.getAreaId()); diff --git a/ruoyi-service/src/main/java/com/ruoyi/dashboard/domain/revenueStat/RevenueStatQuery.java b/ruoyi-service/src/main/java/com/ruoyi/dashboard/domain/revenueStat/RevenueStatQuery.java index 19fc26d..df267fc 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/dashboard/domain/revenueStat/RevenueStatQuery.java +++ b/ruoyi-service/src/main/java/com/ruoyi/dashboard/domain/revenueStat/RevenueStatQuery.java @@ -98,9 +98,9 @@ public class RevenueStatQuery { // 平台分成查询 public BonusQuery toPlatformBonusQuery() { BonusQuery query = new BonusQuery(); - query.setCreateDateRange(dateRange); + query.setWaitDateRange(dateRange); query.setArrivalTypes(BonusArrivalType.platformList()); - query.setStatusList(BonusStatus.valid()); + query.setStatusList(BonusStatus.settle()); return query; } diff --git a/ruoyi-service/src/main/java/com/ruoyi/system/operLog/mapper/OperLogMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/system/operLog/mapper/OperLogMapper.xml index a8017ea..94bdc70 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/system/operLog/mapper/OperLogMapper.xml +++ b/ruoyi-service/src/main/java/com/ruoyi/system/operLog/mapper/OperLogMapper.xml @@ -93,8 +93,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - - + + insert into sys_oper_log title, diff --git a/ruoyi-service/src/main/java/com/ruoyi/system/operLog/service/impl/OperLogServiceImpl.java b/ruoyi-service/src/main/java/com/ruoyi/system/operLog/service/impl/OperLogServiceImpl.java index 0d93012..51e4964 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/system/operLog/service/impl/OperLogServiceImpl.java +++ b/ruoyi-service/src/main/java/com/ruoyi/system/operLog/service/impl/OperLogServiceImpl.java @@ -5,6 +5,7 @@ import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import com.ruoyi.common.utils.collection.CollectionUtils; import com.ruoyi.system.operLog.domain.OperLog; import com.ruoyi.system.operLog.domain.OperLogQuery; import com.ruoyi.system.operLog.domain.OperLogVO; @@ -80,6 +81,9 @@ public class OperLogServiceImpl implements OperLogService @Override public int batchInsert(List list) { + if (CollectionUtils.isEmptyElement(list)) { + return 0; + } return operLogMapper.batchInsert(list); } }