Skip to content

S
smart_gov_platform
Commit 6765aafa authored by 赵啸非's avatar 赵啸非
Browse files
Options

修改应用模板

parent 07b53e1a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2683 additions and 2341 deletions
base-manager/db/base_modules.sql
View file @ 6765aafa
...@@ -984,53 +984,54 @@ CREATE TABLE mortals_sys_app_dataset ...@@ -984,53 +984,54 @@ CREATE TABLE mortals_sys_app_dataset
-- 自助终端应用信息字段表 -- 自助终端应用信息字段表
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `mortals_sys_app_info_field`; DROP TABLE IF EXISTS `mortals_sys_app_info_field`;
CREATE TABLE mortals_sys_app_info_field CREATE TABLE mortals_sys_app_info_field(
( `id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长',
`id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长', `datasetId` bigint(20) COMMENT '应用数据集id',
`datasetId` bigint(20) COMMENT '应用数据集id', `fieldCode` varchar(64) COMMENT '字段编码',
`fieldCode` varchar(64) COMMENT '字段编码', `fieldName` varchar(64) COMMENT '字段名称',
`fieldName` varchar(64) COMMENT '字段名称', `fieldType` varchar(64) COMMENT '字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）',
`fieldType` varchar(64) COMMENT '字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）', `dataType` varchar(64) COMMENT '数据类型（number.数字,string.字符串）',
`dataType` varchar(64) COMMENT '数据类型（number.数字,string.字符串）', `fieldValue` text COMMENT '字段值',
`fieldValue` longtext COMMENT '字段值', `fieldLen` int(9) COMMENT '数据长度，默认128',
`fieldLen` int(9) COMMENT '数据长度，默认128', `fieldNull` tinyint(2) COMMENT '是否允许为空，(0.否,1.是)',
`fieldNull` tinyint(2) COMMENT '是否允许为空，(0.否,1.是)', `isList` tinyint(2) COMMENT '字段是否列表显示(0.否,1.是)',
`isList` tinyint(2) COMMENT '字段是否列表显示(0.否,1.是)', `fieldOrderNo` int(9) COMMENT '排序号',
`fieldOrderNo` varchar(64) COMMENT '排序号', `remark` varchar(1024) COMMENT '备注',
`remark` varchar(1024) COMMENT '备注', `createTime` datetime COMMENT '创建时间',
`createTime` datetime COMMENT '创建时间', `createUserId` bigint(20) COMMENT '创建用户',
`createUserId` bigint(20) COMMENT '创建用户', `updateTime` datetime COMMENT '修改时间',
`updateTime` datetime COMMENT '修改时间', `updateUserId` bigint(20) COMMENT '修改用户',
`updateUserId` bigint(20) COMMENT '修改用户', PRIMARY KEY (`id`)
PRIMARY KEY (`id`),
KEY `datasetId` (`datasetId`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='自助终端应用信息字段'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='自助终端应用信息字段';
-- ---------------------------- -- ----------------------------
-- 自助终端应用模板信息字段表 -- 自助终端应用模板信息字段表
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `mortals_sys_app_info_templete_field`; DROP TABLE IF EXISTS `mortals_sys_app_info_templete_field`;
CREATE TABLE mortals_sys_app_info_templete_field CREATE TABLE mortals_sys_app_info_templete_field(
( `id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长',
`id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长', `appId` bigint(20) COMMENT '应用id',
`appId` bigint(20) COMMENT '应用id', `fieldCode` varchar(64) COMMENT '字段编码',
`fieldCode` varchar(64) COMMENT '字段编码', `fieldName` varchar(64) COMMENT '字段名称',
`fieldName` varchar(64) COMMENT '字段名称', `fieldType` varchar(64) COMMENT '字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）',
`fieldType` varchar(64) COMMENT '字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）', `dataType` varchar(64) COMMENT '数据类型（number.数字,string.字符串）',
`dataType` varchar(64) COMMENT '数据类型（number.数字,string.字符串）', `fieldValue` varchar(64) COMMENT '字段值',
`fieldValue` varchar(64) COMMENT '字段值', `fieldLen` int(9) COMMENT '数据长度，默认128',
`fieldLen` int(9) COMMENT '数据长度，默认128', `fieldNull` tinyint(2) COMMENT '是否允许为空，(0.否,1.是)',
`fieldNull` tinyint(2) COMMENT '是否允许为空，(0.否,1.是)', `isList` tinyint(2) COMMENT '字段是否列表显示(0.否,1.是)',
`isList` tinyint(2) COMMENT '字段是否列表显示(0.否,1.是)', `fieldOrderNo` int(9) COMMENT '排序号',
`fieldOrderNo` varchar(64) COMMENT '排序号', `remark` varchar(1024) COMMENT '备注',
`remark` varchar(1024) COMMENT '备注', `createTime` datetime COMMENT '创建时间',
`createTime` datetime COMMENT '创建时间', `createUserId` bigint(20) COMMENT '创建用户',
`createUserId` bigint(20) COMMENT '创建用户', `updateTime` datetime COMMENT '修改时间',
`updateTime` datetime COMMENT '修改时间', `updateUserId` bigint(20) COMMENT '修改用户',
`updateUserId` bigint(20) COMMENT '修改用户', PRIMARY KEY (`id`)
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='自助终端应用模板信息字段'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='自助终端应用模板信息字段';
-- ---------------------------- -- ----------------------------
-- 自助终端应用版本历史表 -- 自助终端应用版本历史表
-- ---------------------------- -- ----------------------------
......
base-manager/src/main/java/com/mortals/xhx/common/code/AppFieldTypeEnum.java 0 → 100644
View file @ 6765aafa
package com.mortals.xhx.common.code;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* 数据类型（number.数字,string.字符串）枚举类
*
* @author zxfei
*/
public enum AppFieldTypeEnum {
INPUT("input", "单行输入框"),
TEXTAREA("textarea", "多行输入框"),
SELECT("select", "下拉选项框"),
DATE("date", "日期选择框"),
EDITOR("editor", "富文本"),
;
private String value;
private String desc;
AppFieldTypeEnum(String value, String desc) {
this.value = value;
this.desc = desc;
}
public String getValue() {
return this.value;
}
public String getDesc() {
return this.desc;
}
public static AppFieldTypeEnum getByValue(String value) {
for (AppFieldTypeEnum dataTypeEnum : AppFieldTypeEnum.values()) {
if (dataTypeEnum.getValue() == value) {
return dataTypeEnum;
}
}
return null;
}
/**
* 获取Map集合
*
* @param eItem 不包含项
* @return
*/
public static Map<String, String> getEnumMap(String... eItem) {
Map<String, String> resultMap = new LinkedHashMap<>();
for (AppFieldTypeEnum item : AppFieldTypeEnum.values()) {
try {
boolean hasE = false;
for (String e : eItem) {
if (item.getValue() == e) {
hasE = true;
break;
}
}
if (!hasE) {
resultMap.put(item.getValue() + "", item.getDesc());
}
} catch (Exception ex) {
}
}
return resultMap;
}
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/common/code/AppTypeEnum.java 0 → 100644
View file @ 6765aafa
package com.mortals.xhx.common.code;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* 事项来源 (0.政务网，1.自定义)枚举类
*
* @author zxfei
*/
public enum AppTypeEnum {
终端应用(1, "终端应用"),
移动端应用(2, "移动端应用");
private Integer value;
private String desc;
AppTypeEnum(Integer value, String desc) {
this.value = value;
this.desc = desc;
}
public Integer getValue() {
return this.value;
}
public String getDesc() {
return this.desc;
}
public static AppTypeEnum getByValue(Integer value) {
for (AppTypeEnum sourceEnum : AppTypeEnum.values()) {
if (sourceEnum.getValue() == value) {
return sourceEnum;
}
}
return null;
}
/**
* 获取Map集合
*
* @param eItem 不包含项
* @return
*/
public static Map<String, String> getEnumMap(Integer... eItem) {
Map<String, String> resultMap = new LinkedHashMap<>();
for (AppTypeEnum item : AppTypeEnum.values()) {
try {
boolean hasE = false;
for (Integer e : eItem) {
if (item.getValue() == e) {
hasE = true;
break;
}
}
if (!hasE) {
resultMap.put(item.getValue() + "", item.getDesc());
}
} catch (Exception ex) {
}
}
return resultMap;
}
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/common/code/DataTypeEnum.java
View file @ 6765aafa
...@@ -9,8 +9,8 @@ import java.util.Map; ...@@ -9,8 +9,8 @@ import java.util.Map;
* @author zxfei * @author zxfei
*/ */
public enum DataTypeEnum { public enum DataTypeEnum {
number("number.数字", "number.数字"), number("number", "数字"),
string("string.字符串", "string.字符串"); string("string", "字符串");
private String value; private String value;
private String desc; private String desc;
......
base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoFieldEntity.java
View file @ 6765aafa
...@@ -7,214 +7,214 @@ import com.mortals.framework.annotation.Excel; ...@@ -7,214 +7,214 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.app.model.vo.AppInfoFieldVo; import com.mortals.xhx.module.app.model.vo.AppInfoFieldVo;
/** /**
* 自助终端应用信息字段实体对象 * 自助终端应用信息字段实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-28 * @date 2022-12-02
*/ */
public class AppInfoFieldEntity extends AppInfoFieldVo { public class AppInfoFieldEntity extends AppInfoFieldVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 应用数据集id * 应用数据集id
*/ */
private Long datasetId; private Long datasetId;
/** /**
* 字段编码 * 字段编码
*/ */
private String fieldCode; private String fieldCode;
/** /**
* 字段名称 * 字段名称
*/ */
private String fieldName; private String fieldName;
/** /**
* 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框） * 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）
*/ */
private String fieldType; private String fieldType;
/** /**
* 数据类型（number.数字,string.字符串） * 数据类型（number.数字,string.字符串）
*/ */
private String dataType; private String dataType;
/** /**
* 字段值 * 字段值
*/ */
private String fieldValue; private String fieldValue;
/** /**
* 数据长度，默认128 * 数据长度，默认128
*/ */
private Integer fieldLen; private Integer fieldLen;
/** /**
* 是否允许为空，(0.否,1.是) * 是否允许为空，(0.否,1.是)
*/ */
private Integer fieldNull; private Integer fieldNull;
/** /**
* 字段是否列表显示(0.否,1.是) * 字段是否列表显示(0.否,1.是)
*/ */
private Integer isList; private Integer isList;
/** /**
* 排序号 * 排序号
*/ */
private String fieldOrderNo; private Integer fieldOrderNo;
/** /**
* 备注 * 备注
*/ */
private String remark; private String remark;
public AppInfoFieldEntity(){} public AppInfoFieldEntity(){}
/** /**
* 获取 应用数据集id * 获取 应用数据集id
* @return Long * @return Long
*/ */
public Long getDatasetId(){ public Long getDatasetId(){
return datasetId; return datasetId;
} }
/** /**
* 设置 应用数据集id * 设置 应用数据集id
* @param datasetId * @param datasetId
*/ */
public void setDatasetId(Long datasetId){ public void setDatasetId(Long datasetId){
this.datasetId = datasetId; this.datasetId = datasetId;
} }
/** /**
* 获取 字段编码 * 获取 字段编码
* @return String * @return String
*/ */
public String getFieldCode(){ public String getFieldCode(){
return fieldCode; return fieldCode;
} }
/** /**
* 设置 字段编码 * 设置 字段编码
* @param fieldCode * @param fieldCode
*/ */
public void setFieldCode(String fieldCode){ public void setFieldCode(String fieldCode){
this.fieldCode = fieldCode; this.fieldCode = fieldCode;
} }
/** /**
* 获取 字段名称 * 获取 字段名称
* @return String * @return String
*/ */
public String getFieldName(){ public String getFieldName(){
return fieldName; return fieldName;
} }
/** /**
* 设置 字段名称 * 设置 字段名称
* @param fieldName * @param fieldName
*/ */
public void setFieldName(String fieldName){ public void setFieldName(String fieldName){
this.fieldName = fieldName; this.fieldName = fieldName;
} }
/** /**
* 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框） * 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）
* @return String * @return String
*/ */
public String getFieldType(){ public String getFieldType(){
return fieldType; return fieldType;
} }
/** /**
* 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框） * 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）
* @param fieldType * @param fieldType
*/ */
public void setFieldType(String fieldType){ public void setFieldType(String fieldType){
this.fieldType = fieldType; this.fieldType = fieldType;
} }
/** /**
* 获取 数据类型（number.数字,string.字符串） * 获取 数据类型（number.数字,string.字符串）
* @return String * @return String
*/ */
public String getDataType(){ public String getDataType(){
return dataType; return dataType;
} }
/** /**
* 设置 数据类型（number.数字,string.字符串） * 设置 数据类型（number.数字,string.字符串）
* @param dataType * @param dataType
*/ */
public void setDataType(String dataType){ public void setDataType(String dataType){
this.dataType = dataType; this.dataType = dataType;
} }
/** /**
* 获取 字段值 * 获取 字段值
* @return String * @return String
*/ */
public String getFieldValue(){ public String getFieldValue(){
return fieldValue; return fieldValue;
} }
/** /**
* 设置 字段值 * 设置 字段值
* @param fieldValue * @param fieldValue
*/ */
public void setFieldValue(String fieldValue){ public void setFieldValue(String fieldValue){
this.fieldValue = fieldValue; this.fieldValue = fieldValue;
} }
/** /**
* 获取 数据长度，默认128 * 获取 数据长度，默认128
* @return Integer * @return Integer
*/ */
public Integer getFieldLen(){ public Integer getFieldLen(){
return fieldLen; return fieldLen;
} }
/** /**
* 设置 数据长度，默认128 * 设置 数据长度，默认128
* @param fieldLen * @param fieldLen
*/ */
public void setFieldLen(Integer fieldLen){ public void setFieldLen(Integer fieldLen){
this.fieldLen = fieldLen; this.fieldLen = fieldLen;
} }
/** /**
* 获取 是否允许为空，(0.否,1.是) * 获取 是否允许为空，(0.否,1.是)
* @return Integer * @return Integer
*/ */
public Integer getFieldNull(){ public Integer getFieldNull(){
return fieldNull; return fieldNull;
} }
/** /**
* 设置 是否允许为空，(0.否,1.是) * 设置 是否允许为空，(0.否,1.是)
* @param fieldNull * @param fieldNull
*/ */
public void setFieldNull(Integer fieldNull){ public void setFieldNull(Integer fieldNull){
this.fieldNull = fieldNull; this.fieldNull = fieldNull;
} }
/** /**
* 获取 字段是否列表显示(0.否,1.是) * 获取 字段是否列表显示(0.否,1.是)
* @return Integer * @return Integer
*/ */
public Integer getIsList(){ public Integer getIsList(){
return isList; return isList;
} }
/** /**
* 设置 字段是否列表显示(0.否,1.是) * 设置 字段是否列表显示(0.否,1.是)
* @param isList * @param isList
*/ */
public void setIsList(Integer isList){ public void setIsList(Integer isList){
this.isList = isList; this.isList = isList;
} }
/** /**
* 获取 排序号 * 获取 排序号
* @return String * @return Integer
*/ */
public String getFieldOrderNo(){ public Integer getFieldOrderNo(){
return fieldOrderNo; return fieldOrderNo;
} }
/** /**
* 设置 排序号 * 设置 排序号
* @param fieldOrderNo * @param fieldOrderNo
*/ */
public void setFieldOrderNo(String fieldOrderNo){ public void setFieldOrderNo(Integer fieldOrderNo){
this.fieldOrderNo = fieldOrderNo; this.fieldOrderNo = fieldOrderNo;
} }
/** /**
* 获取 备注 * 获取 备注
* @return String * @return String
*/ */
public String getRemark(){ public String getRemark(){
return remark; return remark;
} }
/** /**
* 设置 备注 * 设置 备注
* @param remark * @param remark
*/ */
public void setRemark(String remark){ public void setRemark(String remark){
this.remark = remark; this.remark = remark;
} }
...@@ -224,7 +224,7 @@ public class AppInfoFieldEntity extends AppInfoFieldVo { ...@@ -224,7 +224,7 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
...@@ -232,7 +232,7 @@ public class AppInfoFieldEntity extends AppInfoFieldVo { ...@@ -232,7 +232,7 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
if (obj instanceof AppInfoFieldEntity) { if (obj instanceof AppInfoFieldEntity) {
AppInfoFieldEntity tmp = (AppInfoFieldEntity) obj; AppInfoFieldEntity tmp = (AppInfoFieldEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
...@@ -256,26 +256,26 @@ public class AppInfoFieldEntity extends AppInfoFieldVo { ...@@ -256,26 +256,26 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
public void initAttrValue(){ public void initAttrValue(){
this.datasetId = null; this.datasetId = null;
this.fieldCode = null; this.fieldCode = "";
this.fieldName = null; this.fieldName = "";
this.fieldType = null; this.fieldType = "";
this.dataType = null; this.dataType = "";
this.fieldValue = null; this.fieldValue = "";
this.fieldLen = null; this.fieldLen = 0;
this.fieldNull = 1; this.fieldNull = 1;
this.isList = null; this.isList = 0;
this.fieldOrderNo = null; this.fieldOrderNo = 1;
this.remark = null; this.remark = "";
} }
} }
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoTempleteFieldEntity.java
View file @ 6765aafa
...@@ -7,214 +7,214 @@ import com.mortals.framework.annotation.Excel; ...@@ -7,214 +7,214 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.app.model.vo.AppInfoTempleteFieldVo; import com.mortals.xhx.module.app.model.vo.AppInfoTempleteFieldVo;
/** /**
* 自助终端应用模板信息字段实体对象 * 自助终端应用模板信息字段实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-28 * @date 2022-12-02
*/ */
public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo { public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 应用id * 应用id
*/ */
private Long appId; private Long appId;
/** /**
* 字段编码 * 字段编码
*/ */
private String fieldCode; private String fieldCode;
/** /**
* 字段名称 * 字段名称
*/ */
private String fieldName; private String fieldName;
/** /**
* 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框） * 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
*/ */
private String fieldType; private String fieldType;
/** /**
* 数据类型（number.数字,string.字符串） * 数据类型（number.数字,string.字符串）
*/ */
private String dataType; private String dataType;
/** /**
* 字段值 * 字段值
*/ */
private String fieldValue; private String fieldValue;
/** /**
* 数据长度，默认128 * 数据长度，默认128
*/ */
private Integer fieldLen; private Integer fieldLen;
/** /**
* 是否允许为空，(0.否,1.是) * 是否允许为空，(0.否,1.是)
*/ */
private Integer fieldNull; private Integer fieldNull;
/** /**
* 字段是否列表显示(0.否,1.是) * 字段是否列表显示(0.否,1.是)
*/ */
private Integer isList; private Integer isList;
/** /**
* 排序号 * 排序号
*/ */
private String fieldOrderNo; private Integer fieldOrderNo;
/** /**
* 备注 * 备注
*/ */
private String remark; private String remark;
public AppInfoTempleteFieldEntity(){} public AppInfoTempleteFieldEntity(){}
/** /**
* 获取 应用id * 获取 应用id
* @return Long * @return Long
*/ */
public Long getAppId(){ public Long getAppId(){
return appId; return appId;
} }
/** /**
* 设置 应用id * 设置 应用id
* @param appId * @param appId
*/ */
public void setAppId(Long appId){ public void setAppId(Long appId){
this.appId = appId; this.appId = appId;
} }
/** /**
* 获取 字段编码 * 获取 字段编码
* @return String * @return String
*/ */
public String getFieldCode(){ public String getFieldCode(){
return fieldCode; return fieldCode;
} }
/** /**
* 设置 字段编码 * 设置 字段编码
* @param fieldCode * @param fieldCode
*/ */
public void setFieldCode(String fieldCode){ public void setFieldCode(String fieldCode){
this.fieldCode = fieldCode; this.fieldCode = fieldCode;
} }
/** /**
* 获取 字段名称 * 获取 字段名称
* @return String * @return String
*/ */
public String getFieldName(){ public String getFieldName(){
return fieldName; return fieldName;
} }
/** /**
* 设置 字段名称 * 设置 字段名称
* @param fieldName * @param fieldName
*/ */
public void setFieldName(String fieldName){ public void setFieldName(String fieldName){
this.fieldName = fieldName; this.fieldName = fieldName;
} }
/** /**
* 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框） * 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
* @return String * @return String
*/ */
public String getFieldType(){ public String getFieldType(){
return fieldType; return fieldType;
} }
/** /**
* 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框） * 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
* @param fieldType * @param fieldType
*/ */
public void setFieldType(String fieldType){ public void setFieldType(String fieldType){
this.fieldType = fieldType; this.fieldType = fieldType;
} }
/** /**
* 获取 数据类型（number.数字,string.字符串） * 获取 数据类型（number.数字,string.字符串）
* @return String * @return String
*/ */
public String getDataType(){ public String getDataType(){
return dataType; return dataType;
} }
/** /**
* 设置 数据类型（number.数字,string.字符串） * 设置 数据类型（number.数字,string.字符串）
* @param dataType * @param dataType
*/ */
public void setDataType(String dataType){ public void setDataType(String dataType){
this.dataType = dataType; this.dataType = dataType;
} }
/** /**
* 获取 字段值 * 获取 字段值
* @return String * @return String
*/ */
public String getFieldValue(){ public String getFieldValue(){
return fieldValue; return fieldValue;
} }
/** /**
* 设置 字段值 * 设置 字段值
* @param fieldValue * @param fieldValue
*/ */
public void setFieldValue(String fieldValue){ public void setFieldValue(String fieldValue){
this.fieldValue = fieldValue; this.fieldValue = fieldValue;
} }
/** /**
* 获取 数据长度，默认128 * 获取 数据长度，默认128
* @return Integer * @return Integer
*/ */
public Integer getFieldLen(){ public Integer getFieldLen(){
return fieldLen; return fieldLen;
} }
/** /**
* 设置 数据长度，默认128 * 设置 数据长度，默认128
* @param fieldLen * @param fieldLen
*/ */
public void setFieldLen(Integer fieldLen){ public void setFieldLen(Integer fieldLen){
this.fieldLen = fieldLen; this.fieldLen = fieldLen;
} }
/** /**
* 获取 是否允许为空，(0.否,1.是) * 获取 是否允许为空，(0.否,1.是)
* @return Integer * @return Integer
*/ */
public Integer getFieldNull(){ public Integer getFieldNull(){
return fieldNull; return fieldNull;
} }
/** /**
* 设置 是否允许为空，(0.否,1.是) * 设置 是否允许为空，(0.否,1.是)
* @param fieldNull * @param fieldNull
*/ */
public void setFieldNull(Integer fieldNull){ public void setFieldNull(Integer fieldNull){
this.fieldNull = fieldNull; this.fieldNull = fieldNull;
} }
/** /**
* 获取 字段是否列表显示(0.否,1.是) * 获取 字段是否列表显示(0.否,1.是)
* @return Integer * @return Integer
*/ */
public Integer getIsList(){ public Integer getIsList(){
return isList; return isList;
} }
/** /**
* 设置 字段是否列表显示(0.否,1.是) * 设置 字段是否列表显示(0.否,1.是)
* @param isList * @param isList
*/ */
public void setIsList(Integer isList){ public void setIsList(Integer isList){
this.isList = isList; this.isList = isList;
} }
/** /**
* 获取 排序号 * 获取 排序号
* @return String * @return Integer
*/ */
public String getFieldOrderNo(){ public Integer getFieldOrderNo(){
return fieldOrderNo; return fieldOrderNo;
} }
/** /**
* 设置 排序号 * 设置 排序号
* @param fieldOrderNo * @param fieldOrderNo
*/ */
public void setFieldOrderNo(String fieldOrderNo){ public void setFieldOrderNo(Integer fieldOrderNo){
this.fieldOrderNo = fieldOrderNo; this.fieldOrderNo = fieldOrderNo;
} }
/** /**
* 获取 备注 * 获取 备注
* @return String * @return String
*/ */
public String getRemark(){ public String getRemark(){
return remark; return remark;
} }
/** /**
* 设置 备注 * 设置 备注
* @param remark * @param remark
*/ */
public void setRemark(String remark){ public void setRemark(String remark){
this.remark = remark; this.remark = remark;
} }
...@@ -224,7 +224,7 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo { ...@@ -224,7 +224,7 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
...@@ -232,7 +232,7 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo { ...@@ -232,7 +232,7 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
if (obj instanceof AppInfoTempleteFieldEntity) { if (obj instanceof AppInfoTempleteFieldEntity) {
AppInfoTempleteFieldEntity tmp = (AppInfoTempleteFieldEntity) obj; AppInfoTempleteFieldEntity tmp = (AppInfoTempleteFieldEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
...@@ -256,26 +256,26 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo { ...@@ -256,26 +256,26 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
public void initAttrValue(){ public void initAttrValue(){
this.appId = null; this.appId = null;
this.fieldCode = null; this.fieldCode = "";
this.fieldName = null; this.fieldName = "";
this.fieldType = null; this.fieldType = "";
this.dataType = null; this.dataType = "";
this.fieldValue = null; this.fieldValue = "";
this.fieldLen = null; this.fieldLen = 0;
this.fieldNull = 1; this.fieldNull = 1;
this.isList = null; this.isList = 0;
this.fieldOrderNo = null; this.fieldOrderNo = 1;
this.remark = null; this.remark = "";
} }
} }
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/app/web/AppController.java
View file @ 6765aafa
...@@ -6,6 +6,10 @@ import com.mortals.framework.exception.AppException; ...@@ -6,6 +6,10 @@ import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.AppFieldTypeEnum;
import com.mortals.xhx.common.code.AppTypeEnum;
import com.mortals.xhx.common.code.DataTypeEnum;
import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.module.app.model.AppEntity; import com.mortals.xhx.module.app.model.AppEntity;
import com.mortals.xhx.module.app.model.AppQuery; import com.mortals.xhx.module.app.model.AppQuery;
import com.mortals.xhx.module.app.service.AppService; import com.mortals.xhx.module.app.service.AppService;
...@@ -44,10 +48,11 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService, ...@@ -44,10 +48,11 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService,
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "type", paramService.getParamBySecondOrganize("App", "type")); this.addDict(model, "type", AppTypeEnum.getEnumMap());
this.addDict(model, "shelves", paramService.getParamBySecondOrganize("App", "shelves")); this.addDict(model, "shelves", paramService.getParamBySecondOrganize("App", "shelves"));
this.addDict(model, "distribute", paramService.getParamBySecondOrganize("App", "distribute")); this.addDict(model, "distribute", YesNoEnum.getEnumMap());
this.addDict(model, "dateUpdate", paramService.getParamBySecondOrganize("App", "dateUpdate")); this.addDict(model, "dateUpdate", YesNoEnum.getEnumMap());
super.init(model, context); super.init(model, context);
} }
...@@ -84,8 +89,6 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService, ...@@ -84,8 +89,6 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService,
} }
/** /**
* app应用克隆给其它站点 * app应用克隆给其它站点
*/ */
......
base-manager/src/main/java/com/mortals/xhx/module/app/web/AppInfoFieldController.java
View file @ 6765aafa
package com.mortals.xhx.module.app.web; package com.mortals.xhx.module.app.web;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.AppFieldTypeEnum;
import com.mortals.xhx.common.code.DataTypeEnum;
import com.mortals.xhx.common.code.YesNoEnum;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
...@@ -42,10 +45,10 @@ public class AppInfoFieldController extends BaseCRUDJsonBodyMappingController<Ap ...@@ -42,10 +45,10 @@ public class AppInfoFieldController extends BaseCRUDJsonBodyMappingController<Ap
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "fieldType", paramService.getParamBySecondOrganize("AppInfoField","fieldType")); this.addDict(model, "dataType", DataTypeEnum.getEnumMap());
this.addDict(model, "dataType", paramService.getParamBySecondOrganize("AppInfoField","dataType")); this.addDict(model, "fieldType", AppFieldTypeEnum.getEnumMap());
this.addDict(model, "fieldNull", paramService.getParamBySecondOrganize("AppInfoField","fieldNull")); this.addDict(model, "fieldNull", YesNoEnum.getEnumMap());
this.addDict(model, "isList", paramService.getParamBySecondOrganize("AppInfoField","isList")); this.addDict(model, "isList", YesNoEnum.getEnumMap());
super.init(model, context); super.init(model, context);
} }
......
base-manager/src/test/java/com/mortals/httpclient/app/AppController.http
View file @ 6765aafa
...@@ -57,7 +57,7 @@ Authorization: {{authToken}} ...@@ -57,7 +57,7 @@ Authorization: {{authToken}}
Content-Type: application/json Content-Type: application/json
{ {
"id":5, "id":6,
"siteName":"汇东县", "siteName":"汇东县",
"appCode":"ckp", "appCode":"ckp",
"appName":"测试应用1", "appName":"测试应用1",
...@@ -66,8 +66,8 @@ Content-Type: application/json ...@@ -66,8 +66,8 @@ Content-Type: application/json
"type":1, "type":1,
"downDevCount":0, "downDevCount":0,
"shelves":0, "shelves":0,
"fileName":"窗口屏.zip", "fileName":"窗口屏1.zip",
"filePath":"/file/uploadfile/1661928678354.zip", "filePath":"/file/uploadfile/1664180492089.zip",
"summary":"vyk2sq" "summary":"vyk2sq"
} }
......
base-manager/src/test/java/com/mortals/httpclient/app/AppVersionController.http
View file @ 6765aafa
...@@ -62,7 +62,12 @@ Accept: application/json ...@@ -62,7 +62,12 @@ Accept: application/json
###自助终端应用版本使用 ###自助终端应用版本使用
POST {{baseUrl}}/app/version/used?appVersionId=3 POST {{baseUrl}}/app/version/used?appVersionId=4
Authorization: {{authToken}}
Accept: application/json
###自助终端应用版本预览
GET {{baseUrl}}/app/version/preview?appVersionId=4
Authorization: {{authToken}} Authorization: {{authToken}}
Accept: application/json Accept: application/json
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment