From 7e21e1ab0247feac8ff61d9c715e35f3175a68d7 Mon Sep 17 00:00:00 2001 From: maoju <495345283@qq.com> Date: Wed, 12 Nov 2025 10:48:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=A1=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/yjzl/TbZdxlFgdwBddUpdateDTO.java | 5 +++++ .../model/entity/yjzl/zddw/TbZdxlFgdwBdd.java | 4 ++++ .../entity/yjzl/zddw/TbZdxlFgdwBddxlrwJl.java | 4 ++++ .../model/query/yjzl/TbZdxlFgxlrwQuery.java | 4 ++++ .../model/vo/yjzl/TbZdxlFgdwBddxlrwVO.java | 3 +++ .../service/impl/TbQwXfbbServiceImpl.java | 12 ++++++++++- .../main/resources/mapper/TbQwXfbbMapper.xml | 6 +++--- .../TbZdxlFgdwBddxlrwJlController.java | 21 +++++++++++++++++-- .../controller/TbZdxlFgxlrwController.java | 8 +++++++ .../Impl/TbZdxlFgdwBddServiceImpl.java | 13 ++++++------ .../Impl/TbZdxlFgdwBddxlrwJlServiceImpl.java | 20 +++++++++++++++++- .../Impl/TbZdxlFgdwBddxlrwServiceImpl.java | 11 ++++++---- .../service/Impl/TbZdxlFgxlrwServiceImpl.java | 7 +++++++ .../service/TbZdxlFgdwBddxlrwJlService.java | 2 ++ .../yjzl/service/TbZdxlFgxlrwService.java | 2 ++ 15 files changed, 105 insertions(+), 17 deletions(-) diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZdxlFgdwBddUpdateDTO.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZdxlFgdwBddUpdateDTO.java index d980d35..df3be1c 100644 --- a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZdxlFgdwBddUpdateDTO.java +++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/dto/yjzl/TbZdxlFgdwBddUpdateDTO.java @@ -1,5 +1,6 @@ package com.mosty.base.model.dto.yjzl; +import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -74,4 +75,8 @@ public class TbZdxlFgdwBddUpdateDTO { @NotNull(message = "zdxl.fgdwBdd.wd.notNull") private BigDecimal wd; + @ApiModelProperty(value = "打卡间隔时间") + @TableField(value = "dkjgsj") + private Integer dkjgsj; + } diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/zddw/TbZdxlFgdwBdd.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/zddw/TbZdxlFgdwBdd.java index ee6d41b..b05c594 100644 --- a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/zddw/TbZdxlFgdwBdd.java +++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/zddw/TbZdxlFgdwBdd.java @@ -66,6 +66,10 @@ public class TbZdxlFgdwBdd extends BaseEntity implements Serializable, Cloneable @TableField(value = "bdd_sm") private String bddSm; + @ApiModelProperty(value = "打卡间隔时间") + @TableField(value = "dkjgsj") + private Integer dkjgsj; + /** * 经度 */ diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/zddw/TbZdxlFgdwBddxlrwJl.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/zddw/TbZdxlFgdwBddxlrwJl.java index ddc5f98..e2d212f 100644 --- a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/zddw/TbZdxlFgdwBddxlrwJl.java +++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/entity/yjzl/zddw/TbZdxlFgdwBddxlrwJl.java @@ -129,6 +129,10 @@ public class TbZdxlFgdwBddxlrwJl extends BaseEntity implements Serializable, Clo @TableField(value = "dkr_id") private Long dkrId; + @ApiModelProperty(value = "打卡人ID") + @TableField(value = "sfzh") + private String sfzh; + /** * 所属部门id */ diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbZdxlFgxlrwQuery.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbZdxlFgxlrwQuery.java index 105e158..1e9ae59 100644 --- a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbZdxlFgxlrwQuery.java +++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/query/yjzl/TbZdxlFgxlrwQuery.java @@ -24,6 +24,10 @@ import java.util.Date; @ApiModel(value = "TbZdxlFgxlrwQuery对象", description = "指导巡逻方格巡逻任务查询对象") public class TbZdxlFgxlrwQuery extends BasePage { + + @ApiModelProperty(value = "方格ID") + private String bbdId; + /** * 方格ID */ diff --git a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZdxlFgdwBddxlrwVO.java b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZdxlFgdwBddxlrwVO.java index 7a86a60..c3c0bc5 100644 --- a/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZdxlFgdwBddxlrwVO.java +++ b/feign-client-api/mosty-base-feign-sdk/src/main/java/com/mosty/base/model/vo/yjzl/TbZdxlFgdwBddxlrwVO.java @@ -26,6 +26,9 @@ public class TbZdxlFgdwBddxlrwVO extends TbZdxlFgdwBddxlrw { @ApiModelProperty(value = "必到点名称") private String bddMc; + @ApiModelProperty(value = "打卡间隔时间（分钟）") + private Integer dkjgsj; + /** * 必到点进度 */ diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwXfbbServiceImpl.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwXfbbServiceImpl.java index 89c5506..c1b25b7 100644 --- a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwXfbbServiceImpl.java +++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwXfbbServiceImpl.java @@ -50,6 +50,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.math.BigDecimal; +import java.sql.Timestamp; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; @@ -1352,7 +1353,11 @@ public class TbQwXfbbServiceImpl extends ServiceImpl i // xfbb.setLx(user1.getType()); // } WebSocketObject obj = new WebSocketObject("04", xfbb, null); - this.tbWebSocketAdaptRemoteService.sendBbMessage(obj); + try{ + this.tbWebSocketAdaptRemoteService.sendBbMessage(obj); + }catch (Exception e){ + + } TbWzLswz wz = new TbWzLswz(); wz.setId(UUIDGenerator.getUUID()); wz.setSjly("02"); @@ -1360,6 +1365,11 @@ public class TbQwXfbbServiceImpl extends ServiceImpl i wz.setYwid(xfbb.getId()); wz.setJd(BigDecimal.valueOf(dto.getJd())); wz.setWd(BigDecimal.valueOf(dto.getWd())); + Timestamp csdtTime = new Timestamp(System.currentTimeMillis()); + wz.setXtCjsj(csdtTime); + wz.setXtSjly("1"); + wz.setXtSjzt("1"); + wz.setXtScbz("0"); // wz.setZb(JtsUtils.getPoint(wz.getJd(), wz.getWd())); this.baseMapper.insertTbWzSblswz(wz); } diff --git a/mosty-qwzx/src/main/resources/mapper/TbQwXfbbMapper.xml b/mosty-qwzx/src/main/resources/mapper/TbQwXfbbMapper.xml index dd210a1..699b3b3 100644 --- a/mosty-qwzx/src/main/resources/mapper/TbQwXfbbMapper.xml +++ b/mosty-qwzx/src/main/resources/mapper/TbQwXfbbMapper.xml @@ -533,7 +533,7 @@ and a.xt_sjzt = '1' and a.bbzt = '0' - and a.bbjssj is null + and ( a.fzr_sfzh = #{sfzh} or a.id in (select ywid from tb_qw_jl b @@ -665,8 +665,8 @@ insert into mosty_wzzx.tb_wz_lswz - (id,sjly,dwsj,ywid,jd,wd) - values (#{id},#{sjly},#{dwsj},#{ywid},#{jd},#{wd}) + (id,sjly,dwsj,ywid,jd,wd, xt_sjly, xt_sjzt, xt_scbz) + values (#{id},#{sjly},#{dwsj},#{ywid},#{jd},#{wd}, #{xtSjly}, #{xtSjzt}, #{xtScbz})