Skip to content

J
jyzb_platformV2
Commit ce2cec73 by 李小惠
Options

添加警员模块分页接口

parent fedac8b3
正在显示 包含 132 行增加 和 63 行删除
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/PoliceDto.java deleted 100644 → 0
package com.junmp.jyzb.api.bean.dto;
import lombok.Data;
import java.util.List;
@Data
public class PoliceDto {
//单警柜编号
private String cabinetNum;
//单警柜主柜名
private String cabinetName;
//组织机构名称
private String orgName;
//组织机构id
private Long orgId;
//警员输出信息
private List<PolicemanDto> policemanlist;
private static final long serialVersionUID = 1L;
}
\ No newline at end of file
jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/PolicemanDto.java
package com.junmp.jyzb.api.bean.dto;
import com.junmp.jyzb.api.bean.dto.PoliceFingerDto;
import lombok.Data;
import java.util.List;
......@@ -25,6 +25,14 @@ public class PolicemanDto {
private String photo;
private String phone;
//单警柜编号
private String cabinetNum;
//单警柜主柜名
private String cabinetName;
//组织机构名称
private String orgName;
//组织机构id
private Long orgId;
//指纹信息列表
private List<PoliceFingerDto> fingersList;
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/InventoryController.java
......@@ -154,7 +154,7 @@ public class InventoryController {
//根据区域id查询装备信息汇总(page)
@PostMapping("/AreaInventoryPage")
@ApiOperation("根据区域id查询装备信息汇总(list)")
@ApiOperation("根据区域id查询装备信息汇总(page)")
public ApiRes<PageResult<InventorySummary>> AreaInventoryPage(@RequestBody @Validated(ValidationApi.edit.class) WarehouseAreaReq req){
return ApiRes.success(inventoryService.AreaInventoryPage(req));
}
......
jyzb-biz/src/main/java/com/junmp/jyzb/controller/PoliceController.java
package com.junmp.jyzb.controller;
import cn.hutool.core.util.ObjectUtil;
import com.junmp.jyzb.api.bean.dto.PoliceDto;
import com.junmp.jyzb.api.bean.dto.PolicemanDto;
import com.junmp.jyzb.api.bean.query.CabinetReq;
import com.junmp.jyzb.api.bean.query.PolicemanReq;
......@@ -11,6 +10,7 @@ import com.junmp.jyzb.service.PolicemanService;
import com.junmp.jyzb.utils.ResponseResult;
import com.junmp.v2.common.bean.request.ValidationApi;
import com.junmp.v2.common.bean.response.ApiRes;
import com.junmp.v2.db.api.page.PageResult;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
......@@ -18,6 +18,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
@RestController
......@@ -69,14 +70,21 @@ public class PoliceController {
//根据组织机构id查询,只查询本级，不包含下级
//根据组织机构id查询,只查询本级，不包含下级(list)
@PostMapping("/ShowPoliceList")
@ApiOperation("查询某个组织机构下的所有警员信息")
public ApiRes<PoliceDto> GetAllPolicemanList(@RequestBody PolicemanReq req){
PoliceDto policeDto = policemanService.GetAllPolicemanList(req);
return ApiRes.success(policeDto);
@ApiOperation("查询某个组织机构下的所有警员信息(list)")
public ApiRes<List<PolicemanDto>> GetAllPolicemanList(@RequestBody PolicemanReq req){
List<PolicemanDto> policemanDtos = policemanService.GetAllPolicemanList(req);
return ApiRes.success(policemanDtos);
}
//根据组织机构id查询,只查询本级，不包含下级(page)
@PostMapping("/ShowPolicePage")
@ApiOperation("查询某个组织机构下的所有警员信息(page)")
public ApiRes<PageResult<PolicemanDto>> GetAllPolicemanPage(@RequestBody PolicemanReq req){
PageResult<PolicemanDto> policemanDtoPageResult = policemanService.GetAllPolicemanPage(req);
return ApiRes.success(policemanDtoPageResult);
}
/**
......@@ -92,16 +100,23 @@ public class PoliceController {
/**
* 根据单警柜id查询出单警柜下面箱门绑定的警员信息
* 根据单警柜id查询出单警柜下面箱门绑定的警员信息(list)
* @param
* @return
*/
@PostMapping("/GetPoliceData")
@ApiOperation("查询与单警柜绑定的警员信息") //根据单警柜id查询
public ApiRes<PoliceDto> GetPoliceData(@RequestBody CabinetReq req){
//获取该组织机构下所有警员的id
PoliceDto policeDto = policemanService.GetPoliceData(req);
return ApiRes.success(policeDto);
@ApiOperation("查询与单警柜绑定的警员信息(list)") //根据单警柜id查询
public ApiRes<List<PolicemanDto>> GetPoliceData(@RequestBody CabinetReq req){
//获取该单警柜下所有警员的id
List<PolicemanDto> policemanDtos = policemanService.GetPoliceData(req);
return ApiRes.success(policemanDtos);
}
@PostMapping("/GetPoliceDataPage")
@ApiOperation("查询与单警柜绑定的警员信息(page)") //根据单警柜id查询
public ApiRes<PageResult<PolicemanDto>> GetPoliceDataPage(@RequestBody CabinetReq req){
//获取该单警柜下所有警员的id
return ApiRes.success(policemanService.GetPoliceDataPage(req));
}
......
jyzb-biz/src/main/java/com/junmp/jyzb/service/PolicemanService.java
package com.junmp.jyzb.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.junmp.jyzb.api.bean.dto.PoliceDto;
import com.junmp.jyzb.api.bean.dto.PolicemanDto;
import com.junmp.jyzb.api.bean.query.CabinetReq;
import com.junmp.jyzb.api.bean.query.PolicemanReq;
import com.junmp.jyzb.api.bean.req.UpdatePolicemanReq;
import com.junmp.jyzb.entity.Policeman;
import com.junmp.v2.db.api.page.PageResult;
import java.util.List;
public interface PolicemanService extends IService<Policeman> {
......@@ -34,12 +36,17 @@ public interface PolicemanService extends IService<Policeman> {
boolean ChangePoliceState(UpdatePolicemanReq req);
//通过组织机构id查询警员列表
PoliceDto GetAllPolicemanList(PolicemanReq req);
//通过组织机构id查询警员列表(list)
List<PolicemanDto> GetAllPolicemanList(PolicemanReq req);
//通过组织机构id查询警员列表(page)
PageResult<PolicemanDto> GetAllPolicemanPage(PolicemanReq req);
//根据单警柜id查询警员列表(list)
List<PolicemanDto> GetPoliceData(CabinetReq req);
//根据单警柜id查询警员列表
PoliceDto GetPoliceData(CabinetReq req);
//根据单警柜id查询警员列表(page)
PageResult<PolicemanDto> GetPoliceDataPage(CabinetReq req);
boolean UpdateFaceInfo(UpdatePolicemanReq req);
......@@ -53,4 +60,7 @@ public interface PolicemanService extends IService<Policeman> {
//判断警员信息是否存在
Policeman PoliceExist(String policeId);
}
jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PolicemanServiceImpl.java
......@@ -2,8 +2,8 @@ package com.junmp.jyzb.service.impl;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.junmp.jyzb.api.bean.dto.PoliceDto;
import com.junmp.jyzb.api.bean.dto.PoliceFingerDto;
import com.junmp.jyzb.api.bean.dto.PolicemanDto;
import com.junmp.jyzb.api.bean.query.CabinetReq;
......@@ -17,6 +17,8 @@ import com.junmp.jyzb.utils.*;
import com.junmp.v2.auth.password.BcryptPasswordStoredEncrypt;
import com.junmp.v2.common.exception.base.ServiceException;
import com.junmp.v2.common.util.BeanPlusUtil;
import com.junmp.v2.db.api.factory.PageResultFactory;
import com.junmp.v2.db.api.page.PageResult;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -25,8 +27,6 @@ import javax.annotation.Resource;
import java.util.*;
import static com.junmp.jyzb.utils.CheckBlank.checkNotBlank;
@Service
@Slf4j
public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman> implements PolicemanService {
......@@ -251,12 +251,12 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
}
/**
* 通过组织机构id查询警员列表
* 通过组织机构id查询警员列表(list)
*
* @param
*/
@Override
public PoliceDto GetAllPolicemanList(PolicemanReq req) {
public List<PolicemanDto> GetAllPolicemanList(PolicemanReq req) {
//查询传入的组织机构id是否存在
PubOrg pubOrg = pubOrgService.PubOrgExist(req.getOrgId());
//查询出组织机构下的所有警员信息
......@@ -277,25 +277,54 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
policeFingerDtoList.add(policeFingerDto);
}
policemanDto.setFingersList(policeFingerDtoList);
policemanDto.setOrgName(pubOrg.getOrgName());
policeList.add(policemanDto);
}
PoliceDto policeDto = new PoliceDto();
policeDto.setPolicemanlist(policeList);
//设置组织机构名
policeDto.setOrgName(pubOrg.getOrgName());
policeDto.setOrgId(req.getOrgId());
return policeDto;
return policeList;
}
//通过组织机构id查询警员列表(page)
@Override
public PageResult<PolicemanDto> GetAllPolicemanPage(PolicemanReq req) {
//查询传入的组织机构id是否存在
PubOrg pubOrg = pubOrgService.PubOrgExist(req.getOrgId());
//查询出组织机构下的所有警员信息
List<Policeman> list = list(new LambdaQueryWrapper<Policeman>()
.eq(ObjectUtil.isNotEmpty(req.getOrgId()), Policeman::getOrgId, req.getOrgId())
.eq(Policeman::getState, 1));
List<PolicemanDto> policeList = new ArrayList<>();
//查询出警员信息下的指纹列表信息
for (Policeman p : list) {
PolicemanDto policemanDto = new PolicemanDto();
BeanPlusUtil.copyProperties(p, policemanDto);
List<PoliceFinger> list1 = policeFingerService.list(new LambdaQueryWrapper<PoliceFinger>()
.eq(ObjectUtil.isNotNull(p.getId()), PoliceFinger::getPoliceId, p.getId()));
List<PoliceFingerDto> policeFingerDtoList = new ArrayList<>();
for (PoliceFinger policeFinger : list1) {
PoliceFingerDto policeFingerDto = new PoliceFingerDto();
BeanPlusUtil.copyProperties(policeFinger, policeFingerDto);
policeFingerDtoList.add(policeFingerDto);
}
policemanDto.setFingersList(policeFingerDtoList);
policemanDto.setOrgName(pubOrg.getOrgName());
policeList.add(policemanDto);
}
long pageNo=1L;
long pageSize=20L;
long size = policeList.size();
return PageResultFactory.createPageResult(policeList,Long.valueOf(size),pageSize,pageNo);
}
//根据单警柜id查询警员信息
//根据单警柜id查询警员信息(list)
@Override
public PoliceDto GetPoliceData(CabinetReq req) {
PoliceDto policeDto = new PoliceDto();
public List<PolicemanDto> GetPoliceData(CabinetReq req) {
//判断单警柜id是否正确
Cabinet cabinet = cabinetService.CabinetExist(req.getId());
PubOrg pubOrg = pubOrgService.getOne(new LambdaQueryWrapper<PubOrg>()
.eq(PubOrg::getOrgId, cabinet.getOrgId()));
//通过箱门id查询出警员
List<Policeman> policemenList = policemanMapper.SearchPoliceList(req.getId());
List<PolicemanDto> list = new ArrayList<>();
......@@ -312,16 +341,47 @@ public class PolicemanServiceImpl extends ServiceImpl<PolicemanMapper, Policeman
fingerDtoList.add(policeFingerDto);
}
policemanDto.setFingersList(fingerDtoList);
policemanDto.setCabinetNum(cabinet.getCabinetNum());
policemanDto.setCabinetName(cabinet.getName());
policemanDto.setOrgName(pubOrg.getOrgName());
list.add(policemanDto);
}
policeDto.setPolicemanlist(list);
policeDto.setCabinetNum(cabinet.getCabinetNum());
policeDto.setCabinetName(cabinet.getName());
return list;
}
//根据单警柜id查询警员信息(page)
@Override
public PageResult<PolicemanDto> GetPoliceDataPage(CabinetReq req) {
//判断单警柜id是否正确
Cabinet cabinet = cabinetService.CabinetExist(req.getId());
PubOrg pubOrg = pubOrgService.getOne(new LambdaQueryWrapper<PubOrg>()
.eq(PubOrg::getOrgId, cabinet.getOrgId()));
policeDto.setOrgId(pubOrg.getOrgId());
policeDto.setOrgName(pubOrg.getOrgName());
return policeDto;
//通过箱门id查询出警员
List<Policeman> policemenList = policemanMapper.SearchPoliceList(req.getId());
List<PolicemanDto> list = new ArrayList<>();
for (Policeman policeman : policemenList) {
PolicemanDto policemanDto = new PolicemanDto();
BeanPlusUtil.copyProperties(policeman, policemanDto);
//指纹信息查找
List<PoliceFinger> fingerList = policeFingerService.list(new LambdaQueryWrapper<PoliceFinger>()
.eq(PoliceFinger::getPoliceId, policeman.getId()));
List<PoliceFingerDto> fingerDtoList = new ArrayList<>();
for (PoliceFinger policeFinger : fingerList) {
PoliceFingerDto policeFingerDto = new PoliceFingerDto();
BeanPlusUtil.copyProperties(policeFinger, policeFingerDto);
fingerDtoList.add(policeFingerDto);
}
policemanDto.setFingersList(fingerDtoList);
policemanDto.setCabinetNum(cabinet.getCabinetNum());
policemanDto.setCabinetName(cabinet.getName());
policemanDto.setOrgName(pubOrg.getOrgName());
list.add(policemanDto);
}
long pageNo=1L;
long pageSize=20L;
long size = list.size();
return PageResultFactory.createPageResult(list,Long.valueOf(size),pageSize,pageNo);
}
//添加人脸信息
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论