wuweihao 3 年之前
父节点
当前提交
f775746e98

+ 1 - 0
README.md

@@ -2,4 +2,5 @@
 
 # 模块
 gis_biguiyuan  AR-碧桂园项目-文通部门
+111
 

+ 0 - 13
gis_cms/src/main/java/com/gis/cms/controller/ArEnterController.java

@@ -1,7 +1,6 @@
 package com.gis.cms.controller;
 
 import com.gis.cms.entity.dto.ArEnterDto;
-import com.gis.cms.entity.dto.ArStopDto;
 import com.gis.cms.service.ArEnterService;
 import com.gis.common.util.Result;
 import io.swagger.annotations.Api;
@@ -29,16 +28,4 @@ public class ArEnterController {
     public Result enterSave(@Valid @RequestBody ArEnterDto param) {
         return arEnterService.enterSave(param);
     }
-
-    @ApiOperation(value = "记录停留时长")
-    @PostMapping("stopSave")
-    public Result stopSave(@Valid @RequestBody ArStopDto param) {
-        return arEnterService.stopSave(param);
-    }
-
-    @ApiOperation(value = "记录打卡")
-    @PostMapping("stopSave")
-    public Result stopSave(@Valid @RequestBody ArStopDto param) {
-        return arEnterService.stopSave(param);
-    }
 }

+ 0 - 2
gis_cms/src/main/java/com/gis/cms/entity/dto/ArStopDto.java

@@ -15,8 +15,6 @@ import javax.validation.constraints.NotNull;
 public class ArStopDto {
 
 
-
-
     @NotBlank(message = "类型不能为空")
     @ApiModelProperty(value = "设备id(代表用户)")
     private String deviceId ;

+ 3 - 2
gis_cms/src/main/java/com/gis/cms/mapper/ArStopMapper.java

@@ -5,12 +5,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.gis.cms.entity.po.ArEnterEntity;
 import com.gis.cms.entity.po.ArStopEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Component;
 
 @Component
 @Mapper
 public interface ArStopMapper extends BaseMapper<ArStopEntity> {
 
-
-
+    @Select("select sum(time) from ar_stop where is_delete=0 and device_id=#{deviceId}")
+    Integer getTimeByDeviceId(String deviceId);
 }

+ 0 - 5
gis_cms/src/main/java/com/gis/cms/service/ArEnterService.java

@@ -1,19 +1,14 @@
 package com.gis.cms.service;
 
 import com.gis.cms.entity.dto.ArEnterDto;
-import com.gis.cms.entity.dto.ArStopDto;
 import com.gis.cms.entity.po.ArEnterEntity;
 import com.gis.common.base.service.BaseService;
 import com.gis.common.util.Result;
 
-import javax.validation.Valid;
-
 /**
  * Created by owen on 2022/1/13 0013 19:11
  */
 public interface ArEnterService extends BaseService<ArEnterEntity> {
 
     Result enterSave(ArEnterDto param);
-
-    Result stopSave(@Valid ArStopDto param);
 }

+ 1 - 17
gis_cms/src/main/java/com/gis/cms/service/impl/ArEnterServiceImpl.java

@@ -2,30 +2,21 @@ package com.gis.cms.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.gis.cms.entity.dto.ArEnterDto;
-import com.gis.cms.entity.dto.ArStopDto;
 import com.gis.cms.entity.po.ArEnterEntity;
-import com.gis.cms.entity.po.ArStopEntity;
 import com.gis.cms.mapper.ArEnterMapper;
-import com.gis.cms.mapper.ArStopMapper;
 import com.gis.cms.service.ArEnterService;
 import com.gis.common.base.service.impl.BaseServiceImpl;
 import com.gis.common.util.Result;
 import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.validation.Valid;
-
 /**
  * Created by owen on 2022/1/13 0013 19:25
  */
 @Service
 public class ArEnterServiceImpl extends BaseServiceImpl<ArEnterMapper, ArEnterEntity> implements ArEnterService {
 
-    @Autowired
-    ArStopMapper stopMapper;
-
     /**
      * 根据设备id 跟类型 判断数据唯一
      * @param param
@@ -47,15 +38,8 @@ public class ArEnterServiceImpl extends BaseServiceImpl<ArEnterMapper, ArEnterEn
         return Result.success();
     }
 
-    @Override
-    public Result stopSave(@Valid ArStopDto param) {
-        ArStopEntity entity = new ArStopEntity();
-        BeanUtils.copyProperties(param, entity);
-        stopMapper.insert(entity);
-        return Result.success();
-    }
-
 
+    
     private ArEnterEntity findByDeviceIdAndType(ArEnterDto param){
         
         LambdaQueryWrapper<ArEnterEntity> wrapper = new LambdaQueryWrapper<>();