门户管理功能

gly-base-core/src/main/java/cn/com/taiji/core/entity/comm/PortalConfig.java

@@ -5,6 +5,8 @@ import cn.com.taiji.core.entity.AbstractStringPropertyUUIDEntity;
 import cn.com.taiji.core.entity.dict.EnableStatus;
 import cn.com.taiji.core.entity.dict.basic.SourceType;
 import cn.com.taiji.core.entity.dict.user.RbacSource;
+import lombok.Getter;
+import lombok.Setter;
 
 import javax.persistence.*;
 
@@ -17,185 +19,90 @@ import javax.persistence.*;
  */
 @Entity
 @Table(name = "USER_PORTAL_CONFIG")
+@Getter
+@Setter
 public class PortalConfig extends AbstractStringPropertyUUIDEntity {
 
     /**
      * 来源类型
      */
+    @Enumerated(EnumType.STRING)
+    @Column(name = "SOURCE")
     private SourceType source;
 
     /***
      * 客车车牌颜色（字典）
      */
+    @Column(name = "CAR_PLATE_COLOR_TYPE")
     private String  carPlateColorType;
 
     /***
      * 货车车牌颜色（字典）
      */
-    private String  trucksPlateColorType;
+    @Column(name = "TRUCKS_PLATE_COLOR_TYPE")
+    private String trucksPlateColorType;
 
     /**
      * 是否：置灰（APP/小程序）
      */
+    @Enumerated(EnumType.STRING)
+    @Column(name = "SET_GRAY")
     private EnableStatus setGray;
 
     /**
      * 是否：小程序信息带出（小程序）
      */
+    @Enumerated(EnumType.STRING)
+    @Column(name = "MINI_INFO_SHOW")
     private EnableStatus miniInfoShow;
 
     /**
      * 是否：小程序是否支持他人办理（小程序）
      */
+    @Enumerated(EnumType.STRING)
+    @Column(name = "MINI_SUPPORT_OTHER")
     private EnableStatus miniSupportOther;
 
     /**
      * 是否：他人办理时是否上传委托书（APP/小程序）
      */
+    @Enumerated(EnumType.STRING)
+    @Column(name = "OTHER_UPLOAD_PROXY")
     private EnableStatus otherUploadProxy;
 
     /**
      * 是否：允许修改OCR识别出来的数据
      */
+    @Enumerated(EnumType.STRING)
+    @Column(name = "CHANGE_OCR_DATA")
     private EnableStatus changeOCRData;
 
     /**
      * 是否：申办时是否允许带出车辆信息
      */
+    @Enumerated(EnumType.STRING)
+    @Column(name = "APPLY_CAR_INFO")
     private EnableStatus applyCarInfo;
 
     /**
      * 是否：申办时是否允许修改OCR识别出来的车辆信息数据
      */
+    @Enumerated(EnumType.STRING)
+    @Column(name = "APPLY_CHANGE_OCR_CAR_INFO")
     private EnableStatus applyChangeOCRCarInfo;
 
     /**
      * 是否：申办时是否允许修改OCR识别出来的他人信息数据
      */
+    @Enumerated(EnumType.STRING)
+    @Column(name = "APPLY_CHANGE_OCR_OTHER_INFO")
     private EnableStatus applyChangeOCROtherInfo;
     /**
      * 一路开关
      */
-
-    private EnableStatus setPath;
     @Column(name = "SET_PATH")
     @Enumerated(EnumType.STRING)
-    public EnableStatus getSetPath() {
-        return setPath;
-    }
-
-    public void setSetPath(EnableStatus setPath) {
-        this.setPath = setPath;
-    }
-
-    @Column(name = "CAR_PLATE_COLOR_TYPE")
-    public String getCarPlateColorType() {
-        return carPlateColorType;
-    }
-
-    @Column(name = "TRUCKS_PLATE_COLOR_TYPE")
-    public String getTrucksPlateColorType() {
-        return trucksPlateColorType;
-    }
-
-    @Enumerated(EnumType.STRING)
-    @Column(name = "SOURCE")
-    public SourceType getSource() {
-        return source;
-    }
-
-    @Enumerated(EnumType.STRING)
-    @Column(name = "SET_GRAY")
-    public EnableStatus getSetGray() {
-        return setGray;
-    }
-
-    @Enumerated(EnumType.STRING)
-    @Column(name = "MINI_INFO_SHOW")
-    public EnableStatus getMiniInfoShow() {
-        return miniInfoShow;
-    }
-
-    @Enumerated(EnumType.STRING)
-    @Column(name = "MINI_SUPPORT_OTHER")
-    public EnableStatus getMiniSupportOther() {
-        return miniSupportOther;
-    }
-
-    @Enumerated(EnumType.STRING)
-    @Column(name = "OTHER_UPLOAD_PROXY")
-    public EnableStatus getOtherUploadProxy() {
-        return otherUploadProxy;
-    }
-
-    @Enumerated(EnumType.STRING)
-    @Column(name = "CHANGE_OCR_DATA")
-    public EnableStatus getChangeOCRData() {
-        return changeOCRData;
-    }
-
-    @Enumerated(EnumType.STRING)
-    @Column(name = "APPLY_CAR_INFO")
-    public EnableStatus getApplyCarInfo() {
-        return applyCarInfo;
-    }
-
-    @Enumerated(EnumType.STRING)
-    @Column(name = "APPLY_CHANGE_OCR_CAR_INFO")
-    public EnableStatus getApplyChangeOCRCarInfo() {
-        return applyChangeOCRCarInfo;
-    }
-
-    @Enumerated(EnumType.STRING)
-    @Column(name = "APPLY_CHANGE_OCR_OTHER_INFO")
-    public EnableStatus getApplyChangeOCROtherInfo() {
-        return applyChangeOCROtherInfo;
-    }
-
-
-    public void setSource(SourceType source) {
-        this.source = source;
-    }
-
-    public void setCarPlateColorType(String carPlateColorType) {
-        this.carPlateColorType = carPlateColorType;
-    }
-
-    public void setTrucksPlateColorType(String trucksPlateColorType) {
-        this.trucksPlateColorType = trucksPlateColorType;
-    }
-
-    public void setSetGray(EnableStatus setGray) {
-        this.setGray = setGray;
-    }
-
-    public void setMiniInfoShow(EnableStatus miniInfoShow) {
-        this.miniInfoShow = miniInfoShow;
-    }
-
-    public void setMiniSupportOther(EnableStatus miniSupportOther) {
-        this.miniSupportOther = miniSupportOther;
-    }
-
-    public void setOtherUploadProxy(EnableStatus otherUploadProxy) {
-        this.otherUploadProxy = otherUploadProxy;
-    }
-
-    public void setChangeOCRData(EnableStatus changeOCRData) {
-        this.changeOCRData = changeOCRData;
-    }
-
-    public void setApplyCarInfo(EnableStatus applyCarInfo) {
-        this.applyCarInfo = applyCarInfo;
-    }
-
-    public void setApplyChangeOCRCarInfo(EnableStatus applyChangeOCRCarInfo) {
-        this.applyChangeOCRCarInfo = applyChangeOCRCarInfo;
-    }
-
-    public void setApplyChangeOCROtherInfo(EnableStatus applyChangeOCROtherInfo) {
-        this.applyChangeOCROtherInfo = applyChangeOCROtherInfo;
-    }
+    private EnableStatus setPath;
 
     public PortalConfig() {
     }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/model/protalConfig/PortalConfigChangeRequest.java

@@ -11,18 +11,20 @@ import com.google.common.collect.Lists;
 
 import cn.com.taiji.common.manager.ManagerException;
 import cn.hutool.core.collection.CollectionUtil;
+import lombok.Getter;
 
 /**
  * @Author weicailin
  * @Date 2023/3/6 14:17
  * @Email 13079168756@163.com
  **/
+@Getter
 public class PortalConfigChangeRequest extends AbstractBizRequestDTO {
 
     /**
      * 来源类型
      */
-    private RbacSource source;
+    private SourceType source;
 
     /***
      * 客车车牌颜色（字典）
@@ -85,18 +87,10 @@ public class PortalConfigChangeRequest extends AbstractBizRequestDTO {
     private EnableStatus setPath;
 
 
-    public EnableStatus getSetPath() {
-        return setPath;
-    }
-
-    public void setSetPath(EnableStatus setPath) {
-        this.setPath = setPath;
-    }
-
     public PortalConfigChangeRequest valid() throws ManagerException {
         final ArrayList<String> failParamInfo = Lists.newArrayList();
         if (source == null
-                || (!RbacSource.APP.equals(source) && !RbacSource.MINI_PROGRAM.equals(source) && !RbacSource.ZFB_MINI_PROGRAM.equals(source))) {
+                || (!SourceType.ALI.equals(source) && !SourceType.WECHAT.equals(source) && !SourceType.SERVICE_HALL.equals(source))) {
             failParamInfo.add("系统类别");
         }
 
@@ -152,51 +146,4 @@ public class PortalConfigChangeRequest extends AbstractBizRequestDTO {
         return this;
     }
 
-    public RbacSource getSource() {
-        return source;
-    }
-
-    public List<String> getCarPlateColorType() {
-        return carPlateColorType;
-    }
-
-    public List<String> getTrucksPlateColorType() {
-        return trucksPlateColorType;
-    }
-
-    public EnableStatus getSetGray() {
-        return setGray;
-    }
-
-    public EnableStatus getMiniInfoShow() {
-        return miniInfoShow;
-    }
-
-    public EnableStatus getMiniSupportOther() {
-        return miniSupportOther;
-    }
-
-    public EnableStatus getOtherUploadProxy() {
-        return otherUploadProxy;
-    }
-
-    public EnableStatus getChangeOCRData() {
-        return changeOCRData;
-    }
-
-    public String getLoginSource() {
-        return loginSource;
-    }
-
-    public EnableStatus getApplyCarInfo() {
-        return applyCarInfo;
-    }
-
-    public EnableStatus getApplyChangeOCRCarInfo() {
-        return applyChangeOCRCarInfo;
-    }
-
-    public EnableStatus getApplyChangeOCROtherInfo() {
-        return applyChangeOCROtherInfo;
-    }
 }

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/model/protalConfig/PortalConfigQueryRequest.java

@@ -2,12 +2,14 @@ package cn.com.taiji.managew.model.protalConfig;
 
 import java.util.ArrayList;
 
-import cn.com.taiji.core.dto.AbstractBizRequestDTO;
-import cn.com.taiji.core.entity.dict.user.RbacSource;
 import com.google.common.collect.Lists;
 
 import cn.com.taiji.common.manager.ManagerException;
+import cn.com.taiji.core.dto.AbstractBizRequestDTO;
+import cn.com.taiji.core.entity.dict.basic.SourceType;
 import cn.hutool.core.collection.CollectionUtil;
+import lombok.Getter;
+import lombok.Setter;
 
 /***
  * 门户配置
@@ -15,17 +17,18 @@ import cn.hutool.core.collection.CollectionUtil;
  * @Date 2023/5/8 15:18
  * @Email 13079168756@163.com
  */
+@Getter
+@Setter
 public class PortalConfigQueryRequest extends AbstractBizRequestDTO {
 
-    private RbacSource source;
-
+    private SourceType source;
 
     public PortalConfigQueryRequest valid() throws ManagerException {
         final ArrayList<String> failParamInfo = Lists.newArrayList();
 
         //只允许app和小程序
         if (source == null
-                || (!RbacSource.APP.equals(source) && !RbacSource.MINI_PROGRAM.equals(source) && !RbacSource.ZFB_MINI_PROGRAM.equals(source))) {
+                || (!SourceType.ALI.equals(source) && !SourceType.WECHAT.equals(source) && !SourceType.SERVICE_HALL.equals(source))) {
             failParamInfo.add("系统类别");
         }
 
@@ -37,9 +40,5 @@ public class PortalConfigQueryRequest extends AbstractBizRequestDTO {
 
         return this;
     }
-
-    public RbacSource getSource() {
-        return source;
-    }
 }
 

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/model/protalConfig/PortalConfigVo.java

@@ -4,7 +4,9 @@ package cn.com.taiji.managew.model.protalConfig;
 import java.util.List;
 
 import cn.com.taiji.core.entity.dict.EnableStatus;
-import cn.com.taiji.core.entity.dict.user.RbacSource;
+import cn.com.taiji.core.entity.dict.basic.SourceType;
+import lombok.Getter;
+import lombok.Setter;
 
 /***
  * 门户配置vo类
@@ -12,12 +14,14 @@ import cn.com.taiji.core.entity.dict.user.RbacSource;
  * @Date 2023/5/9 10:06
  * @Email 13079168756@163.com
  */
+@Getter
+@Setter
 public class PortalConfigVo {
 
     /**
      * 来源类型
      */
-    private RbacSource source;
+    private SourceType source;
 
     /***
      * 客车车牌颜色（字典）
@@ -73,99 +77,4 @@ public class PortalConfigVo {
      */
     private EnableStatus setPath;
 
-    public EnableStatus getSetPath() {
-        return setPath;
-    }
-
-    public void setSetPath(EnableStatus setPath) {
-        this.setPath = setPath;
-    }
-
-    public RbacSource getSource() {
-        return source;
-    }
-
-    public void setSource(RbacSource source) {
-        this.source = source;
-    }
-
-    public List<String> getCarPlateColorType() {
-        return carPlateColorType;
-    }
-
-    public void setCarPlateColorType(List<String> carPlateColorType) {
-        this.carPlateColorType = carPlateColorType;
-    }
-
-    public List<String> getTrucksPlateColorType() {
-        return trucksPlateColorType;
-    }
-
-    public void setTrucksPlateColorType(List<String> trucksPlateColorType) {
-        this.trucksPlateColorType = trucksPlateColorType;
-    }
-
-    public EnableStatus getSetGray() {
-        return setGray;
-    }
-
-    public void setSetGray(EnableStatus setGray) {
-        this.setGray = setGray;
-    }
-
-    public EnableStatus getMiniInfoShow() {
-        return miniInfoShow;
-    }
-
-    public void setMiniInfoShow(EnableStatus miniInfoShow) {
-        this.miniInfoShow = miniInfoShow;
-    }
-
-    public EnableStatus getMiniSupportOther() {
-        return miniSupportOther;
-    }
-
-    public void setMiniSupportOther(EnableStatus miniSupportOther) {
-        this.miniSupportOther = miniSupportOther;
-    }
-
-    public EnableStatus getOtherUploadProxy() {
-        return otherUploadProxy;
-    }
-
-    public void setOtherUploadProxy(EnableStatus otherUploadProxy) {
-        this.otherUploadProxy = otherUploadProxy;
-    }
-
-    public EnableStatus getChangeOCRData() {
-        return changeOCRData;
-    }
-
-    public void setChangeOCRData(EnableStatus changeOCRData) {
-        this.changeOCRData = changeOCRData;
-    }
-
-    public EnableStatus getApplyCarInfo() {
-        return applyCarInfo;
-    }
-
-    public void setApplyCarInfo(EnableStatus applyCarInfo) {
-        this.applyCarInfo = applyCarInfo;
-    }
-
-    public EnableStatus getApplyChangeOCRCarInfo() {
-        return applyChangeOCRCarInfo;
-    }
-
-    public void setApplyChangeOCRCarInfo(EnableStatus applyChangeOCRCarInfo) {
-        this.applyChangeOCRCarInfo = applyChangeOCRCarInfo;
-    }
-
-    public EnableStatus getApplyChangeOCROtherInfo() {
-        return applyChangeOCROtherInfo;
-    }
-
-    public void setApplyChangeOCROtherInfo(EnableStatus applyChangeOCROtherInfo) {
-        this.applyChangeOCROtherInfo = applyChangeOCROtherInfo;
-    }
 }