Skip to content

A
amos-boot-biz
Commit b20654b7 authored by KeYong's avatar KeYong
Browse files
Options

脚本调整

parent 5398d7eb
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 37 deletions
amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/aop/ControllerAop.java
View file @ b20654b7
package com.yeejoin.amos.boot.biz.common.aop; package com.yeejoin.amos.boot.biz.common.aop;
import java.util.HashMap; import com.alibaba.fastjson.JSONObject;
import java.util.List; import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
import java.util.Map; import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import javax.servlet.http.HttpServletRequest; import com.yeejoin.amos.boot.biz.common.bo.RoleBo;
import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
import com.yeejoin.amos.feign.privilege.model.RoleModel;
import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.RegionModel;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.aspectj.lang.JoinPoint; import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.annotation.AfterReturning;
...@@ -25,22 +35,10 @@ import org.typroject.tyboot.core.foundation.utils.Bean; ...@@ -25,22 +35,10 @@ import org.typroject.tyboot.core.foundation.utils.Bean;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil; import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.doc.TycloudOperation; import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import com.alibaba.fastjson.JSONObject; import javax.servlet.http.HttpServletRequest;
import com.yeejoin.amos.boot.biz.common.bo.CompanyBo; import java.util.HashMap;
import com.yeejoin.amos.boot.biz.common.bo.DepartmentBo; import java.util.List;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams; import java.util.Map;
import com.yeejoin.amos.boot.biz.common.bo.RoleBo;
import com.yeejoin.amos.boot.biz.common.interceptors.PermissionInterceptorContext;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.feign.privilege.Privilege;
import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
import com.yeejoin.amos.feign.privilege.model.RoleModel;
import com.yeejoin.amos.feign.systemctl.Systemctl;
import com.yeejoin.amos.feign.systemctl.model.RegionModel;
/** /**
* controller层切面 用于用户数据缓存 供 sql自动填充使用 * controller层切面 用于用户数据缓存 供 sql自动填充使用
......
amos-boot-system-equip/src/main/resources/changelog/wl-3.6.0.xml
View file @ b20654b7
...@@ -52,17 +52,36 @@ ...@@ -52,17 +52,36 @@
</sql> </sql>
</changeSet> </changeSet>
<changeSet author="ky" id="1671100692">
<changeSet author="zs" id="20220719-1417-2">
<preConditions onFail="MARK_RAN"> <preConditions onFail="MARK_RAN">
<not> <not>
<columnExists tableName="cb_org_usr" columnName="is_firefighters"/> <columnExists tableName="cb_org_usr" columnName="is_firefighters"/>
</not> </not>
</preConditions> </preConditions>
<comment>新增属性字段 is_firefighters 和 type_code</comment> <comment>新增属性字段is_firefighters</comment>
<sql> <sql>
alter table `cb_org_usr` add column `is_firefighters` varchar(10) DEFAULT '0' COMMENT '是否是消防人员0-否 1-是'; alter table `cb_org_usr` add column `is_firefighters` varchar(10) DEFAULT '0' COMMENT '是否是消防人员0-否 1-是';
</sql>
</changeSet>
<changeSet author="ky" id="1671100692-1">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="cb_org_usr" columnName="type_code"/>
</not>
</preConditions>
<comment>新增属性字段 type_code</comment>
<sql>
alter table `cb_org_usr` add column `type_code` varchar(255) DEFAULT NULL COMMENT '消防队类型'; alter table `cb_org_usr` add column `type_code` varchar(255) DEFAULT NULL COMMENT '消防队类型';
</sql>
</changeSet>
<changeSet author="ky" id="1671100692-2">
<preConditions onFail="MARK_RAN">
<not>
<columnExists tableName="cb_org_usr" columnName="is_certificate"/>
</not>
</preConditions>
<comment>新增属性字段is_certificate</comment>
<sql>
alter table `cb_org_usr` add column `is_certificate` int(10) DEFAULT 0 COMMENT '是否持证'; alter table `cb_org_usr` add column `is_certificate` int(10) DEFAULT 0 COMMENT '是否持证';
</sql> </sql>
</changeSet> </changeSet>
...@@ -179,18 +198,18 @@ ...@@ -179,18 +198,18 @@
</preConditions> </preConditions>
<comment>插入动态表单数据 wl_form_group_column</comment> <comment>插入动态表单数据 wl_form_group_column</comment>
<sql> <sql>
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000308', 'longitude', '经度', 'String', '132828674811', 'eq', b'0', 'fireControlRoom', '2581805', '2022-03-01 12:04:47'); REPLACE INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000308', 'longitude', '经度', 'String', '132828674811', 'eq', b'0', 'fireControlRoom', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000309', 'longitude', '经度', 'String', '132828674812', 'eq', b'0', 'pool', '2581805', '2022-03-01 12:04:47'); REPLACE INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000309', 'longitude', '经度', 'String', '132828674812', 'eq', b'0', 'pool', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000310', 'longitude', '经度', 'String', '132828674813', 'eq', b'0', 'fireRoom', '2581805', '2022-03-01 12:04:47'); REPLACE INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000310', 'longitude', '经度', 'String', '132828674813', 'eq', b'0', 'fireRoom', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000311', 'longitude', '经度', 'String', '132828674814', 'eq', b'0', 'rainRoom', '2581805', '2022-03-01 12:04:47'); REPLACE INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000311', 'longitude', '经度', 'String', '132828674814', 'eq', b'0', 'rainRoom', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000312', 'longitude', '经度', 'String', '132828674815', 'eq', b'0', 'fireFoamRoom', '2581805', '2022-03-01 12:01:04'); REPLACE INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000312', 'longitude', '经度', 'String', '132828674815', 'eq', b'0', 'fireFoamRoom', '2581805', '2022-03-01 12:01:04');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000313', 'latitude', '纬度', 'String', '132828674811', 'eq', b'0', 'fireControlRoom', '2581805', '2022-03-01 12:04:47'); REPLACE INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000313', 'latitude', '纬度', 'String', '132828674811', 'eq', b'0', 'fireControlRoom', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000314', 'latitude', '纬度', 'String', '132828674812', 'eq', b'0', 'pool', '2581805', '2022-03-01 12:04:47'); REPLACE INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000314', 'latitude', '纬度', 'String', '132828674812', 'eq', b'0', 'pool', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000315', 'latitude', '纬度', 'String', '132828674813', 'eq', b'0', 'fireRoom', '2581805', '2022-03-01 12:04:47'); REPLACE INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000315', 'latitude', '纬度', 'String', '132828674813', 'eq', b'0', 'fireRoom', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000316', 'latitude', '纬度', 'String', '132828674814', 'eq', b'0', 'rainRoom', '2581805', '2022-03-01 12:04:47'); REPLACE INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000316', 'latitude', '纬度', 'String', '132828674814', 'eq', b'0', 'rainRoom', '2581805', '2022-03-01 12:04:47');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000317', 'latitude', '纬度', 'String', '132828674815', 'eq', b'0', 'fireFoamRoom', '2581805', '2022-03-01 12:01:04'); REPLACE INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000317', 'latitude', '纬度', 'String', '132828674815', 'eq', b'0', 'fireFoamRoom', '2581805', '2022-03-01 12:01:04');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000318', 'address', '地址', 'String', '132828674811', 'eq', b'0', 'fireControlRoom', '2581805', '2022-03-01 12:01:04'); REPLACE INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000318', 'address', '地址', 'String', '132828674811', 'eq', b'0', 'fireControlRoom', '2581805', '2022-03-01 12:01:04');
INSERT INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000319', 'address', '地址', 'String', '132828674817', 'eq', b'0', 'r_fireControlRoom', '2581805', '2022-03-01 12:01:04'); REPLACE INTO `wl_form_group_column` (`id`, `field_name`, `field_label`, `data_type`, `group_id`, `query_strategy`, `not_null`, `group_code`, `creator_id`, `create_date`) VALUES ('133000000319', 'address', '地址', 'String', '132828674817', 'eq', b'0', 'r_fireControlRoom', '2581805', '2022-03-01 12:01:04');
</sql> </sql>
</changeSet> </changeSet>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment