DY-JMXF/mosty-dyga-cloud
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加返回信息，修复BUG

Browse Source
This commit is contained in:
DEV_ZZ
2025-09-11 22:27:40 +08:00
parent d32e8436a5
commit 0f4b95f355
20 changed files with 247 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mosty-qwzx/src/main/java/com/mosty/qwzx/controller/TbQwXfbbController.java
View File

@ -4,8 +4,11 @@ package com.mosty.qwzx.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.mosty.base.model.dto.qwzx.*;
import com.mosty.base.model.entity.qwzx.TbQwJl;
import com.mosty.base.model.entity.qwzx.TbQwxfbbDk;
import com.mosty.base.model.entity.qwzx.TbQwXfbb;
import com.mosty.base.model.entity.qwzx.TbQwXfpbZq;
import com.mosty.base.model.query.qwzx.TbQwJmxzSearchDto;
import com.mosty.base.model.query.qwzx.TbQwXfbbJmxzQuery;
import com.mosty.base.model.query.qwzx.TbQwXfbbQuery;
import com.mosty.base.model.query.qwzx.TbQwxfbbDkQuery;
import com.mosty.base.model.query.sjzx.XfbbQuery;
import com.mosty.base.model.query.sjzx.XfbbTjQuery;
@ -14,10 +17,6 @@ import com.mosty.common.base.domain.ResponseResult;
import com.mosty.common.base.entity.log.BusinessType;
import com.mosty.common.base.entity.log.Log;
import com.mosty.common.token.JwtSysUser;
import com.mosty.base.model.entity.qwzx.TbQwXfbb;
import com.mosty.base.model.entity.qwzx.TbQwXfpbZq;
import com.mosty.base.model.query.qwzx.TbQwXfbbJmxzQuery;
import com.mosty.base.model.query.qwzx.TbQwXfbbQuery;
import com.mosty.qwzx.service.TbQwXfbbService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@ -42,7 +41,7 @@ import java.util.Map;
public class TbQwXfbbController {
@Resource
private TbQwXfbbService tbQwXfbbService;
private final TbQwXfbbService tbQwXfbbService;
@ApiOperation("通过ID查询单条数据")
@JwtSysUser
@ -351,5 +350,18 @@ public class TbQwXfbbController {
return ResponseResult.success(tbQwXfbbService.updateXflc(bbid));
}
/**
* 查询勤务警力信息（根据报备ID和巡防警力ID）
* @param id 报备ID
* @param xfllId 巡防警力ID
* @return 勤务警力信息
*/
@ApiOperation("查询勤务警力信息（根据报备ID和巡防警力ID）")
@JwtSysUser
@GetMapping("/selectQwJlByBbInfo")
public ResponseResult<TbQwJl> selectQwJlByBbInfo(@PathParam("id") String id, @PathParam("xfllId") String xfllId) {
return ResponseResult.success(tbQwXfbbService.selectQwJlByBbInfo(id, xfllId));
}
}

9
mosty-qwzx/src/main/java/com/mosty/qwzx/service/TbQwXfbbService.java
View File

@ -5,14 +5,12 @@ import com.mosty.base.model.dto.qwzx.*;
import com.mosty.base.model.entity.qwzx.TbQwJl;
import com.mosty.base.model.entity.qwzx.TbQwXfbb;
import com.mosty.base.model.entity.qwzx.TbQwXfpbZq;
import com.mosty.base.model.entity.qwzx.TbQwxfbbDk;
import com.mosty.base.model.query.qwzx.TbQwJmxzSearchDto;
import com.mosty.base.model.query.qwzx.TbQwXfbbJmxzQuery;
import com.mosty.base.model.query.qwzx.TbQwXfbbQuery;
import com.mosty.base.model.query.qwzx.TbQwxfbbDkQuery;
import com.mosty.base.model.query.sjzx.XfbbQuery;
import com.mosty.base.model.query.sjzx.XfbbTjQuery;
import com.mosty.base.model.query.sjzx.XftjQuery;
import com.mosty.base.model.vo.qwzx.TbQwxfbbDkVO;
import io.swagger.annotations.ApiOperation;
@ -160,5 +158,12 @@ public interface TbQwXfbbService {
@ApiOperation("更新巡防里程")
Integer updateXflc(String bbid);
/**
* 查询勤务警力信息（根据报备ID和巡防警力ID）
* @param id 报备ID
* @param xfllId 巡防警力ID
* @return 勤务警力信息
*/
TbQwJl selectQwJlByBbInfo(String id, String xfllId);
}

22
mosty-qwzx/src/main/java/com/mosty/qwzx/service/impl/TbQwXfbbServiceImpl.java
View File

@ -18,8 +18,6 @@ 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.TbWzXfwz;
import com.mosty.base.model.entity.yjzl.TbYjxx;
import com.mosty.base.model.entity.yjzl.TbZlxx;
import com.mosty.base.model.query.qwzx.TbQwJmxzSearchDto;
import com.mosty.base.model.query.qwzx.TbQwXfbbJmxzQuery;
import com.mosty.base.model.query.qwzx.TbQwXfbbQuery;
@ -28,7 +26,6 @@ import com.mosty.base.model.query.sjzx.XfbbQuery;
import com.mosty.base.model.query.sjzx.XfbbTjQuery;
import com.mosty.base.model.vo.base.DeptInfoVo;
import com.mosty.base.model.vo.qwzx.TbQwxfbbDkVO;
import com.mosty.base.model.vo.yjzl.TbFzJlVo;
import com.mosty.base.model.vo.yszx.TbYsGajgVo;
import com.mosty.base.utils.*;
import com.mosty.common.base.exception.BusinessException;
@ -36,7 +33,6 @@ import com.mosty.common.core.business.entity.SysUser;
import com.mosty.common.redis.service.RedisService;
import com.mosty.common.token.UserInfo;
import com.mosty.common.token.UserInfoManager;
import com.mosty.common.util.PermissionsUtil;
import com.mosty.qwzx.mapper.*;
import com.mosty.qwzx.remote.*;
import com.mosty.qwzx.service.TbQwXfbbService;
@ -56,7 +52,6 @@ import java.math.BigDecimal;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import java.util.zip.Inflater;
/**
@ -457,6 +452,7 @@ public class TbQwXfbbServiceImpl extends ServiceImpl<TbQwXfbbMapper, TbQwXfbb> i
return newList;
}
@Override
public void authJsbbTs() {
List<TbQwXfbb> bbList = this.tbQwXfbbMapper.selectList(
new LambdaQueryWrapper<TbQwXfbb>()
@ -1325,4 +1321,20 @@ public class TbQwXfbbServiceImpl extends ServiceImpl<TbQwXfbbMapper, TbQwXfbb> i
}
return lc;
}
@Override
public TbQwJl selectQwJlByBbInfo(String id, String xfllId) {
if(StringUtils.isBlank(id) || StringUtils.isBlank(xfllId)){
return null;
}
QueryWrapper<TbQwJl> qw = new QueryWrapper<>();
qw.eq("xt_sjzt", "1");
qw.eq("xt_scbz", "0");
qw.eq("ywid", id);
qw.eq("jl_id", xfllId);
return this.tbQwJlMapper.selectOne(qw);
}
}