From 878615344d5306abda5e593c8786306c0bf5515f Mon Sep 17 00:00:00 2001 From: maoju <495345283@qq.com> Date: Thu, 6 Nov 2025 12:22:53 +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 --- .../qwzx/controller/TbQwXfbbController.java | 8 +++++ .../com/mosty/qwzx/mapper/TbQwXfbbMapper.java | 4 +++ .../mosty/qwzx/service/TbQwXfbbService.java | 3 ++ .../service/impl/TbQwXfbbServiceImpl.java | 29 +++++++++++++++++++ .../main/resources/mapper/TbQwXfbbMapper.xml | 10 +++++++ .../TbZdxlFgdwBddxlrwJlController.java | 2 +- 6 files changed, 55 insertions(+), 1 deletion(-) diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwXfbbController.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwXfbbController.java index 00b748f..9fbd1c2 100644 --- a/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwXfbbController.java +++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwXfbbController.java @@ -363,5 +363,13 @@ public class TbQwXfbbController { return ResponseResult.success(tbQwXfbbService.selectQwJlByBbInfo(id, xfllId)); } + @ApiOperation("更新报备警组位置") + @PostMapping("/updateBbJzwz") + @JwtSysUser + @Log(title = "更新报备警组位置", businessType = BusinessType.UPDATE,isScSj = true) + public ResponseResult updateBbJzwz(@RequestBody TbQwXfbbDkWzDto dto) { + return ResponseResult.success(tbQwXfbbService.updateBbJzwz(dto)); + } + } diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwXfbbMapper.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwXfbbMapper.java index ab4c62b..473243f 100644 --- a/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwXfbbMapper.java +++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/mapper/TbQwXfbbMapper.java @@ -1,7 +1,9 @@ package com.mosty.qwzx.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.mosty.base.model.dto.qwzx.TbQwXfbbDkWzDto; import com.mosty.base.model.dto.qwzx.TbQwXfbbQueryByJlDto; +import com.mosty.base.model.dto.qwzx.TbQwXfbbStartOrEndBbDto; import com.mosty.base.model.dto.qwzx.TbQwXfbbVo; import com.mosty.base.model.entity.qwzx.TbQwXfbb; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -121,5 +123,7 @@ public interface TbQwXfbbMapper extends BaseMapper { @ApiOperation("根据报备id获取巡逻轨迹") List getBbgj(String bbid); + Boolean updateBbJzwz(TbQwXfbbDkWzDto dto); + void insertTbWzSblswz(TbWzLswz wz); } diff --git a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwXfbbService.java b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwXfbbService.java index d5fa1c8..97bcb50 100644 --- a/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwXfbbService.java +++ b/mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwXfbbService.java @@ -13,6 +13,7 @@ import com.mosty.base.model.query.sjzx.XfbbQuery; import com.mosty.base.model.query.sjzx.XfbbTjQuery; import com.mosty.base.model.vo.qwzx.TbQwxfbbDkVO; import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.RequestBody; import java.util.List; import java.util.Map; @@ -166,4 +167,6 @@ public interface TbQwXfbbService { */ TbQwJl selectQwJlByBbInfo(String id, String xfllId); + Boolean updateBbJzwz(TbQwXfbbDkWzDto dto); + } 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 5fca2ea..89c5506 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 @@ -17,6 +17,7 @@ import com.mosty.base.model.entity.jcgl.TbJcglJwz; import com.mosty.base.model.entity.lzother.BphJlxx; import com.mosty.base.model.entity.qwzx.*; import com.mosty.base.model.entity.wzzx.TbWzLswz; +import com.mosty.base.model.entity.wzzx.TbWzSblswz; import com.mosty.base.model.entity.wzzx.TbWzXfwz; import com.mosty.base.model.query.qwzx.TbQwJmxzSearchDto; import com.mosty.base.model.query.qwzx.TbQwXfbbJmxzQuery; @@ -1337,4 +1338,32 @@ public class TbQwXfbbServiceImpl extends ServiceImpl i return this.tbQwJlMapper.selectOne(qw); } + @Override + public Boolean updateBbJzwz(TbQwXfbbDkWzDto dto) { + UserInfo user = UserInfoManager.get(); + TbQwXfbb xfbb = this.tbQwXfbbMapper.getMybbTodayNew(String.valueOf(user.getIdEntityCard()), null); + if(Objects.nonNull(xfbb)){ + dto.setBbid(xfbb.getId()); + this.tbQwXfbbMapper.updateBbJzwz(dto); + xfbb.setZb(null); + xfbb.setXfzt("0"); +// if (StringUtils.isNotBlank(xfbb.getFzrSfzh())) { +// SysUser user1 = this.tbBaseAdaptRemoteService.getUserInfoBySfzh(xfbb.getFzrSfzh()); +// xfbb.setLx(user1.getType()); +// } + WebSocketObject obj = new WebSocketObject("04", xfbb, null); + this.tbWebSocketAdaptRemoteService.sendBbMessage(obj); + TbWzLswz wz = new TbWzLswz(); + wz.setId(UUIDGenerator.getUUID()); + wz.setSjly("02"); + wz.setDwsj(new Date()); + wz.setYwid(xfbb.getId()); + wz.setJd(BigDecimal.valueOf(dto.getJd())); + wz.setWd(BigDecimal.valueOf(dto.getWd())); +// wz.setZb(JtsUtils.getPoint(wz.getJd(), wz.getWd())); + this.baseMapper.insertTbWzSblswz(wz); + } + return true; + } + } diff --git a/mosty-qwzx/src/main/resources/mapper/TbQwXfbbMapper.xml b/mosty-qwzx/src/main/resources/mapper/TbQwXfbbMapper.xml index cfde487..dd210a1 100644 --- a/mosty-qwzx/src/main/resources/mapper/TbQwXfbbMapper.xml +++ b/mosty-qwzx/src/main/resources/mapper/TbQwXfbbMapper.xml @@ -663,6 +663,12 @@ #{xtZhgxr}, #{xtZhgxbmdm}, #{xtZhgxbm}, #{zylx}, #{dzbq}, #{wqzb}) + + insert into mosty_wzzx.tb_wz_lswz + (id,sjly,dwsj,ywid,jd,wd) + values (#{id},#{sjly},#{dwsj},#{ywid},#{jd},#{wd}) + + + + + update tb_qw_xfbb set jd = #{jd},wd = #{wd} where id = #{bbid} + diff --git a/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbZdxlFgdwBddxlrwJlController.java b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbZdxlFgdwBddxlrwJlController.java index 20b4c71..7472a97 100644 --- a/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbZdxlFgdwBddxlrwJlController.java +++ b/mosty-yjzl/src/main/java/com/mosty/yjzl/controller/TbZdxlFgdwBddxlrwJlController.java @@ -139,7 +139,7 @@ public class TbZdxlFgdwBddxlrwJlController { UserInfo user = UserInfoManager.get(); if(ObjectUtils.isNotEmpty(baseEntity.getDkKsSj())){ //开始和结束是否是同一个人 - if(!user.getUserId().equals(baseEntity.getDkrId())){ + if(!baseEntity.getDkrXm().equals(user.getUserName())){ return ResponseResult.fail(MessageUtils.getSaveFailMsg() + "您不是此记录的打卡人，不能进行打卡"); } //是否待满10分钟