diff --git a/electripper-admin/pom.xml b/electripper-admin/pom.xml index 4388ab4..5deba87 100644 --- a/electripper-admin/pom.xml +++ b/electripper-admin/pom.xml @@ -61,6 +61,25 @@ electripper-generator + + + junit + junit + test + + + + org.springframework.boot + spring-boot-test + test + + + + org.springframework + spring-test + test + + diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java index 909ecad..eaa401e 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppController.java @@ -19,6 +19,7 @@ import com.ruoyi.common.utils.CommonUtil; import com.ruoyi.common.utils.SendAliSmsUtil; import com.ruoyi.common.utils.SendSmsVo; import com.ruoyi.common.utils.map.GeoUtils; +import com.ruoyi.common.utils.map.GpsCoordinateUtils; import com.ruoyi.common.utils.onenet.Token; import com.ruoyi.framework.web.service.SysLoginService; import com.ruoyi.system.domain.*; @@ -33,6 +34,8 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.util.List; @@ -610,4 +613,60 @@ public class AppController extends BaseController return toAjax(etOrderService.repairDeduction(areaId)); } + /** + * 定位转换 + */ + @GetMapping(value = "/position/conversion") + public AjaxResult repairDeduction(BigDecimal lon,BigDecimal lat) + { + logger.info("WGS84经纬度（未计算）：" + lon + "---" + lat); + // 除以100 + lon = lon.divide(new BigDecimal(100), 10, RoundingMode.HALF_UP); + lat = lat.divide(new BigDecimal(100), 10, RoundingMode.HALF_UP); + logger.info("WGS84经纬度（除以100后）：" + lon + "---" + lat); + // 取出lon中后面的小数点 + String[] lonStr = getDecimalPart(lon); + String[] latStr = getDecimalPart(lat); + logger.info("WGS84经纬度（截取小数点）：" + lonStr[0] + "---" + lonStr[1] + "---"+ latStr[0]+"---"+ latStr[1]); + // 再将结果乘以5/3 + String lon2 = "0."+ lonStr[1]; + String lat2 = "0."+ latStr[1]; + BigDecimal lons = new BigDecimal(lon2).multiply(new BigDecimal(5).divide(new BigDecimal(3), 8, RoundingMode.HALF_UP)); + BigDecimal lats = new BigDecimal(lat2).multiply(new BigDecimal(5).divide(new BigDecimal(3), 8, RoundingMode.HALF_UP)); + BigDecimal lo = new BigDecimal(lonStr[0]).add(lons); + BigDecimal la = new BigDecimal(latStr[0]).add(lats); + logger.info("WGS84经纬度（计算后）：" + lo + "---" + la); + lo = lo.setScale(8, RoundingMode.HALF_UP); + la = la.setScale(8, RoundingMode.HALF_UP); + logger.info("WGS84经纬度（保留8为小数）：" + lo + "---" + la); + double[] doubles = GpsCoordinateUtils.calWGS84toGCJ02(la.doubleValue(), lo.doubleValue()); + lat = new BigDecimal(doubles[0]).setScale(8, RoundingMode.HALF_UP); + lon = new BigDecimal(doubles[1]).setScale(8, RoundingMode.HALF_UP); + logger.info("转换后的GCJ02经纬度：" + lon + "---" + lat); + return success(lon+","+lat); + } + + private static String[] getDecimalPart(BigDecimal number) { + // 将BigDecimal转换为字符串 + String numberStr = number.toPlainString(); + + // 找到小数点的位置 + int indexOfDecimal = numberStr.indexOf("."); + + // 初始化结果数组 + String[] parts = new String[2]; + + // 如果有小数点 + if (indexOfDecimal >= 0) { + parts[0] = numberStr.substring(0, indexOfDecimal); // 整数部分 + parts[1] = numberStr.substring(indexOfDecimal + 1); // 小数部分 + } else { + // 如果没有小数点，整数部分为整个字符串，小数部分为空 + parts[0] = numberStr; + parts[1] = ""; + } + + return parts; + } + } diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java index 98c072e..3fe63f5 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/app/AppVerifyController.java @@ -901,7 +901,8 @@ public class AppVerifyController extends BaseController BigDecimal todayOrderAmount = getTodayOrderAmount(sysDept); // 更新 sysDept 的余额字段 if (sysDept.getBalance() != null) { - sysDept.setBalance(sysDept.getBalance().subtract(todayOrderAmount)); + sysDept.setSettlementAmount(todayOrderAmount); + sysDept.setWithdrawableAmount(sysDept.getBalance().subtract(todayOrderAmount)); } return success(sysDept); } @@ -927,6 +928,9 @@ public class AppVerifyController extends BaseController todayOrderAmount = todayOrderAmount.add(areaOrderAmount); } } + if(todayOrderAmount.compareTo(sysDept.getBalance()) > 0){ + todayOrderAmount = sysDept.getBalance(); + } return todayOrderAmount; } diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java index 6ab6c61..dc05566 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/iot/receive/ReceiveController.java @@ -37,6 +37,7 @@ import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicLong; /** * 接收硬件参数 @@ -71,6 +72,9 @@ public class ReceiveController { @Autowired private IEtOrderService etOrderService; + @Autowired + private ISysConfigService sysConfigService; + @Autowired private ScheduledExecutorService scheduledExecutorService; @@ -79,6 +83,10 @@ public class ReceiveController { private final Object lock = new Object(); + // 用于记录上次发送命令的时间 + private static AtomicLong lastCommandTime = new AtomicLong(0); + private static final long COMMAND_COOLDOWN_MS = 5 * 60 * 1000; // 5分钟 + /** * 功能描述：第三方平台数据接收。

@@ -232,25 +240,50 @@ public class ReceiveController { } }else{ //是否在禁行区20米范围内 - boolean inPolygon = asDeviceService.isNoRidingAreaWithTolerance(device.getSn(), device.getAreaId(),20); + boolean inPolygon = asDeviceService.isNoRidingAreaWithTolerance(device.getSn(), device.getAreaId(),30); if (inPolygon && !isAdminUnlocking.equals("1")) { log.info("距离禁行区20米内发送警告命令--SN：" + device.getSn()); - asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_PLAY2, "距离禁行区20米内",null,null); + asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_PLAY2, "距离禁行区30米内",null,null); } } - /** 3.超出运营区外断电*/ - boolean isAreaZone = asDeviceService.isAreaZone(device.getSn(), area); - if(!isAreaZone){ - //是否在30米范围内 - boolean inPolygon = GeoUtils.isInPolygonWithTolerance(lon.toString(), lat.toString(), GeoUtils.fromWkt(area.getBoundary()), 60); - if(inPolygon && !isAdminUnlocking.equals("1")){ + /** 3. 判断是否在运营区外 + * a. 判断是否在缩短后的运营区边界内 + * 如果在，走 返回营运区上电 逻辑 + * 如果不在， + * 判断是否靠近运营区边界 + * 靠近，播报 + * 不靠近，判断是否在运营区外 + * + **/ + String nearBoundaryDistanceConfig = sysConfigService.selectConfigByKey("near.boundary.distance");// 靠近运营区边界时的播报距离 + log.info("靠近运营区边界时的播报距离==================：" + nearBoundaryDistanceConfig); + double nearBoundaryDistance = Double.parseDouble(nearBoundaryDistanceConfig); + String exceedArea = sysConfigService.selectConfigByKey("exceed.area.distance");// 超出运营区外断电距离 + log.info("超出运营区外断电距离================：" + exceedArea); + int exceedDistance = Integer.parseInt(exceedArea); + + // 创建多边形对象 + Geometry polygon = GeoUtils.fromWkt(area.getBoundary()); + + // 判断该车辆是否在进行中的订单,并且车辆的锁状态是关，状态是骑行中 + Boolean inOrderBySn = etOrderService.isInOrderBySn(device.getSn()); + // 是否在缩短后的运营区边界内 + boolean inPolygonWithTolerance = GeoUtils.isInPolygonWithShorten(lon.toString(), lat.toString(), polygon, nearBoundaryDistance); + if(!inPolygonWithTolerance && !isAdminUnlocking.equals("1") && inOrderBySn){//如果正在骑行中，并且不是管理员开锁，并且在不缩短后的运营区域内 没有在缩短后的运营区边界内 + boolean inPolygonWithTolerance1 = GeoUtils.isInPolygonWithTolerance(lon.toString(), lat.toString(), polygon, 0);// 是否在运营区内 + boolean isNearBoundary = GeoUtils.isInPolygonWithTolerance(lon.toString(), lat.toString(), polygon, exceedDistance ); + if(inPolygonWithTolerance1){//是否在运营区边界内 + // 在靠近运营区边界时发警报 + log.info("靠近运营区边界发警告命令--SN：" + device.getSn()); + asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_PLAY2, "靠近运营区边界", null, null); + }else if(isNearBoundary){ // 是否在超出运营区边界多少米内 //在20米范围内，发报警 - log.info("超出运营区30米内发送警告命令--SN：" + device.getSn()); - asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_PLAY3, "超出运营区30米内",null,null); + log.info("超出运营区"+exceedDistance+"米内发送警告命令--SN：" + device.getSn()); + asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_PLAY3, "超出运营区"+exceedDistance+"米内",null,null); }else{ - //超出运营区外断电 + // 超出运营区外断电 String areaOutOutage = area.getAreaOutOutage(); - if (areaOutOutage.equals("1") && value.getStatus() != 3 && !isAdminUnlocking.equals("1")) { // 超出营运区断电 + if (areaOutOutage.equals("1")) { // 超出营运区断电 log.info("超出营运区断电命令--SN：" + device.getSn()); asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_QLOSE+IotConstants.COMMAND_FREQUENCY_5, "超出营运区断电",null,null); device.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE); @@ -261,8 +294,7 @@ public class ReceiveController { } } }else{ - // 判断该车辆是否在进行中的订单,并且车辆的锁状态是关，状态是骑行中 - Boolean inOrderBySn = etOrderService.isInOrderBySn(device.getSn()); + // 在运营区域内 if (inOrderBySn && ServiceConstants.VEHICLE_STATUS_IN_USING.equals(device.getStatus()) && ServiceConstants.LOCK_STATUS_CLOSE.equals(device.getLockStatus())) { // 有正在骑行的订单，给车辆上电 if(!noRidingArea){ log.info("返回营运区上电，有正在骑行的订单，给车辆上电--SN：" + device.getSn()); @@ -301,10 +333,14 @@ public class ReceiveController { optimizeRoute(jsonArray, newPoint,lon,lat,etOrder); }else{ + long currentTime = System.currentTimeMillis(); + long lastTime = lastCommandTime.get();// 上一次命令时间，5分账内不再执行 ‘车辆锁同步关锁’ 命令 long difference = System.currentTimeMillis() - logEntry.getAt(); log.info("当前时间戳：【"+System.currentTimeMillis()+"】,消息时间：【"+logEntry.getAt()+"】,时间差：【"+difference+"】"); - if (difference < 60 * 1000 && ServiceConstants.LOCK_STATUS_CLOSE.equals(device.getLockStatus())) { - asDeviceService.sendCommand(asDevice.getMac(), Token.getToken(), IotConstants.COMMAND_CLOSE + IotConstants.COMMAND_FREQUENCY_3600, "车辆锁同步关锁", null, null, msg); + if (difference < 60 * 1000 && ServiceConstants.LOCK_STATUS_CLOSE.equals(device.getLockStatus())) {// 消息时间和当前时间，时间差在1分钟内，且锁状态为关闭，则发送命令 + if (currentTime - lastTime >= COMMAND_COOLDOWN_MS) { + asDeviceService.sendCommand(asDevice.getMac(), Token.getToken(), IotConstants.COMMAND_CLOSE + IotConstants.COMMAND_FREQUENCY_3600, "车辆锁同步关锁", null, null, msg); + } } } } @@ -437,7 +473,7 @@ public class ReceiveController { } else { jsonArray.add(newPoint); String tripRouteStr = jsonArray.toJSONString(); - log.info("更新行程jsonArray：" + tripRouteStr); +// log.info("更新行程jsonArray：" + tripRouteStr); etOrder.setTripRouteStr(tripRouteStr); Geometry geometry = GeoUtils.toGeometryByLinearRing(tripRouteStr); diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/AsDeviceController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/AsDeviceController.java index d861e38..53ac9ef 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/AsDeviceController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/AsDeviceController.java @@ -122,7 +122,7 @@ public class AsDeviceController extends BaseController } /** - * 一键下线 + * 一键禁用 */ @PreAuthorize("@ss.hasPermi('system:device:oneClickOffline')") @Log(title = "设备", businessType = BusinessType.OFFLINE) diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java index 4021ae3..26d09ba 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java @@ -107,9 +107,13 @@ public class SysDeptController extends BaseController SysDept sysDept = deptService.selectDeptById(deptId); BigDecimal todayOrderAmount = getTodayOrderAmount(deptId); + if(todayOrderAmount.compareTo(sysDept.getBalance()) > 0){ + todayOrderAmount = sysDept.getBalance(); + } // 更新 sysDept 的余额字段 if (sysDept.getBalance() != null) { - sysDept.setBalance(sysDept.getBalance().subtract(todayOrderAmount)); + sysDept.setSettlementAmount(todayOrderAmount); + sysDept.setWithdrawableAmount(sysDept.getBalance().subtract(todayOrderAmount)); } ajax.put(AjaxResult.DATA_TAG,sysDept); diff --git a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java index fd4ad08..7642af3 100644 --- a/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/electripper-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java @@ -126,10 +126,10 @@ public class SysLoginController Long userId = SecurityUtils.getUserId(); List menus = menuService.selectMenuTreeByUserId(userId); SysDept sysDept = deptService.selectDeptById(SecurityUtils.getDeptId()); - if(!sysDept.getIsProfitSharing().equals("true")){ - // 去掉 menus 中的名字为‘合伙人管理’的菜单 - menus.removeIf(menu -> menu.getMenuName().equals("合伙人管理")); - } +// if(!sysDept.getIsProfitSharing().equals("true")){ +// // 去掉 menus 中的名字为‘合伙人管理’的菜单 +// menus.removeIf(menu -> menu.getMenuName().equals("合伙人管理")); +// } if(sysDept.getDeptId() == 101){ // 找出 menus 中的名字为‘财务管理’的菜单，获取到它子菜单 menus.stream().filter(menu -> menu.getMenuName().equals("财务管理")).forEach(menu -> { diff --git a/electripper-admin/src/test/java/MainTests.java b/electripper-admin/src/test/java/MainTests.java new file mode 100644 index 0000000..cae180b --- /dev/null +++ b/electripper-admin/src/test/java/MainTests.java @@ -0,0 +1,97 @@ +import com.alibaba.fastjson2.JSONObject; +import com.ruoyi.RuoYiApplication; +import com.ruoyi.common.constant.IotConstants; +import com.ruoyi.common.constant.ServiceConstants; +import com.ruoyi.common.utils.map.GeoUtils; +import com.ruoyi.common.utils.onenet.Token; +import com.ruoyi.system.domain.AsDevice; +import com.ruoyi.system.domain.EtOperatingArea; +import com.ruoyi.system.service.IAsDeviceService; +import com.ruoyi.system.service.IEtOperatingAreaService; +import com.ruoyi.system.service.ISysConfigService; +import com.ruoyi.web.controller.iot.domain.LogEntry; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.operation.buffer.BufferOp; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import javax.annotation.Resource; +import java.math.BigDecimal; + + +@Slf4j +@RunWith(SpringRunner.class) +@SpringBootTest(classes = RuoYiApplication.class,webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +public class MainTests { + + @Resource + private IAsDeviceService asDeviceService; + + @Autowired + private ISysConfigService sysConfigService; + + @Resource + private IEtOperatingAreaService etOperatingAreaService; + + @Test + @SneakyThrows + public void testSelectActivityById() { + + AsDevice device = asDeviceService.selectAsDeviceByMac("75D30EA71454"); + BigDecimal lon = new BigDecimal("120.25709"); + BigDecimal lat = new BigDecimal("27.105487"); + + EtOperatingArea area = etOperatingAreaService.selectEtOperatingAreaByAreaId(device.getAreaId()); + String isAdminUnlocking = device.getIsAdminUnlocking();// 是否是管理员开锁：0-否；1-是 + + String nearBoundaryDistanceConfig = sysConfigService.selectConfigByKey("near.boundary.distance");// 靠近运营区边界时的播报距离 + log.info("靠近运营区边界时的播报距离==================：" + nearBoundaryDistanceConfig); + double nearBoundaryDistance = Double.parseDouble(nearBoundaryDistanceConfig); + String exceedArea = sysConfigService.selectConfigByKey("exceed.area.distance");// 超出运营区外断电距离 + log.info("超出运营区外断电距离================：" + exceedArea); + int exceedDistance = Integer.parseInt(exceedArea); + + + // 创建多边形对象 + Geometry polygon = GeoUtils.fromWkt(area.getBoundary()); + // 是否在缩短后的运营区边界内 + boolean inPolygonWithTolerance = GeoUtils.isInPolygonWithShorten(lon.toString(), lat.toString(), polygon, nearBoundaryDistance); + if(!inPolygonWithTolerance && !isAdminUnlocking.equals("1")){//没有在缩短后的运营区边界内 + boolean inPolygonWithTolerance1 = GeoUtils.isInPolygonWithTolerance(lon.toString(), lat.toString(), polygon, 0);// 是否在运营区内 + boolean isNearBoundary = GeoUtils.isInPolygonWithTolerance(lon.toString(), lat.toString(), polygon, exceedDistance ); + if(inPolygonWithTolerance1){//是否在运营区边界内 + // 在靠近运营区边界时发警报 + log.info("靠近运营区边界发警告命令--SN：" + device.getSn()); + asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_PLAY2, "靠近运营区边界", null, null); + }else if(isNearBoundary){ // 是否在超出运营区边界多少米内 + //在20米范围内，发报警 + log.info("超出运营区"+exceedDistance+"米内发送警告命令--SN：" + device.getSn()); + asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_PLAY3, "超出运营区"+exceedDistance+"米内",null,null); + }else{ + // 超出运营区外断电 + String areaOutOutage = area.getAreaOutOutage(); + if (areaOutOutage.equals("1")) { // 超出营运区断电 + log.info("超出营运区断电命令--SN：" + device.getSn()); + asDeviceService.sendCommand(device.getMac(), Token.getToken(), IotConstants.COMMAND_QLOSE+IotConstants.COMMAND_FREQUENCY_5, "超出营运区断电",null,null); + device.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE); + int updateAsDevice = asDeviceService.updateAsDevice(device); + if (updateAsDevice > 0) { + log.info("禁行区内断电--更新设备锁状态成功SN：" + device.getSn()); + } + } + } + }else{ + log.info("在运营区域内"); + } + } + + +} + + + diff --git a/electripper-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/electripper-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java index cf03f15..148ca6f 100644 --- a/electripper-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java +++ b/electripper-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java @@ -124,6 +124,28 @@ public class SysDept extends BaseEntity /** 收款码 */ public String collectionCode; + /** 待结算金额 */ + public BigDecimal settlementAmount; + + /** 可提现金额 */ + public BigDecimal withdrawableAmount; + + public BigDecimal getWithdrawableAmount() { + return withdrawableAmount; + } + + public void setWithdrawableAmount(BigDecimal withdrawableAmount) { + this.withdrawableAmount = withdrawableAmount; + } + + public BigDecimal getSettlementAmount() { + return settlementAmount; + } + + public void setSettlementAmount(BigDecimal settlementAmount) { + this.settlementAmount = settlementAmount; + } + public String getCollectionCode() { return collectionCode; } diff --git a/electripper-common/src/main/java/com/ruoyi/common/utils/map/GeoUtils.java b/electripper-common/src/main/java/com/ruoyi/common/utils/map/GeoUtils.java index 9595897..d19146f 100644 --- a/electripper-common/src/main/java/com/ruoyi/common/utils/map/GeoUtils.java +++ b/electripper-common/src/main/java/com/ruoyi/common/utils/map/GeoUtils.java @@ -250,6 +250,7 @@ public class GeoUtils { double distance = calculateDistance(lat, lon, coord.y, coord.x); log.info("距离----distance:{}",distance); if (distance <= tolerance) { + log.info("最小距离----distance:{}",distance); return true; } } @@ -257,6 +258,34 @@ public class GeoUtils { } } + /** + * 判断一个点是否在一个缩短后的圆形区域内 + * */ + public static boolean isInPolygonWithShorten(String longitude, String latitude, Geometry polygon, double shortenDistance) { + double lon = Double.parseDouble(longitude); + double lat = Double.parseDouble(latitude); + + GeometryFactory geometryFactory = new GeometryFactory(); + Coordinate coordinate = new Coordinate(lon, lat); + Point point = geometryFactory.createPoint(coordinate); + + if (polygon.contains(point)) { + // 获取多边形的外边界 + Coordinate[] coordinates = polygon.getCoordinates(); + for (Coordinate coord : coordinates) { + double distance = calculateDistance(lat, lon, coord.y, coord.x); + log.info("距离----distance:{}",distance); + if (shortenDistance >= distance) { + log.info("最小距离----distance:{}",distance); + return false; + } + } + return true; + } else { + return false; + } + } + // 将角度转换为弧度 private static double deg2rad(double deg) { return deg * (Math.PI / 180); diff --git a/electripper-system/src/main/java/com/ruoyi/system/domain/EtCommandLog.java b/electripper-system/src/main/java/com/ruoyi/system/domain/EtCommandLog.java index e045ed2..0b4cae1 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/domain/EtCommandLog.java +++ b/electripper-system/src/main/java/com/ruoyi/system/domain/EtCommandLog.java @@ -62,4 +62,8 @@ public class EtCommandLog extends BaseEntity @Excel(name = "onenet上报的消息") private String msg; +// /** 是否蓝牙控制 0-否；1-是否 */ +// @Excel(name = "是否蓝牙控制 0-否；1-是否 ") +// private String isBluetooth; + } diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/IWxPayService.java b/electripper-system/src/main/java/com/ruoyi/system/service/IWxPayService.java index 031f46e..7bdfed9 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/IWxPayService.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/IWxPayService.java @@ -91,7 +91,7 @@ public interface IWxPayService { * @param transactionId 微信支付单号 * @param receivers 分账接收方 */ - public OrdersEntity createOrder(SysDept sysDept, String transactionId, List receivers); +// public OrdersEntity createOrder(SysDept sysDept, String transactionId, List receivers); /** * 添加分账接收方 diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java index 0e0a7b0..9432ab1 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/AsDeviceServiceImpl.java @@ -47,6 +47,8 @@ import java.util.*; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; +import static com.ruoyi.common.utils.SecurityUtils.getUsername; + /** * 设备Service业务层处理 * @@ -360,6 +362,35 @@ public class AsDeviceServiceImpl extends ServiceImpl i @Override public int updateAsDevice2(AsDevice asDevice) { + AsDevice device = asDeviceMapper.selectAsDeviceByDeviceId(asDevice.getDeviceId());// + if(!device.getStatus().equals(asDevice.getStatus())){ + if(asDevice.getStatus().equals(ServiceConstants.VEHICLE_STATUS_NOT_LISTING)){ + Boolean inOrderBySn = etOrderService.isInOrderBySn(device.getSn()); + if(inOrderBySn){ + throw new ServiceException("还有正在骑行中的订单【"+device.getSn()+"】，不能回仓"); + }else{ + //记录日志 + asynchronousSaveLog(null,null,asDevice.getMac(),null,"回仓",null,getUsername()); + } + } + if(asDevice.getStatus().equals(ServiceConstants.VEHICLE_STATUS_IN_OFFLINE)){ + Boolean inOrderBySn = etOrderService.isInOrderBySn(device.getSn()); + if(inOrderBySn){ + throw new ServiceException("还有正在骑行中的订单【"+device.getSn()+"】，不能禁用"); + }else{ + //记录日志 + asynchronousSaveLog(null,null,asDevice.getMac(),null,"禁用",null,getUsername()); + } + } + if(device.getStatus().equals(ServiceConstants.VEHICLE_STATUS_NOT_LISTING) && asDevice.getStatus().equals(ServiceConstants.VEHICLE_STATUS_NORMAL)){ + //记录日志 + asynchronousSaveLog(null,null,asDevice.getMac(),null,"出仓",null,getUsername()); + } + if(device.getStatus().equals(ServiceConstants.VEHICLE_STATUS_IN_OFFLINE) && asDevice.getStatus().equals(ServiceConstants.VEHICLE_STATUS_NORMAL)){ + //记录日志 + asynchronousSaveLog(null,null,asDevice.getMac(),null,"解禁",null,getUsername()); + } + } if(ObjectUtil.isNotNull(asDevice.getAreaId())){ SysDept sysDept = wxPayService.getDeptObjByAreaId(asDevice.getAreaId()); if(ObjectUtil.isNotNull(sysDept)){ @@ -407,12 +438,13 @@ public class AsDeviceServiceImpl extends ServiceImpl i } /** - * 一键上线 + * 一键解禁 * - * @param deviceIds 需要一键上线的设备主键集合 + * @param deviceIds 需要一键解禁的设备主键集合 * @return 结果 */ @Override + @Transactional public int oneClickOnline(Long[] deviceIds) { for (Long deviceId:deviceIds) { @@ -421,8 +453,10 @@ public class AsDeviceServiceImpl extends ServiceImpl i throw new ServiceException("车辆【"+deviceId+"】不存在"); } if(!device.getStatus().equals(ServiceConstants.VEHICLE_STATUS_IN_OFFLINE)){ - throw new ServiceException("车辆【"+device.getSn()+"】非下线状态，请重新选择！"); + throw new ServiceException("车辆【"+device.getSn()+"】非解禁状态，请重新选择！"); } + //记录日志 + asynchronousSaveLog(null,null,device.getMac(),null,"解禁",null,getUsername()); } return asDeviceMapper.oneClickOnline(deviceIds); } @@ -434,6 +468,7 @@ public class AsDeviceServiceImpl extends ServiceImpl i * @return 结果 */ @Override + @Transactional public int oneClickListing(Long[] deviceIds) { for (Long deviceId:deviceIds) { @@ -444,39 +479,48 @@ public class AsDeviceServiceImpl extends ServiceImpl i if(!device.getStatus().equals(ServiceConstants.VEHICLE_STATUS_NOT_LISTING)){ throw new ServiceException("车辆【"+device.getSn()+"】非仓库中状态，请重新选择！"); } + //记录日志 + asynchronousSaveLog(null,null,device.getMac(),null,"出仓",null,getUsername()); } return asDeviceMapper.oneClickOnline(deviceIds); } /** - * 一键下线 + * 一键禁用 * - * @param deviceIds 需要一键下线的设备主键集合 + * @param deviceIds 需要一键解禁的设备主键集合 * @return 结果 */ + @Transactional @Override public int oneClickOffline(Long[] deviceIds) { for (Long deviceId:deviceIds) { AsDevice device = asDeviceMapper.selectAsDeviceByDeviceId(deviceId); + Boolean inOrderBySn = etOrderService.isInOrderBySn(device.getSn()); + if(inOrderBySn){ + throw new ServiceException("还有正在骑行中的订单【"+device.getSn()+"】，不能禁用"); + } if(ObjectUtil.isNull(device)){ throw new ServiceException("车辆【"+deviceId+"】不存在"); } if(device.getStatus().equals(ServiceConstants.VEHICLE_STATUS_IN_APPOINTMENT)){ - throw new ServiceException("车辆【"+device.getSn()+"】为‘预约中’状态不能下线"); + throw new ServiceException("车辆【"+device.getSn()+"】为‘预约中’状态不能禁用"); } if(device.getStatus().equals(ServiceConstants.VEHICLE_STATUS_IN_USING)){ - throw new ServiceException("车辆【"+device.getSn()+"】为‘使用中’状态不能下线"); + throw new ServiceException("车辆【"+device.getSn()+"】为‘使用中’状态不能禁用"); } if(device.getStatus().equals(ServiceConstants.VEHICLE_STATUS_TEMPORARILY_LOCK)){ - throw new ServiceException("车辆【"+device.getSn()+"】为‘临时停车’状态不能下线"); + throw new ServiceException("车辆【"+device.getSn()+"】为‘临时停车’状态不能禁用"); } if(device.getStatus().equals(ServiceConstants.VEHICLE_STATUS_NOT_LISTING)){ - throw new ServiceException("车辆【"+device.getSn()+"】为‘未上架’状态不能下线"); + throw new ServiceException("车辆【"+device.getSn()+"】为‘未上架’状态不能禁用"); } if(device.getStatus().equals(ServiceConstants.VEHICLE_STATUS_ABANDON)){ - throw new ServiceException("车辆【"+device.getSn()+"】为‘废弃’状态不能下线"); + throw new ServiceException("车辆【"+device.getSn()+"】为‘废弃’状态不能禁用"); } + //记录日志 + asynchronousSaveLog(null,null,device.getMac(),null,"禁用",null,getUsername()); } return asDeviceMapper.oneClickOffline(deviceIds); } @@ -488,10 +532,15 @@ public class AsDeviceServiceImpl extends ServiceImpl i * @return 结果 */ @Override + @Transactional public int oneClickWarehousing(Long[] deviceIds) { for (Long deviceId:deviceIds) { AsDevice device = asDeviceMapper.selectAsDeviceByDeviceId(deviceId); + Boolean inOrderBySn = etOrderService.isInOrderBySn(device.getSn());//有进行中的订单，跳过 + if(inOrderBySn){ + throw new ServiceException("车辆【"+device.getSn()+"】有进行中的订单，不能入仓"); + } if(ObjectUtil.isNull(device)){ throw new ServiceException("车辆【"+deviceId+"】不存在"); } @@ -510,6 +559,8 @@ public class AsDeviceServiceImpl extends ServiceImpl i if(device.getStatus().equals(ServiceConstants.VEHICLE_STATUS_ABANDON)){ throw new ServiceException("车辆【"+device.getSn()+"】为‘废弃’状态不能入仓"); } + //记录日志 + asynchronousSaveLog(null,null,device.getMac(),null,"入仓",null,getUsername()); } return asDeviceMapper.oneClickWarehousing(deviceIds); } @@ -564,6 +615,9 @@ public class AsDeviceServiceImpl extends ServiceImpl i public List vehicleLocalization(String longitude, String latitude,String deptId) { QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("status", "1"); // 设备状态正常 + if(StrUtil.isBlank(deptId)){ + deptId ="100"; + } wrapper.eq("dept_id", deptId); // 查询所有设备 @@ -855,42 +909,55 @@ public class AsDeviceServiceImpl extends ServiceImpl i } /** - * 车辆上线 + * 车辆解禁 */ @SneakyThrows @Override public Boolean online(String sn) { - AsDevice asDevice = asDeviceMapper.selectAsDeviceBySn(sn); - asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL); - int device = asDeviceMapper.updateAsDevice(asDevice); - if(device==0){ - log.info("车辆上线状态失败"); - return Boolean.FALSE; + Boolean inOrderBySn = etOrderService.isInOrderBySn(sn);//有进行中的订单，跳过 + if(!inOrderBySn){ + AsDevice asDevice = asDeviceMapper.selectAsDeviceBySn(sn); + asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL); + int device = asDeviceMapper.updateAsDevice(asDevice); + if(device==0){ + log.info("车辆解禁状态失败"); + return Boolean.FALSE; + }else{ + //记录日志 + asynchronousSaveLog(null,null,asDevice.getMac(),null,"解禁",null,getUsername()); + } } return Boolean.TRUE; } /** - * 车辆下线 + * 车辆禁用 */ @SneakyThrows @Override public Boolean offline(String sn,String status) { + Boolean inOrderBySn = etOrderService.isInOrderBySn(sn); + if(inOrderBySn){ + throw new ServiceException("还有正在骑行中的订单【"+sn+"】，不能禁用"); + } AsDevice asDevice = asDeviceMapper.selectAsDeviceBySn(sn); if(ServiceConstants.VEHICLE_STATUS_IN_APPOINTMENT.equals(asDevice.getStatus())){ - throw new ServiceException("车辆处于预约中，不能下线"); + throw new ServiceException("车辆处于预约中，不能禁用"); } if(ServiceConstants.VEHICLE_STATUS_IN_USING.equals(asDevice.getStatus())){ - throw new ServiceException("车辆使用中，不能下线"); + throw new ServiceException("车辆使用中，不能禁用"); } if(ServiceConstants.VEHICLE_STATUS_TEMPORARILY_LOCK.equals(asDevice.getStatus())){ - throw new ServiceException("车辆临时停车中，不能下线"); + throw new ServiceException("车辆临时停车中，不能禁用"); } asDevice.setStatus(status); int device = asDeviceMapper.updateAsDevice(asDevice); if(device==0){ - log.info("车辆下线状态失败"); + log.info("车辆禁用状态失败"); return Boolean.FALSE; + }else{ + //记录日志 + asynchronousSaveLog(null,null,asDevice.getMac(),null,"解禁",null,getUsername()); } return Boolean.TRUE; } @@ -1076,9 +1143,13 @@ public class AsDeviceServiceImpl extends ServiceImpl i etCommandLog.setLongitude(device.getLongitude()); etCommandLog.setLatitude(device.getLatitude()); etCommandLog.setCreateTime(DateUtils.getNowDate()); - JSONObject paramsObj = JSON.parseObject(result); - String code = paramsObj.getString("code"); - etCommandLog.setCallStatus(code); + if(ObjectUtil.isNotNull(result)){ + JSONObject paramsObj = JSON.parseObject(result); + String code = paramsObj.getString("code"); + etCommandLog.setCallStatus(code); + }else{ + etCommandLog.setCallStatus("0"); + } etCommandLog.setOrderNo(orderNo); etCommandLog.setCreateBy(userName); int i = etCommandLogMapper.insertEtCommandLog(etCommandLog); @@ -2131,6 +2202,7 @@ public class AsDeviceServiceImpl extends ServiceImpl i AsDevice device = asDeviceMapper.selectAsDeviceBySn(sn); String latitude = device.getLatitude(); String longitude = device.getLongitude(); + log.info("定位：{}，{},=============运营区【{}】，边界：【{}】",longitude,latitude,area.getAreaName(),area.getBoundaryStr()); Geometry geometry = GeoUtils.fromWkt(area.getBoundary()); inCircle = GeoUtils.isInCircle(longitude, latitude, geometry); if(inCircle){ diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java index c799abb..48d11f6 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/CallbackServiceImpl.java @@ -228,10 +228,7 @@ public class CallbackServiceImpl implements CallbackService { // 新增资金流水记录 capitalFlowRecords(order,ServiceConstants.FLOW_TYPE_INCOME,ServiceConstants.ORDER_TYPE_RIDING,ServiceConstants.OWNER_TYPE_OPERATOR,null,ServiceConstants.PAY_TYPE_WX); // 24小时后发起分账 - scheduledExecutorService.schedule(() -> { - // 请求分账处理 - if (dividendHandle(transactionId, order, area)) return; - }, 24 , TimeUnit.HOURS); + dividendHandle(transactionId, order, area); logger.info("=================【微信支付回调】4444444=================="); }else if(attachVo.getType().equals(ServiceConstants.BUSINESS_TYPE_APPOINTMENT)){ logger.info("【微信支付回调】取消预约支付"); @@ -414,7 +411,7 @@ public class CallbackServiceImpl implements CallbackService { logger.info("区域对象====="+JSON.toJSONString(area)); logger.info("订单对象====="+JSON.toJSONString(order)); // 请求分账 - List receivers = new ArrayList<>(); +// List receivers = new ArrayList<>(); // 获取到合伙人的openid SysUser sysUser = new SysUser(); sysUser.setUserType("03"); @@ -451,7 +448,7 @@ public class CallbackServiceImpl implements CallbackService { logger.info(sysUser1.getUserName()+"分账比例："+sysUser1.getDividendProportion()+"%，分账金额："+multiply); receiver.setAmount(multiply.multiply(new BigDecimal(100)).longValue()); receiver.setDescription(area.getAreaName()+"共享电动车自动分账"); - receivers.add(receiver); +// receivers.add(receiver); etDividendDetail.setAreaId(area.getAreaId()); etDividendDetail.setType(ServiceConstants.PROFITSHARING_TYPE_PARTNER); @@ -467,7 +464,8 @@ public class CallbackServiceImpl implements CallbackService { if(i==0){ throw new ServiceException("保存分账明细失败"); } -// callbackService.capitalFlowRecords(order,ServiceConstants.FLOW_TYPE_INCOME,ServiceConstants.ORDER_TYPE_RIDING,ServiceConstants.OWNER_TYPE_PARTNER,sysUser1); + order.setPayFee(multiply); + callbackService.capitalFlowRecords(order,ServiceConstants.FLOW_TYPE_INCOME,ServiceConstants.ORDER_TYPE_RIDING,ServiceConstants.OWNER_TYPE_PARTNER,sysUser1,ServiceConstants.PAY_TYPE_WX); } }else{ logger.info("=================【微信支付回调】合伙人【{}】已禁用或已过期合作期==================",sysUser1.getUserName()); @@ -476,42 +474,42 @@ public class CallbackServiceImpl implements CallbackService { } // 计算平台服务费 - logger.info("=================【微信支付回调】计算平台服务费=================="); - platformServiceFee(order, area, receivers); +// logger.info("=================【微信支付回调】计算平台服务费=================="); +// platformServiceFee(order, area); - List areaId1 = etAreaDeptMapper.selectList(new QueryWrapper().eq("area_id", order.getAreaId())); - if (ObjectUtil.isNotEmpty(areaId1) && areaId1.size() > 0){ - EtAreaDept etAreaDept = areaId1.get(0); - SysDept sysDept = deptService.selectDeptById(etAreaDept.getDeptId()); - logger.info("获取到运营商对象：【{}】",JSON.toJSON(sysDept)); - OrdersEntity ordersEntity = wxPayService.createOrder(sysDept,transactionId,receivers); - if(ordersEntity!=null){ - logger.info("【微信支付回调】发起分账响应：【{}】",JSON.toJSON(ordersEntity)); - }else{ - logger.info("【微信支付回调】发起分账失败"); - throw new ServiceException("发起分账失败"); - } - }else{ - logger.info("区域：【{}】没有绑定运营商",order.getAreaId()); - throw new ServiceException("区域：【"+order.getAreaId()+"】没有绑定运营商"); - } +// List areaId1 = etAreaDeptMapper.selectList(new QueryWrapper().eq("area_id", order.getAreaId())); +// if (ObjectUtil.isNotEmpty(areaId1) && areaId1.size() > 0){ +// EtAreaDept etAreaDept = areaId1.get(0); +// SysDept sysDept = deptService.selectDeptById(etAreaDept.getDeptId()); +// logger.info("获取到运营商对象：【{}】",JSON.toJSON(sysDept)); +// OrdersEntity ordersEntity = wxPayService.createOrder(sysDept,transactionId,receivers); +// if(ordersEntity!=null){ +// logger.info("【微信支付回调】发起分账响应：【{}】",JSON.toJSON(ordersEntity)); +// }else{ +// logger.info("【微信支付回调】发起分账失败"); +// throw new ServiceException("发起分账失败"); +// } +// }else{ +// logger.info("区域：【{}】没有绑定运营商",order.getAreaId()); +// throw new ServiceException("区域：【"+order.getAreaId()+"】没有绑定运营商"); +// } return false; } /** * 计算平台服务费 */ - private void platformServiceFee(EtOrder order, EtOperatingArea area, List receivers) { - CreateOrderReceiver receiver = new CreateOrderReceiver(); + private void platformServiceFee(EtOrder order, EtOperatingArea area) { +// CreateOrderReceiver receiver = new CreateOrderReceiver(); SysDept cxPlatform = deptService.selectDeptById(100L);//创享电动车 - receiver.setType(ReceiverType.MERCHANT_ID.name()); - receiver.setAccount(cxPlatform.getMerchantId()); - receiver.setDescription("平台服务费"); +// receiver.setType(ReceiverType.MERCHANT_ID.name()); +// receiver.setAccount(cxPlatform.getMerchantId()); +// receiver.setDescription("平台服务费"); BigDecimal divide = new BigDecimal(cxPlatform.getPlatformServiceFee()).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP); BigDecimal platformServiceFee = order.getTotalFee().multiply(divide); logger.info("平台服务费比例："+cxPlatform.getPlatformServiceFee()+"%，分账金额："+platformServiceFee); - receiver.setAmount(platformServiceFee.longValue());//平台服务费 = 平台服务费比例 * 订单金额 - receivers.add(receiver); +// receiver.setAmount(platformServiceFee.longValue());//平台服务费 = 平台服务费比例 * 订单金额 +// receivers.add(receiver); EtDividendDetail etDividendDetail = new EtDividendDetail(); etDividendDetail.setAreaId(area.getAreaId()); @@ -583,11 +581,9 @@ public class CallbackServiceImpl implements CallbackService { // 更新用户信息，清除缓存 asUser.setBalance(BigDecimal.ZERO); int updateUser = userService.updateUser(asUser); -// if(updateUser>0){ -// Collection keys = SpringUtils.getBean(RedisCache.class).keys(CacheConstants.LOGIN_TOKEN_KEY + "*"); -// redisCache.deleteObject(keys); -// logger.info("【微信支付回调】退还押金,更新用户余额成功！"); -// } + if(updateUser>0){ + logger.info("【微信支付回调】退还押金,更新用户余额成功！"); + } logger.info("=================【微信支付回调】退还押金定时任务结束！！！=================="); } else { throw new ServiceException("没有找到押金充值记录"); @@ -708,6 +704,7 @@ public class CallbackServiceImpl implements CallbackService { logger.info("【微信支付回调】保存资金流水记录成功"); } }else{ + logger.info("【合伙人记录资金流水】"); capitalFlow.setAreaId(order.getAreaId()); capitalFlow.setOrderNo(order.getOrderNo()); capitalFlow.setOutTradeNo(order.getOutTradeNo()); @@ -717,60 +714,31 @@ public class CallbackServiceImpl implements CallbackService { capitalFlow.setOwnerId(user.getUserId()); capitalFlow.setOwner(user.getUserName()); capitalFlow.setAmount(order.getPayFee()); -// String handlingCharge1 = sysDept.getHandlingCharge(); -// logger.info("【微信支付回调--保存资金流水记录】 获取到配置手续费==============handlingCharge=====================："+handlingCharge1); -// BigDecimal bigDecimal = new BigDecimal(handlingCharge1).divide(new BigDecimal(1000), 6, BigDecimal.ROUND_HALF_UP); -// logger.info("【微信支付回调--保存资金流水记录】 转换后手续费==============bigDecimal=====================："+bigDecimal); -// BigDecimal handlingCharge = bigDecimal.multiply(order.getPayFee()).setScale(2, BigDecimal.ROUND_HALF_UP); -// logger.info("【微信支付回调--保存资金流水记录】 计算出的手续费==============handlingCharge=====================："+handlingCharge); -// BigDecimal serviceFeeScale = new BigDecimal(sysDept.getPlatformServiceFee()).divide(new BigDecimal(100), 6, BigDecimal.ROUND_HALF_UP); -// BigDecimal platformServiceFee = serviceFeeScale.multiply(order.getPayFee()); -// logger.info("【微信支付回调--保存资金流水记录】 计算出的平台服务费==============platformServiceFee=====================："+platformServiceFee); -// capitalFlow.setPlatformServiceFee(platformServiceFee); -// capitalFlow.setHandlingCharge(handlingCharge);//手续费 + capitalFlow.setHandlingCharge(BigDecimal.ZERO);//手续费 0 + capitalFlow.setPlatformServiceFee(BigDecimal.ZERO);//平台服务费 0 if(busType.equals(ServiceConstants.ORDER_TYPE_WITHDRAW)){//提现，需要手续费，不需要平台服务费 BigDecimal separateAccountFee = order.getPayFee(); capitalFlow.setPartnerDividend(BigDecimal.ZERO); - capitalFlow.setPlatformServiceFee(BigDecimal.ZERO); capitalFlow.setOperatorDividend(separateAccountFee.negate()); capitalFlow.setOperatorBalance(user.getBalance().subtract(separateAccountFee)); userMapper.changeUserBalance(separateAccountFee.negate(),user.getUserId()); logger.info("【保存资金流水记录】 ==============支出=====================："); }else{ - logger.info("【微信支付回调--保存资金流水记录】 ==============业务类型=====================："+busType); -// BigDecimal partnerDividend = BigDecimal.ZERO; -// BigDecimal separateAccountFee = order.getPayFee().subtract(handlingCharge).subtract(platformServiceFee); -// logger.info("【微信支付回调--保存资金流水记录】 ==============扣掉手续费和服务费之后的金额，这个金额拿来分账=====================："+separateAccountFee); -// BigDecimal operatorDividend = separateAccountFee; -// if(sysDept.getIsProfitSharing().equals("true")){//需要分账 -// logger.info("【微信支付回调--保存资金流水记录】 ==============需要分账====================="+sysDept.getIsProfitSharing()); -// //获取所有合伙人列表 -// SysUser sysUser = new SysUser(); -// sysUser.setUserType("03"); -// sysUser.setAreaId(order.getAreaId()); -// List sysUsers = userMapper.selectUserList(sysUser); -// double totalDividendProportion = sysUsers.stream() -// .mapToDouble(SysUser::getDividendProportion) -// .sum();//算出总的分成比例 -// BigDecimal decimal = new BigDecimal(totalDividendProportion).divide(new BigDecimal(100), 2, BigDecimal.ROUND_HALF_UP); -// partnerDividend = operatorDividend.multiply(decimal); -// operatorDividend = operatorDividend.subtract(partnerDividend); -// } -// logger.info("【微信支付回调--保存资金流水记录】 ==============partnerDividend=====================："+partnerDividend); -// logger.info("【微信支付回调--保存资金流水记录】 ==============operatorDividend=====================："+operatorDividend); - BigDecimal operatorDividend = order.getPayFee(); + logger.info("【微信支付回调(合伙人)--保存资金流水记录】 ==============业务类型===骑行收入==================："+busType); + BigDecimal partnerDividend = order.getPayFee(); + logger.info("【微信支付回调(合伙人)--保存资金流水记录】 ==============合伙人分账partnerDividend=====================："+partnerDividend); if(type.equals(ServiceConstants.FLOW_TYPE_INCOME)){ - capitalFlow.setPartnerDividend(BigDecimal.ZERO); + capitalFlow.setPartnerDividend(partnerDividend); capitalFlow.setOperatorDividend(BigDecimal.ZERO); - capitalFlow.setOperatorBalance(user.getBalance().add(operatorDividend)); - userMapper.changeUserBalance(operatorDividend,user.getUserId()); - logger.info("【微信支付回调--保存资金流水记录】 ==============收入=====================："); + capitalFlow.setOperatorBalance(user.getBalance().add(partnerDividend)); + userMapper.changeUserBalance(partnerDividend,user.getUserId()); + logger.info("【微信支付回调(合伙人)--保存资金流水记录】 ==============收入=====================："); }else{ - capitalFlow.setPartnerDividend(BigDecimal.ZERO); + capitalFlow.setPartnerDividend(partnerDividend.negate()); capitalFlow.setOperatorDividend(BigDecimal.ZERO); - capitalFlow.setOperatorBalance(user.getBalance().subtract(order.getPayFee())); - userMapper.changeUserBalance(operatorDividend.negate(),user.getUserId()); - logger.info("【微信支付回调--保存资金流水记录】 ==============支出=====================："); + capitalFlow.setOperatorBalance(user.getBalance().subtract(partnerDividend)); + userMapper.changeUserBalance(partnerDividend.negate(),user.getUserId()); + logger.info("【微信支付回调(合伙人)--保存资金流水记录】 ==============支出=====================："); } } capitalFlow.setPayType(payType); diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtFeeRuleServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtFeeRuleServiceImpl.java index 91d68f5..24c7169 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtFeeRuleServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtFeeRuleServiceImpl.java @@ -82,7 +82,7 @@ public class EtFeeRuleServiceImpl implements IEtFeeRuleService @DataScope(deptAlias = "d") public List selectEtFeeRuleList(EtFeeRule etFeeRule) { - if(ObjectUtil.isNotNull(etFeeRule.getAreaId())){ + if(ObjectUtil.isNull(etFeeRule.getDeptId()) && ObjectUtil.isNotNull(etFeeRule.getAreaId())){ SysDept sysDept = wxPayService.getDeptObjByAreaId(etFeeRule.getAreaId()); etFeeRule.setDeptId(sysDept.getDeptId()); } diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtModelServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtModelServiceImpl.java index 88e3e86..fd4cd00 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtModelServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtModelServiceImpl.java @@ -120,20 +120,20 @@ public class EtModelServiceImpl implements IEtModelService } etModel.setCreateTime(DateUtils.getNowDate()); int i = etModelMapper.insertEtModel(etModel); - // 发送设置低电压命令 - Integer lowBatteryReminder = etModel.getLowBatteryReminder(); - if(ObjectUtil.isNotNull(lowBatteryReminder) && lowBatteryReminder > 0){ - AsDevice device = new AsDevice(); - device.setModelId(etModel.getModelId()); - List asDevices = asDeviceMapper.selectAsDeviceList(device); - for(AsDevice asDevice: asDevices){ - // 根据百分比计算提醒电压值 - Integer quantityByPercentage = CommonUtil.getElectricQuantityByPercentage(lowBatteryReminder, etModel.getFullVoltage(), etModel.getLowVoltage()); - String lowVoltageCommand = IotConstants.COMMAND_BAT + quantityByPercentage * 10 + "@"; - log.info("发送低电压命令：" + lowVoltageCommand); - asDeviceService.sendCommand(asDevice.getMac(), Token.getToken(), lowVoltageCommand,"发送低电压播报",null,null); - } - } +// // 发送设置低电压命令 +// Integer lowBatteryReminder = etModel.getLowBatteryReminder(); +// if(ObjectUtil.isNotNull(lowBatteryReminder) && lowBatteryReminder > 0){ +// AsDevice device = new AsDevice(); +// device.setModelId(etModel.getModelId()); +// List asDevices = asDeviceMapper.selectAsDeviceList(device); +// for(AsDevice asDevice: asDevices){ +// // 根据百分比计算提醒电压值 +// Integer quantityByPercentage = CommonUtil.getElectricQuantityByPercentage(lowBatteryReminder, etModel.getFullVoltage(), etModel.getLowVoltage()); +// String lowVoltageCommand = IotConstants.COMMAND_BAT + quantityByPercentage * 10 + "@"; +// log.info("发送低电压命令：" + lowVoltageCommand); +// asDeviceService.sendCommand(asDevice.getMac(), Token.getToken(), lowVoltageCommand,"发送低电压播报",null,null); +// } +// } return i; } @@ -157,22 +157,22 @@ public class EtModelServiceImpl implements IEtModelService etModel.setUpdateTime(DateUtils.getNowDate()); int i = etModelMapper.updateEtModel(etModel); // 发送设置低电压命令 - Integer lowBatteryReminder = etModel.getLowBatteryReminder(); - if(ObjectUtil.isNotNull(lowBatteryReminder) && lowBatteryReminder > 0){ - AsDevice device = new AsDevice(); - device.setModelId(etModel.getModelId()); - List asDevices = asDeviceMapper.selectAsDeviceList(device); - for(AsDevice asDevice: asDevices){ - // 根据百分比计算提醒电压值 - Integer quantityByPercentage = CommonUtil.getElectricQuantityByPercentage(lowBatteryReminder, etModel.getFullVoltage(), etModel.getLowVoltage()); - String lowVoltageCommand = IotConstants.COMMAND_BAT + quantityByPercentage * 10 + "@"; - log.info("发送低电压命令：" + lowVoltageCommand); - ResponseVo responseVo = asDeviceService.sendCommandWithResp(asDevice.getMac(), Token.getToken(), lowVoltageCommand,"发送低电压播报",null); - if(responseVo.getCode()!=0){ - log.info("【还车关锁】设备【{}】远程关锁失败", asDevice.getMac()); - } - } - } +// Integer lowBatteryReminder = etModel.getLowBatteryReminder(); +// if(ObjectUtil.isNotNull(lowBatteryReminder) && lowBatteryReminder > 0){ +// AsDevice device = new AsDevice(); +// device.setModelId(etModel.getModelId()); +// List asDevices = asDeviceMapper.selectAsDeviceList(device); +// for(AsDevice asDevice: asDevices){ +// // 根据百分比计算提醒电压值 +// Integer quantityByPercentage = CommonUtil.getElectricQuantityByPercentage(lowBatteryReminder, etModel.getFullVoltage(), etModel.getLowVoltage()); +// String lowVoltageCommand = IotConstants.COMMAND_BAT + quantityByPercentage * 10 + "@"; +// log.info("发送低电压命令：" + lowVoltageCommand); +// ResponseVo responseVo = asDeviceService.sendCommandWithResp(asDevice.getMac(), Token.getToken(), lowVoltageCommand,"发送低电压播报",null); +// if(responseVo.getCode()!=0){ +// log.info("【还车关锁】设备【{}】远程关锁失败", asDevice.getMac()); +// } +// } +// } return i; } diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOperatingAreaServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOperatingAreaServiceImpl.java index 2411960..5ab1b72 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOperatingAreaServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOperatingAreaServiceImpl.java @@ -225,6 +225,10 @@ public class EtOperatingAreaServiceImpl extends ServiceImpl { + asDevice.setLockStatus(ServiceConstants.LOCK_STATUS_CLOSE); + asDevice.setStatus(ServiceConstants.VEHICLE_STATUS_NORMAL); + asDevice.setIsAdminUnlocking("0"); + int device = asDeviceMapper.updateAsDevice(asDevice); + if(device==0){ + log.info("【临时解锁】改变车辆状态失败"); + throw new ServiceException("【临时锁车】改变车辆状态失败"); + } + String usedSn = order.getUsedSn(); + if(StrUtil.isNotBlank(usedSn)){ + usedSn = usedSn+","+sn; + }else{ + usedSn = sn; + } + order.setUsedSn(usedSn); + order.setSn(""); + order.setChangeReason(changeReason); + int i = etOrderMapper.updateEtOrderByOrderNo(order); + if(i==0){ + log.info("【换车关锁】改变订单使用过的sn失败"); + throw new ServiceException("【换车关锁】改变订单使用过的sn失败"); + } + return Boolean.TRUE; + }); + if(execute){ + return Boolean.TRUE; }else{ - usedSn = sn; - } - order.setUsedSn(usedSn); - order.setSn(""); - order.setChangeReason(changeReason); - int i = etOrderMapper.updateEtOrderByOrderNo(order); - if(i==0){ - log.info("【换车关锁】改变订单使用过的sn失败"); - throw new ServiceException("【换车关锁】改变订单使用过的sn失败"); + return Boolean.FALSE; } + }else{ + return Boolean.TRUE; } - return Boolean.TRUE; } /** @@ -1735,6 +1750,9 @@ public class EtOrderServiceImpl implements IEtOrderService if (ObjectUtil.isNull(newDevice)) { throw new ServiceException("设备不存在："+ newSn); } + if(order.getAreaId() != newDevice.getAreaId()){ + throw new ServiceException("不同运营区，请勿操作"); + } /** 1.获取token*/ String token = Token.getToken(); Boolean execute = transactionTemplate.execute(e -> { diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java index e21ddc5..24d4a62 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -333,10 +333,10 @@ public class SysDeptServiceImpl implements ISysDeptService // 添加运营商账号并添加运营商角色 createOperator(dept); // 是否分账 - if("true".equals(dept.getIsProfitSharing()) && StringUtils.isNotEmpty(dept.getMerchantId()) && dept.getParentId() != 0L){ - AddReceiverResponse addReceiverResponse = wxPayService.addReceiver(dept.getMerchantId(),dept.getDeptId(), ServiceConstants.PROFITSHARING_TYPE_PLATFORM); - log.info("添加分账接收方响应:【{}】", JSON.toJSON(addReceiverResponse)); - } +// if("true".equals(dept.getIsProfitSharing()) && StringUtils.isNotEmpty(dept.getMerchantId()) && dept.getParentId() != 0L){ +// AddReceiverResponse addReceiverResponse = wxPayService.addReceiver(dept.getMerchantId(),dept.getDeptId(), ServiceConstants.PROFITSHARING_TYPE_PLATFORM); +// log.info("添加分账接收方响应:【{}】", JSON.toJSON(addReceiverResponse)); +// } return i; } @@ -380,14 +380,14 @@ public class SysDeptServiceImpl implements ISysDeptService } // 添加运营商账号并添加运营商角色 // createOperator(dept); - if("true".equals(dept.getIsProfitSharing()) && StringUtils.isNotEmpty(dept.getMerchantId()) && dept.getParentId() != 0L && !dept.getMerchantId().equals("1656437344")){ - // 删除分账接收方 - DeleteReceiverResponse deleteReceiverResponse = wxPayService.deleteReceiver(dept.getMerchantId(),dept.getDeptId(),ServiceConstants.PROFITSHARING_TYPE_PLATFORM); - log.info("删除分账接收方响应:【{}】", JSON.toJSON(deleteReceiverResponse)); - - AddReceiverResponse addReceiverResponse = wxPayService.addReceiver(dept.getMerchantId(),dept.getDeptId(), ServiceConstants.PROFITSHARING_TYPE_PLATFORM); - log.info("添加分账接收方响应:【{}】", JSON.toJSON(addReceiverResponse)); - } +// if("true".equals(dept.getIsProfitSharing()) && StringUtils.isNotEmpty(dept.getMerchantId()) && dept.getParentId() != 0L && !dept.getMerchantId().equals("1656437344")){ +// // 删除分账接收方 +// DeleteReceiverResponse deleteReceiverResponse = wxPayService.deleteReceiver(dept.getMerchantId(),dept.getDeptId(),ServiceConstants.PROFITSHARING_TYPE_PLATFORM); +// log.info("删除分账接收方响应:【{}】", JSON.toJSON(deleteReceiverResponse)); +// +// AddReceiverResponse addReceiverResponse = wxPayService.addReceiver(dept.getMerchantId(),dept.getDeptId(), ServiceConstants.PROFITSHARING_TYPE_PLATFORM); +// log.info("添加分账接收方响应:【{}】", JSON.toJSON(addReceiverResponse)); +// } return result; } diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index 5201fa9..07e4f6c 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -342,14 +342,14 @@ public class SysUserServiceImpl implements ISysUserService // 分账项目 setDividendItem(user); // 添加分账接收方 - if(user.getUserType().equals("03")){ - AsUser asUser = asUserService.selectUserByPhone(user.getPhonenumber()); - if(ObjectUtils.isNotEmpty(asUser)){ - addReceiver(user,asUser); - }else{ - throw new ServiceException("未查询到APP用户,请登录小程序"); - } - } +// if(user.getUserType().equals("03")){ +// AsUser asUser = asUserService.selectUserByPhone(user.getPhonenumber()); +// if(ObjectUtils.isNotEmpty(asUser)){ +// addReceiver(user,asUser); +// }else{ +// throw new ServiceException("未查询到APP用户,请登录小程序"); +// } +// } //根据运营区id查询运营商id， 运营商与运营区是一对多关系 setOperatorId(user); // 新增用户信息 @@ -425,17 +425,17 @@ public class SysUserServiceImpl implements ISysUserService insertUserPost(user); // 分账项目 setDividendItem(user); - if(user.getUserType().equals("03")){ - AsUser asUser = asUserService.selectUserByPhone(user.getPhonenumber()); - if(ObjectUtils.isNotEmpty(asUser)){ - // 删除分账接收方 - deleteReceiver(asUser.getWxopenid(),user.getDeptId()); - // 添加分账接收方 - addReceiver(user,asUser); - }else{ - throw new ServiceException("未查询到APP用户,请登录小程序"); - } - } +// if(user.getUserType().equals("03")){ +// AsUser asUser = asUserService.selectUserByPhone(user.getPhonenumber()); +// if(ObjectUtils.isNotEmpty(asUser)){ +// // 删除分账接收方 +// deleteReceiver(asUser.getWxopenid(),user.getDeptId()); +// // 添加分账接收方 +// addReceiver(user,asUser); +// }else{ +// throw new ServiceException("未查询到APP用户,请登录小程序"); +// } +// } //根据运营区id查询运营商id， 运营商与运营区是一对多关系 setOperatorId(user); return userMapper.updateUser(user); diff --git a/electripper-system/src/main/java/com/ruoyi/system/service/impl/WxPayService.java b/electripper-system/src/main/java/com/ruoyi/system/service/impl/WxPayService.java index 2ae5e09..cfecb4e 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/service/impl/WxPayService.java +++ b/electripper-system/src/main/java/com/ruoyi/system/service/impl/WxPayService.java @@ -102,7 +102,7 @@ public class WxPayService implements IWxPayService { throw new ServiceException("没有运营商：【"+etAreaDept.getDeptId()+"】"); } - String isProfitSharing = sysDept.getIsProfitSharing(); +// String isProfitSharing = sysDept.getIsProfitSharing(); // 获取JSAPI所需参数 PrepayRequest request = new PrepayRequest(); request.setAmount(getAmount(order.getPayFee())); @@ -125,7 +125,8 @@ public class WxPayService implements IWxPayService { request.setNotifyUrl(sysDept.getNotifyUrl()); request.setPayer(getPayer(user.getWxopenid())); SettleInfo settleInfo = new SettleInfo(); - settleInfo.setProfitSharing( "true".equalsIgnoreCase(isProfitSharing)); + settleInfo.setProfitSharing(false);//暂时关闭分账 +// settleInfo.setProfitSharing( "true".equalsIgnoreCase(isProfitSharing)); request.setSettleInfo(settleInfo); JsapiServiceExtension jsapiServiceExtension = getJsapiServiceExtension(sysDept); PrepayWithRequestPaymentResponse res = jsapiServiceExtension.prepayWithRequestPayment(request); diff --git a/electripper-system/src/main/java/com/ruoyi/system/task/EtTask.java b/electripper-system/src/main/java/com/ruoyi/system/task/EtTask.java index 4c0d81f..05e054f 100644 --- a/electripper-system/src/main/java/com/ruoyi/system/task/EtTask.java +++ b/electripper-system/src/main/java/com/ruoyi/system/task/EtTask.java @@ -187,36 +187,36 @@ public class EtTask { * 已过，直接分账（记录分账明细表） */ // 查询所有待分账的订单 - List needDividendOrders = etOrderMapper.selectNeedDividendOrder(); - for(EtOrder order: needDividendOrders){ - log.info("【系统启动】待分账订单:【{}】",order.getOrderNo()); - EtOperatingArea area = etOperatingAreaService.selectEtOperatingAreaByAreaId(order.getAreaId()); - if(dividendDetailService.isDividendComputedByOrderNo(order.getOrderNo())){ - log.info("订单【{}】已经分账",order.getOrderNo()); - break; - } - log.info("【系统启动】骑行订单【{}】未分账，开始分账",order.getOrderNo()); - Date payTime = order.getPayTime(); - Date dividendTime = DateUtils.getTimeAfterXHours(payTime, 24);//分账时间 - Date nowDate = DateUtils.getNowDate(); - if (nowDate.after(dividendTime)) { - log.info("【系统启动】骑行订单【{}】已过分账时间，开始分账",order.getOrderNo()); - // 请求分账处理 - Transaction transaction = wxPayService.queryOrderByOutTradeNo(order.getOrderNo()); - if (callbackService.dividendHandle(transaction.getTransactionId(), order, area)) break; - }else{ - int timeDifferenceInHours = DateUtils.timeDifferenceInHours(payTime, nowDate); - int delay = 24 - timeDifferenceInHours; - log.info("【系统启动】骑行订单【{}】未过分账时间,【{}】小时后开始分账",order.getOrderNo(),delay); - // 24小时后发起分账 - scheduledExecutorService.schedule(() -> { - // 请求分账处理 - Transaction transaction = wxPayService.queryOrderByOutTradeNo(order.getOrderNo()); - if (callbackService.dividendHandle(transaction.getTransactionId(), order, area)) return; - }, delay , TimeUnit.HOURS); - } - } - log.info("=========================结束========================="); +// List needDividendOrders = etOrderMapper.selectNeedDividendOrder(); +// for(EtOrder order: needDividendOrders){ +// log.info("【系统启动】待分账订单:【{}】",order.getOrderNo()); +// EtOperatingArea area = etOperatingAreaService.selectEtOperatingAreaByAreaId(order.getAreaId()); +// if(dividendDetailService.isDividendComputedByOrderNo(order.getOrderNo())){ +// log.info("订单【{}】已经分账",order.getOrderNo()); +// break; +// } +// log.info("【系统启动】骑行订单【{}】未分账，开始分账",order.getOrderNo()); +// Date payTime = order.getPayTime(); +// Date dividendTime = DateUtils.getTimeAfterXHours(payTime, 24);//分账时间 +// Date nowDate = DateUtils.getNowDate(); +// if (nowDate.after(dividendTime)) { +// log.info("【系统启动】骑行订单【{}】已过分账时间，开始分账",order.getOrderNo()); +// // 请求分账处理 +// Transaction transaction = wxPayService.queryOrderByOutTradeNo(order.getOrderNo()); +//// if (callbackService.dividendHandle(transaction.getTransactionId(), order, area)) break; +// }else{ +// int timeDifferenceInHours = DateUtils.timeDifferenceInHours(payTime, nowDate); +// int delay = 24 - timeDifferenceInHours; +// log.info("【系统启动】骑行订单【{}】未过分账时间,【{}】小时后开始分账",order.getOrderNo(),delay); +// // 24小时后发起分账 +//// scheduledExecutorService.schedule(() -> { +//// // 请求分账处理 +//// Transaction transaction = wxPayService.queryOrderByOutTradeNo(order.getOrderNo()); +//// if (callbackService.dividendHandle(transaction.getTransactionId(), order, area)) return; +//// }, delay , TimeUnit.HOURS); +// } +// } +// log.info("=========================结束========================="); } diff --git a/electripper-system/src/main/resources/mapper/system/AsDeviceMapper.xml b/electripper-system/src/main/resources/mapper/system/AsDeviceMapper.xml index bb2d79b..b5472c5 100644 --- a/electripper-system/src/main/resources/mapper/system/AsDeviceMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/AsDeviceMapper.xml @@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select de.device_id, de.picture, de.device_name, de.mac, de.sn, de.model_id, de.hardware_version_id, de.vehicle_num, de.area_id, de.activation_time, de.online_status, de.create_by, de.create_time, de.update_by, de.update_time, de.last_time, de.last_location_time, de.gps, de.remark, de.status, de.lock_status, de.location, - de.remaining_power, de.voltage, de.qrcode, de.longitude, de.latitude, de.is_area_out_outage, de.is_admin_unlocking,appid, app_name, dept_id from et_device de + de.remaining_power, de.voltage, de.qrcode, de.longitude, de.latitude, de.is_area_out_outage, de.is_admin_unlocking,de.appid, de.app_name, de.dept_id from et_device de left join et_area_dept ad on ad.area_id = de.area_id left join sys_dept d on d.dept_id = ad.dept_id where 1 = 1 diff --git a/electripper-system/src/main/resources/mapper/system/EtOperatingAreaMapper.xml b/electripper-system/src/main/resources/mapper/system/EtOperatingAreaMapper.xml index 829da60..63a3ef9 100644 --- a/electripper-system/src/main/resources/mapper/system/EtOperatingAreaMapper.xml +++ b/electripper-system/src/main/resources/mapper/system/EtOperatingAreaMapper.xml @@ -104,7 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.area_id,u.dividend_proportion,u.dividend_item,u.app_user_id, u.cooperation_time,u.dividend_status,u.balance, d.dept_name, d.leader,a.area_name areaName from sys_user u + select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, + u.login_date, u.create_by, u.create_time, u.remark, u.area_id,u.dividend_proportion,u.dividend_item,u.app_user_id, u.cooperation_time, + u.dividend_status,u.balance, d.dept_name, d.leader,a.area_name areaName from sys_user u left join sys_dept d on u.dept_id = d.dept_id left join et_operating_area a on u.area_id = a.area_id where u.del_flag = '0'