From 593d6d486f2ed41eb7fc76836dccaf0b3f594b03 Mon Sep 17 00:00:00 2001 From: renfan <2206580733@qq.com> Date: Tue, 30 Jul 2024 11:38:18 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90admin=E3=80=91=E4=BC=98=E5=8C=96#=201?= =?UTF-8?q?=E3=80=81=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hcy/admin/AdminApplication.java | 2 +- .../warehouse/impl/WarehouseServiceImpl.java | 12 +++++++++ .../validate/warehouse/WarehouseParam.java | 2 -- .../spring-configuration-metadata.json | 25 +----------------- .../admin-log4j2-ERROR-2024-07-29_1.log.gz | Bin 0 -> 1685 bytes 5 files changed, 14 insertions(+), 27 deletions(-) create mode 100644 www/wwwroot/java-smyy/server/like-admin/admin-log4j2-ERROR-2024-07-29_1.log.gz diff --git a/admin/src/main/java/com/hcy/admin/AdminApplication.java b/admin/src/main/java/com/hcy/admin/AdminApplication.java index c0443a2..3b5ec50 100644 --- a/admin/src/main/java/com/hcy/admin/AdminApplication.java +++ b/admin/src/main/java/com/hcy/admin/AdminApplication.java @@ -22,7 +22,7 @@ public class AdminApplication { public static void main(String[] args) { SpringApplication.run(AdminApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ AuditingBureau启动成功 ლ(´ڡ`ლ)ﾞ"); + System.out.println("(♥◠‿◠)ﾉﾞ charging_pile启动成功 ლ(´ڡ`ლ)ﾞ"); } } diff --git a/admin/src/main/java/com/hcy/admin/service/warehouse/impl/WarehouseServiceImpl.java b/admin/src/main/java/com/hcy/admin/service/warehouse/impl/WarehouseServiceImpl.java index 4c68aa2..c55777f 100644 --- a/admin/src/main/java/com/hcy/admin/service/warehouse/impl/WarehouseServiceImpl.java +++ b/admin/src/main/java/com/hcy/admin/service/warehouse/impl/WarehouseServiceImpl.java @@ -149,6 +149,18 @@ public class WarehouseServiceImpl implements IWarehouseService { List modelList = warehouseMapper.selectList( new QueryWrapper() .in("id", ids)); + for (Long id : ids) { + Warehouse pModel = warehouseMapper.selectOne( + new QueryWrapper() + .select("id,pid,warehouse_name") + .eq("pid", id) + .eq("is_delete", 0) + .last("limit 1")); + + Assert.isNull(pModel, "请先删除子级部门"); + } + + // GlobalConstant.NOT_DELETE 调用未删除常量 // GlobalConstant.DELETE 删除标识 diff --git a/admin/src/main/java/com/hcy/admin/validate/warehouse/WarehouseParam.java b/admin/src/main/java/com/hcy/admin/validate/warehouse/WarehouseParam.java index 56ad147..b534f54 100644 --- a/admin/src/main/java/com/hcy/admin/validate/warehouse/WarehouseParam.java +++ b/admin/src/main/java/com/hcy/admin/validate/warehouse/WarehouseParam.java @@ -26,8 +26,6 @@ public class WarehouseParam implements Serializable { @NotNull(message = "id参数缺失", groups = {update.class, delete.class}) private Long id; - @NotNull(message = "pid参数缺失", groups = {create.class, update.class}) - @DecimalMin(value = "0", message = "pid参数值不能少于0", groups = {create.class, update.class}) private Long pid; @NotNull(message = "warehouseName参数缺失", groups = {create.class, update.class}) diff --git a/admin/target/classes/META-INF/spring-configuration-metadata.json b/admin/target/classes/META-INF/spring-configuration-metadata.json index a4da159..cf94d52 100644 --- a/admin/target/classes/META-INF/spring-configuration-metadata.json +++ b/admin/target/classes/META-INF/spring-configuration-metadata.json @@ -1,11 +1,5 @@ { - "groups": [ - { - "name": "wx.pay", - "type": "com.hcy.admin.config.wxpay.WxPayProperties", - "sourceType": "com.hcy.admin.config.wxpay.WxPayProperties" - } - ], + "groups": [], "properties": [ { "name": "like.production", @@ -16,23 +10,6 @@ "name": "like.upload-directory", "type": "java.lang.String", "description": "Description for like.upload-directory." - }, - { - "name": "wx.pay.description", - "type": "java.lang.String", - "description": "商品描述", - "sourceType": "com.hcy.admin.config.wxpay.WxPayProperties" - }, - { - "name": "wx.pay.order-notify-url", - "type": "java.lang.String", - "description": "订单支付后回调", - "sourceType": "com.hcy.admin.config.wxpay.WxPayProperties" - }, - { - "name": "wx.pay.order-refund-notify-url", - "type": "java.lang.String", - "sourceType": "com.hcy.admin.config.wxpay.WxPayProperties" } ], "hints": [] diff --git a/www/wwwroot/java-smyy/server/like-admin/admin-log4j2-ERROR-2024-07-29_1.log.gz b/www/wwwroot/java-smyy/server/like-admin/admin-log4j2-ERROR-2024-07-29_1.log.gz new file mode 100644 index 0000000000000000000000000000000000000000..8db00f291c53587c661b14494fe2c4c245405742 GIT binary patch literal 1685 zcmV;G25R{qiwFP!000000PS4MZW}igT{l4ffeQmxfQp@`G@}*`Y}rT@#ExSn%_0Z_ zYKD>~9+3)X#qb4SUc&S^pjjGmhBrD%DoBt%&O09P4yvNRPEJ1j^7ika|M=(auOHt3^x@sRf8YOh z`_?ORNN`M84-49jX^`R;JLCb8I8TV^(R3SNhw`z3SQf{(Z+%5llw@rD!ad5UASn%Z zXxiuDMi9^>;li>#90Aq=tvqE1j2|)7=9viS9rWY#yN$aqW|6jNOnX4hdS{_pgJFD% zwRDV}O~bJjgNZ$CytI9@V49t(LO4Y(o)m`f%?DYw0j(V8X&S{zfvF%X<>QH6(fv zlO&4L4qd> zKfMyK!cKrgl9D8+#K2Azduc6p2qQfzKwmd$FJhIYgOny2zEoVrR+S`G7dFVOR|T>ATk`s50EoqO>2e^0F?M(e|vB z%GfG37rt;oud?>0e{pdLAL7Z=zH-FTVd2asu?HRs9#9%qmJCtSc(sx=0DlQ_n!Pyc zZ1CZp;K!r2{AraM*aQMN{m45DBoJdD6$oZYYD^E`oSDvCLWKxbWbLd9VO zW;PI%he?+5Hf7-> z5mJ#!$3>ahNqXGEtGmh~lxFoqcZ^-d6Shs!-jfc{`E1KNX7ZwO`0A(yw zr8J`0kX%_$<*Pc_fL$nu9iOHGi#(as41?*{SItnfKAS-eo;c*W6s2xOqypI`MAsN9 zST$FN3OZEKp@I$-bf|DcLj@_>U?gLO+zE^`+a!N>@XiQgh+WQ>hY`D6CeR|^!UT~x z=0||90)t=@O$0FqUOan=wM(Q10yLPvEP#bSb3?`GQ44zHQWzCA6e-1-f8TT=sKg6(5JzH;$A>mzw|0k;U+ZQ zrKxmTMV>U5*mY{og^1_mG%{(~Bnh2EJ?>JZwF~BDW0)wJOlBhn<2%J*swj7rd6~EJ z+)`(LI`h++pU(Vr=BG2i|3C9HRpo?>>xRFua>Cb@6S{IjS5D~4i7&Ns!gO`zgbs>z zP^^Pu9Te-J_(oJtlw6XooY41Y`ul@q#hLRU`c z$_btM>C8`Oeme8hnV-)5zR1katT#-j;XuUid+2#TO@~z$@v3KdR#kq5Ts4j9vI+P* zfbAJ)hWK90J0u=QU#N;c{(188;DN7B*ae#q)7%4a>&0nlYDW<{yuIF3RfkglS-;Xb9 literal 0 HcmV?d00001