优化业务注解

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/bo/ReginParams.java

@@ -18,6 +18,7 @@ public class ReginParams implements Serializable {
     private DepartmentBo department;
     private AgencyUserModel userModel;
     private PersonIdentity personIdentity;
+    private BusinessInfo businessInfo;
 
     @Data
     public static class PersonIdentity implements Serializable {
@@ -29,6 +30,26 @@ public class ReginParams implements Serializable {
         private String bizOrgCode;
     }
 
+    @Data
+    public static class BusinessInfo implements Serializable {
+        private Long amosBizCode;
+        private String companyName;
+        private Long companySequenceNbr;
+        private String companyType;
+        private Long amosUserCode;
+        private String userName;
+        private Long userSequenceNbr;
+        private String userType;
+    }
+
+    public BusinessInfo getBusinessInfo() {
+        return businessInfo;
+    }
+
+    public void setBusinessInfo(BusinessInfo businessInfo) {
+        this.businessInfo = businessInfo;
+    }
+
     public PersonIdentity getPersonIdentity() {
         return personIdentity;
     }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/framework/BusinessIdentifyAspect.java

@@ -45,6 +45,7 @@ public class BusinessIdentifyAspect {
         ReginParams reginParam = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
         if (permission.isNeedIdentity() && reginParam != null) {
             ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+            ReginParams.BusinessInfo businessInfo = new ReginParams.BusinessInfo();
             //company
             Long amosBizCode = reginParams.getCompany().getSequenceNbr();
             OrgUsr companyOrgUsr = orgUsrService.getById(amosBizCode);
@@ -54,10 +55,11 @@ public class BusinessIdentifyAspect {
             if (ValidationUtil.isEmpty(companyType)) {
                 companyType = companyOrgUsr.getBizOrgType();
             }
-            BusinessInfo.amosBizCode = amosBizCode;
-            BusinessInfo.companySequenceNbr = companySequenceNbr;
-            BusinessInfo.companyName = companyName;
-            BusinessInfo.companyType = companyType;
+            businessInfo.setCompanyName(companyName);
+            businessInfo.setAmosBizCode(amosBizCode);
+            businessInfo.setCompanyType(companyType);
+            businessInfo.setCompanySequenceNbr(companySequenceNbr);
+
             //User
             Long amosUserCode = reginParams.getUserModel().getSequenceNbr();
             OrgUsr userOrgUsr = orgUsrService.getById(amosUserCode);
@@ -67,10 +69,11 @@ public class BusinessIdentifyAspect {
             if (ValidationUtil.isEmpty(userType)) {
                 userType = userOrgUsr.getBizOrgType();
             }
-            BusinessInfo.amosUserCode = amosUserCode;
-            BusinessInfo.userName = userName;
-            BusinessInfo.userSequenceNbr = userSequenceNbr;
-            BusinessInfo.userType = userType;
+            businessInfo.setUserSequenceNbr(userSequenceNbr);
+            businessInfo.setUserName(userName);
+            businessInfo.setUserType(userType);
+            businessInfo.setAmosUserCode(amosUserCode);
+            reginParams.setBusinessInfo(businessInfo);
         }
     }
 

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/framework/BusinessInfo.java

@@ -13,47 +13,47 @@ public class BusinessInfo {
      * 公司
      * 平台存储的sequenceNbr
      */
-    public static Long amosBizCode;
+    private Long amosBizCode;
 
     /**
      * 公司
      * 业务存储的名称
      */
-    public static String companyName;
+    private String companyName;
 
     /**
      * 公司
      * 业务存储的sequenceNbr
      */
-    public static Long companySequenceNbr;
+    private Long companySequenceNbr;
 
     /**
      * 公司
      * 业务存储的类型
      */
-    public static String companyType;
+    private String companyType;
 
     /**
      * 人员
      * 平台存储的sequenceNbr
      */
-    public static Long amosUserCode;
+    private Long amosUserCode;
 
     /**
      * 人员
      * 业务存储的名称
      */
-    public static String userName;
+    private String userName;
 
     /**
      * 人员
      * 业务存储的sequenceNbr
      */
-    public static Long userSequenceNbr;
+    private Long userSequenceNbr;
 
     /**
      * 人员
      * 业务存储的类型
      */
-    public static String userType;
+    private String userType;
 }