1.口门门禁-黑名单管理
parent
e5c0e4f9ba
commit
809c3b7ffe
|
|
@ -37,25 +37,11 @@ public class VehicleBlackController {
|
|||
SSOUser ssoUser = AuthContext.getCurrentUser();
|
||||
return vehicleBlackService.add(cmd);
|
||||
}
|
||||
|
||||
@ApiOperation("分页")
|
||||
@PostMapping("/list")
|
||||
public PageResponse<VehicleBlackCO> page(@RequestBody VehicleBlackPageQry qry) {
|
||||
return vehicleBlackService.listPage(qry);
|
||||
}
|
||||
|
||||
@ApiOperation("所有数据")
|
||||
@GetMapping("/listAll")
|
||||
public MultiResponse<VehicleBlackCO> listAll() {
|
||||
return MultiResponse.of(new ArrayList<VehicleBlackCO>());
|
||||
}
|
||||
|
||||
@ApiOperation("详情")
|
||||
@GetMapping("/{id}")
|
||||
public SingleResponse<VehicleBlackCO> getInfoById(@PathVariable("id") Long id) {
|
||||
return SingleResponse.of(vehicleBlackService.queryById(id));
|
||||
}
|
||||
|
||||
@ApiOperation("删除")
|
||||
@DeleteMapping("/{id}")
|
||||
public Response remove(@PathVariable("id") Long id) {
|
||||
|
|
@ -63,18 +49,5 @@ public class VehicleBlackController {
|
|||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
|
||||
@ApiOperation("删除多个")
|
||||
@DeleteMapping("/ids")
|
||||
public Response removeBatch(@RequestParam Long[] ids) {
|
||||
vehicleBlackService.removeBatch(ids);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
|
||||
@ApiOperation("修改")
|
||||
@PutMapping("/edit")
|
||||
public SingleResponse edit(@Validated @RequestBody VehicleBlackUpdateCmd vehicleBlackUpdateCmd) {
|
||||
vehicleBlackService.edit(vehicleBlackUpdateCmd);
|
||||
return SingleResponse.buildSuccess();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,10 +5,13 @@ import com.zcloud.primeport.command.convertor.VehicleBlackCoConvertor;
|
|||
import com.zcloud.primeport.dto.VehicleBlackPageQry;
|
||||
import com.zcloud.primeport.dto.clientobject.VehicleBlackCO;
|
||||
import com.zcloud.primeport.persistence.dataobject.VehicleBlackDO;
|
||||
import com.zcloud.primeport.persistence.dataobject.VehicleMessageDO;
|
||||
import com.zcloud.primeport.persistence.repository.VehicleBlackRepository;
|
||||
import com.zcloud.primeport.persistence.repository.VehicleMessageRepository;
|
||||
import lombok.AllArgsConstructor;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
|
|
@ -24,7 +27,7 @@ import java.util.Map;
|
|||
public class VehicleBlackQueryExe {
|
||||
private final VehicleBlackRepository vehicleBlackRepository;
|
||||
private final VehicleBlackCoConvertor vehicleBlackCoConvertor;
|
||||
|
||||
private final VehicleMessageRepository vehicleMessageRepository;
|
||||
/**
|
||||
* 根据id查询
|
||||
*
|
||||
|
|
@ -44,7 +47,18 @@ public class VehicleBlackQueryExe {
|
|||
public PageResponse<VehicleBlackCO> execute(VehicleBlackPageQry vehicleBlackPageQry) {
|
||||
Map<String, Object> params = PageQueryHelper.toHashMap(vehicleBlackPageQry);
|
||||
PageResponse<VehicleBlackDO> pageResponse = vehicleBlackRepository.listPage(params);
|
||||
List<VehicleBlackCO> examCenterCOS = vehicleBlackCoConvertor.converDOsToCOs(pageResponse.getData());
|
||||
List<VehicleBlackCO> examCenterCOS = vehicleBlackCoConvertor.converDOsToCOs(pageResponse.getData()); //分页获取信息
|
||||
Long[] vehicleIds = examCenterCOS.stream().map(VehicleBlackCO::getVehicleId).toArray(Long[]::new);
|
||||
List<VehicleMessageDO> vehicleMessageDOS = vehicleMessageRepository.listAll(vehicleIds); // 根据id获取信息
|
||||
Map<Long, VehicleMessageDO> vehicleMessageDOMap = new HashMap<>();
|
||||
for (VehicleMessageDO vehicleMessageDO : vehicleMessageDOS) {
|
||||
vehicleMessageDOMap.put(vehicleMessageDO.getId(), vehicleMessageDO);
|
||||
}
|
||||
for (VehicleBlackCO vehicleBlackCO : examCenterCOS) {
|
||||
if (vehicleMessageDOMap.containsKey(vehicleBlackCO.getVehicleId())){
|
||||
vehicleBlackCO.setVehicleId(vehicleMessageDOMap.get(vehicleBlackCO.getVehicleId()).getId());
|
||||
}
|
||||
}
|
||||
return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,5 +23,8 @@ public class VehicleBlackCO extends ClientObject {
|
|||
@ApiModelProperty(value = "车辆信息表(t_vehicle_message)的主键id")
|
||||
private Long vehicleId;
|
||||
|
||||
@ApiModelProperty(value = "车辆信息")
|
||||
private VehicleMessageCO vehicleMessage;
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package com.zcloud.primeport.gatewayimpl;
|
|||
import com.zcloud.primeport.domain.gateway.VehicleBlackGateway;
|
||||
import com.zcloud.primeport.domain.model.VehicleBlackE;
|
||||
import com.zcloud.primeport.persistence.dataobject.VehicleBlackDO;
|
||||
import com.zcloud.primeport.persistence.dataobject.VehicleViolationsDO;
|
||||
import com.zcloud.primeport.persistence.repository.VehicleBlackRepository;
|
||||
import lombok.AllArgsConstructor;
|
||||
import com.zcloud.gbscommon.utils.Tools;
|
||||
|
|
@ -39,7 +40,10 @@ public class VehicleBlackGatewayImpl implements VehicleBlackGateway {
|
|||
|
||||
@Override
|
||||
public Boolean deletedVehicleBlackById(Long id) {
|
||||
return vehicleBlackRepository.removeById(id);
|
||||
VehicleBlackDO d = new VehicleBlackDO();
|
||||
d.setId(id);
|
||||
d.setDeleteEnum("TRUE");
|
||||
return vehicleBlackRepository.updateById(d);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
Loading…
Reference in New Issue