mengff
/
jihe-dc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化定时导出内容 

优化设备在线率分析页面设备类型
develop
zhaoxianglong 9 months ago
parent
301ef04ba9
commit
65d95ba62c
3 changed files with 125 additions and 96 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      zc-business/src/main/java/com/zc/business/controller/StatusController.java
  2. 16
      zc-business/src/main/java/com/zc/business/enums/UniversalEnum.java
  3. 67
      zc-business/src/main/java/com/zc/business/service/impl/ExcelExportService.java

6
zc-business/src/main/java/com/zc/business/controller/StatusController.java
View File

@ -267,6 +267,8 @@ public class StatusController extends BaseController {
itemTypeMap.put(UniversalEnum.ELEVEN.getValue(), UniversalEnum.CLASS_I_TRAFFIC_SURVEY_STATION.getValue());
itemTypeMap.put(UniversalEnum.TWELVE.getValue(), UniversalEnum.INTELLIGENT_DRIVING_GUIDANCE_SYSTEM.getValue());
itemTypeMap.put(UniversalEnum.THIRTEEN.getValue(), UniversalEnum.SMART_DEVICE_BOX.getValue());
itemTypeMap.put(UniversalEnum.FIFTEEN.getValue(), UniversalEnum.SOLAR_PANEL.getValue());
itemTypeMap.put(UniversalEnum.SIXTEEN.getValue(), UniversalEnum.REMOTE_COMPUTER.getValue());
LocalDateTime todayStart = LocalDateTime.now().truncatedTo(ChronoUnit.DAYS);
LocalDateTime currentTime = LocalDateTime.now();
Status status = new Status();
@ -394,7 +396,9 @@ public class StatusController extends BaseController {
UniversalEnum.LASER_FATIGUE_AWAKENING.getValue(),
UniversalEnum.CLASS_I_TRAFFIC_SURVEY_STATION.getValue(),
UniversalEnum.INTELLIGENT_DRIVING_GUIDANCE_SYSTEM.getValue(),
UniversalEnum.SMART_DEVICE_BOX.getValue()
UniversalEnum.SMART_DEVICE_BOX.getValue(),
UniversalEnum.SOLAR_PANEL.getValue(),
UniversalEnum.REMOTE_COMPUTER.getValue()
};
orderRule= Arrays.toString(rules).replace(UniversalEnum.LEFT_CENTER_BRACKET.getValue(),UniversalEnum.EMPTY_STRING.getValue()).replace(UniversalEnum.CLOSE_CENTER_BRACKET.getValue(),UniversalEnum.EMPTY_STRING.getValue()).replace(UniversalEnum.BLANK_SPACE.getValue(),UniversalEnum.EMPTY_STRING.getValue());
ruleMap.put("rule",orderRule);

16
zc-business/src/main/java/com/zc/business/enums/UniversalEnum.java
View File

@ -338,10 +338,16 @@ public enum UniversalEnum {
ROAD_SECTION_NAME(0, "路段名称"),
// 菏泽方向
DIRECTION_OF_HEZE(0, "菏泽方向"),
DIRECTION_OF_HEZE(1, "菏泽方向"),
// 双向
BIDIRECTIONAL(2, "双向"),
// 济南方向
DIRECTION_OF_JINAN(0, "济南方向"),
DIRECTION_OF_JINAN(3, "济南方向"),
// 未知方向
UNKNOWN_DIRECTION(4, "未知方向"),
// 上行
Up(0, "上行"),
@ -409,6 +415,12 @@ public enum UniversalEnum {
//智能设备箱
SMART_DEVICE_BOX(0, "智能设备箱"),
//太阳能板
SOLAR_PANEL(0, "太阳能板"),
//远端机
REMOTE_COMPUTER(0, "远端机"),
//设备名称
DEVICE_NAME(0, "设备名称"),

67
zc-business/src/main/java/com/zc/business/service/impl/ExcelExportService.java
View File

@ -55,18 +55,27 @@ public class ExcelExportService {
}
if (flag) {
row.createCell(UniversalEnum.ZERO.getNumber()).setCellValue(ignored.getDeviceName());
row.createCell(UniversalEnum.ZERO.getNumber()).setCellValue(ignored.getDeviceIp());
row.createCell(UniversalEnum.ZERO.getNumber()).setCellValue(ignored.getDeviceNo());
row.createCell(UniversalEnum.ZERO.getNumber()).setCellValue(ignored.getDirection());
row.createCell(UniversalEnum.ZERO.getNumber()).setCellValue(ignored.getProduction());
row.createCell(UniversalEnum.ZERO.getNumber()).setCellValue(ignored.getModel());
row.createCell(UniversalEnum.ZERO.getNumber()).setCellValue(ignored.getContent());
row.createCell(UniversalEnum.ONE.getNumber()).setCellValue(ignored.getDeviceIp());
row.createCell(UniversalEnum.TWO.getNumber()).setCellValue(ignored.getDeviceNo());
Integer direction = Integer.parseInt(ignored.getDirection() != null ? ignored.getDirection() : UniversalEnum.FOUR.getValue());
String directionDescription = UniversalEnum.UNKNOWN_DIRECTION.getValue();
if (Objects.equals(direction, UniversalEnum.DIRECTION_OF_HEZE.getNumber())) {
directionDescription = UniversalEnum.DIRECTION_OF_HEZE.getValue();
} else if (Objects.equals(direction, UniversalEnum.BIDIRECTIONAL.getNumber())) {
directionDescription = UniversalEnum.BIDIRECTIONAL.getValue();
} else if (Objects.equals(direction, UniversalEnum.DIRECTION_OF_JINAN.getNumber())) {
directionDescription = UniversalEnum.DIRECTION_OF_JINAN.getValue();
}
row.createCell(UniversalEnum.THREE.getNumber()).setCellValue(directionDescription);
row.createCell(UniversalEnum.FOUR.getNumber()).setCellValue(ignored.getProduction());
row.createCell(UniversalEnum.FIVE.getNumber()).setCellValue(ignored.getModel());
row.createCell(UniversalEnum.SIX.getNumber()).setCellValue(ignored.getContent());
}
row.createCell(UniversalEnum.TWO.getNumber() * i + UniversalEnum.SEVEN.getNumber()).setCellValue(ignored.getSuccessRate());
row.createCell(UniversalEnum.TWO.getNumber() * i + UniversalEnum.EIGHT.getNumber()).setCellValue(ignored.getLostRate());
}
i++;
flag = false;
//flag = false;
}
Sheet sheets = workbook.createSheet(UniversalEnum.DEVICE_FAILURE_RATE_SUMMARY_PAGE.getValue());
createSheet(sheets, categoryMap);
@ -80,6 +89,7 @@ public class ExcelExportService {
System.out.println("excel写入成功！！！！！！");
}
public void createSheet1(Sheet sheet, Map<Integer, List<Status>> ipMap) {
Map<Integer, List<Status>> map = new TreeMap<>(ipMap);
int rowNum = UniversalEnum.ZERO.getNumber();
@ -114,6 +124,7 @@ public class ExcelExportService {
itemTypeMap.put(UniversalEnum.ONE_FOUR.getValue(), UniversalEnum.THREE_HUNDRED_SIXTY_PANORAMIC_CAMERA.getValue());
itemTypeMap.put(UniversalEnum.ONE_FIVE.getValue(), UniversalEnum.ONE_HUNDRED_EIGHTY_PANORAMIC_CAMERA.getValue());
itemTypeMap.put(UniversalEnum.TWO_ONE.getValue(), UniversalEnum.GANTRY_TYPE_VARIABLE_MESSAGE_SIGN.getValue());
itemTypeMap.put(UniversalEnum.TWO_TWO.getValue(), UniversalEnum.VARIABLE_MESSAGE_SIGN_IN_FRONT_OF_STATION.getValue());
itemTypeMap.put(UniversalEnum.TWO_THREE.getValue(), UniversalEnum.AWNING_VARIABLE_INFORMATION_SIGN.getValue());
itemTypeMap.put(UniversalEnum.TWO_FOUR.getValue(), UniversalEnum.CANTILEVER_VARIABLE_INFORMATION_SIGN_IN_FRONT_OF_STATION.getValue());
itemTypeMap.put(UniversalEnum.THREE.getValue(), UniversalEnum.METEOROLOGICAL_DETECTOR.getValue());
@ -125,6 +136,8 @@ public class ExcelExportService {
itemTypeMap.put(UniversalEnum.ELEVEN.getValue(), UniversalEnum.CLASS_I_TRAFFIC_SURVEY_STATION.getValue());
itemTypeMap.put(UniversalEnum.TWELVE.getValue(), UniversalEnum.INTELLIGENT_DRIVING_GUIDANCE_SYSTEM.getValue());
itemTypeMap.put(UniversalEnum.THIRTEEN.getValue(), UniversalEnum.SMART_DEVICE_BOX.getValue());
itemTypeMap.put(UniversalEnum.FIFTEEN.getValue(), UniversalEnum.SOLAR_PANEL.getValue());
itemTypeMap.put(UniversalEnum.SIXTEEN.getValue(), UniversalEnum.REMOTE_COMPUTER.getValue());
String type = groupItems.get(UniversalEnum.ZERO.getNumber()).getType();
String description = itemTypeMap.get(type);
if (flag) {
@ -154,23 +167,26 @@ public class ExcelExportService {
long a = groupItems.stream().filter(iteam -> Objects.equals(iteam.getDeviceStatus(), UniversalEnum.ONE.getValue())).count();
row = sheet.createRow(rowNum++);
HashMap<String, String> itemTypeMap = new HashMap<>();
itemTypeMap.put(UniversalEnum.ONE.getValue(), UniversalEnum.HD_NETWORK_GUN_TYPE_FIXED_CAMERA.getValue());
itemTypeMap.put(UniversalEnum.TWO.getValue(), UniversalEnum.HD_NETWORK_SPHERICAL_CAMERA.getValue());
itemTypeMap.put(UniversalEnum.THREE.getValue(), UniversalEnum.UNDER_THE_BRIDGE_HD_NETWORK_SPHERICAL_CAMERA.getValue());
itemTypeMap.put(UniversalEnum.FOUR.getValue(), UniversalEnum.THREE_HUNDRED_SIXTY_PANORAMIC_CAMERA.getValue());
itemTypeMap.put(UniversalEnum.FIVE.getValue(), UniversalEnum.ONE_HUNDRED_EIGHTY_PANORAMIC_CAMERA.getValue());
itemTypeMap.put(UniversalEnum.SIX.getValue(), UniversalEnum.GANTRY_TYPE_VARIABLE_MESSAGE_SIGN.getValue());
itemTypeMap.put(UniversalEnum.SEVEN.getValue(), UniversalEnum.AWNING_VARIABLE_INFORMATION_SIGN.getValue());
itemTypeMap.put(UniversalEnum.EIGHT.getValue(), UniversalEnum.CANTILEVER_VARIABLE_INFORMATION_SIGN_IN_FRONT_OF_STATION.getValue());
itemTypeMap.put(UniversalEnum.NINE.getValue(), UniversalEnum.METEOROLOGICAL_DETECTOR.getValue());
itemTypeMap.put(UniversalEnum.TEN.getValue(), UniversalEnum.SECTION_VOICE_BROADCAST_SYSTEM.getValue());
itemTypeMap.put(UniversalEnum.ELEVEN.getValue(), UniversalEnum.GUARDRAIL_COLLISION_WARNING_SYSTEM.getValue());
itemTypeMap.put(UniversalEnum.TWELVE.getValue(), UniversalEnum.MILLIMETER_WAVE_RADAR.getValue());
itemTypeMap.put(UniversalEnum.THIRTEEN.getValue(), UniversalEnum.CONFLUENCE_AREA_EARLY_WARNING_SYSTEM.getValue());
itemTypeMap.put(UniversalEnum.FOURTEEN.getValue(), UniversalEnum.LASER_FATIGUE_AWAKENING.getValue());
itemTypeMap.put(UniversalEnum.FIFTEEN.getValue(), UniversalEnum.CLASS_I_TRAFFIC_SURVEY_STATION.getValue());
itemTypeMap.put(UniversalEnum.SIXTEEN.getValue(), UniversalEnum.INTELLIGENT_DRIVING_GUIDANCE_SYSTEM.getValue());
itemTypeMap.put(UniversalEnum.SEVENTEEN.getValue(), UniversalEnum.SMART_DEVICE_BOX.getValue());
itemTypeMap.put(UniversalEnum.ONE_ONE.getValue(), UniversalEnum.HD_NETWORK_GUN_TYPE_FIXED_CAMERA.getValue());
itemTypeMap.put(UniversalEnum.ONE_TWO.getValue(), UniversalEnum.HD_NETWORK_SPHERICAL_CAMERA.getValue());
itemTypeMap.put(UniversalEnum.ONE_THREE.getValue(), UniversalEnum.UNDER_THE_BRIDGE_HD_NETWORK_SPHERICAL_CAMERA.getValue());
itemTypeMap.put(UniversalEnum.ONE_FOUR.getValue(), UniversalEnum.THREE_HUNDRED_SIXTY_PANORAMIC_CAMERA.getValue());
itemTypeMap.put(UniversalEnum.ONE_FIVE.getValue(), UniversalEnum.ONE_HUNDRED_EIGHTY_PANORAMIC_CAMERA.getValue());
itemTypeMap.put(UniversalEnum.TWO_ONE.getValue(), UniversalEnum.GANTRY_TYPE_VARIABLE_MESSAGE_SIGN.getValue());
itemTypeMap.put(UniversalEnum.TWO_TWO.getValue(), UniversalEnum.VARIABLE_MESSAGE_SIGN_IN_FRONT_OF_STATION.getValue());
itemTypeMap.put(UniversalEnum.TWO_THREE.getValue(), UniversalEnum.AWNING_VARIABLE_INFORMATION_SIGN.getValue());
itemTypeMap.put(UniversalEnum.TWO_FOUR.getValue(), UniversalEnum.CANTILEVER_VARIABLE_INFORMATION_SIGN_IN_FRONT_OF_STATION.getValue());
itemTypeMap.put(UniversalEnum.THREE.getValue(), UniversalEnum.METEOROLOGICAL_DETECTOR.getValue());
itemTypeMap.put(UniversalEnum.FIVE.getValue(), UniversalEnum.SECTION_VOICE_BROADCAST_SYSTEM.getValue());
itemTypeMap.put(UniversalEnum.SIX.getValue(), UniversalEnum.GUARDRAIL_COLLISION_WARNING_SYSTEM.getValue());
itemTypeMap.put(UniversalEnum.SEVEN.getValue(), UniversalEnum.MILLIMETER_WAVE_RADAR.getValue());
itemTypeMap.put(UniversalEnum.EIGHT.getValue(), UniversalEnum.CONFLUENCE_AREA_EARLY_WARNING_SYSTEM.getValue());
itemTypeMap.put(UniversalEnum.TEN.getValue(), UniversalEnum.LASER_FATIGUE_AWAKENING.getValue());
itemTypeMap.put(UniversalEnum.ELEVEN.getValue(), UniversalEnum.CLASS_I_TRAFFIC_SURVEY_STATION.getValue());
itemTypeMap.put(UniversalEnum.TWELVE.getValue(), UniversalEnum.INTELLIGENT_DRIVING_GUIDANCE_SYSTEM.getValue());
itemTypeMap.put(UniversalEnum.THIRTEEN.getValue(), UniversalEnum.SMART_DEVICE_BOX.getValue());
itemTypeMap.put(UniversalEnum.FIFTEEN.getValue(), UniversalEnum.SOLAR_PANEL.getValue());
itemTypeMap.put(UniversalEnum.SIXTEEN.getValue(), UniversalEnum.REMOTE_COMPUTER.getValue());
String type = groupItems.get(UniversalEnum.ZERO.getNumber()).getType();
String description = itemTypeMap.get(type);
row.createCell(UniversalEnum.ZERO.getNumber()).setCellValue(description);
@ -183,8 +199,5 @@ public class ExcelExportService {
}
}

Write Preview
Loading…
Cancel
Save