helixiao пре 2 година
родитељ
комит
6e609accf0

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

@@ -5,6 +5,7 @@ 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.SysGeographyPositionPageDto;
+import com.ydtech.modules.admin.model.vo.SysGeographyPositionVo;
 import com.ydtech.modules.admin.service.SysGeographyPositionService;
 import com.ydtech.modules.order.entity.BasePageResult;
 import io.swagger.annotations.Api;
@@ -24,7 +25,7 @@ public class SysGeographyPositionController {
 
     @GetMapping("/queryPosition")
     @ApiOperation(value = "查询所有用户的位置列表")
-    public HttpResult<List<SysGeographyPosition>> queryPosition() {
+    public HttpResult<SysGeographyPositionVo> queryPosition() {
 
         return HttpResult.ok("success", this.sysGeographyPositionService.queryPosition());
     }

+ 23 - 0
src/main/java/com/ydtech/modules/admin/model/vo/SysGeographyPositionVo.java

@@ -0,0 +1,23 @@
+package com.ydtech.modules.admin.model.vo;
+
+import com.ydtech.modules.admin.model.SysGeographyPosition;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(value ="人员地址位置")
+public class SysGeographyPositionVo {
+    /**
+     * 在线人数
+     */
+    @ApiModelProperty(value = "在线人数")
+    private Long manNum;
+    /**
+     * 位置列表
+     */
+    @ApiModelProperty(value = "位置列表")
+    private List<SysGeographyPosition> list;
+}

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

@@ -4,13 +4,14 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.modules.admin.model.SysGeographyPosition;
 import com.ydtech.modules.admin.model.SysGeographyPositionRecord;
 import com.ydtech.modules.admin.model.dto.SysGeographyPositionPageDto;
+import com.ydtech.modules.admin.model.vo.SysGeographyPositionVo;
 import com.ydtech.modules.order.entity.BasePageResult;
 
 import java.util.List;
 
 public interface SysGeographyPositionService extends IService<SysGeographyPosition> {
 
-    List<SysGeographyPosition> queryPosition();
+    SysGeographyPositionVo queryPosition();
 
     BasePageResult<SysGeographyPositionRecord> queryPositionList(SysGeographyPositionPageDto sysGeographyPositionPageDto);
 }

+ 8 - 2
src/main/java/com/ydtech/modules/admin/service/impl/SysGeographyPositionServiceImpl.java

@@ -8,6 +8,7 @@ import com.ydtech.modules.admin.dao.SysGeographyPositionRecordMapper;
 import com.ydtech.modules.admin.model.SysGeographyPosition;
 import com.ydtech.modules.admin.model.SysGeographyPositionRecord;
 import com.ydtech.modules.admin.model.dto.SysGeographyPositionPageDto;
+import com.ydtech.modules.admin.model.vo.SysGeographyPositionVo;
 import com.ydtech.modules.admin.service.SysGeographyPositionRecordService;
 import com.ydtech.modules.admin.service.SysGeographyPositionService;
 import com.ydtech.modules.order.entity.BasePageResult;
@@ -31,8 +32,13 @@ public class SysGeographyPositionServiceImpl extends ServiceImpl<SysGeographyPos
 
 
     @Override
-    public List<SysGeographyPosition> queryPosition() {
-        return  list();
+    public SysGeographyPositionVo queryPosition() {
+        SysGeographyPositionVo sysGeographyPositionVo = new SysGeographyPositionVo();
+        List<SysGeographyPosition> list = list();
+        sysGeographyPositionVo.setList(list);
+        Long aLong = sysGeographyPositionMapper.selectCount(new LambdaQueryWrapper<SysGeographyPosition>().eq(SysGeographyPosition::getStatus, 1));
+        sysGeographyPositionVo.setManNum(aLong);
+        return  sysGeographyPositionVo;
     }
 
     @Override