首页功能入口设置新增字段

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/MajorFunctionConfDTO.java

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.dto.consult;
 
 import java.io.Serializable;
 import java.util.Date;
+
 import lombok.Data;
 
 
@@ -36,68 +37,73 @@ public class MajorFunctionConfDTO implements Serializable {
     /**
      * 主键
      */
-	private String id;
+    private String id;
 
     /**
      * 功能编码，不可重复，与前端商定一致。目前包括consultState:咨询;cadreEvaluationState:干部评价;
      */
-	private String code;
+    private String code;
 
     /**
      * 功能名称
      */
-	private String name;
+    private String name;
 
     /**
      * 是否可用 0：否，1：是
      */
-	private String availableFlag;
+    private String availableFlag;
 
     /**
      * 是否访问外链 0：否，1：是
      */
-	private String externalFlag;
+    private String externalFlag;
+
+    /**
+     * 需要拼接token 0：否，1：是
+     */
+    private String tokenFlag;
 
     /**
      * 外链访问地址，external_flag = 1则非空
      */
-	private String externalUrl;
+    private String externalUrl;
 
     /**
      * 备注
      */
-	private String remark;
+    private String remark;
 
     /**
      * 删除标识 0：否，1：是
      */
-	private String delFlag;
+    private String delFlag;
 
     /**
      * 乐观锁
      */
-	private Integer revision;
+    private Integer revision;
 
     /**
      * 创建人
      */
-	private String createdBy;
+    private String createdBy;
 
     /**
      * 创建时间
      */
-	private Date createdTime;
+    private Date createdTime;
 
     /**
      * 更新人
      */
-	private String updatedBy;
+    private String updatedBy;
 
     /**
      * 更新时间
      */
-	private Date updatedTime;
+    private Date updatedTime;
 
-	private String imgUrl;
+    private String imgUrl;
 
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/consult/result/CheckStateResultDTO.java

@@ -13,15 +13,9 @@ import java.io.Serializable;
 public class CheckStateResultDTO implements Serializable {
     private static final long serialVersionUID = -8559260405823478733L;
 
-    /**
-     * availableFlag : 1
-     * externalFlag : 0
-     * externalUrl : http://pyt.kuntowcd.vztgvnx
-     * name : cadreEvaluationState
-     */
-
     private String availableFlag;
     private String externalFlag;
+    private String tokenFlag;
     private String externalUrl;
     private String name;
     private String imgUrl;

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/entity/MajorFunctionConfEntity.java

@@ -23,7 +23,6 @@ import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
 
 /**
  * 小程序首页主要功能按钮状态配置
@@ -32,45 +31,50 @@ import java.util.Date;
  * @since v1.0.0 2020-03-06
  */
 @Data
-@EqualsAndHashCode(callSuper=false)
+@EqualsAndHashCode(callSuper = false)
 @TableName("epdc_major_function_conf")
 public class MajorFunctionConfEntity extends BaseEpdcEntity {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
     /**
      * 功能编码，不可重复，与前端商定一致。目前包括consultState:咨询;cadreEvaluationState:干部评价;
      */
-	private String code;
+    private String code;
 
     /**
      * 功能名称
      */
-	private String name;
+    private String name;
 
     /**
      * 是否可用 0：否，1：是
      */
-	private String availableFlag;
+    private String availableFlag;
 
     /**
      * 是否访问外链 0：否，1：是
      */
-	private String externalFlag;
+    private String externalFlag;
+
+    /**
+     * 需要拼接token 0：否，1：是
+     */
+    private String tokenFlag;
 
     /**
      * 外链访问地址，external_flag = 1则非空
      */
-	private String externalUrl;
+    private String externalUrl;
 
     /**
      * 备注
      */
-	private String remark;
+    private String remark;
 
-	/**
+    /**
-	 * 图标
+     * 图标
-	 */
+     */
-	private String imgUrl;
+    private String imgUrl;
 
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/consult/service/impl/MajorFunctionConfServiceImpl.java

@@ -115,8 +115,8 @@ public class MajorFunctionConfServiceImpl extends BaseServiceImpl<MajorFunctionC
     public Result<List<CheckStateResultDTO>> getCheckState() {
         QueryWrapper queryWrapper = new QueryWrapper();
         List list = baseDao.selectList(queryWrapper);
-        List<CheckStateResultDTO> checkStateResultDTOS = ConvertUtils.sourceToTarget(list, CheckStateResultDTO.class);
+        List<CheckStateResultDTO> checkStateResults = ConvertUtils.sourceToTarget(list, CheckStateResultDTO.class);
-        return new Result<List<CheckStateResultDTO>>().ok(checkStateResultDTOS);
+        return new Result<List<CheckStateResultDTO>>().ok(checkStateResults);
     }
 
 }