Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码提交

Browse Source
This commit is contained in:
huangzj
2023-10-26 16:37:43 +08:00
parent 58ff8f304d
commit 68146d493f
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java
View File

@@ -210,7 +210,7 @@ public class EquipmentDeliveryController extends BaseController {
exportParams.setStyle(ExcelStyleUtil.class); exportParams.setStyle(ExcelStyleUtil.class);
Workbook workbook = ExcelExportUtil.exportExcel(exportParams, DeviceExcelTemplete.class, new ArrayList<DeviceExcelTemplete>()); Workbook workbook = ExcelExportUtil.exportExcel(exportParams, DeviceExcelTemplete.class, new ArrayList<DeviceExcelTemplete>());
ExcelUtil.selectList(workbook, 2, 2, Stream.of("直连设备","网关设备").collect(Collectors.toList()).toArray(new String[]{})); ExcelUtil.selectList(workbook, 2, 2, Stream.of("直连设备","网关设备").collect(Collectors.toList()).toArray(new String[]{}));
ExcelUtil.selectList(workbook, 4, 4, Stream.of("mqtt","cloud").collect(Collectors.toList()).toArray(new String[]{})); ExcelUtil.selectList(workbook, 4, 4, Stream.of("MQTT","CLD").collect(Collectors.toList()).toArray(new String[]{}));
String fileName = "设备模板.xlsx"; String fileName = "设备模板.xlsx";
ExportParams exportExcel = new ExportParams("设备模板", "设备模板"); ExportParams exportExcel = new ExportParams("设备模板", "设备模板");
PoiUtil.exportFileByWorkbook(workbook, fileName, response); PoiUtil.exportFileByWorkbook(workbook, fileName, response);

4
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
View File

@@ -116,6 +116,8 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
csEquipmentProcess.setOperator(RequestUtil.getUserIndex()); csEquipmentProcess.setOperator(RequestUtil.getUserIndex());
csEquipmentProcess.setStartTime(LocalDateTime.now()); csEquipmentProcess.setStartTime(LocalDateTime.now());
csEquipmentProcess.setProcess(1); csEquipmentProcess.setProcess(1);
csEquipmentProcess.setStatus (1);
csEquipmentProcessPOService.save(csEquipmentProcess); csEquipmentProcessPOService.save(csEquipmentProcess);
return this.save (csEquipmentDeliveryPo); return this.save (csEquipmentDeliveryPo);
} }
@@ -420,7 +422,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
csEquipmentDeliveryPO.setMac(path); csEquipmentDeliveryPO.setMac(path);
csEquipmentDeliveryPO.setRunStatus(1); csEquipmentDeliveryPO.setRunStatus(1);
csEquipmentDeliveryPO.setStatus("1"); csEquipmentDeliveryPO.setStatus("1");
csEquipmentDeliveryPO.setProcess(1); csEquipmentDeliveryPO.setProcess(2);
CsEquipmentProcessPO csEquipmentProcess = new CsEquipmentProcessPO(); CsEquipmentProcessPO csEquipmentProcess = new CsEquipmentProcessPO();
csEquipmentProcess.setDevId(csEquipmentDeliveryPO.getNdid()); csEquipmentProcess.setDevId(csEquipmentDeliveryPO.getNdid());