From e010f942dbee8b4f53c2a5119411cc6447e8a065 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E4=B9=BE=E7=BF=94?= Date: Wed, 15 Apr 2026 18:55:58 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=AF=E4=BF=9D=E5=B7=A1=E6=A3=80=E7=82=B9?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/LauncherConstant.java | 4 +-- .../excel/BsEpciuInspectionPointExcel.java | 30 ++++++++++-------- .../QA/环保巡检点配置导入模板.xls | Bin 18944 -> 19456 bytes 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index bc322eab..8651ee38 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -31,8 +31,8 @@ public interface LauncherConstant { /** * nacos dev 地址 */ - String NACOS_DEV_ADDR = "192.168.249.27:8848"; -// String NACOS_DEV_ADDR = "127.0.0.1:8848"; + //String NACOS_DEV_ADDR = "192.168.249.27:8848"; + String NACOS_DEV_ADDR = "127.0.0.1:8848"; /**R * nacos prod 地址 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsEpciuInspectionPointExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsEpciuInspectionPointExcel.java index 8edac720..1c712040 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsEpciuInspectionPointExcel.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsEpciuInspectionPointExcel.java @@ -71,18 +71,8 @@ public class BsEpciuInspectionPointExcel implements Serializable { @ColumnWidth(20) @ExcelProperty("巡检点位置") private String insSite; - /** - * 上次巡检日期 - */ - @ColumnWidth(20) - @ExcelProperty("上次检验日期") - private Date lastInsCycle; - /** - * 备注 - */ - @ColumnWidth(20) - @ExcelProperty("备注") - private String memo; + + /** * 是否已删除 */ @@ -99,7 +89,21 @@ public class BsEpciuInspectionPointExcel implements Serializable { * 巡检周期 */ @ColumnWidth(20) - @ExcelProperty("巡检周期") + @ExcelProperty("巡检周期(h)") private Long insCycle; + /** + * 上次巡检日期 + */ + @ColumnWidth(20) + @ExcelProperty("上次检验日期") + private Date lastInsCycle; + + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String memo; + } diff --git a/blade-service/blade-desk/src/main/resources/Excel/QA/环保巡检点配置导入模板.xls b/blade-service/blade-desk/src/main/resources/Excel/QA/环保巡检点配置导入模板.xls index 40e383b651dd8df0777e5cef85de7d47d9e05a93..8eeef4f7c116ebbdccbe513491d9c69e6b0ba496 100644 GIT binary patch delta 438 zcmZpe!q_l_ae@t_!baQUjEu^YS(%C@|AB2^FY!w)P^F*fGjGPT?CMF&` zbB9rJaw$tQ6SLLkUo3izoXiZ23i0(xO4*Yg*}^9WunA0_!Dh>xkf*!(23waYBgf=q zn>CEhn+0qO89mv7268Y707(W0b_NMXFoTgFEC%ABi!oslV+M&$K4qs^?*!KVmw^jN zGchFDvA}}5ckO$HQkz)n&Sl~Q1AdeNu+s7aR*6+&Th6LHb;vkdI#err` zjI{s)w^VMt<-V33&HU~j<31vZ-z=q4bGW%53Ir^x}H8=$yvlY;@P(x0L;6Se&Q w6ajTIIDiNzK8Zc^FEE1HuQY){ygA7A4l}nYgAov#0u``McJ$mo*?@%u06jKYjsO4v delta 422 zcmZpe!Pqc`ae@t_{6^d3jEqW?S(%DO|NZ~}AA}Vd7#Ng+7|h=oSj;$yC5LkZBZuzH zk~@qFlS^5enLb)>{>7rl$j`>W=);i8kjIeEPzJ=44cQVW&tS7<`BbdR+4;BM)(8ZXrh%tl2CZDoXtaoMr>G{jR z1tggmT!0wHV+Qg->L79~KpqR6#|q@J0(tuwguwb;8QkEI6)Xxe2UQeg4#+%rpbJ4d zK|IFEHTK-xZ-9Ioh7blZ2C>PL><#!t!Dccthyo!al+l0Y@!I;4WsDO1cqr-6kC38=2