PC打印机列表
This commit is contained in:
@@ -34,7 +34,7 @@ public class TbPrintPCMachineController {
|
|||||||
*/
|
*/
|
||||||
@GetMapping
|
@GetMapping
|
||||||
public Result queryByPage(TbPrintPCMachine tbPrintMachine) {
|
public Result queryByPage(TbPrintPCMachine tbPrintMachine) {
|
||||||
return this.tbPrintPCMachineService.queryByPage(tbPrintMachine);
|
return tbPrintPCMachineService.queryByPage(tbPrintMachine);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.time.Instant;
|
import java.time.Instant;
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -62,7 +63,19 @@ public class TbPrintPCMachineService {
|
|||||||
PageHelper.startPage(tbPrintMachine.getPage(), tbPrintMachine.getPageSize());
|
PageHelper.startPage(tbPrintMachine.getPage(), tbPrintMachine.getPageSize());
|
||||||
tbPrintMachine.setContentType("local");
|
tbPrintMachine.setContentType("local");
|
||||||
List<TbPrintPCMachine> tbPrintMachines = this.tbPrintMachineMapper.queryAll(tbPrintMachine);
|
List<TbPrintPCMachine> tbPrintMachines = this.tbPrintMachineMapper.queryAll(tbPrintMachine);
|
||||||
|
|
||||||
|
List<PrintMachineDto> printMachineList = new ArrayList<>();
|
||||||
|
for (TbPrintPCMachine printMachine : tbPrintMachines) {
|
||||||
|
PrintMachineDto tbPrintMachineVO = new PrintMachineDto();
|
||||||
|
if (StringUtils.isNotBlank(printMachine.getConfig())) {
|
||||||
|
tbPrintMachineVO.setConfig(JSON.parseObject(printMachine.getConfig(), PrintConfig.class));
|
||||||
|
}
|
||||||
|
BeanUtils.copyProperties(printMachine, tbPrintMachineVO);
|
||||||
|
printMachineList.add(tbPrintMachineVO);
|
||||||
|
}
|
||||||
|
|
||||||
PageInfo pageInfo = new PageInfo(tbPrintMachines);
|
PageInfo pageInfo = new PageInfo(tbPrintMachines);
|
||||||
|
pageInfo.setList(printMachineList);
|
||||||
return Result.success(CodeEnum.SUCCESS, pageInfo);
|
return Result.success(CodeEnum.SUCCESS, pageInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user