添加应用复选字段

base-manager/db/add.sql

@@ -15,3 +15,14 @@ INSERT INTO `mortals_xhx_task` VALUES (null, '统计站点部门事项数', 'Sta
 2023-3-11
 -- ----------------------------
 ALTER TABLE mortals_sys_workman ADD COLUMN  `operatorId` varchar (128) default ""  COMMENT '一体化经办人id' AFTER modelIds;
+
+
+
+-- ----------------------------
+2023-3-28
+-- ----------------------------
+ALTER TABLE mortals_sys_app_info_field ADD COLUMN  `fieldTypeValue` varchar (255) default ""  COMMENT '字段类型值，当字段类型为多选，单选时候，预设复选值' AFTER fieldType;
+ALTER TABLE mortals_sys_app_info_field ADD COLUMN  `defaultValue` varchar (255) default ""  COMMENT '字段默认值' AFTER fieldValue;
+
+ALTER TABLE mortals_sys_app_info_templete_field ADD COLUMN  `fieldTypeValue` varchar (255) default ""  COMMENT '字段类型值，当字段类型为多选，单选时候，预设复选值' AFTER fieldType;
+ALTER TABLE mortals_sys_app_info_templete_field ADD COLUMN  `defaultValue` varchar (255) default ""  COMMENT '字段默认值' AFTER fieldValue;

base-manager/doc/api.md

@@ -10976,6 +10976,8 @@ data|object|数据对象
   createUserId|Long|创建用户
   updateTime|Date|修改时间
   updateUserId|Long|修改用户
+  fieldTypeValue|String|字段类型值，当字段类型为多选，单选时候，预设复选值
+  defaultValue|String|字段默认值
 dict|object|字典对象
  fieldType|object|字典属性对象，详见附录
  dataType|object|字典属性对象，详见附录
@@ -11037,6 +11039,8 @@ data|object|数据对象
  createUserId|Long|创建用户
  updateTime|Date|修改时间
  updateUserId|Long|修改用户
+ fieldTypeValue|String|字段类型值，当字段类型为多选，单选时候，预设复选值
+ defaultValue|String|字段默认值
 dict|object|字典对象
  fieldType|object|字典属性对象，详见附录
  dataType|object|字典属性对象，详见附录
@@ -11094,6 +11098,8 @@ fieldNull|Integer|否|是否允许为空，(0.否,1.是)
 isList|Integer|否|字段是否列表显示(0.否,1.是)
 fieldOrderNo|String|否|排序号
 remark|String|否|备注
+fieldTypeValue|String|否|字段类型值，当字段类型为多选，单选时候，预设复选值
+defaultValue|String|否|字段默认值
 
 **请求样例:**
 
@@ -11250,6 +11256,8 @@ data|object|数据对象
   createUserId|Long|创建用户
   updateTime|Date|修改时间
   updateUserId|Long|修改用户
+  fieldTypeValue|String|字段类型值，当字段类型为多选，单选时候，预设复选值
+  defaultValue|String|字段默认值
 dict|object|字典对象
  fieldType|object|字典属性对象，详见附录
  dataType|object|字典属性对象，详见附录
@@ -11311,6 +11319,8 @@ data|object|数据对象
  createUserId|Long|创建用户
  updateTime|Date|修改时间
  updateUserId|Long|修改用户
+ fieldTypeValue|String|字段类型值，当字段类型为多选，单选时候，预设复选值
+ defaultValue|String|字段默认值
 dict|object|字典对象
  fieldType|object|字典属性对象，详见附录
  dataType|object|字典属性对象，详见附录
@@ -11368,6 +11378,8 @@ fieldNull|Integer|否|是否允许为空，(0.否,1.是)
 isList|Integer|否|字段是否列表显示(0.否,1.是)
 fieldOrderNo|String|否|排序号
 remark|String|否|备注
+fieldTypeValue|String|否|字段类型值，当字段类型为多选，单选时候，预设复选值
+defaultValue|String|否|字段默认值
 
 **请求样例:**
 

base-manager/src/main/java/com/mortals/xhx/busiz/web/MidSignApiController.java

 package com.mortals.xhx.busiz.web;
 
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.net.url.UrlBuilder;
-import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.RandomUtil;
-import cn.hutool.core.util.URLUtil;
-import cn.hutool.crypto.digest.DigestAlgorithm;
-import cn.hutool.crypto.digest.Digester;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.http.Method;
 import com.alibaba.fastjson.JSON;
@@ -17,40 +11,15 @@ import com.mortals.framework.common.Rest;
 import com.mortals.xhx.busiz.req.MidReq;
 import com.mortals.xhx.busiz.rsp.SignResp;
 import com.mortals.xhx.common.utils.EncryptionUtils;
-import com.mortals.xhx.module.dept.model.DeptEntity;
-import com.mortals.xhx.module.dept.model.DeptQuery;
-import com.mortals.xhx.module.dept.service.DeptService;
-import com.mortals.xhx.module.matter.model.MatterEntity;
-import com.mortals.xhx.module.matter.model.MatterQuery;
-import com.mortals.xhx.module.matter.service.MatterService;
-import com.mortals.xhx.module.site.model.SiteMatterEntity;
-import com.mortals.xhx.module.site.model.SiteMatterQuery;
-import com.mortals.xhx.module.site.service.SiteMatterService;
-import com.mortals.xhx.module.window.model.WindowEntity;
-import com.mortals.xhx.module.window.model.WindowMatterEntity;
-import com.mortals.xhx.module.window.model.WindowMatterQuery;
-import com.mortals.xhx.module.window.model.WindowQuery;
-import com.mortals.xhx.module.window.service.WindowMatterService;
-import com.mortals.xhx.module.window.service.WindowService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.CookieStore;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.BasicCookieStore;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.apache.http.util.EntityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpMethod;
-import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.*;
-import java.util.stream.Collectors;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * 微中台签名接口

base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoFieldEntity.java

@@ -10,16 +10,12 @@ import com.mortals.xhx.module.app.model.vo.AppInfoFieldVo;
  * 自助终端应用信息字段实体对象
  *
  * @author zxfei
- * @date 2022-12-02
+ * @date 2023-03-28
  */
 
 public class AppInfoFieldEntity extends AppInfoFieldVo {
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 应用数据集id
-     */
-    private Long datasetId;
     /**
      * 字段编码
      */
@@ -60,24 +56,22 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
      * 备注
      */
     private String remark;
-
-
-
-    public AppInfoFieldEntity(){}
     /**
-     * 获取 应用数据集id
-     * @return Long
+     * 应用id
      */
-    public Long getDatasetId(){
-        return datasetId;
-    }
+    private Long appId;
     /**
-     * 设置 应用数据集id
-     * @param datasetId
+     * 字段类型值，当字段类型为多选，单选时候，预设复选值
      */
-    public void setDatasetId(Long datasetId){
-        this.datasetId = datasetId;
-    }
+    private String fieldTypeValue;
+    /**
+     * 字段默认值
+     */
+    private String defaultValue;
+
+
+
+    public AppInfoFieldEntity(){}
     /**
      * 获取 字段编码
      * @return String
@@ -218,6 +212,48 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
     public void setRemark(String remark){
         this.remark = remark;
     }
+    /**
+     * 获取 应用id
+     * @return Long
+     */
+    public Long getAppId(){
+        return appId;
+    }
+    /**
+     * 设置 应用id
+     * @param appId
+     */
+    public void setAppId(Long appId){
+        this.appId = appId;
+    }
+    /**
+     * 获取 字段类型值，当字段类型为多选，单选时候，预设复选值
+     * @return String
+     */
+    public String getFieldTypeValue(){
+        return fieldTypeValue;
+    }
+    /**
+     * 设置 字段类型值，当字段类型为多选，单选时候，预设复选值
+     * @param fieldTypeValue
+     */
+    public void setFieldTypeValue(String fieldTypeValue){
+        this.fieldTypeValue = fieldTypeValue;
+    }
+    /**
+     * 获取 字段默认值
+     * @return String
+     */
+    public String getDefaultValue(){
+        return defaultValue;
+    }
+    /**
+     * 设置 字段默认值
+     * @param defaultValue
+     */
+    public void setDefaultValue(String defaultValue){
+        this.defaultValue = defaultValue;
+    }
 
 
 
@@ -240,7 +276,6 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
 
     public String toString(){
         StringBuilder sb = new StringBuilder("");
-        sb.append(",datasetId:").append(getDatasetId());
         sb.append(",fieldCode:").append(getFieldCode());
         sb.append(",fieldName:").append(getFieldName());
         sb.append(",fieldType:").append(getFieldType());
@@ -251,13 +286,14 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
         sb.append(",isList:").append(getIsList());
         sb.append(",fieldOrderNo:").append(getFieldOrderNo());
         sb.append(",remark:").append(getRemark());
+        sb.append(",appId:").append(getAppId());
+        sb.append(",fieldTypeValue:").append(getFieldTypeValue());
+        sb.append(",defaultValue:").append(getDefaultValue());
         return sb.toString();
     }
 
     public void initAttrValue(){
 
-        this.datasetId = null;
-
         this.fieldCode = "";
 
         this.fieldName = "";
@@ -277,5 +313,11 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
         this.fieldOrderNo = 1;
 
         this.remark = "";
+
+        this.appId = null;
+
+        this.fieldTypeValue = "";
+
+        this.defaultValue = "";
     }
 }
\ No newline at end of file

base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoTempleteFieldEntity.java

@@ -10,7 +10,7 @@ import com.mortals.xhx.module.app.model.vo.AppInfoTempleteFieldVo;
  * 自助终端应用模板信息字段实体对象
  *
  * @author zxfei
- * @date 2022-12-02
+ * @date 2023-03-28
  */
 
 public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
@@ -60,6 +60,14 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
      * 备注
      */
     private String remark;
+    /**
+     * 字段类型值，当字段类型为多选，单选时候，预设复选值
+     */
+    private String fieldTypeValue;
+    /**
+     * 字段默认值
+     */
+    private String defaultValue;
 
 
 
@@ -218,6 +226,34 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
     public void setRemark(String remark){
         this.remark = remark;
     }
+    /**
+     * 获取 字段类型值，当字段类型为多选，单选时候，预设复选值
+     * @return String
+     */
+    public String getFieldTypeValue(){
+        return fieldTypeValue;
+    }
+    /**
+     * 设置 字段类型值，当字段类型为多选，单选时候，预设复选值
+     * @param fieldTypeValue
+     */
+    public void setFieldTypeValue(String fieldTypeValue){
+        this.fieldTypeValue = fieldTypeValue;
+    }
+    /**
+     * 获取 字段默认值
+     * @return String
+     */
+    public String getDefaultValue(){
+        return defaultValue;
+    }
+    /**
+     * 设置 字段默认值
+     * @param defaultValue
+     */
+    public void setDefaultValue(String defaultValue){
+        this.defaultValue = defaultValue;
+    }
 
 
 
@@ -251,6 +287,8 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
         sb.append(",isList:").append(getIsList());
         sb.append(",fieldOrderNo:").append(getFieldOrderNo());
         sb.append(",remark:").append(getRemark());
+        sb.append(",fieldTypeValue:").append(getFieldTypeValue());
+        sb.append(",defaultValue:").append(getDefaultValue());
         return sb.toString();
     }
 
@@ -277,5 +315,9 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
         this.fieldOrderNo = 1;
 
         this.remark = "";
+
+        this.fieldTypeValue = "";
+
+        this.defaultValue = "";
     }
 }
\ No newline at end of file