refactor(大编辑)：代码重构

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/permission/FillingEditPermForCurrentUser.java

@@ -54,7 +54,12 @@ public class FillingEditPermForCurrentUser extends BaseUseRegisterResultData {
         List<GroupModel> groupModels = FeignUtil.remoteCall(() -> Privilege.groupClient.queryByUserId(RequestContext.getExeUserId()));
         // 有权限编辑设备的用户组（value为用户组名称）
         List<DictionarieValueModel> hasPermGroup = FeignUtil.remoteCall(() -> Systemctl.dictionarieClient.dictValues(this.getDictCode()));
-        if (groupModels.stream().anyMatch(g -> hasPermGroup.stream().anyMatch(h -> h.getDictDataValue().equals(g.getGroupName())))) {
+        // 优先级以各业务配置的为准，在业务不进行配置时，走默认组
+        if(hasPermGroup.isEmpty()){
+            hasPermGroup = FeignUtil.remoteCall(() -> Systemctl.dictionarieClient.dictValues("DEFAULT_EDIT_PERMISSION_GROUP"));
+        }
+        List<DictionarieValueModel> finalHasPermGroup = hasPermGroup;
+        if (groupModels.stream().anyMatch(g -> finalHasPermGroup.stream().anyMatch(h -> h.getDictDataValue().equals(g.getGroupName())))) {
             jsonObject.put(HAS_PERMISSION, true);
         }
         if (company != null) {
@@ -67,6 +72,6 @@ public class FillingEditPermForCurrentUser extends BaseUseRegisterResultData {
     }
 
     private String getDictCode() {
-        return this.businessType == null ? "USE_REG_PERMISSION_GROUP" : this.businessType.getName() + "_PERMISSION_GROUP";
+        return this.businessType == null ? "JG_USAGE_REGISTRATION" : this.businessType.name() + "_PERMISSION_GROUP";
     }
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgOtherInfo.java

 package com.yeejoin.amos.boot.module.ymt.api.entity;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.annotation.FieldDisplayDefine;
 import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
 import com.yeejoin.amos.boot.module.common.api.dto.IBaseChangeData;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import java.util.Date;
 
 /**
  * 安全追溯-其他信息表
@@ -74,6 +74,7 @@ public class IdxBizJgOtherInfo extends TzsBaseEntity implements IBaseChangeData
      *
      */
 	@TableField("\"CODE96333\"")
+    @FieldDisplayDefine(value = "96333识别码")
     private String code96333;
 
     /**
@@ -116,18 +117,21 @@ public class IdxBizJgOtherInfo extends TzsBaseEntity implements IBaseChangeData
      * 信息化管理情况:1-二维码；2-电子标签；3-其他；99-无
      */
     @TableField(value = "\"INFORMATION_SITUATION\"")
+    @FieldDisplayDefine(value = "信息化管理情况")
     private String informationSituation;
 
     /**
      * 信息化管理二维码或者电子标签编号或者信息化管理情况为【其他】时候的具体说明
      */
     @TableField(value = "\"INFORMATION_MANAGE_CODE\"")
+    @FieldDisplayDefine(value = "信息化管理二维码或者电子标签编号或者信息化管理情况为【其他】时候的具体说明")
     private String informationManageCode;
 
     /**
      * 气瓶钢印标识
      */
     @TableField(value = "\"CYLINDER_STAMP_ATTACHMENT\"")
+    @FieldDisplayDefine(value = "气瓶钢印标识", type = JSON.class)
     private String cylinderStampAttachment;
 
 
@@ -135,5 +139,6 @@ public class IdxBizJgOtherInfo extends TzsBaseEntity implements IBaseChangeData
      * 96333码类型，类型手工输入（1）、系统自动生成（2）（历史登记时使用）,默认2
      */
     @TableField("\"CODE96333_TYPE\"")
+    @FieldDisplayDefine(value = "有无96333识别码")
     private String code96333Type;
 }

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/java/com/yeejoin/amos/boot/module/ymt/api/entity/IdxBizJgRegisterInfo.java

@@ -156,6 +156,7 @@ public class IdxBizJgRegisterInfo extends TzsBaseEntity implements IBaseChangeDa
      *
      */
     @TableField("\"CAR_NUMBER\"")
+    @FieldDisplayDefine(value = "车牌号")
     private String carNumber;
 
     /**
@@ -212,6 +213,7 @@ public class IdxBizJgRegisterInfo extends TzsBaseEntity implements IBaseChangeDa
      *  0：不是
      */
     @TableField("\"WHETHER_SPHERICAL_TANK\"")
+    @FieldDisplayDefine(value = "是否球罐")
     private String whetherSphericalTank;
 
     /**