Merge branch 'ppt-20260120' into zhc

dongjian-dashboard-back-controller/src/main/java/com/dongjian/dashboard/back/controller/DeviceDataAccumulateController.java

@@ -95,7 +95,7 @@ public class DeviceDataAccumulateController {
 
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
         response.setCharacterEncoding("utf-8");
-        String fileName = URLEncoder.encode("積算データ"+CommonUtil.generateSuffix(), StandardCharsets.UTF_8).replace("+", "%20");
+        String fileName = URLEncoder.encode("積算データ"+CommonUtil.generateExcelSuffix(), StandardCharsets.UTF_8).replace("+", "%20");
         response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
 
         PageInfo<DeviceAccumulateData> pageData = deviceDataAccumulateService.getDataList(pageSearchParam, CompanyId, UserId, LanguageType);

dongjian-dashboard-back-controller/src/main/java/com/dongjian/dashboard/back/controller/DeviceDataAlarmController.java

@@ -95,7 +95,7 @@ public class DeviceDataAlarmController {
 
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
         response.setCharacterEncoding("utf-8");
-        String fileName = URLEncoder.encode("警報データ"+ CommonUtil.generateSuffix(), StandardCharsets.UTF_8).replace("+", "%20");
+        String fileName = URLEncoder.encode("警報データ"+ CommonUtil.generateExcelSuffix(), StandardCharsets.UTF_8).replace("+", "%20");
         response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
 
         PageInfo<DeviceAlarmData> pageData = deviceDataAlarmService.getDataList(pageSearchParam, CompanyId, UserId, LanguageType);

dongjian-dashboard-back-controller/src/main/java/com/dongjian/dashboard/back/controller/DeviceDataBaStatusController.java

@@ -94,7 +94,7 @@ public class DeviceDataBaStatusController {
 
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
         response.setCharacterEncoding("utf-8");
-        String fileName = URLEncoder.encode("稼働設備"+ CommonUtil.generateSuffix(), StandardCharsets.UTF_8).replace("+", "%20");
+        String fileName = URLEncoder.encode("稼働設備"+ CommonUtil.generateExcelSuffix(), StandardCharsets.UTF_8).replace("+", "%20");
         response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
 
         PageInfo<DeviceBaStatusData> pageData = deviceDataBaStatusService.getDataList(pageSearchParam, CompanyId, UserId, LanguageType);

dongjian-dashboard-back-controller/src/main/java/com/dongjian/dashboard/back/controller/DeviceDataMeasureController.java

@@ -94,7 +94,7 @@ public class DeviceDataMeasureController {
 
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
         response.setCharacterEncoding("utf-8");
-        String fileName = URLEncoder.encode("計測データ"+ CommonUtil.generateSuffix(), StandardCharsets.UTF_8).replace("+", "%20");
+        String fileName = URLEncoder.encode("計測データ"+ CommonUtil.generateExcelSuffix(), StandardCharsets.UTF_8).replace("+", "%20");
         response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
 
         PageInfo<DeviceMeasureData> pageData = deviceDataMeasureService.getDataList(pageSearchParam, CompanyId, UserId, LanguageType);

dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/DeviceDataBaStatusServiceImpl.java

@@ -165,6 +165,7 @@ public class DeviceDataBaStatusServiceImpl implements DeviceDataBaStatusService
 					data.setStopRun(commonOpt.judgeStopRun(objectMapper, realtime85Map.get(deviceId)));
 				}
 
+				if (null != data.getStopRun()) {
 					if (0 == data.getStopRun()) {
 						data.setContinuousRunningTimeStr(SecondsToHMSConverter.covertSeconds(data.getContinuousRunningTime()));
 					} else if (StringUtils.isNotBlank(data.getLatestTs()) && currentTs >= Long.parseLong(data.getLatestTs())) {
@@ -173,6 +174,7 @@ public class DeviceDataBaStatusServiceImpl implements DeviceDataBaStatusService
 					}
 				}
 			}
+		}
 
 		return resultList;
 	}

dongjian-dashboard-back-util/src/main/java/com/dongjian/dashboard/back/util/CommonUtil.java

@@ -878,7 +878,7 @@ public class CommonUtil {
 		return result.multiply(new BigDecimal(100)).toPlainString() + "%";
     }
 
-	public static String generateSuffix() {
+	public static String generateExcelSuffix() {
 		String date = LocalDate.now(ZoneId.of("Asia/Tokyo"))
 				.format(DateTimeFormatter.ofPattern("yyyyMMdd"));
 		long timestampSeconds = System.currentTimeMillis() / 1000;