智慧保安后台管理-外网项目备份
guoshilong
2023-12-15 cbb51be06db9560ffaca9cd42d1f2d92b4ed3f37
添加打卡距离
7 files modified
41 ■■■■■ changed files
src/main/java/org/springblade/modules/post/controller/PostFilingController.java 10 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/post/entity/CheckRecord.java 5 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/post/entity/PostFiling.java 3 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/post/mapper/PostFilingMapper.java 2 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/post/mapper/PostFilingMapper.xml 11 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/post/service/PostFilingService.java 3 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/post/service/impl/PostFilingServiceImpl.java 7 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/post/controller/PostFilingController.java
@@ -18,6 +18,7 @@
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.Date;
import java.util.List;
/**
 * 控制器
@@ -105,4 +106,13 @@
    public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
        return R.status(postFilingService.removeByIds(Func.toLongList(ids)));
    }
    /**
     * 删除
     */
    @GetMapping("/getAll")
    public R getAll(PostFiling postFiling) {
        List<PostFiling> postFilingList =postFilingService.getAll(postFiling);
        return R.data(postFilingList);
    }
}
src/main/java/org/springblade/modules/post/entity/CheckRecord.java
@@ -1,15 +1,18 @@
package org.springblade.modules.post.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import org.springblade.core.mp.base.BaseEntity;
import org.springframework.format.annotation.DateTimeFormat;
@Data
@TableName("sys_check_record")
public class CheckRecord extends BaseEntity {
    private String postId;
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private String checkTime;
    private String lon;
src/main/java/org/springblade/modules/post/entity/PostFiling.java
@@ -88,6 +88,9 @@
//    @DateTimeFormat(pattern = "HH:mm")
    private String layoffTime;
    //距离,默认50m
    private Double distance;
}
src/main/java/org/springblade/modules/post/mapper/PostFilingMapper.java
@@ -23,4 +23,6 @@
     * @return
     */
    List<PostFilingVO> selectPostFilingPage(IPage page, @Param("postFiling") PostFilingVO postFiling);
    List<PostFiling> getAll(@Param("postFiling") PostFiling postFiling);
}
src/main/java/org/springblade/modules/post/mapper/PostFilingMapper.xml
@@ -14,4 +14,15 @@
        </if>
        ORDER BY duty_time ASC
    </select>
    <select id="getAll" resultType="org.springblade.modules.post.entity.PostFiling">
        select * from sys_post_filing
        where is_deleted = 0
        <if test="postFiling.type!=null">
            and type = #{postFiling.type}
        </if>
        <if test="postFiling.name!=null and postFiling.name!=''">
            and name like concat('%',#{postFiling.name},'%')
        </if>
        ORDER BY duty_time ASC
    </select>
</mapper>
src/main/java/org/springblade/modules/post/service/PostFilingService.java
@@ -6,6 +6,8 @@
import org.springblade.modules.post.entity.PostFiling;
import org.springblade.modules.post.vo.PostFilingVO;
import java.util.List;
/**
 *  服务类
 *
@@ -23,4 +25,5 @@
     */
    IPage<PostFilingVO> selectPostFilingPage(IPage<PostFilingVO> page, PostFilingVO postFiling);
    List<PostFiling> getAll(PostFiling postFiling);
}
src/main/java/org/springblade/modules/post/service/impl/PostFilingServiceImpl.java
@@ -8,6 +8,8 @@
import org.springblade.modules.post.vo.PostFilingVO;
import org.springframework.stereotype.Service;
import java.util.List;
/**
 *  服务实现类
 *
@@ -28,4 +30,9 @@
    public IPage<PostFilingVO> selectPostFilingPage(IPage<PostFilingVO> page, PostFilingVO postFiling) {
        return page.setRecords(baseMapper.selectPostFilingPage(page, postFiling));
    }
    @Override
    public List<PostFiling> getAll(PostFiling postFiling) {
        return baseMapper.getAll(postFiling);
    }
}