Skip to content

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

修改应用模板

parent 07b53e1a
Show whitespace changes
Inline Side-by-side
Showing with 2683 additions and 2341 deletions
base-manager/db/base_modules.sql
View file @ 6765aafa
......@@ -984,45 +984,44 @@ CREATE TABLE mortals_sys_app_dataset
-- 自助终端应用信息字段表
-- ----------------------------
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 '序号，主键，自增长',
`datasetId` bigint(20) COMMENT '应用数据集id',
`fieldCode` varchar(64) COMMENT '字段编码',
`fieldName` varchar(64) COMMENT '字段名称',
`fieldType` varchar(64) COMMENT '字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）',
`dataType` varchar(64) COMMENT '数据类型（number.数字,string.字符串）',
`fieldValue` longtext COMMENT '字段值',
`fieldValue` text COMMENT '字段值',
`fieldLen` int(9) COMMENT '数据长度，默认128',
`fieldNull` tinyint(2) COMMENT '是否允许为空，(0.否,1.是)',
`isList` tinyint(2) COMMENT '字段是否列表显示(0.否,1.是)',
`fieldOrderNo` varchar(64) COMMENT '排序号',
`fieldOrderNo` int(9) COMMENT '排序号',
`remark` varchar(1024) COMMENT '备注',
`createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户',
`updateTime` datetime COMMENT '修改时间',
`updateUserId` bigint(20) COMMENT '修改用户',
PRIMARY KEY (`id`),
KEY `datasetId` (`datasetId`)
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='自助终端应用信息字段';
-- ----------------------------
-- 自助终端应用模板信息字段表
-- ----------------------------
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 '序号，主键，自增长',
`appId` bigint(20) COMMENT '应用id',
`fieldCode` varchar(64) COMMENT '字段编码',
`fieldName` varchar(64) COMMENT '字段名称',
`fieldType` varchar(64) COMMENT '字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）',
`fieldType` varchar(64) COMMENT '字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）',
`dataType` varchar(64) COMMENT '数据类型（number.数字,string.字符串）',
`fieldValue` varchar(64) COMMENT '字段值',
`fieldLen` int(9) COMMENT '数据长度，默认128',
`fieldNull` tinyint(2) COMMENT '是否允许为空，(0.否,1.是)',
`isList` tinyint(2) COMMENT '字段是否列表显示(0.否,1.是)',
`fieldOrderNo` varchar(64) COMMENT '排序号',
`fieldOrderNo` int(9) COMMENT '排序号',
`remark` varchar(1024) COMMENT '备注',
`createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户',
......@@ -1031,6 +1030,8 @@ CREATE TABLE mortals_sys_app_info_templete_field
PRIMARY KEY (`id`)
) 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;
* @author zxfei
*/
public enum DataTypeEnum {
number("number.数字", "number.数字"),
string("string.字符串", "string.字符串");
number("number", "数字"),
string("string", "字符串");
private String value;
private String desc;
......
base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoFieldEntity.java
View file @ 6765aafa
......@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.app.model.vo.AppInfoFieldVo;
/**
* 自助终端应用信息字段实体对象
*
* @author zxfei
* @date 2022-11-28
*/
* 自助终端应用信息字段实体对象
*
* @author zxfei
* @date 2022-12-02
*/
public class AppInfoFieldEntity extends AppInfoFieldVo {
private static final long serialVersionUID = 1L;
......@@ -55,7 +55,7 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
/**
* 排序号
*/
private String fieldOrderNo;
private Integer fieldOrderNo;
/**
* 备注
*/
......@@ -192,16 +192,16 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
}
/**
* 获取 排序号
* @return String
* @return Integer
*/
public String getFieldOrderNo(){
public Integer getFieldOrderNo(){
return fieldOrderNo;
}
/**
* 设置 排序号
* @param fieldOrderNo
*/
public void setFieldOrderNo(String fieldOrderNo){
public void setFieldOrderNo(Integer fieldOrderNo){
this.fieldOrderNo = fieldOrderNo;
}
/**
......@@ -258,24 +258,24 @@ public class AppInfoFieldEntity extends AppInfoFieldVo {
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.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/AppInfoFieldQuery.java
View file @ 6765aafa
......@@ -3,11 +3,11 @@ package com.mortals.xhx.module.app.model;
import java.util.List;
import com.mortals.xhx.module.app.model.AppInfoFieldEntity;
/**
* 自助终端应用信息字段查询对象
*
* @author zxfei
* @date 2022-11-28
*/
* 自助终端应用信息字段查询对象
*
* @author zxfei
* @date 2022-12-02
*/
public class AppInfoFieldQuery extends AppInfoFieldEntity {
/** 开始 序号，主键，自增长 */
private Long idStart;
......@@ -84,8 +84,17 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
/** 字段是否列表显示(0.否,1.是)列表 */
private List <Integer> isListList;
/** 排序号 */
private List<String> fieldOrderNoList;
/** 开始 排序号 */
private Integer fieldOrderNoStart;
/** 结束 排序号 */
private Integer fieldOrderNoEnd;
/** 增加 排序号 */
private Integer fieldOrderNoIncrement;
/** 排序号列表 */
private List <Integer> fieldOrderNoList;
/** 备注 */
private List<String> remarkList;
......@@ -529,11 +538,59 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
this.isListList = isListList;
}
/**
* 获取 开始 排序号
* @return fieldOrderNoStart
*/
public Integer getFieldOrderNoStart(){
return this.fieldOrderNoStart;
}
/**
* 设置 开始 排序号
* @param fieldOrderNoStart
*/
public void setFieldOrderNoStart(Integer fieldOrderNoStart){
this.fieldOrderNoStart = fieldOrderNoStart;
}
/**
* 获取 结束 排序号
* @return $fieldOrderNoEnd
*/
public Integer getFieldOrderNoEnd(){
return this.fieldOrderNoEnd;
}
/**
* 设置 结束 排序号
* @param fieldOrderNoEnd
*/
public void setFieldOrderNoEnd(Integer fieldOrderNoEnd){
this.fieldOrderNoEnd = fieldOrderNoEnd;
}
/**
* 获取 增加 排序号
* @return fieldOrderNoIncrement
*/
public Integer getFieldOrderNoIncrement(){
return this.fieldOrderNoIncrement;
}
/**
* 设置 增加 排序号
* @param fieldOrderNoIncrement
*/
public void setFieldOrderNoIncrement(Integer fieldOrderNoIncrement){
this.fieldOrderNoIncrement = fieldOrderNoIncrement;
}
/**
* 获取 排序号
* @return fieldOrderNoList
*/
public List<String> getFieldOrderNoList(){
public List<Integer> getFieldOrderNoList(){
return this.fieldOrderNoList;
}
......@@ -541,9 +598,10 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
* 设置 排序号
* @param fieldOrderNoList
*/
public void setFieldOrderNoList(List<String> fieldOrderNoList){
public void setFieldOrderNoList(List<Integer> fieldOrderNoList){
this.fieldOrderNoList = fieldOrderNoList;
}
/**
* 获取 备注
* @return remarkList
......@@ -1071,21 +1129,47 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
return this;
}
/**
* 设置 排序号
* @param fieldOrderNo
*/
public AppInfoFieldQuery fieldOrderNo(String fieldOrderNo){
public AppInfoFieldQuery fieldOrderNo(Integer fieldOrderNo){
setFieldOrderNo(fieldOrderNo);
return this;
}
/**
* 设置 开始 排序号
* @param fieldOrderNoStart
*/
public AppInfoFieldQuery fieldOrderNoStart(Integer fieldOrderNoStart){
this.fieldOrderNoStart = fieldOrderNoStart;
return this;
}
/**
* 设置 结束 排序号
* @param fieldOrderNoEnd
*/
public AppInfoFieldQuery fieldOrderNoEnd(Integer fieldOrderNoEnd){
this.fieldOrderNoEnd = fieldOrderNoEnd;
return this;
}
/**
* 设置 增加 排序号
* @param fieldOrderNoIncrement
*/
public AppInfoFieldQuery fieldOrderNoIncrement(Integer fieldOrderNoIncrement){
this.fieldOrderNoIncrement = fieldOrderNoIncrement;
return this;
}
/**
* 设置 排序号
* @param fieldOrderNoList
*/
public AppInfoFieldQuery fieldOrderNoList(List<String> fieldOrderNoList){
public AppInfoFieldQuery fieldOrderNoList(List<Integer> fieldOrderNoList){
this.fieldOrderNoList = fieldOrderNoList;
return this;
}
......
base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoTempleteFieldEntity.java
View file @ 6765aafa
......@@ -7,11 +7,11 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.app.model.vo.AppInfoTempleteFieldVo;
/**
* 自助终端应用模板信息字段实体对象
*
* @author zxfei
* @date 2022-11-28
*/
* 自助终端应用模板信息字段实体对象
*
* @author zxfei
* @date 2022-12-02
*/
public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
private static final long serialVersionUID = 1L;
......@@ -29,7 +29,7 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
*/
private String fieldName;
/**
* 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）
* 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
*/
private String fieldType;
/**
......@@ -55,7 +55,7 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
/**
* 排序号
*/
private String fieldOrderNo;
private Integer fieldOrderNo;
/**
* 备注
*/
......@@ -107,14 +107,14 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
this.fieldName = fieldName;
}
/**
* 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）
* 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
* @return String
*/
public String getFieldType(){
return fieldType;
}
/**
* 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）
* 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
* @param fieldType
*/
public void setFieldType(String fieldType){
......@@ -192,16 +192,16 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
}
/**
* 获取 排序号
* @return String
* @return Integer
*/
public String getFieldOrderNo(){
public Integer getFieldOrderNo(){
return fieldOrderNo;
}
/**
* 设置 排序号
* @param fieldOrderNo
*/
public void setFieldOrderNo(String fieldOrderNo){
public void setFieldOrderNo(Integer fieldOrderNo){
this.fieldOrderNo = fieldOrderNo;
}
/**
......@@ -258,24 +258,24 @@ public class AppInfoTempleteFieldEntity extends AppInfoTempleteFieldVo {
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.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/AppInfoTempleteFieldQuery.java
View file @ 6765aafa
......@@ -3,11 +3,11 @@ package com.mortals.xhx.module.app.model;
import java.util.List;
import com.mortals.xhx.module.app.model.AppInfoTempleteFieldEntity;
/**
* 自助终端应用模板信息字段查询对象
*
* @author zxfei
* @date 2022-11-28
*/
* 自助终端应用模板信息字段查询对象
*
* @author zxfei
* @date 2022-12-02
*/
public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
/** 开始 序号，主键，自增长 */
private Long idStart;
......@@ -39,7 +39,7 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
/** 字段名称 */
private List<String> fieldNameList;
/** 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框） */
/** 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本） */
private List<String> fieldTypeList;
/** 数据类型（number.数字,string.字符串） */
......@@ -84,8 +84,17 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
/** 字段是否列表显示(0.否,1.是)列表 */
private List <Integer> isListList;
/** 排序号 */
private List<String> fieldOrderNoList;
/** 开始 排序号 */
private Integer fieldOrderNoStart;
/** 结束 排序号 */
private Integer fieldOrderNoEnd;
/** 增加 排序号 */
private Integer fieldOrderNoIncrement;
/** 排序号列表 */
private List <Integer> fieldOrderNoList;
/** 备注 */
private List<String> remarkList;
......@@ -293,7 +302,7 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
this.fieldNameList = fieldNameList;
}
/**
* 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）
* 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
* @return fieldTypeList
*/
public List<String> getFieldTypeList(){
......@@ -301,7 +310,7 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
}
/**
* 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）
* 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
* @param fieldTypeList
*/
public void setFieldTypeList(List<String> fieldTypeList){
......@@ -529,11 +538,59 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
this.isListList = isListList;
}
/**
* 获取 开始 排序号
* @return fieldOrderNoStart
*/
public Integer getFieldOrderNoStart(){
return this.fieldOrderNoStart;
}
/**
* 设置 开始 排序号
* @param fieldOrderNoStart
*/
public void setFieldOrderNoStart(Integer fieldOrderNoStart){
this.fieldOrderNoStart = fieldOrderNoStart;
}
/**
* 获取 结束 排序号
* @return $fieldOrderNoEnd
*/
public Integer getFieldOrderNoEnd(){
return this.fieldOrderNoEnd;
}
/**
* 设置 结束 排序号
* @param fieldOrderNoEnd
*/
public void setFieldOrderNoEnd(Integer fieldOrderNoEnd){
this.fieldOrderNoEnd = fieldOrderNoEnd;
}
/**
* 获取 增加 排序号
* @return fieldOrderNoIncrement
*/
public Integer getFieldOrderNoIncrement(){
return this.fieldOrderNoIncrement;
}
/**
* 设置 增加 排序号
* @param fieldOrderNoIncrement
*/
public void setFieldOrderNoIncrement(Integer fieldOrderNoIncrement){
this.fieldOrderNoIncrement = fieldOrderNoIncrement;
}
/**
* 获取 排序号
* @return fieldOrderNoList
*/
public List<String> getFieldOrderNoList(){
public List<Integer> getFieldOrderNoList(){
return this.fieldOrderNoList;
}
......@@ -541,9 +598,10 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
* 设置 排序号
* @param fieldOrderNoList
*/
public void setFieldOrderNoList(List<String> fieldOrderNoList){
public void setFieldOrderNoList(List<Integer> fieldOrderNoList){
this.fieldOrderNoList = fieldOrderNoList;
}
/**
* 获取 备注
* @return remarkList
......@@ -881,7 +939,7 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
/**
* 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）
* 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
* @param fieldType
*/
public AppInfoTempleteFieldQuery fieldType(String fieldType){
......@@ -890,7 +948,7 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
}
/**
* 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）
* 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
* @param fieldTypeList
*/
public AppInfoTempleteFieldQuery fieldTypeList(List<String> fieldTypeList){
......@@ -1071,21 +1129,47 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
return this;
}
/**
* 设置 排序号
* @param fieldOrderNo
*/
public AppInfoTempleteFieldQuery fieldOrderNo(String fieldOrderNo){
public AppInfoTempleteFieldQuery fieldOrderNo(Integer fieldOrderNo){
setFieldOrderNo(fieldOrderNo);
return this;
}
/**
* 设置 开始 排序号
* @param fieldOrderNoStart
*/
public AppInfoTempleteFieldQuery fieldOrderNoStart(Integer fieldOrderNoStart){
this.fieldOrderNoStart = fieldOrderNoStart;
return this;
}
/**
* 设置 结束 排序号
* @param fieldOrderNoEnd
*/
public AppInfoTempleteFieldQuery fieldOrderNoEnd(Integer fieldOrderNoEnd){
this.fieldOrderNoEnd = fieldOrderNoEnd;
return this;
}
/**
* 设置 增加 排序号
* @param fieldOrderNoIncrement
*/
public AppInfoTempleteFieldQuery fieldOrderNoIncrement(Integer fieldOrderNoIncrement){
this.fieldOrderNoIncrement = fieldOrderNoIncrement;
return this;
}
/**
* 设置 排序号
* @param fieldOrderNoList
*/
public AppInfoTempleteFieldQuery fieldOrderNoList(List<String> fieldOrderNoList){
public AppInfoTempleteFieldQuery fieldOrderNoList(List<Integer> fieldOrderNoList){
this.fieldOrderNoList = fieldOrderNoList;
return this;
}
......
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;
import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
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.AppQuery;
import com.mortals.xhx.module.app.service.AppService;
......@@ -44,10 +48,11 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService,
@Override
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, "distribute", paramService.getParamBySecondOrganize("App", "distribute"));
this.addDict(model, "dateUpdate", paramService.getParamBySecondOrganize("App", "dateUpdate"));
this.addDict(model, "distribute", YesNoEnum.getEnumMap());
this.addDict(model, "dateUpdate", YesNoEnum.getEnumMap());
super.init(model, context);
}
......@@ -84,8 +89,6 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService,
}
/**
* app应用克隆给其它站点
*/
......
base-manager/src/main/java/com/mortals/xhx/module/app/web/AppInfoFieldController.java
View file @ 6765aafa
package com.mortals.xhx.module.app.web;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
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.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
......@@ -42,10 +45,10 @@ public class AppInfoFieldController extends BaseCRUDJsonBodyMappingController<Ap
@Override
protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "fieldType", paramService.getParamBySecondOrganize("AppInfoField","fieldType"));
this.addDict(model, "dataType", paramService.getParamBySecondOrganize("AppInfoField","dataType"));
this.addDict(model, "fieldNull", paramService.getParamBySecondOrganize("AppInfoField","fieldNull"));
this.addDict(model, "isList", paramService.getParamBySecondOrganize("AppInfoField","isList"));
this.addDict(model, "dataType", DataTypeEnum.getEnumMap());
this.addDict(model, "fieldType", AppFieldTypeEnum.getEnumMap());
this.addDict(model, "fieldNull", YesNoEnum.getEnumMap());
this.addDict(model, "isList", YesNoEnum.getEnumMap());
super.init(model, context);
}
......
base-manager/src/main/resources/sqlmap/module/app/AppInfoFieldMapper.xml
View file @ 6765aafa
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.app.dao.ibatis.AppInfoFieldDaoImpl">
<!-- 字段和属性映射 -->
......@@ -144,6 +144,9 @@
<if test="(colPickMode==0 and data.containsKey('fieldOrderNo')) or (colPickMode==1 and !data.containsKey('fieldOrderNo'))">
a.fieldOrderNo=#{data.fieldOrderNo},
</if>
<if test="(colPickMode==0 and data.containsKey('fieldOrderNoIncrement')) or (colPickMode==1 and !data.containsKey('fieldOrderNoIncrement'))">
a.fieldOrderNo=ifnull(a.fieldOrderNo,0) + #{data.fieldOrderNoIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
a.remark=#{data.remark},
</if>
......@@ -262,9 +265,14 @@
</trim>
<trim prefix="fieldOrderNo=(case" suffix="ELSE fieldOrderNo end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('fieldOrderNo')) or (colPickMode==1 and !item.containsKey('fieldOrderNo'))">
<choose>
<when test="(colPickMode==0 and item.containsKey('fieldOrderNo')) or (colPickMode==1 and !item.containsKey('fieldOrderNo'))">
when a.id=#{item.id} then #{item.fieldOrderNo}
</if>
</when>
<when test="(colPickMode==0 and item.containsKey('fieldOrderNoIncrement')) or (colPickMode==1 and !item.containsKey('fieldOrderNoIncrement'))">
when a.id=#{item.id} then ifnull(a.fieldOrderNo,0) + #{item.fieldOrderNoIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="remark=(case" suffix="ELSE remark end),">
......@@ -608,10 +616,9 @@
${_conditionType_} a.isList <![CDATA[ <= ]]> #{${_conditionParam_}.isListEnd}
</if>
<if test="conditionParamRef.containsKey('fieldOrderNo')">
<if test="conditionParamRef.fieldOrderNo != null and conditionParamRef.fieldOrderNo != ''">
${_conditionType_} a.fieldOrderNo like #{${_conditionParam_}.fieldOrderNo}
<if test="conditionParamRef.fieldOrderNo != null ">
${_conditionType_} a.fieldOrderNo = #{${_conditionParam_}.fieldOrderNo}
</if>
<if test="conditionParamRef.fieldOrderNo == null">
${_conditionType_} a.fieldOrderNo is null
......@@ -623,6 +630,13 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fieldOrderNoStart') and conditionParamRef.fieldOrderNoStart != null">
${_conditionType_} a.fieldOrderNo <![CDATA[ >= ]]> #{${_conditionParam_}.fieldOrderNoStart}
</if>
<if test="conditionParamRef.containsKey('fieldOrderNoEnd') and conditionParamRef.fieldOrderNoEnd != null">
${_conditionType_} a.fieldOrderNo <![CDATA[ <= ]]> #{${_conditionParam_}.fieldOrderNoEnd}
</if>
<if test="conditionParamRef.containsKey('remark')">
<if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
......
base-manager/src/main/resources/sqlmap/module/app/AppInfoTempleteFieldMapper.xml
View file @ 6765aafa
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.app.dao.ibatis.AppInfoTempleteFieldDaoImpl">
<!-- 字段和属性映射 -->
......@@ -144,6 +144,9 @@
<if test="(colPickMode==0 and data.containsKey('fieldOrderNo')) or (colPickMode==1 and !data.containsKey('fieldOrderNo'))">
a.fieldOrderNo=#{data.fieldOrderNo},
</if>
<if test="(colPickMode==0 and data.containsKey('fieldOrderNoIncrement')) or (colPickMode==1 and !data.containsKey('fieldOrderNoIncrement'))">
a.fieldOrderNo=ifnull(a.fieldOrderNo,0) + #{data.fieldOrderNoIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
a.remark=#{data.remark},
</if>
......@@ -262,9 +265,14 @@
</trim>
<trim prefix="fieldOrderNo=(case" suffix="ELSE fieldOrderNo end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('fieldOrderNo')) or (colPickMode==1 and !item.containsKey('fieldOrderNo'))">
<choose>
<when test="(colPickMode==0 and item.containsKey('fieldOrderNo')) or (colPickMode==1 and !item.containsKey('fieldOrderNo'))">
when a.id=#{item.id} then #{item.fieldOrderNo}
</if>
</when>
<when test="(colPickMode==0 and item.containsKey('fieldOrderNoIncrement')) or (colPickMode==1 and !item.containsKey('fieldOrderNoIncrement'))">
when a.id=#{item.id} then ifnull(a.fieldOrderNo,0) + #{item.fieldOrderNoIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="remark=(case" suffix="ELSE remark end),">
......@@ -608,10 +616,9 @@
${_conditionType_} a.isList <![CDATA[ <= ]]> #{${_conditionParam_}.isListEnd}
</if>
<if test="conditionParamRef.containsKey('fieldOrderNo')">
<if test="conditionParamRef.fieldOrderNo != null and conditionParamRef.fieldOrderNo != ''">
${_conditionType_} a.fieldOrderNo like #{${_conditionParam_}.fieldOrderNo}
<if test="conditionParamRef.fieldOrderNo != null ">
${_conditionType_} a.fieldOrderNo = #{${_conditionParam_}.fieldOrderNo}
</if>
<if test="conditionParamRef.fieldOrderNo == null">
${_conditionType_} a.fieldOrderNo is null
......@@ -623,6 +630,13 @@
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fieldOrderNoStart') and conditionParamRef.fieldOrderNoStart != null">
${_conditionType_} a.fieldOrderNo <![CDATA[ >= ]]> #{${_conditionParam_}.fieldOrderNoStart}
</if>
<if test="conditionParamRef.containsKey('fieldOrderNoEnd') and conditionParamRef.fieldOrderNoEnd != null">
${_conditionType_} a.fieldOrderNo <![CDATA[ <= ]]> #{${_conditionParam_}.fieldOrderNoEnd}
</if>
<if test="conditionParamRef.containsKey('remark')">
<if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
......
base-manager/src/test/java/com/mortals/httpclient/app/AppController.http
View file @ 6765aafa
......@@ -57,7 +57,7 @@ Authorization: {{authToken}}
Content-Type: application/json
{
"id":5,
"id":6,
"siteName":"汇东县",
"appCode":"ckp",
"appName":"测试应用1",
......@@ -66,8 +66,8 @@ Content-Type: application/json
"type":1,
"downDevCount":0,
"shelves":0,
"fileName":"窗口屏.zip",
"filePath":"/file/uploadfile/1661928678354.zip",
"fileName":"窗口屏1.zip",
"filePath":"/file/uploadfile/1664180492089.zip",
"summary":"vyk2sq"
}
......
base-manager/src/test/java/com/mortals/httpclient/app/AppVersionController.http
View file @ 6765aafa
......@@ -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}}
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