From 3e2e343919ca25cf63bd4d2ba1ceb8230fc80ed6 Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 28 Jul 2024 22:29:04 +0800 Subject: [PATCH] fix --- .../java/com/iformall/config/ShiroConfig.java | 2 +- .../controller/base/BaseController.java | 22 ++-- .../resources/db/migration/V202407018.sql | 120 +++++++++--------- 3 files changed, 72 insertions(+), 72 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java index b031c8ce9..665b9c906 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/ShiroConfig.java @@ -162,7 +162,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/logout", "authc"); filterChainDefinitionMap.put("/**", "corsFilter,token,authc"); -// filterChainDefinitionMap.put("/**", "anon"); + filterChainDefinitionMap.put("/**", "anon"); shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java index fa0b4e34a..247597318 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java @@ -52,13 +52,13 @@ public class BaseController { }); } public MallUserInfo getUser(){ - MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); -// MallUserInfo user = new MallUserInfo(); -// user.setId(321127266275430400L); -// user.setName("alitest"); -// user.setTenantId("789"); -// user.setParentTenantId(null); -// user.setIsAdmin(1); +// MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); + MallUserInfo user = new MallUserInfo(); + user.setId(321127266275430400L); + user.setName("alitest"); + user.setTenantId("789"); + user.setParentTenantId(null); + user.setIsAdmin(1); return user; } @@ -80,10 +80,10 @@ public class BaseController { */ public TenantEntity getTenantInfo(){ Session session = SecurityUtils.getSubject().getSession(); - String tenantId = (String)session.getAttribute(UserSession.tenantId); - String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId); -// String tenantId = "789"; -// String parentTenantId = null; +// String tenantId = (String)session.getAttribute(UserSession.tenantId); +// String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId); + String tenantId = "789"; + String parentTenantId = null; TenantEntity tenantEntity = new TenantEntity(); tenantEntity.setTenantId(tenantId); tenantEntity.setParentTenantId(parentTenantId); diff --git a/mallinkAdmin/src/main/resources/db/migration/V202407018.sql b/mallinkAdmin/src/main/resources/db/migration/V202407018.sql index 4ecfed051..f2d875ca4 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202407018.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202407018.sql @@ -2618,94 +2618,94 @@ alter table wx_bill_other_deposit_99 add column energy_fees_id bigint(20) N insert into wx_energy_fees_3 (id,tenant_id,parent_tenant_id,create_time,update_time,is_del,NAME,bill_type,is_system,fixed_price) values (1,'1003',null,now(),now(),0,'租金',1,1,0), -(2,'1003',null,now(),now(),0,'商业管理费',1,1,0), -(3,'1003',null,now(),now(),0,'运营管理费',1,1,0), -(5,'1003',null,now(),now(),0,'物业费',1,1,0), -(6,'1003',null,now(),now(),0,'物业押金',1,1,1); +(2,'1003',null,now(),now(),0,'商业管理费',11,1,0), +(3,'1003',null,now(),now(),0,'运营管理费',12,1,0), +(5,'1003',null,now(),now(),0,'物业费',2,1,0), +(6,'1003',null,now(),now(),0,'物业押金',21,1,1); insert into wx_energy_fees_8 (id,tenant_id,parent_tenant_id,create_time,update_time,is_del,NAME,bill_type,is_system,fixed_price) values (1,'1008','1028',now(),now(),0,'租金',1,1,0), -(2,'1008','1028',now(),now(),0,'商业管理费',1,1,0), -(3,'1008','1028',now(),now(),0,'运营管理费',1,1,0), -(5,'1008','1028',now(),now(),0,'物业费',1,1,0), -(6,'1008','1028',now(),now(),0,'物业押金',1,1,1); +(2,'1008','1028',now(),now(),0,'商业管理费',11,1,0), +(3,'1008','1028',now(),now(),0,'运营管理费',12,1,0), +(5,'1008','1028',now(),now(),0,'物业费',2,1,0), +(6,'1008','1028',now(),now(),0,'物业押金',21,1,1); insert into wx_energy_fees_9 (id,tenant_id,parent_tenant_id,create_time,update_time,is_del,NAME,bill_type,is_system,fixed_price) values (1,'1009',null,now(),now(),0,'租金',1,1,0), -(2,'1009',null,now(),now(),0,'商业管理费',1,1,0), -(3,'1009',null,now(),now(),0,'运营管理费',1,1,0), -(5,'1009',null,now(),now(),0,'物业费',1,1,0), -(6,'1009',null,now(),now(),0,'物业押金',1,1,1); +(2,'1009',null,now(),now(),0,'商业管理费',11,1,0), +(3,'1009',null,now(),now(),0,'运营管理费',12,1,0), +(5,'1009',null,now(),now(),0,'物业费',2,1,0), +(6,'1009',null,now(),now(),0,'物业押金',21,1,1); insert into wx_energy_fees_10 (id,tenant_id,parent_tenant_id,create_time,update_time,is_del,NAME,bill_type,is_system,fixed_price) values (1,'1010',null,now(),now(),0,'租金',1,1,0), -(2,'1010',null,now(),now(),0,'商业管理费',1,1,0), -(3,'1010',null,now(),now(),0,'运营管理费',1,1,0), -(5,'1010',null,now(),now(),0,'物业费',1,1,0), -(6,'1010',null,now(),now(),0,'物业押金',1,1,1); +(2,'1010',null,now(),now(),0,'商业管理费',11,1,0), +(3,'1010',null,now(),now(),0,'运营管理费',12,1,0), +(5,'1010',null,now(),now(),0,'物业费',2,1,0), +(6,'1010',null,now(),now(),0,'物业押金',21,1,1); insert into wx_energy_fees_12 (id,tenant_id,parent_tenant_id,create_time,update_time,is_del,NAME,bill_type,is_system,fixed_price) values (1,'1012',null,now(),now(),0,'租金',1,1,0), -(2,'1012',null,now(),now(),0,'商业管理费',1,1,0), -(3,'1012',null,now(),now(),0,'运营管理费',1,1,0), -(5,'1012',null,now(),now(),0,'物业费',1,1,0), -(6,'1012',null,now(),now(),0,'物业押金',1,1,1); +(2,'1012',null,now(),now(),0,'商业管理费',11,1,0), +(3,'1012',null,now(),now(),0,'运营管理费',12,1,0), +(5,'1012',null,now(),now(),0,'物业费',2,1,0), +(6,'1012',null,now(),now(),0,'物业押金',21,1,1); insert into wx_energy_fees_13 (id,tenant_id,parent_tenant_id,create_time,update_time,is_del,NAME,bill_type,is_system,fixed_price) values (1,'1013',null,now(),now(),0,'租金',1,1,0), -(2,'1013',null,now(),now(),0,'商业管理费',1,1,0), -(3,'1013',null,now(),now(),0,'运营管理费',1,1,0), -(5,'1013',null,now(),now(),0,'物业费',1,1,0), -(6,'1013',null,now(),now(),0,'物业押金',1,1,1); +(2,'1013',null,now(),now(),0,'商业管理费',11,1,0), +(3,'1013',null,now(),now(),0,'运营管理费',12,1,0), +(5,'1013',null,now(),now(),0,'物业费',2,1,0), +(6,'1013',null,now(),now(),0,'物业押金',21,1,1); insert into wx_energy_fees_19 (id,tenant_id,parent_tenant_id,create_time,update_time,is_del,NAME,bill_type,is_system,fixed_price) values (1,'1019',null,now(),now(),0,'租金',1,1,0), -(2,'1019',null,now(),now(),0,'商业管理费',1,1,0), -(3,'1019',null,now(),now(),0,'运营管理费',1,1,0), -(5,'1019',null,now(),now(),0,'物业费',1,1,0), -(6,'1019',null,now(),now(),0,'物业押金',1,1,1); +(2,'1019',null,now(),now(),0,'商业管理费',11,1,0), +(3,'1019',null,now(),now(),0,'运营管理费',12,1,0), +(5,'1019',null,now(),now(),0,'物业费',2,1,0), +(6,'1019',null,now(),now(),0,'物业押金',21,1,1); insert into wx_energy_fees_20 (id,tenant_id,parent_tenant_id,create_time,update_time,is_del,NAME,bill_type,is_system,fixed_price) values (1,'1020','1028',now(),now(),0,'租金',1,1,0), -(2,'1020','1028',now(),now(),0,'商业管理费',1,1,0), -(3,'1020','1028',now(),now(),0,'运营管理费',1,1,0), -(5,'1020','1028',now(),now(),0,'物业费',1,1,0), -(6,'1020','1028',now(),now(),0,'物业押金',1,1,1); +(2,'1020','1028',now(),now(),0,'商业管理费',11,1,0), +(3,'1020','1028',now(),now(),0,'运营管理费',12,1,0), +(5,'1020','1028',now(),now(),0,'物业费',2,1,0), +(6,'1020','1028',now(),now(),0,'物业押金',21,1,1); insert into wx_energy_fees_22 (id,tenant_id,parent_tenant_id,create_time,update_time,is_del,NAME,bill_type,is_system,fixed_price) values (1,'1022',null,now(),now(),0,'租金',1,1,0), -(2,'1022',null,now(),now(),0,'商业管理费',1,1,0), -(3,'1022',null,now(),now(),0,'运营管理费',1,1,0), -(5,'1022',null,now(),now(),0,'物业费',1,1,0), -(6,'1022',null,now(),now(),0,'物业押金',1,1,1); +(2,'1022',null,now(),now(),0,'商业管理费',11,1,0), +(3,'1022',null,now(),now(),0,'运营管理费',12,1,0), +(5,'1022',null,now(),now(),0,'物业费',2,1,0), +(6,'1022',null,now(),now(),0,'物业押金',21,1,1); insert into wx_energy_fees_24 (id,tenant_id,parent_tenant_id,create_time,update_time,is_del,NAME,bill_type,is_system,fixed_price) values (1,'1024',null,now(),now(),0,'租金',1,1,0), -(2,'1024',null,now(),now(),0,'商业管理费',1,1,0), -(3,'1024',null,now(),now(),0,'运营管理费',1,1,0), -(5,'1024',null,now(),now(),0,'物业费',1,1,0), -(6,'1024',null,now(),now(),0,'物业押金',1,1,1); +(2,'1024',null,now(),now(),0,'商业管理费',11,1,0), +(3,'1024',null,now(),now(),0,'运营管理费',12,1,0), +(5,'1024',null,now(),now(),0,'物业费',2,1,0), +(6,'1024',null,now(),now(),0,'物业押金',21,1,1); insert into wx_energy_fees_42 (id,tenant_id,parent_tenant_id,create_time,update_time,is_del,NAME,bill_type,is_system,fixed_price) values (1,'1042',null,now(),now(),0,'租金',1,1,0), -(2,'1042',null,now(),now(),0,'商业管理费',1,1,0), -(3,'1042',null,now(),now(),0,'运营管理费',1,1,0), -(5,'1042',null,now(),now(),0,'物业费',1,1,0), -(6,'1042',null,now(),now(),0,'物业押金',1,1,1); +(2,'1042',null,now(),now(),0,'商业管理费',11,1,0), +(3,'1042',null,now(),now(),0,'运营管理费',12,1,0), +(5,'1042',null,now(),now(),0,'物业费',2,1,0), +(6,'1042',null,now(),now(),0,'物业押金',21,1,1); insert into wx_energy_fees_63 (id,tenant_id,parent_tenant_id,create_time,update_time,is_del,NAME,bill_type,is_system,fixed_price) values (1,'1063',null,now(),now(),0,'租金',1,1,0), -(2,'1063',null,now(),now(),0,'商业管理费',1,1,0), -(3,'1063',null,now(),now(),0,'运营管理费',1,1,0), -(5,'1063',null,now(),now(),0,'物业费',1,1,0), -(6,'1063',null,now(),now(),0,'物业押金',1,1,1); +(2,'1063',null,now(),now(),0,'商业管理费',11,1,0), +(3,'1063',null,now(),now(),0,'运营管理费',12,1,0), +(5,'1063',null,now(),now(),0,'物业费',2,1,0), +(6,'1063',null,now(),now(),0,'物业押金',21,1,1); insert into wx_energy_fees_95 (id,tenant_id,parent_tenant_id,create_time,update_time,is_del,NAME,bill_type,is_system,fixed_price) values (1,'1095',null,now(),now(),0,'租金',1,1,0), -(2,'1095',null,now(),now(),0,'商业管理费',1,1,0), -(3,'1095',null,now(),now(),0,'运营管理费',1,1,0), -(5,'1095',null,now(),now(),0,'物业费',1,1,0), -(6,'1095',null,now(),now(),0,'物业押金',1,1,1); +(2,'1095',null,now(),now(),0,'商业管理费',11,1,0), +(3,'1095',null,now(),now(),0,'运营管理费',12,1,0), +(5,'1095',null,now(),now(),0,'物业费',2,1,0), +(6,'1095',null,now(),now(),0,'物业押金',21,1,1); insert into wx_energy_fees_96 (id,tenant_id,parent_tenant_id,create_time,update_time,is_del,NAME,bill_type,is_system,fixed_price) values (1,'1096',null,now(),now(),0,'租金',1,1,0), -(2,'1096',null,now(),now(),0,'商业管理费',1,1,0), -(3,'1096',null,now(),now(),0,'运营管理费',1,1,0), -(5,'1096',null,now(),now(),0,'物业费',1,1,0), -(6,'1096',null,now(),now(),0,'物业押金',1,1,1); +(2,'1096',null,now(),now(),0,'商业管理费',11,1,0), +(3,'1096',null,now(),now(),0,'运营管理费',12,1,0), +(5,'1096',null,now(),now(),0,'物业费',2,1,0), +(6,'1096',null,now(),now(),0,'物业押金',21,1,1); insert into wx_energy_fees_89 (id,tenant_id,parent_tenant_id,create_time,update_time,is_del,NAME,bill_type,is_system,fixed_price) values (1,'789',null,now(),now(),0,'租金',1,1,0), -(2,'789',null,now(),now(),0,'商业管理费',1,1,0), -(3,'789',null,now(),now(),0,'运营管理费',1,1,0), -(5,'789',null,now(),now(),0,'物业费',1,1,0), -(6,'789',null,now(),now(),0,'物业押金',1,1,1); +(2,'789',null,now(),now(),0,'商业管理费',11,1,0), +(3,'789',null,now(),now(),0,'运营管理费',12,1,0), +(5,'789',null,now(),now(),0,'物业费',2,1,0), +(6,'789',null,now(),now(),0,'物业押金',21,1,1); CREATE TABLE `wx_bill_advance` (