helixiao 2 år sedan
förälder
incheckning
670d9da1b8

+ 7 - 1
src/main/java/com/ydtech/modules/admin/controller/SysPcAddressController.java

@@ -14,7 +14,6 @@ import com.ydtech.modules.admin.service.SysPcAddressService;
 import com.ydtech.modules.admin.service.SysUserService;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.modules.order.entity.BasePageResult;
-import com.ydtech.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -109,6 +108,13 @@ public class SysPcAddressController extends BaseController{
         return HttpResult.ok("success", this.sysPcAddressService.getPcAddress(dates));
     }
 
+    @GetMapping("/getOnlinePeople")
+    @ApiOperation(value = "PC在线用户")
+    public HttpResult<List<SysPcAddress>> getOnlinePeople() {
+
+        return HttpResult.ok("success", this.sysPcAddressService.getOnlinePeople());
+    }
+
 
 
 

+ 8 - 2
src/main/java/com/ydtech/modules/admin/controller/websocket/SysGeographyPositionController.java

@@ -2,6 +2,7 @@ package com.ydtech.modules.admin.controller.websocket;
 
 
 import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.admin.model.SysGeographyPosition;
 import com.ydtech.modules.admin.model.SysGeographyPositionRecord;
 import com.ydtech.modules.admin.model.dto.*;
 import com.ydtech.modules.admin.model.vo.PcAddressHistoryInfoVo;
@@ -10,13 +11,11 @@ import com.ydtech.modules.admin.model.vo.SysGeographyPositionInfoVo;
 import com.ydtech.modules.admin.model.vo.SysGeographyPositionVo;
 import com.ydtech.modules.admin.service.SysGeographyPositionService;
 import com.ydtech.modules.order.entity.BasePageResult;
-import com.ydtech.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
@@ -85,6 +84,13 @@ public class SysGeographyPositionController {
         return HttpResult.ok("success", this.sysGeographyPositionService.getGeographyPosition(dates));
     }
 
+    @GetMapping("/getOnlinePeople")
+    @ApiOperation(value = "APP在线用户")
+    public HttpResult<List<SysGeographyPosition>> getOnlinePeople() {
+
+        return HttpResult.ok("success", this.sysGeographyPositionService.getOnlinePeople());
+    }
+
 
 
 }

+ 3 - 0
src/main/java/com/ydtech/modules/admin/service/SysGeographyPositionService.java

@@ -27,4 +27,7 @@ public interface SysGeographyPositionService extends IService<SysGeographyPositi
     BasePageResult<SysGeographyPositionInfoVo> queryPcAddressInfo(PcAddressInfoDto addressInfoDto);
 
     PcAddressHistoryInfoVo getGeographyPosition(String dates);
+
+    List<SysGeographyPosition> getOnlinePeople();
+
 }

+ 2 - 1
src/main/java/com/ydtech/modules/admin/service/SysPcAddressService.java

@@ -5,7 +5,6 @@ import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.dto.*;
 import com.ydtech.modules.admin.model.po.SysPcAddress;
 import com.ydtech.modules.admin.model.vo.PcAddressHistoryInfoVo;
-import com.ydtech.modules.admin.model.vo.PcAddressHistoryTimeVo;
 import com.ydtech.modules.admin.model.vo.RegionInfoVo;
 import com.ydtech.modules.order.entity.BasePageResult;
 
@@ -43,4 +42,6 @@ public interface SysPcAddressService extends IService<SysPcAddress> {
     BasePageResult<SysPcAddress> queryPcAddressInfo(PcAddressInfoDto addressInfoDto);
 
     PcAddressHistoryInfoVo getPcAddress(String dates);
+
+    List<SysPcAddress> getOnlinePeople();
 }

+ 6 - 0
src/main/java/com/ydtech/modules/admin/service/impl/SysGeographyPositionServiceImpl.java

@@ -242,5 +242,11 @@ public class SysGeographyPositionServiceImpl extends ServiceImpl<SysGeographyPos
         return pcAddressHistoryInfoVo;
     }
 
+    @Override
+    public List<SysGeographyPosition> getOnlinePeople() {
+
+        return sysGeographyPositionMapper.selectList(new LambdaQueryWrapper<SysGeographyPosition>().eq(SysGeographyPosition::getStatus,1));
+    }
+
 
 }

+ 5 - 0
src/main/java/com/ydtech/modules/admin/service/impl/SysPcAddressServiceImpl.java

@@ -221,6 +221,11 @@ public class SysPcAddressServiceImpl extends ServiceImpl<SysPcAddressMapper, Sys
         return pcAddressHistoryInfoVo;
     }
 
+    @Override
+    public List<SysPcAddress> getOnlinePeople() {
+        return sysPcAddressMapper.selectList(new LambdaQueryWrapper<SysPcAddress>().eq(SysPcAddress::getStatus,1));
+    }
+
 
 }