diff --git a/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java b/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java index 8fe0309f..10545b04 100644 --- a/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java +++ b/backend/src/main/java/com/yfd/platform/config/SecurityConfig.java @@ -87,6 +87,7 @@ public class SecurityConfig { // .requestMatchers("/base/msalongb/**").permitAll() // .requestMatchers("/base/msalongdetb/**").permitAll() // .requestMatchers("/smartImage/**").permitAll() +// .requestMatchers("/base/fpssrlR/**").permitAll() .requestMatchers("/sms/**").permitAll() .requestMatchers(HttpMethod.GET, "/").permitAll() .requestMatchers(HttpMethod.GET, diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java index 8d5f79bf..cd28644a 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdVdinfoB.java @@ -245,7 +245,8 @@ public class SdVdinfoB implements Serializable { /** 视频站设备机位变更日期 */ @FieldChinese("视频站设备机位变更日期") - private Integer jwupdate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date jwupdate; /** 视频站AI识别是否启用 */ @FieldChinese("视频站AI识别是否启用") diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java index 01b739d0..57b99528 100644 --- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java +++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdVdinfoBServiceImpl.java @@ -86,7 +86,7 @@ public class SdVdinfoBServiceImpl extends ServiceImpl sql.append("(STCD = ? AND TM = TO_DATE(SUBSTR(?, 1, 19), 'YYYY-MM-DD HH24:MI:SS'))"); DataParam item = dataParamList.get(i); params.add(item == null ? null : item.getId()); - params.add(item == null ? null : item.getDt()); + String timeStr = (item.getDt() != null && !item.getDt().isEmpty()) + ? item.getDt() + : item.getTm(); + params.add(timeStr); } jdbcTemplate.update(sql.toString(), params.toArray()); }