Skip to content

S
smart_gov_platform
Commit 4c59864b authored by “yiyousong”'s avatar “yiyousong”
Browse files
Options

Merge branch 'master' of http://gitlab.scsmile.cn/zxf/smart_gov_platform

parents a8aa14c3 e6d0761d
Hide whitespace changes
Inline Side-by-side
Showing with 4913 additions and 3175 deletions
base-manager/db/base_modules.sql
View file @ 4c59864b
...@@ -927,34 +927,45 @@ CREATE TABLE mortals_sys_matter_ext ...@@ -927,34 +927,45 @@ CREATE TABLE mortals_sys_matter_ext
-- ----------------------------
-- 自助终端应用表
-- ----------------------------
-- ---------------------------- -- ----------------------------
-- 自助终端应用表 -- 自助终端应用表
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `mortals_sys_app`; DROP TABLE IF EXISTS `mortals_sys_app`;
CREATE TABLE mortals_sys_app CREATE TABLE mortals_sys_app(
( `id` bigint(20) AUTO_INCREMENT COMMENT '主键ID，主键，自增长',
`id` bigint(20) AUTO_INCREMENT COMMENT '主键ID，主键，自增长', `siteId` bigint(20) COMMENT '站点Id',
`siteId` bigint(20) COMMENT '站点Id', `siteName` varchar(256) COMMENT '站点名称',
`siteName` varchar(256) COMMENT '站点名称', `appCode` varchar(256) COMMENT '应用编码',
`appCode` varchar(256) COMMENT '应用编码', `appName` varchar(256) COMMENT '应用名称',
`appName` varchar(256) COMMENT '应用名称', `appIconPath` varchar(256) COMMENT '应用图标',
`appIconPath` varchar(256) COMMENT '应用图标', `appThemeName` varchar(256) COMMENT '应用主题名称',
`appThemeName` varchar(256) COMMENT '应用主题名称', `type` tinyint(2) COMMENT '类型(1.终端应用,2.移动端应用)',
`type` tinyint(2) COMMENT '类型(1.终端应用,2.移动端应用)', `downDevCount` int(4) COMMENT '下发设备次数',
`downDevCount` int(4) COMMENT '下发设备次数', `shelves` tinyint(2) COMMENT '是否上架(0.下架，1.上架)',
`shelves` tinyint(2) COMMENT '是否上架(0.上架，1.下架)', `appType` tinyint(2) COMMENT '类型(1.应用程序,2.url)',
`filePath` varchar(256) COMMENT '文件相对路径地址', `fileName` varchar(255) COMMENT '文件名称',
`distributeFilePath` varchar(256) COMMENT '文件部署路径地址', `filePath` varchar(256) COMMENT '文件相对路径地址',
`version` varchar(64) COMMENT '当前版本', `distributeFilePath` varchar(256) COMMENT '文件部署路径地址',
`summary` varchar(2048) COMMENT '简介', `version` int(9) COMMENT '当前版本',
`distribute` tinyint(2) COMMENT '是否部署(0.否，1.是)', `summary` varchar(2048) COMMENT '简介',
`dateUpdate` tinyint(2) COMMENT '是否数据更新(0.否，1.是)', `notes` varchar(512) COMMENT '更新说明',
`createTime` datetime COMMENT '创建时间', `distribute` tinyint(2) COMMENT '是否部署(0.否，1.是)',
`updateUserId` bigint(20) COMMENT '更新用户', `dataUpdate` tinyint(2) COMMENT '是否数据更新(0.否，1.是)',
`updateTime` datetime COMMENT '更新时间', `createTime` datetime COMMENT '创建时间',
PRIMARY KEY (`id`) `updateUserId` bigint(20) COMMENT '更新用户',
`updateTime` datetime COMMENT '更新时间',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='自助终端应用'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='自助终端应用';
-- ---------------------------- -- ----------------------------
-- 自助终端应用数据集表 -- 自助终端应用数据集表
-- ---------------------------- -- ----------------------------
...@@ -973,67 +984,72 @@ CREATE TABLE mortals_sys_app_dataset ...@@ -973,67 +984,72 @@ 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` 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='自助终端应用信息字段';
-- ---------------------------- -- ----------------------------
-- 自助终端应用模板信息字段表 -- 自助终端应用模板信息字段表
-- ---------------------------- -- ----------------------------
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='自助终端应用模板信息字段';
-- ---------------------------- -- ----------------------------
-- 自助终端应用版本历史表 -- 自助终端应用版本历史表
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `mortals_sys_app_version`; DROP TABLE IF EXISTS `mortals_sys_app_version`;
CREATE TABLE mortals_sys_app_version CREATE TABLE `mortals_sys_app_version` (
( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键ID，主键，自增长',
`id` bigint(20) AUTO_INCREMENT COMMENT '主键ID，主键，自增长', `appId` bigint(20) DEFAULT NULL COMMENT 'app应用Id',
`appId` bigint(20) COMMENT 'app应用Id', `appName` varchar(256) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' COMMENT '应用名称',
`appName` varchar(256) COMMENT '应用名称', `version` int(9) COMMENT '版本号',
`version` varchar(256) COMMENT '版本号', `notes` varchar(512) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' COMMENT '更新说明',
`notes` varchar(2048) COMMENT '更新说明', `fileName` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' COMMENT '文件名称',
`createTime` datetime COMMENT '创建时间', `filePath` varchar(256) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' COMMENT '文件相对路径地址',
`updateUserId` bigint(20) COMMENT '更新用户', `distributeFilePath` varchar(256) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' COMMENT '文件部署路径地址',
`updateTime` datetime COMMENT '更新时间', `used` tinyint(2) DEFAULT '0' COMMENT '是否使用(0.否，1.是)',
PRIMARY KEY (`id`) `createTime` datetime DEFAULT NULL COMMENT '创建时间',
`updateUserId` bigint(20) DEFAULT NULL COMMENT '更新用户',
`updateTime` datetime DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='自助终端应用版本历史'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='自助终端应用版本历史';
base-manager/doc/api.md
View file @ 4c59864b
...@@ -9144,7 +9144,7 @@ data| object |数据对象 ...@@ -9144,7 +9144,7 @@ data| object |数据对象
  version| String |当前版本   version| String |当前版本
  summary| String |简介   summary| String |简介
  distribute| Integer |是否部署(0.否，1.是)   distribute| Integer |是否部署(0.否，1.是)
  dateUpdate| Integer |是否数据更新(0.否，1.是)   dataUpdate| Integer |是否数据更新(0.否，1.是)
  appDatasetList| array |数据结果集   appDatasetList| array |数据结果集
  applianceSiteScope| Integer |适用站点范围数量   applianceSiteScope| Integer |适用站点范围数量
  siteIdList| array |适用范围站点列表   siteIdList| array |适用范围站点列表
...@@ -9271,10 +9271,11 @@ appName|String|否|应用名称 ...@@ -9271,10 +9271,11 @@ appName|String|否|应用名称
appIconPath|String|否|应用图标 appIconPath|String|否|应用图标
appThemeName|String|否|应用主题名称 appThemeName|String|否|应用主题名称
type|Integer|否|类型(1.终端应用,2.移动端应用) type|Integer|否|类型(1.终端应用,2.移动端应用)
shelves|Integer|否|是否上架(0.上架，1.下架) appType|Integer|否|类型(1.应用程序,2.url)
shelves|Integer|否|是否上架(0.下架，1.上架)
filePath|String|否|文件相对路径地址 filePath|String|否|文件相对路径地址
summary|String|否|简介 summary|String|否|简介
dateUpdate|Integer|否|是否数据更新(0.否，1.是) dataUpdate|Integer|否|是否数据更新(0.否，1.是)
**请求样例:** **请求样例:**
...@@ -9287,12 +9288,13 @@ dateUpdate|Integer|否|是否数据更新(0.否，1.是) ...@@ -9287,12 +9288,13 @@ dateUpdate|Integer|否|是否数据更新(0.否，1.是)
"appIconPath":"3dzxzj", "appIconPath":"3dzxzj",
"appThemeName":"jy1ied", "appThemeName":"jy1ied",
"type":1, "type":1,
"appType":1,
"downDevCount":1824, "downDevCount":1824,
"shelves":226, "shelves":226,
"filePath":"f20yrl", "filePath":"f20yrl",
"summary":"ahn2gk", "summary":"ahn2gk",
"distribute":0, "distribute":0,
"dateUpdate":5868, "dataUpdate":5868,
} }
``` ```
...@@ -9377,50 +9379,7 @@ msg|String|消息|- ...@@ -9377,50 +9379,7 @@ msg|String|消息|-
``` ```
### 自助终端应用部署
**请求URL:** app/appDistribute
**请求方式:** POST
**内容类型:** application/json;charset=utf-8
**简要描述:** 自主终端部署
**请求参数:**
参数名称|类型| 必填 |描述
:---|:---|:----|:-------
id|Long| 是 |应用app Id
**请求样例:**
```
{
"id":1
}
```
**响应参数:**
参数名称 |参数类型|描述
:---|:---|:------
code|Integer|结果码（-1.失败，1.成功）
msg|String|消息
data|object|数据对象
**响应消息样例:**
```
{
"msg":"部署成功",
"code":1,
"data":{}
}
}
```
### 自助终端应用克隆 ### 自助终端应用克隆
...@@ -10300,25 +10259,25 @@ appName|String|否|应用名称,字段前后添加%%模糊查询 ...@@ -10300,25 +10259,25 @@ appName|String|否|应用名称,字段前后添加%%模糊查询
**响应参数:** **响应参数:**
参数名称|参数类型|描述 参数名称| 参数类型 |描述
:---|:---|:------ :---|:---------|:------
code|Integer|结果码（-1.失败，1.成功） code| Integer |结果码（-1.失败，1.成功）
msg|String|消息 msg| String |消息
data|object|数据对象 data| object |数据对象
 per_page|Integer|每页条数  per_page| Integer |每页条数
 total|Integer|总条数  total| Integer |总条数
 last_page|Integer|总页数  last_page| Integer |总页数
 current_page|Integer|当前页  current_page| Integer |当前页
 data|array|结果集列表|数组  data| array |结果集列表|数组
  id|Long|主键ID，主键，自增长   id| Long |主键ID，主键，自增长
  appId|Long|app应用Id   appId| Long |app应用Id
  appName|String|应用名称   appName| String |应用名称
  version|String|版本号   version| Integer |版本号
  notes|String|更新说明   notes| String |更新说明
  createTime|Date|创建时间   createTime| Date |创建时间
  updateUserId|Long|更新用户   updateUserId| Long |更新用户
  updateTime|Date|更新时间   updateTime| Date |更新时间
dict|object|字典对象 dict| object |字典对象
**响应消息样例:** **响应消息样例:**
...@@ -10457,6 +10416,97 @@ msg|String|消息|- ...@@ -10457,6 +10416,97 @@ msg|String|消息|-
``` ```
### 自助终端应用使用
**请求URL:** app/version/used
**请求方式:** POST
**内容类型:** application/json;charset=utf-8
**简要描述:** 自主终端部署
**请求参数:**
参数名称|类型| 必填 |描述
:---|:---|:----|:-------
appVersionId|Long| 是 |应用版本 Id
**请求样例:**
```
{
"appVersionId":1
}
```
**响应参数:**
参数名称 |参数类型|描述
:---|:---|:------
code|Integer|结果码（-1.失败，1.成功）
msg|String|消息
data|object|数据对象
**响应消息样例:**
```
{
"msg":"应用成功",
"code":1,
"data":{}
}
}
```
### 自助终端应用预览
**请求URL:** app/version/preview
**请求方式:** GET
**内容类型:** application/json;charset=utf-8
**简要描述:** 自主终端预览
**请求参数:**
参数名称|类型| 必填 |描述
:---|:---|:----|:-------
appVersionId|Long| 是 |应用版本 Id
**请求样例:**
```
{
"appVersionId":1
}
```
**响应参数:**
参数名称 |参数类型|描述
:---|:---|:------
code|Integer|结果码（-1.失败，1.成功）
msg|String|消息
data|object|请求地址
**响应消息样例:**
```
{
"msg":"应用成功",
"code":1,
"data":"http://www.baidu.com/aa/"
}
}
```
## 字典附录 ## 字典附录
### isBusiness ### isBusiness
......
base-manager/src/main/java/com/mortals/xhx/common/code/AppFieldTypeEnum.java 0 → 100644
View file @ 4c59864b
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 @ 4c59864b
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 @ 4c59864b
...@@ -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/common/key/Constant.java
View file @ 4c59864b
...@@ -118,4 +118,10 @@ public final class Constant { ...@@ -118,4 +118,10 @@ public final class Constant {
public static final String VERSION_PREFIX = "V"; public static final String VERSION_PREFIX = "V";
/**
* 服务器http
*/
public final static String PARAM_SERVER_HTTP_URL = "server_http_url";
} }
base-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DemoStartedService.java
View file @ 4c59864b
...@@ -23,6 +23,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; ...@@ -23,6 +23,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.mortals.framework.springcloud.service.IApplicationStartedService; import com.mortals.framework.springcloud.service.IApplicationStartedService;
import org.springframework.util.ObjectUtils;
import java.util.List; import java.util.List;
...@@ -40,6 +41,8 @@ public class DemoStartedService implements IApplicationStartedService { ...@@ -40,6 +41,8 @@ public class DemoStartedService implements IApplicationStartedService {
private static Log logger = LogFactory.getLog(DemoStartedService.class); private static Log logger = LogFactory.getLog(DemoStartedService.class);
@Autowired @Autowired
private IUserFeign userFeign; private IUserFeign userFeign;
@Autowired
private UserService userService;
@Override @Override
public void start() { public void start() {
...@@ -52,6 +55,17 @@ public class DemoStartedService implements IApplicationStartedService { ...@@ -52,6 +55,17 @@ public class DemoStartedService implements IApplicationStartedService {
SyncTreeSiteThread syncTreeSiteThread = new SyncTreeSiteThread(contextTemp); SyncTreeSiteThread syncTreeSiteThread = new SyncTreeSiteThread(contextTemp);
ThreadPool.getInstance().execute(syncTreeSiteThread); ThreadPool.getInstance().execute(syncTreeSiteThread);
if(ObjectUtils.isEmpty(userFeign)){
logger.info("userFeign未加载,加载本地用户");
userService.find(new UserQuery()).forEach(user->{
Context context = new Context();
context.setUser(user);
ThreadPool.getInstance().execute(new SyncTreeSiteThread(context));
});
return;
}
userFeign.list(new UserPdu()).getData().getData().stream().forEach(userPdu->{ userFeign.list(new UserPdu()).getData().getData().stream().forEach(userPdu->{
Context context = new Context(); Context context = new Context();
......
base-manager/src/main/java/com/mortals/xhx/module/app/model/AppEntity.java
View file @ 4c59864b
...@@ -11,7 +11,7 @@ import com.mortals.xhx.module.app.model.AppDatasetEntity; ...@@ -11,7 +11,7 @@ import com.mortals.xhx.module.app.model.AppDatasetEntity;
* 自助终端应用实体对象 * 自助终端应用实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-28 * @date 2022-12-01
*/ */
public class AppEntity extends AppVo { public class AppEntity extends AppVo {
...@@ -50,9 +50,17 @@ public class AppEntity extends AppVo { ...@@ -50,9 +50,17 @@ public class AppEntity extends AppVo {
*/ */
private Integer downDevCount; private Integer downDevCount;
/** /**
* 是否上架(0.上架，1.下架) * 是否上架(0.下架，1.上架)
*/ */
private Integer shelves; private Integer shelves;
/**
* 类型(1.应用程序,2.url)
*/
private Integer appType;
/**
* 文件名称
*/
private String fileName;
/** /**
* 文件相对路径地址 * 文件相对路径地址
*/ */
...@@ -64,11 +72,15 @@ public class AppEntity extends AppVo { ...@@ -64,11 +72,15 @@ public class AppEntity extends AppVo {
/** /**
* 当前版本 * 当前版本
*/ */
private String version; private Integer version;
/** /**
* 简介 * 简介
*/ */
private String summary; private String summary;
/**
* 更新说明
*/
private String notes;
/** /**
* 是否部署(0.否，1.是) * 是否部署(0.否，1.是)
*/ */
...@@ -76,7 +88,7 @@ public class AppEntity extends AppVo { ...@@ -76,7 +88,7 @@ public class AppEntity extends AppVo {
/** /**
* 是否数据更新(0.否，1.是) * 是否数据更新(0.否，1.是)
*/ */
private Integer dateUpdate; private Integer dataUpdate;
/** /**
* 自助终端应用数据集信息 * 自助终端应用数据集信息
...@@ -198,19 +210,47 @@ public class AppEntity extends AppVo { ...@@ -198,19 +210,47 @@ public class AppEntity extends AppVo {
this.downDevCount = downDevCount; this.downDevCount = downDevCount;
} }
/** /**
* 获取 是否上架(0.上架，1.下架) * 获取 是否上架(0.下架，1.上架)
* @return Integer * @return Integer
*/ */
public Integer getShelves(){ public Integer getShelves(){
return shelves; return shelves;
} }
/** /**
* 设置 是否上架(0.上架，1.下架) * 设置 是否上架(0.下架，1.上架)
* @param shelves * @param shelves
*/ */
public void setShelves(Integer shelves){ public void setShelves(Integer shelves){
this.shelves = shelves; this.shelves = shelves;
} }
/**
* 获取 类型(1.应用程序,2.url)
* @return Integer
*/
public Integer getAppType(){
return appType;
}
/**
* 设置 类型(1.应用程序,2.url)
* @param appType
*/
public void setAppType(Integer appType){
this.appType = appType;
}
/**
* 获取 文件名称
* @return String
*/
public String getFileName(){
return fileName;
}
/**
* 设置 文件名称
* @param fileName
*/
public void setFileName(String fileName){
this.fileName = fileName;
}
/** /**
* 获取 文件相对路径地址 * 获取 文件相对路径地址
* @return String * @return String
...@@ -241,16 +281,16 @@ public class AppEntity extends AppVo { ...@@ -241,16 +281,16 @@ public class AppEntity extends AppVo {
} }
/** /**
* 获取 当前版本 * 获取 当前版本
* @return String * @return Integer
*/ */
public String getVersion(){ public Integer getVersion(){
return version; return version;
} }
/** /**
* 设置 当前版本 * 设置 当前版本
* @param version * @param version
*/ */
public void setVersion(String version){ public void setVersion(Integer version){
this.version = version; this.version = version;
} }
/** /**
...@@ -267,6 +307,20 @@ public class AppEntity extends AppVo { ...@@ -267,6 +307,20 @@ public class AppEntity extends AppVo {
public void setSummary(String summary){ public void setSummary(String summary){
this.summary = summary; this.summary = summary;
} }
/**
* 获取 更新说明
* @return String
*/
public String getNotes(){
return notes;
}
/**
* 设置 更新说明
* @param notes
*/
public void setNotes(String notes){
this.notes = notes;
}
/** /**
* 获取 是否部署(0.否，1.是) * 获取 是否部署(0.否，1.是)
* @return Integer * @return Integer
...@@ -285,15 +339,15 @@ public class AppEntity extends AppVo { ...@@ -285,15 +339,15 @@ public class AppEntity extends AppVo {
* 获取 是否数据更新(0.否，1.是) * 获取 是否数据更新(0.否，1.是)
* @return Integer * @return Integer
*/ */
public Integer getDateUpdate(){ public Integer getDataUpdate(){
return dateUpdate; return dataUpdate;
} }
/** /**
* 设置 是否数据更新(0.否，1.是) * 设置 是否数据更新(0.否，1.是)
* @param dateUpdate * @param dataUpdate
*/ */
public void setDateUpdate(Integer dateUpdate){ public void setDataUpdate(Integer dataUpdate){
this.dateUpdate = dateUpdate; this.dataUpdate = dataUpdate;
} }
...@@ -333,12 +387,15 @@ public class AppEntity extends AppVo { ...@@ -333,12 +387,15 @@ public class AppEntity extends AppVo {
sb.append(",type:").append(getType()); sb.append(",type:").append(getType());
sb.append(",downDevCount:").append(getDownDevCount()); sb.append(",downDevCount:").append(getDownDevCount());
sb.append(",shelves:").append(getShelves()); sb.append(",shelves:").append(getShelves());
sb.append(",appType:").append(getAppType());
sb.append(",fileName:").append(getFileName());
sb.append(",filePath:").append(getFilePath()); sb.append(",filePath:").append(getFilePath());
sb.append(",distributeFilePath:").append(getDistributeFilePath()); sb.append(",distributeFilePath:").append(getDistributeFilePath());
sb.append(",version:").append(getVersion()); sb.append(",version:").append(getVersion());
sb.append(",summary:").append(getSummary()); sb.append(",summary:").append(getSummary());
sb.append(",notes:").append(getNotes());
sb.append(",distribute:").append(getDistribute()); sb.append(",distribute:").append(getDistribute());
sb.append(",dateUpdate:").append(getDateUpdate()); sb.append(",dataUpdate:").append(getDataUpdate());
return sb.toString(); return sb.toString();
} }
...@@ -362,16 +419,22 @@ public class AppEntity extends AppVo { ...@@ -362,16 +419,22 @@ public class AppEntity extends AppVo {
this.shelves = 0; this.shelves = 0;
this.filePath = null; this.appType = 1;
this.fileName = "";
this.filePath = "";
this.distributeFilePath = "";
this.distributeFilePath = null; this.version = 1;
this.version = null; this.summary = "";
this.summary = null; this.notes = null;
this.distribute = 0; this.distribute = 0;
this.dateUpdate = 0; this.dataUpdate = 0;
} }
} }
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoFieldEntity.java
View file @ 4c59864b
...@@ -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/AppInfoFieldQuery.java
View file @ 4c59864b
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.app.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.app.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.app.model.AppInfoFieldEntity; import com.mortals.xhx.module.app.model.AppInfoFieldEntity;
/** /**
* 自助终端应用信息字段查询对象 * 自助终端应用信息字段查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-28 * @date 2022-12-02
*/ */
public class AppInfoFieldQuery extends AppInfoFieldEntity { public class AppInfoFieldQuery extends AppInfoFieldEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -84,8 +84,17 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -84,8 +84,17 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
/** 字段是否列表显示(0.否,1.是)列表 */ /** 字段是否列表显示(0.否,1.是)列表 */
private List <Integer> isListList; 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; private List<String> remarkList;
...@@ -135,1100 +144,1175 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity { ...@@ -135,1100 +144,1175 @@ public class AppInfoFieldQuery extends AppInfoFieldEntity {
public AppInfoFieldQuery(){} public AppInfoFieldQuery(){}
/** /**
* 获取 开始 序号，主键，自增长 * 获取 开始 序号，主键，自增长
* @return idStart * @return idStart
*/ */
public Long getIdStart(){ public Long getIdStart(){
return this.idStart; return this.idStart;
} }
/** /**
* 设置 开始 序号，主键，自增长 * 设置 开始 序号，主键，自增长
* @param idStart * @param idStart
*/ */
public void setIdStart(Long idStart){ public void setIdStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
} }
/** /**
* 获取 结束 序号，主键，自增长 * 获取 结束 序号，主键，自增长
* @return $idEnd * @return $idEnd
*/ */
public Long getIdEnd(){ public Long getIdEnd(){
return this.idEnd; return this.idEnd;
} }
/** /**
* 设置 结束 序号，主键，自增长 * 设置 结束 序号，主键，自增长
* @param idEnd * @param idEnd
*/ */
public void setIdEnd(Long idEnd){ public void setIdEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
} }
/** /**
* 获取 增加 序号，主键，自增长 * 获取 增加 序号，主键，自增长
* @return idIncrement * @return idIncrement
*/ */
public Long getIdIncrement(){ public Long getIdIncrement(){
return this.idIncrement; return this.idIncrement;
} }
/** /**
* 设置 增加 序号，主键，自增长 * 设置 增加 序号，主键，自增长
* @param idIncrement * @param idIncrement
*/ */
public void setIdIncrement(Long idIncrement){ public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
} }
/** /**
* 获取 序号，主键，自增长 * 获取 序号，主键，自增长
* @return idList * @return idList
*/ */
public List<Long> getIdList(){ public List<Long> getIdList(){
return this.idList; return this.idList;
} }
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param idList * @param idList
*/ */
public void setIdList(List<Long> idList){ public void setIdList(List<Long> idList){
this.idList = idList; this.idList = idList;
} }
/** /**
* 获取 开始 应用数据集id * 获取 开始 应用数据集id
* @return datasetIdStart * @return datasetIdStart
*/ */
public Long getDatasetIdStart(){ public Long getDatasetIdStart(){
return this.datasetIdStart; return this.datasetIdStart;
} }
/** /**
* 设置 开始 应用数据集id * 设置 开始 应用数据集id
* @param datasetIdStart * @param datasetIdStart
*/ */
public void setDatasetIdStart(Long datasetIdStart){ public void setDatasetIdStart(Long datasetIdStart){
this.datasetIdStart = datasetIdStart; this.datasetIdStart = datasetIdStart;
} }
/** /**
* 获取 结束 应用数据集id * 获取 结束 应用数据集id
* @return $datasetIdEnd * @return $datasetIdEnd
*/ */
public Long getDatasetIdEnd(){ public Long getDatasetIdEnd(){
return this.datasetIdEnd; return this.datasetIdEnd;
} }
/** /**
* 设置 结束 应用数据集id * 设置 结束 应用数据集id
* @param datasetIdEnd * @param datasetIdEnd
*/ */
public void setDatasetIdEnd(Long datasetIdEnd){ public void setDatasetIdEnd(Long datasetIdEnd){
this.datasetIdEnd = datasetIdEnd; this.datasetIdEnd = datasetIdEnd;
} }
/** /**
* 获取 增加 应用数据集id * 获取 增加 应用数据集id
* @return datasetIdIncrement * @return datasetIdIncrement
*/ */
public Long getDatasetIdIncrement(){ public Long getDatasetIdIncrement(){
return this.datasetIdIncrement; return this.datasetIdIncrement;
} }
/** /**
* 设置 增加 应用数据集id * 设置 增加 应用数据集id
* @param datasetIdIncrement * @param datasetIdIncrement
*/ */
public void setDatasetIdIncrement(Long datasetIdIncrement){ public void setDatasetIdIncrement(Long datasetIdIncrement){
this.datasetIdIncrement = datasetIdIncrement; this.datasetIdIncrement = datasetIdIncrement;
} }
/** /**
* 获取 应用数据集id * 获取 应用数据集id
* @return datasetIdList * @return datasetIdList
*/ */
public List<Long> getDatasetIdList(){ public List<Long> getDatasetIdList(){
return this.datasetIdList; return this.datasetIdList;
} }
/** /**
* 设置 应用数据集id * 设置 应用数据集id
* @param datasetIdList * @param datasetIdList
*/ */
public void setDatasetIdList(List<Long> datasetIdList){ public void setDatasetIdList(List<Long> datasetIdList){
this.datasetIdList = datasetIdList; this.datasetIdList = datasetIdList;
} }
/** /**
* 获取 字段编码 * 获取 字段编码
* @return fieldCodeList * @return fieldCodeList
*/ */
public List<String> getFieldCodeList(){ public List<String> getFieldCodeList(){
return this.fieldCodeList; return this.fieldCodeList;
} }
/** /**
* 设置 字段编码 * 设置 字段编码
* @param fieldCodeList * @param fieldCodeList
*/ */
public void setFieldCodeList(List<String> fieldCodeList){ public void setFieldCodeList(List<String> fieldCodeList){
this.fieldCodeList = fieldCodeList; this.fieldCodeList = fieldCodeList;
} }
/** /**
* 获取 字段名称 * 获取 字段名称
* @return fieldNameList * @return fieldNameList
*/ */
public List<String> getFieldNameList(){ public List<String> getFieldNameList(){
return this.fieldNameList; return this.fieldNameList;
} }
/** /**
* 设置 字段名称 * 设置 字段名称
* @param fieldNameList * @param fieldNameList
*/ */
public void setFieldNameList(List<String> fieldNameList){ public void setFieldNameList(List<String> fieldNameList){
this.fieldNameList = fieldNameList; this.fieldNameList = fieldNameList;
} }
/** /**
* 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框） * 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）
* @return fieldTypeList * @return fieldTypeList
*/ */
public List<String> getFieldTypeList(){ public List<String> getFieldTypeList(){
return this.fieldTypeList; return this.fieldTypeList;
} }
/** /**
* 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框） * 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）
* @param fieldTypeList * @param fieldTypeList
*/ */
public void setFieldTypeList(List<String> fieldTypeList){ public void setFieldTypeList(List<String> fieldTypeList){
this.fieldTypeList = fieldTypeList; this.fieldTypeList = fieldTypeList;
} }
/** /**
* 获取 数据类型（number.数字,string.字符串） * 获取 数据类型（number.数字,string.字符串）
* @return dataTypeList * @return dataTypeList
*/ */
public List<String> getDataTypeList(){ public List<String> getDataTypeList(){
return this.dataTypeList; return this.dataTypeList;
} }
/** /**
* 设置 数据类型（number.数字,string.字符串） * 设置 数据类型（number.数字,string.字符串）
* @param dataTypeList * @param dataTypeList
*/ */
public void setDataTypeList(List<String> dataTypeList){ public void setDataTypeList(List<String> dataTypeList){
this.dataTypeList = dataTypeList; this.dataTypeList = dataTypeList;
} }
/** /**
* 获取 字段值 * 获取 字段值
* @return fieldValueList * @return fieldValueList
*/ */
public List<String> getFieldValueList(){ public List<String> getFieldValueList(){
return this.fieldValueList; return this.fieldValueList;
} }
/** /**
* 设置 字段值 * 设置 字段值
* @param fieldValueList * @param fieldValueList
*/ */
public void setFieldValueList(List<String> fieldValueList){ public void setFieldValueList(List<String> fieldValueList){
this.fieldValueList = fieldValueList; this.fieldValueList = fieldValueList;
} }
/** /**
* 获取 开始 数据长度，默认128 * 获取 开始 数据长度，默认128
* @return fieldLenStart * @return fieldLenStart
*/ */
public Integer getFieldLenStart(){ public Integer getFieldLenStart(){
return this.fieldLenStart; return this.fieldLenStart;
} }
/** /**
* 设置 开始 数据长度，默认128 * 设置 开始 数据长度，默认128
* @param fieldLenStart * @param fieldLenStart
*/ */
public void setFieldLenStart(Integer fieldLenStart){ public void setFieldLenStart(Integer fieldLenStart){
this.fieldLenStart = fieldLenStart; this.fieldLenStart = fieldLenStart;
} }
/** /**
* 获取 结束 数据长度，默认128 * 获取 结束 数据长度，默认128
* @return $fieldLenEnd * @return $fieldLenEnd
*/ */
public Integer getFieldLenEnd(){ public Integer getFieldLenEnd(){
return this.fieldLenEnd; return this.fieldLenEnd;
} }
/** /**
* 设置 结束 数据长度，默认128 * 设置 结束 数据长度，默认128
* @param fieldLenEnd * @param fieldLenEnd
*/ */
public void setFieldLenEnd(Integer fieldLenEnd){ public void setFieldLenEnd(Integer fieldLenEnd){
this.fieldLenEnd = fieldLenEnd; this.fieldLenEnd = fieldLenEnd;
} }
/** /**
* 获取 增加 数据长度，默认128 * 获取 增加 数据长度，默认128
* @return fieldLenIncrement * @return fieldLenIncrement
*/ */
public Integer getFieldLenIncrement(){ public Integer getFieldLenIncrement(){
return this.fieldLenIncrement; return this.fieldLenIncrement;
} }
/** /**
* 设置 增加 数据长度，默认128 * 设置 增加 数据长度，默认128
* @param fieldLenIncrement * @param fieldLenIncrement
*/ */
public void setFieldLenIncrement(Integer fieldLenIncrement){ public void setFieldLenIncrement(Integer fieldLenIncrement){
this.fieldLenIncrement = fieldLenIncrement; this.fieldLenIncrement = fieldLenIncrement;
} }
/** /**
* 获取 数据长度，默认128 * 获取 数据长度，默认128
* @return fieldLenList * @return fieldLenList
*/ */
public List<Integer> getFieldLenList(){ public List<Integer> getFieldLenList(){
return this.fieldLenList; return this.fieldLenList;
} }
/** /**
* 设置 数据长度，默认128 * 设置 数据长度，默认128
* @param fieldLenList * @param fieldLenList
*/ */
public void setFieldLenList(List<Integer> fieldLenList){ public void setFieldLenList(List<Integer> fieldLenList){
this.fieldLenList = fieldLenList; this.fieldLenList = fieldLenList;
} }
/** /**
* 获取 开始 是否允许为空，(0.否,1.是) * 获取 开始 是否允许为空，(0.否,1.是)
* @return fieldNullStart * @return fieldNullStart
*/ */
public Integer getFieldNullStart(){ public Integer getFieldNullStart(){
return this.fieldNullStart; return this.fieldNullStart;
} }
/** /**
* 设置 开始 是否允许为空，(0.否,1.是) * 设置 开始 是否允许为空，(0.否,1.是)
* @param fieldNullStart * @param fieldNullStart
*/ */
public void setFieldNullStart(Integer fieldNullStart){ public void setFieldNullStart(Integer fieldNullStart){
this.fieldNullStart = fieldNullStart; this.fieldNullStart = fieldNullStart;
} }
/** /**
* 获取 结束 是否允许为空，(0.否,1.是) * 获取 结束 是否允许为空，(0.否,1.是)
* @return $fieldNullEnd * @return $fieldNullEnd
*/ */
public Integer getFieldNullEnd(){ public Integer getFieldNullEnd(){
return this.fieldNullEnd; return this.fieldNullEnd;
} }
/** /**
* 设置 结束 是否允许为空，(0.否,1.是) * 设置 结束 是否允许为空，(0.否,1.是)
* @param fieldNullEnd * @param fieldNullEnd
*/ */
public void setFieldNullEnd(Integer fieldNullEnd){ public void setFieldNullEnd(Integer fieldNullEnd){
this.fieldNullEnd = fieldNullEnd; this.fieldNullEnd = fieldNullEnd;
} }
/** /**
* 获取 增加 是否允许为空，(0.否,1.是) * 获取 增加 是否允许为空，(0.否,1.是)
* @return fieldNullIncrement * @return fieldNullIncrement
*/ */
public Integer getFieldNullIncrement(){ public Integer getFieldNullIncrement(){
return this.fieldNullIncrement; return this.fieldNullIncrement;
} }
/** /**
* 设置 增加 是否允许为空，(0.否,1.是) * 设置 增加 是否允许为空，(0.否,1.是)
* @param fieldNullIncrement * @param fieldNullIncrement
*/ */
public void setFieldNullIncrement(Integer fieldNullIncrement){ public void setFieldNullIncrement(Integer fieldNullIncrement){
this.fieldNullIncrement = fieldNullIncrement; this.fieldNullIncrement = fieldNullIncrement;
} }
/** /**
* 获取 是否允许为空，(0.否,1.是) * 获取 是否允许为空，(0.否,1.是)
* @return fieldNullList * @return fieldNullList
*/ */
public List<Integer> getFieldNullList(){ public List<Integer> getFieldNullList(){
return this.fieldNullList; return this.fieldNullList;
} }
/** /**
* 设置 是否允许为空，(0.否,1.是) * 设置 是否允许为空，(0.否,1.是)
* @param fieldNullList * @param fieldNullList
*/ */
public void setFieldNullList(List<Integer> fieldNullList){ public void setFieldNullList(List<Integer> fieldNullList){
this.fieldNullList = fieldNullList; this.fieldNullList = fieldNullList;
} }
/** /**
* 获取 开始 字段是否列表显示(0.否,1.是) * 获取 开始 字段是否列表显示(0.否,1.是)
* @return isListStart * @return isListStart
*/ */
public Integer getIsListStart(){ public Integer getIsListStart(){
return this.isListStart; return this.isListStart;
} }
/** /**
* 设置 开始 字段是否列表显示(0.否,1.是) * 设置 开始 字段是否列表显示(0.否,1.是)
* @param isListStart * @param isListStart
*/ */
public void setIsListStart(Integer isListStart){ public void setIsListStart(Integer isListStart){
this.isListStart = isListStart; this.isListStart = isListStart;
} }
/** /**
* 获取 结束 字段是否列表显示(0.否,1.是) * 获取 结束 字段是否列表显示(0.否,1.是)
* @return $isListEnd * @return $isListEnd
*/ */
public Integer getIsListEnd(){ public Integer getIsListEnd(){
return this.isListEnd; return this.isListEnd;
} }
/** /**
* 设置 结束 字段是否列表显示(0.否,1.是) * 设置 结束 字段是否列表显示(0.否,1.是)
* @param isListEnd * @param isListEnd
*/ */
public void setIsListEnd(Integer isListEnd){ public void setIsListEnd(Integer isListEnd){
this.isListEnd = isListEnd; this.isListEnd = isListEnd;
} }
/** /**
* 获取 增加 字段是否列表显示(0.否,1.是) * 获取 增加 字段是否列表显示(0.否,1.是)
* @return isListIncrement * @return isListIncrement
*/ */
public Integer getIsListIncrement(){ public Integer getIsListIncrement(){
return this.isListIncrement; return this.isListIncrement;
} }
/** /**
* 设置 增加 字段是否列表显示(0.否,1.是) * 设置 增加 字段是否列表显示(0.否,1.是)
* @param isListIncrement * @param isListIncrement
*/ */
public void setIsListIncrement(Integer isListIncrement){ public void setIsListIncrement(Integer isListIncrement){
this.isListIncrement = isListIncrement; this.isListIncrement = isListIncrement;
} }
/** /**
* 获取 字段是否列表显示(0.否,1.是) * 获取 字段是否列表显示(0.否,1.是)
* @return isListList * @return isListList
*/ */
public List<Integer> getIsListList(){ public List<Integer> getIsListList(){
return this.isListList; return this.isListList;
} }
/** /**
* 设置 字段是否列表显示(0.否,1.是) * 设置 字段是否列表显示(0.否,1.是)
* @param isListList * @param isListList
*/ */
public void setIsListList(List<Integer> isListList){ public void setIsListList(List<Integer> isListList){
this.isListList = isListList; this.isListList = isListList;
} }
/** /**
* 获取 排序号 * 获取 开始 排序号
* @return fieldOrderNoList * @return fieldOrderNoStart
*/ */
public List<String> getFieldOrderNoList(){ 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<Integer> getFieldOrderNoList(){
return this.fieldOrderNoList; return this.fieldOrderNoList;
} }
/** /**
* 设置 排序号 * 设置 排序号
* @param fieldOrderNoList * @param fieldOrderNoList
*/ */
public void setFieldOrderNoList(List<String> fieldOrderNoList){ public void setFieldOrderNoList(List<Integer> fieldOrderNoList){
this.fieldOrderNoList = fieldOrderNoList; this.fieldOrderNoList = fieldOrderNoList;
} }
/** /**
* 获取 备注 * 获取 备注
* @return remarkList * @return remarkList
*/ */
public List<String> getRemarkList(){ public List<String> getRemarkList(){
return this.remarkList; return this.remarkList;
} }
/** /**
* 设置 备注 * 设置 备注
* @param remarkList * @param remarkList
*/ */
public void setRemarkList(List<String> remarkList){ public void setRemarkList(List<String> remarkList){
this.remarkList = remarkList; this.remarkList = remarkList;
} }
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
*/ */
public String getCreateTimeStart(){ public String getCreateTimeStart(){
return this.createTimeStart; return this.createTimeStart;
} }
/** /**
* 设置 开始 创建时间 * 设置 开始 创建时间
* @param createTimeStart * @param createTimeStart
*/ */
public void setCreateTimeStart(String createTimeStart){ public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart; this.createTimeStart = createTimeStart;
} }
/** /**
* 获取 结束 创建时间 * 获取 结束 创建时间
* @return createTimeEnd * @return createTimeEnd
*/ */
public String getCreateTimeEnd(){ public String getCreateTimeEnd(){
return this.createTimeEnd; return this.createTimeEnd;
} }
/** /**
* 设置 结束 创建时间 * 设置 结束 创建时间
* @param createTimeEnd * @param createTimeEnd
*/ */
public void setCreateTimeEnd(String createTimeEnd){ public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd; this.createTimeEnd = createTimeEnd;
} }
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @return createUserIdStart * @return createUserIdStart
*/ */
public Long getCreateUserIdStart(){ public Long getCreateUserIdStart(){
return this.createUserIdStart; return this.createUserIdStart;
} }
/** /**
* 设置 开始 创建用户 * 设置 开始 创建用户
* @param createUserIdStart * @param createUserIdStart
*/ */
public void setCreateUserIdStart(Long createUserIdStart){ public void setCreateUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart; this.createUserIdStart = createUserIdStart;
} }
/** /**
* 获取 结束 创建用户 * 获取 结束 创建用户
* @return $createUserIdEnd * @return $createUserIdEnd
*/ */
public Long getCreateUserIdEnd(){ public Long getCreateUserIdEnd(){
return this.createUserIdEnd; return this.createUserIdEnd;
} }
/** /**
* 设置 结束 创建用户 * 设置 结束 创建用户
* @param createUserIdEnd * @param createUserIdEnd
*/ */
public void setCreateUserIdEnd(Long createUserIdEnd){ public void setCreateUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd; this.createUserIdEnd = createUserIdEnd;
} }
/** /**
* 获取 增加 创建用户 * 获取 增加 创建用户
* @return createUserIdIncrement * @return createUserIdIncrement
*/ */
public Long getCreateUserIdIncrement(){ public Long getCreateUserIdIncrement(){
return this.createUserIdIncrement; return this.createUserIdIncrement;
} }
/** /**
* 设置 增加 创建用户 * 设置 增加 创建用户
* @param createUserIdIncrement * @param createUserIdIncrement
*/ */
public void setCreateUserIdIncrement(Long createUserIdIncrement){ public void setCreateUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement; this.createUserIdIncrement = createUserIdIncrement;
} }
/** /**
* 获取 创建用户 * 获取 创建用户
* @return createUserIdList * @return createUserIdList
*/ */
public List<Long> getCreateUserIdList(){ public List<Long> getCreateUserIdList(){
return this.createUserIdList; return this.createUserIdList;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdList * @param createUserIdList
*/ */
public void setCreateUserIdList(List<Long> createUserIdList){ public void setCreateUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
} }
/** /**
* 获取 开始 修改时间 * 获取 开始 修改时间
* @return updateTimeStart * @return updateTimeStart
*/ */
public String getUpdateTimeStart(){ public String getUpdateTimeStart(){
return this.updateTimeStart; return this.updateTimeStart;
} }
/** /**
* 设置 开始 修改时间 * 设置 开始 修改时间
* @param updateTimeStart * @param updateTimeStart
*/ */
public void setUpdateTimeStart(String updateTimeStart){ public void setUpdateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart; this.updateTimeStart = updateTimeStart;
} }
/** /**
* 获取 结束 修改时间 * 获取 结束 修改时间
* @return updateTimeEnd * @return updateTimeEnd
*/ */
public String getUpdateTimeEnd(){ public String getUpdateTimeEnd(){
return this.updateTimeEnd; return this.updateTimeEnd;
} }
/** /**
* 设置 结束 修改时间 * 设置 结束 修改时间
* @param updateTimeEnd * @param updateTimeEnd
*/ */
public void setUpdateTimeEnd(String updateTimeEnd){ public void setUpdateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/** /**
* 获取 开始 修改用户 * 获取 开始 修改用户
* @return updateUserIdStart * @return updateUserIdStart
*/ */
public Long getUpdateUserIdStart(){ public Long getUpdateUserIdStart(){
return this.updateUserIdStart; return this.updateUserIdStart;
} }
/** /**
* 设置 开始 修改用户 * 设置 开始 修改用户
* @param updateUserIdStart * @param updateUserIdStart
*/ */
public void setUpdateUserIdStart(Long updateUserIdStart){ public void setUpdateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart; this.updateUserIdStart = updateUserIdStart;
} }
/** /**
* 获取 结束 修改用户 * 获取 结束 修改用户
* @return $updateUserIdEnd * @return $updateUserIdEnd
*/ */
public Long getUpdateUserIdEnd(){ public Long getUpdateUserIdEnd(){
return this.updateUserIdEnd; return this.updateUserIdEnd;
} }
/** /**
* 设置 结束 修改用户 * 设置 结束 修改用户
* @param updateUserIdEnd * @param updateUserIdEnd
*/ */
public void setUpdateUserIdEnd(Long updateUserIdEnd){ public void setUpdateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd; this.updateUserIdEnd = updateUserIdEnd;
} }
/** /**
* 获取 增加 修改用户 * 获取 增加 修改用户
* @return updateUserIdIncrement * @return updateUserIdIncrement
*/ */
public Long getUpdateUserIdIncrement(){ public Long getUpdateUserIdIncrement(){
return this.updateUserIdIncrement; return this.updateUserIdIncrement;
} }
/** /**
* 设置 增加 修改用户 * 设置 增加 修改用户
* @param updateUserIdIncrement * @param updateUserIdIncrement
*/ */
public void setUpdateUserIdIncrement(Long updateUserIdIncrement){ public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement; this.updateUserIdIncrement = updateUserIdIncrement;
} }
/** /**
* 获取 修改用户 * 获取 修改用户
* @return updateUserIdList * @return updateUserIdList
*/ */
public List<Long> getUpdateUserIdList(){ public List<Long> getUpdateUserIdList(){
return this.updateUserIdList; return this.updateUserIdList;
} }
/** /**
* 设置 修改用户 * 设置 修改用户
* @param updateUserIdList * @param updateUserIdList
*/ */
public void setUpdateUserIdList(List<Long> updateUserIdList){ public void setUpdateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
} }
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
*/ */
public AppInfoFieldQuery id(Long id){ public AppInfoFieldQuery id(Long id){
setId(id); setId(id);
return this; return this;
} }
/** /**
* 设置 开始 序号，主键，自增长 * 设置 开始 序号，主键，自增长
* @param idStart * @param idStart
*/ */
public AppInfoFieldQuery idStart(Long idStart){ public AppInfoFieldQuery idStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
return this; return this;
} }
/** /**
* 设置 结束 序号，主键，自增长 * 设置 结束 序号，主键，自增长
* @param idEnd * @param idEnd
*/ */
public AppInfoFieldQuery idEnd(Long idEnd){ public AppInfoFieldQuery idEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
return this; return this;
} }
/** /**
* 设置 增加 序号，主键，自增长 * 设置 增加 序号，主键，自增长
* @param idIncrement * @param idIncrement
*/ */
public AppInfoFieldQuery idIncrement(Long idIncrement){ public AppInfoFieldQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
return this; return this;
} }
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param idList * @param idList
*/ */
public AppInfoFieldQuery idList(List<Long> idList){ public AppInfoFieldQuery idList(List<Long> idList){
this.idList = idList; this.idList = idList;
return this; return this;
} }
/** /**
* 设置 应用数据集id * 设置 应用数据集id
* @param datasetId * @param datasetId
*/ */
public AppInfoFieldQuery datasetId(Long datasetId){ public AppInfoFieldQuery datasetId(Long datasetId){
setDatasetId(datasetId); setDatasetId(datasetId);
return this; return this;
} }
/** /**
* 设置 开始 应用数据集id * 设置 开始 应用数据集id
* @param datasetIdStart * @param datasetIdStart
*/ */
public AppInfoFieldQuery datasetIdStart(Long datasetIdStart){ public AppInfoFieldQuery datasetIdStart(Long datasetIdStart){
this.datasetIdStart = datasetIdStart; this.datasetIdStart = datasetIdStart;
return this; return this;
} }
/** /**
* 设置 结束 应用数据集id * 设置 结束 应用数据集id
* @param datasetIdEnd * @param datasetIdEnd
*/ */
public AppInfoFieldQuery datasetIdEnd(Long datasetIdEnd){ public AppInfoFieldQuery datasetIdEnd(Long datasetIdEnd){
this.datasetIdEnd = datasetIdEnd; this.datasetIdEnd = datasetIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 应用数据集id * 设置 增加 应用数据集id
* @param datasetIdIncrement * @param datasetIdIncrement
*/ */
public AppInfoFieldQuery datasetIdIncrement(Long datasetIdIncrement){ public AppInfoFieldQuery datasetIdIncrement(Long datasetIdIncrement){
this.datasetIdIncrement = datasetIdIncrement; this.datasetIdIncrement = datasetIdIncrement;
return this; return this;
} }
/** /**
* 设置 应用数据集id * 设置 应用数据集id
* @param datasetIdList * @param datasetIdList
*/ */
public AppInfoFieldQuery datasetIdList(List<Long> datasetIdList){ public AppInfoFieldQuery datasetIdList(List<Long> datasetIdList){
this.datasetIdList = datasetIdList; this.datasetIdList = datasetIdList;
return this; return this;
} }
/** /**
* 设置 字段编码 * 设置 字段编码
* @param fieldCode * @param fieldCode
*/ */
public AppInfoFieldQuery fieldCode(String fieldCode){ public AppInfoFieldQuery fieldCode(String fieldCode){
setFieldCode(fieldCode); setFieldCode(fieldCode);
return this; return this;
} }
/** /**
* 设置 字段编码 * 设置 字段编码
* @param fieldCodeList * @param fieldCodeList
*/ */
public AppInfoFieldQuery fieldCodeList(List<String> fieldCodeList){ public AppInfoFieldQuery fieldCodeList(List<String> fieldCodeList){
this.fieldCodeList = fieldCodeList; this.fieldCodeList = fieldCodeList;
return this; return this;
} }
/** /**
* 设置 字段名称 * 设置 字段名称
* @param fieldName * @param fieldName
*/ */
public AppInfoFieldQuery fieldName(String fieldName){ public AppInfoFieldQuery fieldName(String fieldName){
setFieldName(fieldName); setFieldName(fieldName);
return this; return this;
} }
/** /**
* 设置 字段名称 * 设置 字段名称
* @param fieldNameList * @param fieldNameList
*/ */
public AppInfoFieldQuery fieldNameList(List<String> fieldNameList){ public AppInfoFieldQuery fieldNameList(List<String> fieldNameList){
this.fieldNameList = fieldNameList; this.fieldNameList = fieldNameList;
return this; return this;
} }
/** /**
* 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框） * 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）
* @param fieldType * @param fieldType
*/ */
public AppInfoFieldQuery fieldType(String fieldType){ public AppInfoFieldQuery fieldType(String fieldType){
setFieldType(fieldType); setFieldType(fieldType);
return this; return this;
} }
/** /**
* 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框） * 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框）
* @param fieldTypeList * @param fieldTypeList
*/ */
public AppInfoFieldQuery fieldTypeList(List<String> fieldTypeList){ public AppInfoFieldQuery fieldTypeList(List<String> fieldTypeList){
this.fieldTypeList = fieldTypeList; this.fieldTypeList = fieldTypeList;
return this; return this;
} }
/** /**
* 设置 数据类型（number.数字,string.字符串） * 设置 数据类型（number.数字,string.字符串）
* @param dataType * @param dataType
*/ */
public AppInfoFieldQuery dataType(String dataType){ public AppInfoFieldQuery dataType(String dataType){
setDataType(dataType); setDataType(dataType);
return this; return this;
} }
/** /**
* 设置 数据类型（number.数字,string.字符串） * 设置 数据类型（number.数字,string.字符串）
* @param dataTypeList * @param dataTypeList
*/ */
public AppInfoFieldQuery dataTypeList(List<String> dataTypeList){ public AppInfoFieldQuery dataTypeList(List<String> dataTypeList){
this.dataTypeList = dataTypeList; this.dataTypeList = dataTypeList;
return this; return this;
} }
/** /**
* 设置 字段值 * 设置 字段值
* @param fieldValue * @param fieldValue
*/ */
public AppInfoFieldQuery fieldValue(String fieldValue){ public AppInfoFieldQuery fieldValue(String fieldValue){
setFieldValue(fieldValue); setFieldValue(fieldValue);
return this; return this;
} }
/** /**
* 设置 字段值 * 设置 字段值
* @param fieldValueList * @param fieldValueList
*/ */
public AppInfoFieldQuery fieldValueList(List<String> fieldValueList){ public AppInfoFieldQuery fieldValueList(List<String> fieldValueList){
this.fieldValueList = fieldValueList; this.fieldValueList = fieldValueList;
return this; return this;
} }
/** /**
* 设置 数据长度，默认128 * 设置 数据长度，默认128
* @param fieldLen * @param fieldLen
*/ */
public AppInfoFieldQuery fieldLen(Integer fieldLen){ public AppInfoFieldQuery fieldLen(Integer fieldLen){
setFieldLen(fieldLen); setFieldLen(fieldLen);
return this; return this;
} }
/** /**
* 设置 开始 数据长度，默认128 * 设置 开始 数据长度，默认128
* @param fieldLenStart * @param fieldLenStart
*/ */
public AppInfoFieldQuery fieldLenStart(Integer fieldLenStart){ public AppInfoFieldQuery fieldLenStart(Integer fieldLenStart){
this.fieldLenStart = fieldLenStart; this.fieldLenStart = fieldLenStart;
return this; return this;
} }
/** /**
* 设置 结束 数据长度，默认128 * 设置 结束 数据长度，默认128
* @param fieldLenEnd * @param fieldLenEnd
*/ */
public AppInfoFieldQuery fieldLenEnd(Integer fieldLenEnd){ public AppInfoFieldQuery fieldLenEnd(Integer fieldLenEnd){
this.fieldLenEnd = fieldLenEnd; this.fieldLenEnd = fieldLenEnd;
return this; return this;
} }
/** /**
* 设置 增加 数据长度，默认128 * 设置 增加 数据长度，默认128
* @param fieldLenIncrement * @param fieldLenIncrement
*/ */
public AppInfoFieldQuery fieldLenIncrement(Integer fieldLenIncrement){ public AppInfoFieldQuery fieldLenIncrement(Integer fieldLenIncrement){
this.fieldLenIncrement = fieldLenIncrement; this.fieldLenIncrement = fieldLenIncrement;
return this; return this;
} }
/** /**
* 设置 数据长度，默认128 * 设置 数据长度，默认128
* @param fieldLenList * @param fieldLenList
*/ */
public AppInfoFieldQuery fieldLenList(List<Integer> fieldLenList){ public AppInfoFieldQuery fieldLenList(List<Integer> fieldLenList){
this.fieldLenList = fieldLenList; this.fieldLenList = fieldLenList;
return this; return this;
} }
/** /**
* 设置 是否允许为空，(0.否,1.是) * 设置 是否允许为空，(0.否,1.是)
* @param fieldNull * @param fieldNull
*/ */
public AppInfoFieldQuery fieldNull(Integer fieldNull){ public AppInfoFieldQuery fieldNull(Integer fieldNull){
setFieldNull(fieldNull); setFieldNull(fieldNull);
return this; return this;
} }
/** /**
* 设置 开始 是否允许为空，(0.否,1.是) * 设置 开始 是否允许为空，(0.否,1.是)
* @param fieldNullStart * @param fieldNullStart
*/ */
public AppInfoFieldQuery fieldNullStart(Integer fieldNullStart){ public AppInfoFieldQuery fieldNullStart(Integer fieldNullStart){
this.fieldNullStart = fieldNullStart; this.fieldNullStart = fieldNullStart;
return this; return this;
} }
/** /**
* 设置 结束 是否允许为空，(0.否,1.是) * 设置 结束 是否允许为空，(0.否,1.是)
* @param fieldNullEnd * @param fieldNullEnd
*/ */
public AppInfoFieldQuery fieldNullEnd(Integer fieldNullEnd){ public AppInfoFieldQuery fieldNullEnd(Integer fieldNullEnd){
this.fieldNullEnd = fieldNullEnd; this.fieldNullEnd = fieldNullEnd;
return this; return this;
} }
/** /**
* 设置 增加 是否允许为空，(0.否,1.是) * 设置 增加 是否允许为空，(0.否,1.是)
* @param fieldNullIncrement * @param fieldNullIncrement
*/ */
public AppInfoFieldQuery fieldNullIncrement(Integer fieldNullIncrement){ public AppInfoFieldQuery fieldNullIncrement(Integer fieldNullIncrement){
this.fieldNullIncrement = fieldNullIncrement; this.fieldNullIncrement = fieldNullIncrement;
return this; return this;
} }
/** /**
* 设置 是否允许为空，(0.否,1.是) * 设置 是否允许为空，(0.否,1.是)
* @param fieldNullList * @param fieldNullList
*/ */
public AppInfoFieldQuery fieldNullList(List<Integer> fieldNullList){ public AppInfoFieldQuery fieldNullList(List<Integer> fieldNullList){
this.fieldNullList = fieldNullList; this.fieldNullList = fieldNullList;
return this; return this;
} }
/** /**
* 设置 字段是否列表显示(0.否,1.是) * 设置 字段是否列表显示(0.否,1.是)
* @param isList * @param isList
*/ */
public AppInfoFieldQuery isList(Integer isList){ public AppInfoFieldQuery isList(Integer isList){
setIsList(isList); setIsList(isList);
return this; return this;
} }
/** /**
* 设置 开始 字段是否列表显示(0.否,1.是) * 设置 开始 字段是否列表显示(0.否,1.是)
* @param isListStart * @param isListStart
*/ */
public AppInfoFieldQuery isListStart(Integer isListStart){ public AppInfoFieldQuery isListStart(Integer isListStart){
this.isListStart = isListStart; this.isListStart = isListStart;
return this; return this;
} }
/** /**
* 设置 结束 字段是否列表显示(0.否,1.是) * 设置 结束 字段是否列表显示(0.否,1.是)
* @param isListEnd * @param isListEnd
*/ */
public AppInfoFieldQuery isListEnd(Integer isListEnd){ public AppInfoFieldQuery isListEnd(Integer isListEnd){
this.isListEnd = isListEnd; this.isListEnd = isListEnd;
return this; return this;
} }
/** /**
* 设置 增加 字段是否列表显示(0.否,1.是) * 设置 增加 字段是否列表显示(0.否,1.是)
* @param isListIncrement * @param isListIncrement
*/ */
public AppInfoFieldQuery isListIncrement(Integer isListIncrement){ public AppInfoFieldQuery isListIncrement(Integer isListIncrement){
this.isListIncrement = isListIncrement; this.isListIncrement = isListIncrement;
return this; return this;
} }
/** /**
* 设置 字段是否列表显示(0.否,1.是) * 设置 字段是否列表显示(0.否,1.是)
* @param isListList * @param isListList
*/ */
public AppInfoFieldQuery isListList(List<Integer> isListList){ public AppInfoFieldQuery isListList(List<Integer> isListList){
this.isListList = isListList; this.isListList = isListList;
return this; return this;
} }
/** /**
* 设置 排序号 * 设置 排序号
* @param fieldOrderNo * @param fieldOrderNo
*/ */
public AppInfoFieldQuery fieldOrderNo(String fieldOrderNo){ public AppInfoFieldQuery fieldOrderNo(Integer fieldOrderNo){
setFieldOrderNo(fieldOrderNo); setFieldOrderNo(fieldOrderNo);
return this; 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 fieldOrderNoList * @param fieldOrderNoIncrement
*/ */
public AppInfoFieldQuery fieldOrderNoList(List<String> fieldOrderNoList){ public AppInfoFieldQuery fieldOrderNoIncrement(Integer fieldOrderNoIncrement){
this.fieldOrderNoIncrement = fieldOrderNoIncrement;
return this;
}
/**
* 设置 排序号
* @param fieldOrderNoList
*/
public AppInfoFieldQuery fieldOrderNoList(List<Integer> fieldOrderNoList){
this.fieldOrderNoList = fieldOrderNoList; this.fieldOrderNoList = fieldOrderNoList;
return this; return this;
} }
/** /**
* 设置 备注 * 设置 备注
* @param remark * @param remark
*/ */
public AppInfoFieldQuery remark(String remark){ public AppInfoFieldQuery remark(String remark){
setRemark(remark); setRemark(remark);
return this; return this;
} }
/** /**
* 设置 备注 * 设置 备注
* @param remarkList * @param remarkList
*/ */
public AppInfoFieldQuery remarkList(List<String> remarkList){ public AppInfoFieldQuery remarkList(List<String> remarkList){
this.remarkList = remarkList; this.remarkList = remarkList;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserId * @param createUserId
*/ */
public AppInfoFieldQuery createUserId(Long createUserId){ public AppInfoFieldQuery createUserId(Long createUserId){
setCreateUserId(createUserId); setCreateUserId(createUserId);
return this; return this;
} }
/** /**
* 设置 开始 创建用户 * 设置 开始 创建用户
* @param createUserIdStart * @param createUserIdStart
*/ */
public AppInfoFieldQuery createUserIdStart(Long createUserIdStart){ public AppInfoFieldQuery createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart; this.createUserIdStart = createUserIdStart;
return this; return this;
} }
/** /**
* 设置 结束 创建用户 * 设置 结束 创建用户
* @param createUserIdEnd * @param createUserIdEnd
*/ */
public AppInfoFieldQuery createUserIdEnd(Long createUserIdEnd){ public AppInfoFieldQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd; this.createUserIdEnd = createUserIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 创建用户 * 设置 增加 创建用户
* @param createUserIdIncrement * @param createUserIdIncrement
*/ */
public AppInfoFieldQuery createUserIdIncrement(Long createUserIdIncrement){ public AppInfoFieldQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement; this.createUserIdIncrement = createUserIdIncrement;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdList * @param createUserIdList
*/ */
public AppInfoFieldQuery createUserIdList(List<Long> createUserIdList){ public AppInfoFieldQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
return this; return this;
} }
/** /**
* 设置 修改用户 * 设置 修改用户
* @param updateUserId * @param updateUserId
*/ */
public AppInfoFieldQuery updateUserId(Long updateUserId){ public AppInfoFieldQuery updateUserId(Long updateUserId){
setUpdateUserId(updateUserId); setUpdateUserId(updateUserId);
return this; return this;
} }
/** /**
* 设置 开始 修改用户 * 设置 开始 修改用户
* @param updateUserIdStart * @param updateUserIdStart
*/ */
public AppInfoFieldQuery updateUserIdStart(Long updateUserIdStart){ public AppInfoFieldQuery updateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart; this.updateUserIdStart = updateUserIdStart;
return this; return this;
} }
/** /**
* 设置 结束 修改用户 * 设置 结束 修改用户
* @param updateUserIdEnd * @param updateUserIdEnd
*/ */
public AppInfoFieldQuery updateUserIdEnd(Long updateUserIdEnd){ public AppInfoFieldQuery updateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd; this.updateUserIdEnd = updateUserIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 修改用户 * 设置 增加 修改用户
* @param updateUserIdIncrement * @param updateUserIdIncrement
*/ */
public AppInfoFieldQuery updateUserIdIncrement(Long updateUserIdIncrement){ public AppInfoFieldQuery updateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement; this.updateUserIdIncrement = updateUserIdIncrement;
return this; return this;
} }
/** /**
* 设置 修改用户 * 设置 修改用户
* @param updateUserIdList * @param updateUserIdList
*/ */
public AppInfoFieldQuery updateUserIdList(List<Long> updateUserIdList){ public AppInfoFieldQuery updateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
return this; return this;
} }
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
*/ */
public List<AppInfoFieldQuery> getOrConditionList(){ public List<AppInfoFieldQuery> getOrConditionList(){
return this.orConditionList; return this.orConditionList;
} }
/** /**
* 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @param orConditionList * @param orConditionList
*/ */
public void setOrConditionList(List<AppInfoFieldQuery> orConditionList){ public void setOrConditionList(List<AppInfoFieldQuery> orConditionList){
this.orConditionList = orConditionList; this.orConditionList = orConditionList;
} }
/** /**
* 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList * @return andConditionList
*/ */
public List<AppInfoFieldQuery> getAndConditionList(){ public List<AppInfoFieldQuery> getAndConditionList(){
return this.andConditionList; return this.andConditionList;
} }
/** /**
* 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList * @param andConditionList
*/ */
public void setAndConditionList(List<AppInfoFieldQuery> andConditionList){ public void setAndConditionList(List<AppInfoFieldQuery> andConditionList){
this.andConditionList = andConditionList; this.andConditionList = andConditionList;
} }
......
base-manager/src/main/java/com/mortals/xhx/module/app/model/AppInfoTempleteFieldEntity.java
View file @ 4c59864b
...@@ -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/model/AppInfoTempleteFieldQuery.java
View file @ 4c59864b
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.app.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.app.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.app.model.AppInfoTempleteFieldEntity; import com.mortals.xhx.module.app.model.AppInfoTempleteFieldEntity;
/** /**
* 自助终端应用模板信息字段查询对象 * 自助终端应用模板信息字段查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-28 * @date 2022-12-02
*/ */
public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -39,7 +39,7 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -39,7 +39,7 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
/** 字段名称 */ /** 字段名称 */
private List<String> fieldNameList; private List<String> fieldNameList;
/** 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框） */ /** 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本） */
private List<String> fieldTypeList; private List<String> fieldTypeList;
/** 数据类型（number.数字,string.字符串） */ /** 数据类型（number.数字,string.字符串） */
...@@ -84,8 +84,17 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -84,8 +84,17 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
/** 字段是否列表显示(0.否,1.是)列表 */ /** 字段是否列表显示(0.否,1.是)列表 */
private List <Integer> isListList; 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; private List<String> remarkList;
...@@ -135,1100 +144,1175 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity { ...@@ -135,1100 +144,1175 @@ public class AppInfoTempleteFieldQuery extends AppInfoTempleteFieldEntity {
public AppInfoTempleteFieldQuery(){} public AppInfoTempleteFieldQuery(){}
/** /**
* 获取 开始 序号，主键，自增长 * 获取 开始 序号，主键，自增长
* @return idStart * @return idStart
*/ */
public Long getIdStart(){ public Long getIdStart(){
return this.idStart; return this.idStart;
} }
/** /**
* 设置 开始 序号，主键，自增长 * 设置 开始 序号，主键，自增长
* @param idStart * @param idStart
*/ */
public void setIdStart(Long idStart){ public void setIdStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
} }
/** /**
* 获取 结束 序号，主键，自增长 * 获取 结束 序号，主键，自增长
* @return $idEnd * @return $idEnd
*/ */
public Long getIdEnd(){ public Long getIdEnd(){
return this.idEnd; return this.idEnd;
} }
/** /**
* 设置 结束 序号，主键，自增长 * 设置 结束 序号，主键，自增长
* @param idEnd * @param idEnd
*/ */
public void setIdEnd(Long idEnd){ public void setIdEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
} }
/** /**
* 获取 增加 序号，主键，自增长 * 获取 增加 序号，主键，自增长
* @return idIncrement * @return idIncrement
*/ */
public Long getIdIncrement(){ public Long getIdIncrement(){
return this.idIncrement; return this.idIncrement;
} }
/** /**
* 设置 增加 序号，主键，自增长 * 设置 增加 序号，主键，自增长
* @param idIncrement * @param idIncrement
*/ */
public void setIdIncrement(Long idIncrement){ public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
} }
/** /**
* 获取 序号，主键，自增长 * 获取 序号，主键，自增长
* @return idList * @return idList
*/ */
public List<Long> getIdList(){ public List<Long> getIdList(){
return this.idList; return this.idList;
} }
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param idList * @param idList
*/ */
public void setIdList(List<Long> idList){ public void setIdList(List<Long> idList){
this.idList = idList; this.idList = idList;
} }
/** /**
* 获取 开始 应用id * 获取 开始 应用id
* @return appIdStart * @return appIdStart
*/ */
public Long getAppIdStart(){ public Long getAppIdStart(){
return this.appIdStart; return this.appIdStart;
} }
/** /**
* 设置 开始 应用id * 设置 开始 应用id
* @param appIdStart * @param appIdStart
*/ */
public void setAppIdStart(Long appIdStart){ public void setAppIdStart(Long appIdStart){
this.appIdStart = appIdStart; this.appIdStart = appIdStart;
} }
/** /**
* 获取 结束 应用id * 获取 结束 应用id
* @return $appIdEnd * @return $appIdEnd
*/ */
public Long getAppIdEnd(){ public Long getAppIdEnd(){
return this.appIdEnd; return this.appIdEnd;
} }
/** /**
* 设置 结束 应用id * 设置 结束 应用id
* @param appIdEnd * @param appIdEnd
*/ */
public void setAppIdEnd(Long appIdEnd){ public void setAppIdEnd(Long appIdEnd){
this.appIdEnd = appIdEnd; this.appIdEnd = appIdEnd;
} }
/** /**
* 获取 增加 应用id * 获取 增加 应用id
* @return appIdIncrement * @return appIdIncrement
*/ */
public Long getAppIdIncrement(){ public Long getAppIdIncrement(){
return this.appIdIncrement; return this.appIdIncrement;
} }
/** /**
* 设置 增加 应用id * 设置 增加 应用id
* @param appIdIncrement * @param appIdIncrement
*/ */
public void setAppIdIncrement(Long appIdIncrement){ public void setAppIdIncrement(Long appIdIncrement){
this.appIdIncrement = appIdIncrement; this.appIdIncrement = appIdIncrement;
} }
/** /**
* 获取 应用id * 获取 应用id
* @return appIdList * @return appIdList
*/ */
public List<Long> getAppIdList(){ public List<Long> getAppIdList(){
return this.appIdList; return this.appIdList;
} }
/** /**
* 设置 应用id * 设置 应用id
* @param appIdList * @param appIdList
*/ */
public void setAppIdList(List<Long> appIdList){ public void setAppIdList(List<Long> appIdList){
this.appIdList = appIdList; this.appIdList = appIdList;
} }
/** /**
* 获取 字段编码 * 获取 字段编码
* @return fieldCodeList * @return fieldCodeList
*/ */
public List<String> getFieldCodeList(){ public List<String> getFieldCodeList(){
return this.fieldCodeList; return this.fieldCodeList;
} }
/** /**
* 设置 字段编码 * 设置 字段编码
* @param fieldCodeList * @param fieldCodeList
*/ */
public void setFieldCodeList(List<String> fieldCodeList){ public void setFieldCodeList(List<String> fieldCodeList){
this.fieldCodeList = fieldCodeList; this.fieldCodeList = fieldCodeList;
} }
/** /**
* 获取 字段名称 * 获取 字段名称
* @return fieldNameList * @return fieldNameList
*/ */
public List<String> getFieldNameList(){ public List<String> getFieldNameList(){
return this.fieldNameList; return this.fieldNameList;
} }
/** /**
* 设置 字段名称 * 设置 字段名称
* @param fieldNameList * @param fieldNameList
*/ */
public void setFieldNameList(List<String> fieldNameList){ public void setFieldNameList(List<String> fieldNameList){
this.fieldNameList = fieldNameList; this.fieldNameList = fieldNameList;
} }
/** /**
* 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框） * 获取 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
* @return fieldTypeList * @return fieldTypeList
*/ */
public List<String> getFieldTypeList(){ public List<String> getFieldTypeList(){
return this.fieldTypeList; return this.fieldTypeList;
} }
/** /**
* 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框） * 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
* @param fieldTypeList * @param fieldTypeList
*/ */
public void setFieldTypeList(List<String> fieldTypeList){ public void setFieldTypeList(List<String> fieldTypeList){
this.fieldTypeList = fieldTypeList; this.fieldTypeList = fieldTypeList;
} }
/** /**
* 获取 数据类型（number.数字,string.字符串） * 获取 数据类型（number.数字,string.字符串）
* @return dataTypeList * @return dataTypeList
*/ */
public List<String> getDataTypeList(){ public List<String> getDataTypeList(){
return this.dataTypeList; return this.dataTypeList;
} }
/** /**
* 设置 数据类型（number.数字,string.字符串） * 设置 数据类型（number.数字,string.字符串）
* @param dataTypeList * @param dataTypeList
*/ */
public void setDataTypeList(List<String> dataTypeList){ public void setDataTypeList(List<String> dataTypeList){
this.dataTypeList = dataTypeList; this.dataTypeList = dataTypeList;
} }
/** /**
* 获取 字段值 * 获取 字段值
* @return fieldValueList * @return fieldValueList
*/ */
public List<String> getFieldValueList(){ public List<String> getFieldValueList(){
return this.fieldValueList; return this.fieldValueList;
} }
/** /**
* 设置 字段值 * 设置 字段值
* @param fieldValueList * @param fieldValueList
*/ */
public void setFieldValueList(List<String> fieldValueList){ public void setFieldValueList(List<String> fieldValueList){
this.fieldValueList = fieldValueList; this.fieldValueList = fieldValueList;
} }
/** /**
* 获取 开始 数据长度，默认128 * 获取 开始 数据长度，默认128
* @return fieldLenStart * @return fieldLenStart
*/ */
public Integer getFieldLenStart(){ public Integer getFieldLenStart(){
return this.fieldLenStart; return this.fieldLenStart;
} }
/** /**
* 设置 开始 数据长度，默认128 * 设置 开始 数据长度，默认128
* @param fieldLenStart * @param fieldLenStart
*/ */
public void setFieldLenStart(Integer fieldLenStart){ public void setFieldLenStart(Integer fieldLenStart){
this.fieldLenStart = fieldLenStart; this.fieldLenStart = fieldLenStart;
} }
/** /**
* 获取 结束 数据长度，默认128 * 获取 结束 数据长度，默认128
* @return $fieldLenEnd * @return $fieldLenEnd
*/ */
public Integer getFieldLenEnd(){ public Integer getFieldLenEnd(){
return this.fieldLenEnd; return this.fieldLenEnd;
} }
/** /**
* 设置 结束 数据长度，默认128 * 设置 结束 数据长度，默认128
* @param fieldLenEnd * @param fieldLenEnd
*/ */
public void setFieldLenEnd(Integer fieldLenEnd){ public void setFieldLenEnd(Integer fieldLenEnd){
this.fieldLenEnd = fieldLenEnd; this.fieldLenEnd = fieldLenEnd;
} }
/** /**
* 获取 增加 数据长度，默认128 * 获取 增加 数据长度，默认128
* @return fieldLenIncrement * @return fieldLenIncrement
*/ */
public Integer getFieldLenIncrement(){ public Integer getFieldLenIncrement(){
return this.fieldLenIncrement; return this.fieldLenIncrement;
} }
/** /**
* 设置 增加 数据长度，默认128 * 设置 增加 数据长度，默认128
* @param fieldLenIncrement * @param fieldLenIncrement
*/ */
public void setFieldLenIncrement(Integer fieldLenIncrement){ public void setFieldLenIncrement(Integer fieldLenIncrement){
this.fieldLenIncrement = fieldLenIncrement; this.fieldLenIncrement = fieldLenIncrement;
} }
/** /**
* 获取 数据长度，默认128 * 获取 数据长度，默认128
* @return fieldLenList * @return fieldLenList
*/ */
public List<Integer> getFieldLenList(){ public List<Integer> getFieldLenList(){
return this.fieldLenList; return this.fieldLenList;
} }
/** /**
* 设置 数据长度，默认128 * 设置 数据长度，默认128
* @param fieldLenList * @param fieldLenList
*/ */
public void setFieldLenList(List<Integer> fieldLenList){ public void setFieldLenList(List<Integer> fieldLenList){
this.fieldLenList = fieldLenList; this.fieldLenList = fieldLenList;
} }
/** /**
* 获取 开始 是否允许为空，(0.否,1.是) * 获取 开始 是否允许为空，(0.否,1.是)
* @return fieldNullStart * @return fieldNullStart
*/ */
public Integer getFieldNullStart(){ public Integer getFieldNullStart(){
return this.fieldNullStart; return this.fieldNullStart;
} }
/** /**
* 设置 开始 是否允许为空，(0.否,1.是) * 设置 开始 是否允许为空，(0.否,1.是)
* @param fieldNullStart * @param fieldNullStart
*/ */
public void setFieldNullStart(Integer fieldNullStart){ public void setFieldNullStart(Integer fieldNullStart){
this.fieldNullStart = fieldNullStart; this.fieldNullStart = fieldNullStart;
} }
/** /**
* 获取 结束 是否允许为空，(0.否,1.是) * 获取 结束 是否允许为空，(0.否,1.是)
* @return $fieldNullEnd * @return $fieldNullEnd
*/ */
public Integer getFieldNullEnd(){ public Integer getFieldNullEnd(){
return this.fieldNullEnd; return this.fieldNullEnd;
} }
/** /**
* 设置 结束 是否允许为空，(0.否,1.是) * 设置 结束 是否允许为空，(0.否,1.是)
* @param fieldNullEnd * @param fieldNullEnd
*/ */
public void setFieldNullEnd(Integer fieldNullEnd){ public void setFieldNullEnd(Integer fieldNullEnd){
this.fieldNullEnd = fieldNullEnd; this.fieldNullEnd = fieldNullEnd;
} }
/** /**
* 获取 增加 是否允许为空，(0.否,1.是) * 获取 增加 是否允许为空，(0.否,1.是)
* @return fieldNullIncrement * @return fieldNullIncrement
*/ */
public Integer getFieldNullIncrement(){ public Integer getFieldNullIncrement(){
return this.fieldNullIncrement; return this.fieldNullIncrement;
} }
/** /**
* 设置 增加 是否允许为空，(0.否,1.是) * 设置 增加 是否允许为空，(0.否,1.是)
* @param fieldNullIncrement * @param fieldNullIncrement
*/ */
public void setFieldNullIncrement(Integer fieldNullIncrement){ public void setFieldNullIncrement(Integer fieldNullIncrement){
this.fieldNullIncrement = fieldNullIncrement; this.fieldNullIncrement = fieldNullIncrement;
} }
/** /**
* 获取 是否允许为空，(0.否,1.是) * 获取 是否允许为空，(0.否,1.是)
* @return fieldNullList * @return fieldNullList
*/ */
public List<Integer> getFieldNullList(){ public List<Integer> getFieldNullList(){
return this.fieldNullList; return this.fieldNullList;
} }
/** /**
* 设置 是否允许为空，(0.否,1.是) * 设置 是否允许为空，(0.否,1.是)
* @param fieldNullList * @param fieldNullList
*/ */
public void setFieldNullList(List<Integer> fieldNullList){ public void setFieldNullList(List<Integer> fieldNullList){
this.fieldNullList = fieldNullList; this.fieldNullList = fieldNullList;
} }
/** /**
* 获取 开始 字段是否列表显示(0.否,1.是) * 获取 开始 字段是否列表显示(0.否,1.是)
* @return isListStart * @return isListStart
*/ */
public Integer getIsListStart(){ public Integer getIsListStart(){
return this.isListStart; return this.isListStart;
} }
/** /**
* 设置 开始 字段是否列表显示(0.否,1.是) * 设置 开始 字段是否列表显示(0.否,1.是)
* @param isListStart * @param isListStart
*/ */
public void setIsListStart(Integer isListStart){ public void setIsListStart(Integer isListStart){
this.isListStart = isListStart; this.isListStart = isListStart;
} }
/** /**
* 获取 结束 字段是否列表显示(0.否,1.是) * 获取 结束 字段是否列表显示(0.否,1.是)
* @return $isListEnd * @return $isListEnd
*/ */
public Integer getIsListEnd(){ public Integer getIsListEnd(){
return this.isListEnd; return this.isListEnd;
} }
/** /**
* 设置 结束 字段是否列表显示(0.否,1.是) * 设置 结束 字段是否列表显示(0.否,1.是)
* @param isListEnd * @param isListEnd
*/ */
public void setIsListEnd(Integer isListEnd){ public void setIsListEnd(Integer isListEnd){
this.isListEnd = isListEnd; this.isListEnd = isListEnd;
} }
/** /**
* 获取 增加 字段是否列表显示(0.否,1.是) * 获取 增加 字段是否列表显示(0.否,1.是)
* @return isListIncrement * @return isListIncrement
*/ */
public Integer getIsListIncrement(){ public Integer getIsListIncrement(){
return this.isListIncrement; return this.isListIncrement;
} }
/** /**
* 设置 增加 字段是否列表显示(0.否,1.是) * 设置 增加 字段是否列表显示(0.否,1.是)
* @param isListIncrement * @param isListIncrement
*/ */
public void setIsListIncrement(Integer isListIncrement){ public void setIsListIncrement(Integer isListIncrement){
this.isListIncrement = isListIncrement; this.isListIncrement = isListIncrement;
} }
/** /**
* 获取 字段是否列表显示(0.否,1.是) * 获取 字段是否列表显示(0.否,1.是)
* @return isListList * @return isListList
*/ */
public List<Integer> getIsListList(){ public List<Integer> getIsListList(){
return this.isListList; return this.isListList;
} }
/** /**
* 设置 字段是否列表显示(0.否,1.是) * 设置 字段是否列表显示(0.否,1.是)
* @param isListList * @param isListList
*/ */
public void setIsListList(List<Integer> isListList){ public void setIsListList(List<Integer> isListList){
this.isListList = isListList; this.isListList = isListList;
} }
/** /**
* 获取 排序号 * 获取 开始 排序号
* @return fieldOrderNoList * @return fieldOrderNoStart
*/ */
public List<String> getFieldOrderNoList(){ 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<Integer> getFieldOrderNoList(){
return this.fieldOrderNoList; return this.fieldOrderNoList;
} }
/** /**
* 设置 排序号 * 设置 排序号
* @param fieldOrderNoList * @param fieldOrderNoList
*/ */
public void setFieldOrderNoList(List<String> fieldOrderNoList){ public void setFieldOrderNoList(List<Integer> fieldOrderNoList){
this.fieldOrderNoList = fieldOrderNoList; this.fieldOrderNoList = fieldOrderNoList;
} }
/** /**
* 获取 备注 * 获取 备注
* @return remarkList * @return remarkList
*/ */
public List<String> getRemarkList(){ public List<String> getRemarkList(){
return this.remarkList; return this.remarkList;
} }
/** /**
* 设置 备注 * 设置 备注
* @param remarkList * @param remarkList
*/ */
public void setRemarkList(List<String> remarkList){ public void setRemarkList(List<String> remarkList){
this.remarkList = remarkList; this.remarkList = remarkList;
} }
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
*/ */
public String getCreateTimeStart(){ public String getCreateTimeStart(){
return this.createTimeStart; return this.createTimeStart;
} }
/** /**
* 设置 开始 创建时间 * 设置 开始 创建时间
* @param createTimeStart * @param createTimeStart
*/ */
public void setCreateTimeStart(String createTimeStart){ public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart; this.createTimeStart = createTimeStart;
} }
/** /**
* 获取 结束 创建时间 * 获取 结束 创建时间
* @return createTimeEnd * @return createTimeEnd
*/ */
public String getCreateTimeEnd(){ public String getCreateTimeEnd(){
return this.createTimeEnd; return this.createTimeEnd;
} }
/** /**
* 设置 结束 创建时间 * 设置 结束 创建时间
* @param createTimeEnd * @param createTimeEnd
*/ */
public void setCreateTimeEnd(String createTimeEnd){ public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd; this.createTimeEnd = createTimeEnd;
} }
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @return createUserIdStart * @return createUserIdStart
*/ */
public Long getCreateUserIdStart(){ public Long getCreateUserIdStart(){
return this.createUserIdStart; return this.createUserIdStart;
} }
/** /**
* 设置 开始 创建用户 * 设置 开始 创建用户
* @param createUserIdStart * @param createUserIdStart
*/ */
public void setCreateUserIdStart(Long createUserIdStart){ public void setCreateUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart; this.createUserIdStart = createUserIdStart;
} }
/** /**
* 获取 结束 创建用户 * 获取 结束 创建用户
* @return $createUserIdEnd * @return $createUserIdEnd
*/ */
public Long getCreateUserIdEnd(){ public Long getCreateUserIdEnd(){
return this.createUserIdEnd; return this.createUserIdEnd;
} }
/** /**
* 设置 结束 创建用户 * 设置 结束 创建用户
* @param createUserIdEnd * @param createUserIdEnd
*/ */
public void setCreateUserIdEnd(Long createUserIdEnd){ public void setCreateUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd; this.createUserIdEnd = createUserIdEnd;
} }
/** /**
* 获取 增加 创建用户 * 获取 增加 创建用户
* @return createUserIdIncrement * @return createUserIdIncrement
*/ */
public Long getCreateUserIdIncrement(){ public Long getCreateUserIdIncrement(){
return this.createUserIdIncrement; return this.createUserIdIncrement;
} }
/** /**
* 设置 增加 创建用户 * 设置 增加 创建用户
* @param createUserIdIncrement * @param createUserIdIncrement
*/ */
public void setCreateUserIdIncrement(Long createUserIdIncrement){ public void setCreateUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement; this.createUserIdIncrement = createUserIdIncrement;
} }
/** /**
* 获取 创建用户 * 获取 创建用户
* @return createUserIdList * @return createUserIdList
*/ */
public List<Long> getCreateUserIdList(){ public List<Long> getCreateUserIdList(){
return this.createUserIdList; return this.createUserIdList;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdList * @param createUserIdList
*/ */
public void setCreateUserIdList(List<Long> createUserIdList){ public void setCreateUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
} }
/** /**
* 获取 开始 修改时间 * 获取 开始 修改时间
* @return updateTimeStart * @return updateTimeStart
*/ */
public String getUpdateTimeStart(){ public String getUpdateTimeStart(){
return this.updateTimeStart; return this.updateTimeStart;
} }
/** /**
* 设置 开始 修改时间 * 设置 开始 修改时间
* @param updateTimeStart * @param updateTimeStart
*/ */
public void setUpdateTimeStart(String updateTimeStart){ public void setUpdateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart; this.updateTimeStart = updateTimeStart;
} }
/** /**
* 获取 结束 修改时间 * 获取 结束 修改时间
* @return updateTimeEnd * @return updateTimeEnd
*/ */
public String getUpdateTimeEnd(){ public String getUpdateTimeEnd(){
return this.updateTimeEnd; return this.updateTimeEnd;
} }
/** /**
* 设置 结束 修改时间 * 设置 结束 修改时间
* @param updateTimeEnd * @param updateTimeEnd
*/ */
public void setUpdateTimeEnd(String updateTimeEnd){ public void setUpdateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/** /**
* 获取 开始 修改用户 * 获取 开始 修改用户
* @return updateUserIdStart * @return updateUserIdStart
*/ */
public Long getUpdateUserIdStart(){ public Long getUpdateUserIdStart(){
return this.updateUserIdStart; return this.updateUserIdStart;
} }
/** /**
* 设置 开始 修改用户 * 设置 开始 修改用户
* @param updateUserIdStart * @param updateUserIdStart
*/ */
public void setUpdateUserIdStart(Long updateUserIdStart){ public void setUpdateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart; this.updateUserIdStart = updateUserIdStart;
} }
/** /**
* 获取 结束 修改用户 * 获取 结束 修改用户
* @return $updateUserIdEnd * @return $updateUserIdEnd
*/ */
public Long getUpdateUserIdEnd(){ public Long getUpdateUserIdEnd(){
return this.updateUserIdEnd; return this.updateUserIdEnd;
} }
/** /**
* 设置 结束 修改用户 * 设置 结束 修改用户
* @param updateUserIdEnd * @param updateUserIdEnd
*/ */
public void setUpdateUserIdEnd(Long updateUserIdEnd){ public void setUpdateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd; this.updateUserIdEnd = updateUserIdEnd;
} }
/** /**
* 获取 增加 修改用户 * 获取 增加 修改用户
* @return updateUserIdIncrement * @return updateUserIdIncrement
*/ */
public Long getUpdateUserIdIncrement(){ public Long getUpdateUserIdIncrement(){
return this.updateUserIdIncrement; return this.updateUserIdIncrement;
} }
/** /**
* 设置 增加 修改用户 * 设置 增加 修改用户
* @param updateUserIdIncrement * @param updateUserIdIncrement
*/ */
public void setUpdateUserIdIncrement(Long updateUserIdIncrement){ public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement; this.updateUserIdIncrement = updateUserIdIncrement;
} }
/** /**
* 获取 修改用户 * 获取 修改用户
* @return updateUserIdList * @return updateUserIdList
*/ */
public List<Long> getUpdateUserIdList(){ public List<Long> getUpdateUserIdList(){
return this.updateUserIdList; return this.updateUserIdList;
} }
/** /**
* 设置 修改用户 * 设置 修改用户
* @param updateUserIdList * @param updateUserIdList
*/ */
public void setUpdateUserIdList(List<Long> updateUserIdList){ public void setUpdateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
} }
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
*/ */
public AppInfoTempleteFieldQuery id(Long id){ public AppInfoTempleteFieldQuery id(Long id){
setId(id); setId(id);
return this; return this;
} }
/** /**
* 设置 开始 序号，主键，自增长 * 设置 开始 序号，主键，自增长
* @param idStart * @param idStart
*/ */
public AppInfoTempleteFieldQuery idStart(Long idStart){ public AppInfoTempleteFieldQuery idStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
return this; return this;
} }
/** /**
* 设置 结束 序号，主键，自增长 * 设置 结束 序号，主键，自增长
* @param idEnd * @param idEnd
*/ */
public AppInfoTempleteFieldQuery idEnd(Long idEnd){ public AppInfoTempleteFieldQuery idEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
return this; return this;
} }
/** /**
* 设置 增加 序号，主键，自增长 * 设置 增加 序号，主键，自增长
* @param idIncrement * @param idIncrement
*/ */
public AppInfoTempleteFieldQuery idIncrement(Long idIncrement){ public AppInfoTempleteFieldQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
return this; return this;
} }
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param idList * @param idList
*/ */
public AppInfoTempleteFieldQuery idList(List<Long> idList){ public AppInfoTempleteFieldQuery idList(List<Long> idList){
this.idList = idList; this.idList = idList;
return this; return this;
} }
/** /**
* 设置 应用id * 设置 应用id
* @param appId * @param appId
*/ */
public AppInfoTempleteFieldQuery appId(Long appId){ public AppInfoTempleteFieldQuery appId(Long appId){
setAppId(appId); setAppId(appId);
return this; return this;
} }
/** /**
* 设置 开始 应用id * 设置 开始 应用id
* @param appIdStart * @param appIdStart
*/ */
public AppInfoTempleteFieldQuery appIdStart(Long appIdStart){ public AppInfoTempleteFieldQuery appIdStart(Long appIdStart){
this.appIdStart = appIdStart; this.appIdStart = appIdStart;
return this; return this;
} }
/** /**
* 设置 结束 应用id * 设置 结束 应用id
* @param appIdEnd * @param appIdEnd
*/ */
public AppInfoTempleteFieldQuery appIdEnd(Long appIdEnd){ public AppInfoTempleteFieldQuery appIdEnd(Long appIdEnd){
this.appIdEnd = appIdEnd; this.appIdEnd = appIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 应用id * 设置 增加 应用id
* @param appIdIncrement * @param appIdIncrement
*/ */
public AppInfoTempleteFieldQuery appIdIncrement(Long appIdIncrement){ public AppInfoTempleteFieldQuery appIdIncrement(Long appIdIncrement){
this.appIdIncrement = appIdIncrement; this.appIdIncrement = appIdIncrement;
return this; return this;
} }
/** /**
* 设置 应用id * 设置 应用id
* @param appIdList * @param appIdList
*/ */
public AppInfoTempleteFieldQuery appIdList(List<Long> appIdList){ public AppInfoTempleteFieldQuery appIdList(List<Long> appIdList){
this.appIdList = appIdList; this.appIdList = appIdList;
return this; return this;
} }
/** /**
* 设置 字段编码 * 设置 字段编码
* @param fieldCode * @param fieldCode
*/ */
public AppInfoTempleteFieldQuery fieldCode(String fieldCode){ public AppInfoTempleteFieldQuery fieldCode(String fieldCode){
setFieldCode(fieldCode); setFieldCode(fieldCode);
return this; return this;
} }
/** /**
* 设置 字段编码 * 设置 字段编码
* @param fieldCodeList * @param fieldCodeList
*/ */
public AppInfoTempleteFieldQuery fieldCodeList(List<String> fieldCodeList){ public AppInfoTempleteFieldQuery fieldCodeList(List<String> fieldCodeList){
this.fieldCodeList = fieldCodeList; this.fieldCodeList = fieldCodeList;
return this; return this;
} }
/** /**
* 设置 字段名称 * 设置 字段名称
* @param fieldName * @param fieldName
*/ */
public AppInfoTempleteFieldQuery fieldName(String fieldName){ public AppInfoTempleteFieldQuery fieldName(String fieldName){
setFieldName(fieldName); setFieldName(fieldName);
return this; return this;
} }
/** /**
* 设置 字段名称 * 设置 字段名称
* @param fieldNameList * @param fieldNameList
*/ */
public AppInfoTempleteFieldQuery fieldNameList(List<String> fieldNameList){ public AppInfoTempleteFieldQuery fieldNameList(List<String> fieldNameList){
this.fieldNameList = fieldNameList; this.fieldNameList = fieldNameList;
return this; return this;
} }
/** /**
* 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框） * 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
* @param fieldType * @param fieldType
*/ */
public AppInfoTempleteFieldQuery fieldType(String fieldType){ public AppInfoTempleteFieldQuery fieldType(String fieldType){
setFieldType(fieldType); setFieldType(fieldType);
return this; return this;
} }
/** /**
* 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框） * 设置 字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,editer.富文本）
* @param fieldTypeList * @param fieldTypeList
*/ */
public AppInfoTempleteFieldQuery fieldTypeList(List<String> fieldTypeList){ public AppInfoTempleteFieldQuery fieldTypeList(List<String> fieldTypeList){
this.fieldTypeList = fieldTypeList; this.fieldTypeList = fieldTypeList;
return this; return this;
} }
/** /**
* 设置 数据类型（number.数字,string.字符串） * 设置 数据类型（number.数字,string.字符串）
* @param dataType * @param dataType
*/ */
public AppInfoTempleteFieldQuery dataType(String dataType){ public AppInfoTempleteFieldQuery dataType(String dataType){
setDataType(dataType); setDataType(dataType);
return this; return this;
} }
/** /**
* 设置 数据类型（number.数字,string.字符串） * 设置 数据类型（number.数字,string.字符串）
* @param dataTypeList * @param dataTypeList
*/ */
public AppInfoTempleteFieldQuery dataTypeList(List<String> dataTypeList){ public AppInfoTempleteFieldQuery dataTypeList(List<String> dataTypeList){
this.dataTypeList = dataTypeList; this.dataTypeList = dataTypeList;
return this; return this;
} }
/** /**
* 设置 字段值 * 设置 字段值
* @param fieldValue * @param fieldValue
*/ */
public AppInfoTempleteFieldQuery fieldValue(String fieldValue){ public AppInfoTempleteFieldQuery fieldValue(String fieldValue){
setFieldValue(fieldValue); setFieldValue(fieldValue);
return this; return this;
} }
/** /**
* 设置 字段值 * 设置 字段值
* @param fieldValueList * @param fieldValueList
*/ */
public AppInfoTempleteFieldQuery fieldValueList(List<String> fieldValueList){ public AppInfoTempleteFieldQuery fieldValueList(List<String> fieldValueList){
this.fieldValueList = fieldValueList; this.fieldValueList = fieldValueList;
return this; return this;
} }
/** /**
* 设置 数据长度，默认128 * 设置 数据长度，默认128
* @param fieldLen * @param fieldLen
*/ */
public AppInfoTempleteFieldQuery fieldLen(Integer fieldLen){ public AppInfoTempleteFieldQuery fieldLen(Integer fieldLen){
setFieldLen(fieldLen); setFieldLen(fieldLen);
return this; return this;
} }
/** /**
* 设置 开始 数据长度，默认128 * 设置 开始 数据长度，默认128
* @param fieldLenStart * @param fieldLenStart
*/ */
public AppInfoTempleteFieldQuery fieldLenStart(Integer fieldLenStart){ public AppInfoTempleteFieldQuery fieldLenStart(Integer fieldLenStart){
this.fieldLenStart = fieldLenStart; this.fieldLenStart = fieldLenStart;
return this; return this;
} }
/** /**
* 设置 结束 数据长度，默认128 * 设置 结束 数据长度，默认128
* @param fieldLenEnd * @param fieldLenEnd
*/ */
public AppInfoTempleteFieldQuery fieldLenEnd(Integer fieldLenEnd){ public AppInfoTempleteFieldQuery fieldLenEnd(Integer fieldLenEnd){
this.fieldLenEnd = fieldLenEnd; this.fieldLenEnd = fieldLenEnd;
return this; return this;
} }
/** /**
* 设置 增加 数据长度，默认128 * 设置 增加 数据长度，默认128
* @param fieldLenIncrement * @param fieldLenIncrement
*/ */
public AppInfoTempleteFieldQuery fieldLenIncrement(Integer fieldLenIncrement){ public AppInfoTempleteFieldQuery fieldLenIncrement(Integer fieldLenIncrement){
this.fieldLenIncrement = fieldLenIncrement; this.fieldLenIncrement = fieldLenIncrement;
return this; return this;
} }
/** /**
* 设置 数据长度，默认128 * 设置 数据长度，默认128
* @param fieldLenList * @param fieldLenList
*/ */
public AppInfoTempleteFieldQuery fieldLenList(List<Integer> fieldLenList){ public AppInfoTempleteFieldQuery fieldLenList(List<Integer> fieldLenList){
this.fieldLenList = fieldLenList; this.fieldLenList = fieldLenList;
return this; return this;
} }
/** /**
* 设置 是否允许为空，(0.否,1.是) * 设置 是否允许为空，(0.否,1.是)
* @param fieldNull * @param fieldNull
*/ */
public AppInfoTempleteFieldQuery fieldNull(Integer fieldNull){ public AppInfoTempleteFieldQuery fieldNull(Integer fieldNull){
setFieldNull(fieldNull); setFieldNull(fieldNull);
return this; return this;
} }
/** /**
* 设置 开始 是否允许为空，(0.否,1.是) * 设置 开始 是否允许为空，(0.否,1.是)
* @param fieldNullStart * @param fieldNullStart
*/ */
public AppInfoTempleteFieldQuery fieldNullStart(Integer fieldNullStart){ public AppInfoTempleteFieldQuery fieldNullStart(Integer fieldNullStart){
this.fieldNullStart = fieldNullStart; this.fieldNullStart = fieldNullStart;
return this; return this;
} }
/** /**
* 设置 结束 是否允许为空，(0.否,1.是) * 设置 结束 是否允许为空，(0.否,1.是)
* @param fieldNullEnd * @param fieldNullEnd
*/ */
public AppInfoTempleteFieldQuery fieldNullEnd(Integer fieldNullEnd){ public AppInfoTempleteFieldQuery fieldNullEnd(Integer fieldNullEnd){
this.fieldNullEnd = fieldNullEnd; this.fieldNullEnd = fieldNullEnd;
return this; return this;
} }
/** /**
* 设置 增加 是否允许为空，(0.否,1.是) * 设置 增加 是否允许为空，(0.否,1.是)
* @param fieldNullIncrement * @param fieldNullIncrement
*/ */
public AppInfoTempleteFieldQuery fieldNullIncrement(Integer fieldNullIncrement){ public AppInfoTempleteFieldQuery fieldNullIncrement(Integer fieldNullIncrement){
this.fieldNullIncrement = fieldNullIncrement; this.fieldNullIncrement = fieldNullIncrement;
return this; return this;
} }
/** /**
* 设置 是否允许为空，(0.否,1.是) * 设置 是否允许为空，(0.否,1.是)
* @param fieldNullList * @param fieldNullList
*/ */
public AppInfoTempleteFieldQuery fieldNullList(List<Integer> fieldNullList){ public AppInfoTempleteFieldQuery fieldNullList(List<Integer> fieldNullList){
this.fieldNullList = fieldNullList; this.fieldNullList = fieldNullList;
return this; return this;
} }
/** /**
* 设置 字段是否列表显示(0.否,1.是) * 设置 字段是否列表显示(0.否,1.是)
* @param isList * @param isList
*/ */
public AppInfoTempleteFieldQuery isList(Integer isList){ public AppInfoTempleteFieldQuery isList(Integer isList){
setIsList(isList); setIsList(isList);
return this; return this;
} }
/** /**
* 设置 开始 字段是否列表显示(0.否,1.是) * 设置 开始 字段是否列表显示(0.否,1.是)
* @param isListStart * @param isListStart
*/ */
public AppInfoTempleteFieldQuery isListStart(Integer isListStart){ public AppInfoTempleteFieldQuery isListStart(Integer isListStart){
this.isListStart = isListStart; this.isListStart = isListStart;
return this; return this;
} }
/** /**
* 设置 结束 字段是否列表显示(0.否,1.是) * 设置 结束 字段是否列表显示(0.否,1.是)
* @param isListEnd * @param isListEnd
*/ */
public AppInfoTempleteFieldQuery isListEnd(Integer isListEnd){ public AppInfoTempleteFieldQuery isListEnd(Integer isListEnd){
this.isListEnd = isListEnd; this.isListEnd = isListEnd;
return this; return this;
} }
/** /**
* 设置 增加 字段是否列表显示(0.否,1.是) * 设置 增加 字段是否列表显示(0.否,1.是)
* @param isListIncrement * @param isListIncrement
*/ */
public AppInfoTempleteFieldQuery isListIncrement(Integer isListIncrement){ public AppInfoTempleteFieldQuery isListIncrement(Integer isListIncrement){
this.isListIncrement = isListIncrement; this.isListIncrement = isListIncrement;
return this; return this;
} }
/** /**
* 设置 字段是否列表显示(0.否,1.是) * 设置 字段是否列表显示(0.否,1.是)
* @param isListList * @param isListList
*/ */
public AppInfoTempleteFieldQuery isListList(List<Integer> isListList){ public AppInfoTempleteFieldQuery isListList(List<Integer> isListList){
this.isListList = isListList; this.isListList = isListList;
return this; return this;
} }
/** /**
* 设置 排序号 * 设置 排序号
* @param fieldOrderNo * @param fieldOrderNo
*/ */
public AppInfoTempleteFieldQuery fieldOrderNo(String fieldOrderNo){ public AppInfoTempleteFieldQuery fieldOrderNo(Integer fieldOrderNo){
setFieldOrderNo(fieldOrderNo); setFieldOrderNo(fieldOrderNo);
return this; 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 fieldOrderNoList * @param fieldOrderNoIncrement
*/ */
public AppInfoTempleteFieldQuery fieldOrderNoList(List<String> fieldOrderNoList){ public AppInfoTempleteFieldQuery fieldOrderNoIncrement(Integer fieldOrderNoIncrement){
this.fieldOrderNoIncrement = fieldOrderNoIncrement;
return this;
}
/**
* 设置 排序号
* @param fieldOrderNoList
*/
public AppInfoTempleteFieldQuery fieldOrderNoList(List<Integer> fieldOrderNoList){
this.fieldOrderNoList = fieldOrderNoList; this.fieldOrderNoList = fieldOrderNoList;
return this; return this;
} }
/** /**
* 设置 备注 * 设置 备注
* @param remark * @param remark
*/ */
public AppInfoTempleteFieldQuery remark(String remark){ public AppInfoTempleteFieldQuery remark(String remark){
setRemark(remark); setRemark(remark);
return this; return this;
} }
/** /**
* 设置 备注 * 设置 备注
* @param remarkList * @param remarkList
*/ */
public AppInfoTempleteFieldQuery remarkList(List<String> remarkList){ public AppInfoTempleteFieldQuery remarkList(List<String> remarkList){
this.remarkList = remarkList; this.remarkList = remarkList;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserId * @param createUserId
*/ */
public AppInfoTempleteFieldQuery createUserId(Long createUserId){ public AppInfoTempleteFieldQuery createUserId(Long createUserId){
setCreateUserId(createUserId); setCreateUserId(createUserId);
return this; return this;
} }
/** /**
* 设置 开始 创建用户 * 设置 开始 创建用户
* @param createUserIdStart * @param createUserIdStart
*/ */
public AppInfoTempleteFieldQuery createUserIdStart(Long createUserIdStart){ public AppInfoTempleteFieldQuery createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart; this.createUserIdStart = createUserIdStart;
return this; return this;
} }
/** /**
* 设置 结束 创建用户 * 设置 结束 创建用户
* @param createUserIdEnd * @param createUserIdEnd
*/ */
public AppInfoTempleteFieldQuery createUserIdEnd(Long createUserIdEnd){ public AppInfoTempleteFieldQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd; this.createUserIdEnd = createUserIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 创建用户 * 设置 增加 创建用户
* @param createUserIdIncrement * @param createUserIdIncrement
*/ */
public AppInfoTempleteFieldQuery createUserIdIncrement(Long createUserIdIncrement){ public AppInfoTempleteFieldQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement; this.createUserIdIncrement = createUserIdIncrement;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdList * @param createUserIdList
*/ */
public AppInfoTempleteFieldQuery createUserIdList(List<Long> createUserIdList){ public AppInfoTempleteFieldQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
return this; return this;
} }
/** /**
* 设置 修改用户 * 设置 修改用户
* @param updateUserId * @param updateUserId
*/ */
public AppInfoTempleteFieldQuery updateUserId(Long updateUserId){ public AppInfoTempleteFieldQuery updateUserId(Long updateUserId){
setUpdateUserId(updateUserId); setUpdateUserId(updateUserId);
return this; return this;
} }
/** /**
* 设置 开始 修改用户 * 设置 开始 修改用户
* @param updateUserIdStart * @param updateUserIdStart
*/ */
public AppInfoTempleteFieldQuery updateUserIdStart(Long updateUserIdStart){ public AppInfoTempleteFieldQuery updateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart; this.updateUserIdStart = updateUserIdStart;
return this; return this;
} }
/** /**
* 设置 结束 修改用户 * 设置 结束 修改用户
* @param updateUserIdEnd * @param updateUserIdEnd
*/ */
public AppInfoTempleteFieldQuery updateUserIdEnd(Long updateUserIdEnd){ public AppInfoTempleteFieldQuery updateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd; this.updateUserIdEnd = updateUserIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 修改用户 * 设置 增加 修改用户
* @param updateUserIdIncrement * @param updateUserIdIncrement
*/ */
public AppInfoTempleteFieldQuery updateUserIdIncrement(Long updateUserIdIncrement){ public AppInfoTempleteFieldQuery updateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement; this.updateUserIdIncrement = updateUserIdIncrement;
return this; return this;
} }
/** /**
* 设置 修改用户 * 设置 修改用户
* @param updateUserIdList * @param updateUserIdList
*/ */
public AppInfoTempleteFieldQuery updateUserIdList(List<Long> updateUserIdList){ public AppInfoTempleteFieldQuery updateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
return this; return this;
} }
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
*/ */
public List<AppInfoTempleteFieldQuery> getOrConditionList(){ public List<AppInfoTempleteFieldQuery> getOrConditionList(){
return this.orConditionList; return this.orConditionList;
} }
/** /**
* 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @param orConditionList * @param orConditionList
*/ */
public void setOrConditionList(List<AppInfoTempleteFieldQuery> orConditionList){ public void setOrConditionList(List<AppInfoTempleteFieldQuery> orConditionList){
this.orConditionList = orConditionList; this.orConditionList = orConditionList;
} }
/** /**
* 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList * @return andConditionList
*/ */
public List<AppInfoTempleteFieldQuery> getAndConditionList(){ public List<AppInfoTempleteFieldQuery> getAndConditionList(){
return this.andConditionList; return this.andConditionList;
} }
/** /**
* 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList * @param andConditionList
*/ */
public void setAndConditionList(List<AppInfoTempleteFieldQuery> andConditionList){ public void setAndConditionList(List<AppInfoTempleteFieldQuery> andConditionList){
this.andConditionList = andConditionList; this.andConditionList = andConditionList;
} }
......
base-manager/src/main/java/com/mortals/xhx/module/app/model/AppQuery.java
View file @ 4c59864b
...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.app.model.AppEntity; ...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.app.model.AppEntity;
* 自助终端应用查询对象 * 自助终端应用查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-28 * @date 2022-12-01
*/ */
public class AppQuery extends AppEntity { public class AppQuery extends AppEntity {
/** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
...@@ -73,30 +73,57 @@ public class AppQuery extends AppEntity { ...@@ -73,30 +73,57 @@ public class AppQuery extends AppEntity {
/** 下发设备次数列表 */ /** 下发设备次数列表 */
private List <Integer> downDevCountList; private List <Integer> downDevCountList;
/** 开始 是否上架(0.上架，1.下架) */ /** 开始 是否上架(0.下架，1.上架) */
private Integer shelvesStart; private Integer shelvesStart;
/** 结束 是否上架(0.上架，1.下架) */ /** 结束 是否上架(0.下架，1.上架) */
private Integer shelvesEnd; private Integer shelvesEnd;
/** 增加 是否上架(0.上架，1.下架) */ /** 增加 是否上架(0.下架，1.上架) */
private Integer shelvesIncrement; private Integer shelvesIncrement;
/** 是否上架(0.上架，1.下架)列表 */ /** 是否上架(0.下架，1.上架)列表 */
private List <Integer> shelvesList; private List <Integer> shelvesList;
/** 开始 类型(1.应用程序,2.url) */
private Integer appTypeStart;
/** 结束 类型(1.应用程序,2.url) */
private Integer appTypeEnd;
/** 增加 类型(1.应用程序,2.url) */
private Integer appTypeIncrement;
/** 类型(1.应用程序,2.url)列表 */
private List <Integer> appTypeList;
/** 文件名称 */
private List<String> fileNameList;
/** 文件相对路径地址 */ /** 文件相对路径地址 */
private List<String> filePathList; private List<String> filePathList;
/** 文件部署路径地址 */ /** 文件部署路径地址 */
private List<String> distributeFilePathList; private List<String> distributeFilePathList;
/** 当前版本 */ /** 开始 当前版本 */
private List<String> versionList; private Integer versionStart;
/** 结束 当前版本 */
private Integer versionEnd;
/** 增加 当前版本 */
private Integer versionIncrement;
/** 当前版本列表 */
private List <Integer> versionList;
/** 简介 */ /** 简介 */
private List<String> summaryList; private List<String> summaryList;
/** 更新说明 */
private List<String> notesList;
/** 开始 是否部署(0.否，1.是) */ /** 开始 是否部署(0.否，1.是) */
private Integer distributeStart; private Integer distributeStart;
...@@ -110,16 +137,16 @@ public class AppQuery extends AppEntity { ...@@ -110,16 +137,16 @@ public class AppQuery extends AppEntity {
private List <Integer> distributeList; private List <Integer> distributeList;
/** 开始 是否数据更新(0.否，1.是) */ /** 开始 是否数据更新(0.否，1.是) */
private Integer dateUpdateStart; private Integer dataUpdateStart;
/** 结束 是否数据更新(0.否，1.是) */ /** 结束 是否数据更新(0.否，1.是) */
private Integer dateUpdateEnd; private Integer dataUpdateEnd;
/** 增加 是否数据更新(0.否，1.是) */ /** 增加 是否数据更新(0.否，1.是) */
private Integer dateUpdateIncrement; private Integer dataUpdateIncrement;
/** 是否数据更新(0.否，1.是)列表 */ /** 是否数据更新(0.否，1.是)列表 */
private List <Integer> dateUpdateList; private List <Integer> dataUpdateList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -485,7 +512,7 @@ public class AppQuery extends AppEntity { ...@@ -485,7 +512,7 @@ public class AppQuery extends AppEntity {
} }
/** /**
* 获取 开始 是否上架(0.上架，1.下架) * 获取 开始 是否上架(0.下架，1.上架)
* @return shelvesStart * @return shelvesStart
*/ */
public Integer getShelvesStart(){ public Integer getShelvesStart(){
...@@ -493,7 +520,7 @@ public class AppQuery extends AppEntity { ...@@ -493,7 +520,7 @@ public class AppQuery extends AppEntity {
} }
/** /**
* 设置 开始 是否上架(0.上架，1.下架) * 设置 开始 是否上架(0.下架，1.上架)
* @param shelvesStart * @param shelvesStart
*/ */
public void setShelvesStart(Integer shelvesStart){ public void setShelvesStart(Integer shelvesStart){
...@@ -501,7 +528,7 @@ public class AppQuery extends AppEntity { ...@@ -501,7 +528,7 @@ public class AppQuery extends AppEntity {
} }
/** /**
* 获取 结束 是否上架(0.上架，1.下架) * 获取 结束 是否上架(0.下架，1.上架)
* @return $shelvesEnd * @return $shelvesEnd
*/ */
public Integer getShelvesEnd(){ public Integer getShelvesEnd(){
...@@ -509,7 +536,7 @@ public class AppQuery extends AppEntity { ...@@ -509,7 +536,7 @@ public class AppQuery extends AppEntity {
} }
/** /**
* 设置 结束 是否上架(0.上架，1.下架) * 设置 结束 是否上架(0.下架，1.上架)
* @param shelvesEnd * @param shelvesEnd
*/ */
public void setShelvesEnd(Integer shelvesEnd){ public void setShelvesEnd(Integer shelvesEnd){
...@@ -517,7 +544,7 @@ public class AppQuery extends AppEntity { ...@@ -517,7 +544,7 @@ public class AppQuery extends AppEntity {
} }
/** /**
* 获取 增加 是否上架(0.上架，1.下架) * 获取 增加 是否上架(0.下架，1.上架)
* @return shelvesIncrement * @return shelvesIncrement
*/ */
public Integer getShelvesIncrement(){ public Integer getShelvesIncrement(){
...@@ -525,7 +552,7 @@ public class AppQuery extends AppEntity { ...@@ -525,7 +552,7 @@ public class AppQuery extends AppEntity {
} }
/** /**
* 设置 增加 是否上架(0.上架，1.下架) * 设置 增加 是否上架(0.下架，1.上架)
* @param shelvesIncrement * @param shelvesIncrement
*/ */
public void setShelvesIncrement(Integer shelvesIncrement){ public void setShelvesIncrement(Integer shelvesIncrement){
...@@ -533,7 +560,7 @@ public class AppQuery extends AppEntity { ...@@ -533,7 +560,7 @@ public class AppQuery extends AppEntity {
} }
/** /**
* 获取 是否上架(0.上架，1.下架) * 获取 是否上架(0.下架，1.上架)
* @return shelvesList * @return shelvesList
*/ */
public List<Integer> getShelvesList(){ public List<Integer> getShelvesList(){
...@@ -541,13 +568,92 @@ public class AppQuery extends AppEntity { ...@@ -541,13 +568,92 @@ public class AppQuery extends AppEntity {
} }
/** /**
* 设置 是否上架(0.上架，1.下架) * 设置 是否上架(0.下架，1.上架)
* @param shelvesList * @param shelvesList
*/ */
public void setShelvesList(List<Integer> shelvesList){ public void setShelvesList(List<Integer> shelvesList){
this.shelvesList = shelvesList; this.shelvesList = shelvesList;
} }
/**
* 获取 开始 类型(1.应用程序,2.url)
* @return appTypeStart
*/
public Integer getAppTypeStart(){
return this.appTypeStart;
}
/**
* 设置 开始 类型(1.应用程序,2.url)
* @param appTypeStart
*/
public void setAppTypeStart(Integer appTypeStart){
this.appTypeStart = appTypeStart;
}
/**
* 获取 结束 类型(1.应用程序,2.url)
* @return $appTypeEnd
*/
public Integer getAppTypeEnd(){
return this.appTypeEnd;
}
/**
* 设置 结束 类型(1.应用程序,2.url)
* @param appTypeEnd
*/
public void setAppTypeEnd(Integer appTypeEnd){
this.appTypeEnd = appTypeEnd;
}
/**
* 获取 增加 类型(1.应用程序,2.url)
* @return appTypeIncrement
*/
public Integer getAppTypeIncrement(){
return this.appTypeIncrement;
}
/**
* 设置 增加 类型(1.应用程序,2.url)
* @param appTypeIncrement
*/
public void setAppTypeIncrement(Integer appTypeIncrement){
this.appTypeIncrement = appTypeIncrement;
}
/**
* 获取 类型(1.应用程序,2.url)
* @return appTypeList
*/
public List<Integer> getAppTypeList(){
return this.appTypeList;
}
/**
* 设置 类型(1.应用程序,2.url)
* @param appTypeList
*/
public void setAppTypeList(List<Integer> appTypeList){
this.appTypeList = appTypeList;
}
/**
* 获取 文件名称
* @return fileNameList
*/
public List<String> getFileNameList(){
return this.fileNameList;
}
/**
* 设置 文件名称
* @param fileNameList
*/
public void setFileNameList(List<String> fileNameList){
this.fileNameList = fileNameList;
}
/** /**
* 获取 文件相对路径地址 * 获取 文件相对路径地址
* @return filePathList * @return filePathList
...@@ -578,11 +684,59 @@ public class AppQuery extends AppEntity { ...@@ -578,11 +684,59 @@ public class AppQuery extends AppEntity {
public void setDistributeFilePathList(List<String> distributeFilePathList){ public void setDistributeFilePathList(List<String> distributeFilePathList){
this.distributeFilePathList = distributeFilePathList; this.distributeFilePathList = distributeFilePathList;
} }
/**
* 获取 开始 当前版本
* @return versionStart
*/
public Integer getVersionStart(){
return this.versionStart;
}
/**
* 设置 开始 当前版本
* @param versionStart
*/
public void setVersionStart(Integer versionStart){
this.versionStart = versionStart;
}
/**
* 获取 结束 当前版本
* @return $versionEnd
*/
public Integer getVersionEnd(){
return this.versionEnd;
}
/**
* 设置 结束 当前版本
* @param versionEnd
*/
public void setVersionEnd(Integer versionEnd){
this.versionEnd = versionEnd;
}
/**
* 获取 增加 当前版本
* @return versionIncrement
*/
public Integer getVersionIncrement(){
return this.versionIncrement;
}
/**
* 设置 增加 当前版本
* @param versionIncrement
*/
public void setVersionIncrement(Integer versionIncrement){
this.versionIncrement = versionIncrement;
}
/** /**
* 获取 当前版本 * 获取 当前版本
* @return versionList * @return versionList
*/ */
public List<String> getVersionList(){ public List<Integer> getVersionList(){
return this.versionList; return this.versionList;
} }
...@@ -590,9 +744,10 @@ public class AppQuery extends AppEntity { ...@@ -590,9 +744,10 @@ public class AppQuery extends AppEntity {
* 设置 当前版本 * 设置 当前版本
* @param versionList * @param versionList
*/ */
public void setVersionList(List<String> versionList){ public void setVersionList(List<Integer> versionList){
this.versionList = versionList; this.versionList = versionList;
} }
/** /**
* 获取 简介 * 获取 简介
* @return summaryList * @return summaryList
...@@ -608,6 +763,21 @@ public class AppQuery extends AppEntity { ...@@ -608,6 +763,21 @@ public class AppQuery extends AppEntity {
public void setSummaryList(List<String> summaryList){ public void setSummaryList(List<String> summaryList){
this.summaryList = summaryList; this.summaryList = summaryList;
} }
/**
* 获取 更新说明
* @return notesList
*/
public List<String> getNotesList(){
return this.notesList;
}
/**
* 设置 更新说明
* @param notesList
*/
public void setNotesList(List<String> notesList){
this.notesList = notesList;
}
/** /**
* 获取 开始 是否部署(0.否，1.是) * 获取 开始 是否部署(0.否，1.是)
* @return distributeStart * @return distributeStart
...@@ -674,66 +844,66 @@ public class AppQuery extends AppEntity { ...@@ -674,66 +844,66 @@ public class AppQuery extends AppEntity {
/** /**
* 获取 开始 是否数据更新(0.否，1.是) * 获取 开始 是否数据更新(0.否，1.是)
* @return dateUpdateStart * @return dataUpdateStart
*/ */
public Integer getDateUpdateStart(){ public Integer getDataUpdateStart(){
return this.dateUpdateStart; return this.dataUpdateStart;
} }
/** /**
* 设置 开始 是否数据更新(0.否，1.是) * 设置 开始 是否数据更新(0.否，1.是)
* @param dateUpdateStart * @param dataUpdateStart
*/ */
public void setDateUpdateStart(Integer dateUpdateStart){ public void setDataUpdateStart(Integer dataUpdateStart){
this.dateUpdateStart = dateUpdateStart; this.dataUpdateStart = dataUpdateStart;
} }
/** /**
* 获取 结束 是否数据更新(0.否，1.是) * 获取 结束 是否数据更新(0.否，1.是)
* @return $dateUpdateEnd * @return $dataUpdateEnd
*/ */
public Integer getDateUpdateEnd(){ public Integer getDataUpdateEnd(){
return this.dateUpdateEnd; return this.dataUpdateEnd;
} }
/** /**
* 设置 结束 是否数据更新(0.否，1.是) * 设置 结束 是否数据更新(0.否，1.是)
* @param dateUpdateEnd * @param dataUpdateEnd
*/ */
public void setDateUpdateEnd(Integer dateUpdateEnd){ public void setDataUpdateEnd(Integer dataUpdateEnd){
this.dateUpdateEnd = dateUpdateEnd; this.dataUpdateEnd = dataUpdateEnd;
} }
/** /**
* 获取 增加 是否数据更新(0.否，1.是) * 获取 增加 是否数据更新(0.否，1.是)
* @return dateUpdateIncrement * @return dataUpdateIncrement
*/ */
public Integer getDateUpdateIncrement(){ public Integer getDataUpdateIncrement(){
return this.dateUpdateIncrement; return this.dataUpdateIncrement;
} }
/** /**
* 设置 增加 是否数据更新(0.否，1.是) * 设置 增加 是否数据更新(0.否，1.是)
* @param dateUpdateIncrement * @param dataUpdateIncrement
*/ */
public void setDateUpdateIncrement(Integer dateUpdateIncrement){ public void setDataUpdateIncrement(Integer dataUpdateIncrement){
this.dateUpdateIncrement = dateUpdateIncrement; this.dataUpdateIncrement = dataUpdateIncrement;
} }
/** /**
* 获取 是否数据更新(0.否，1.是) * 获取 是否数据更新(0.否，1.是)
* @return dateUpdateList * @return dataUpdateList
*/ */
public List<Integer> getDateUpdateList(){ public List<Integer> getDataUpdateList(){
return this.dateUpdateList; return this.dataUpdateList;
} }
/** /**
* 设置 是否数据更新(0.否，1.是) * 设置 是否数据更新(0.否，1.是)
* @param dateUpdateList * @param dataUpdateList
*/ */
public void setDateUpdateList(List<Integer> dateUpdateList){ public void setDataUpdateList(List<Integer> dataUpdateList){
this.dateUpdateList = dateUpdateList; this.dataUpdateList = dataUpdateList;
} }
/** /**
...@@ -1140,7 +1310,7 @@ public class AppQuery extends AppEntity { ...@@ -1140,7 +1310,7 @@ public class AppQuery extends AppEntity {
} }
/** /**
* 设置 是否上架(0.上架，1.下架) * 设置 是否上架(0.下架，1.上架)
* @param shelves * @param shelves
*/ */
public AppQuery shelves(Integer shelves){ public AppQuery shelves(Integer shelves){
...@@ -1149,7 +1319,7 @@ public class AppQuery extends AppEntity { ...@@ -1149,7 +1319,7 @@ public class AppQuery extends AppEntity {
} }
/** /**
* 设置 开始 是否上架(0.上架，1.下架) * 设置 开始 是否上架(0.下架，1.上架)
* @param shelvesStart * @param shelvesStart
*/ */
public AppQuery shelvesStart(Integer shelvesStart){ public AppQuery shelvesStart(Integer shelvesStart){
...@@ -1158,7 +1328,7 @@ public class AppQuery extends AppEntity { ...@@ -1158,7 +1328,7 @@ public class AppQuery extends AppEntity {
} }
/** /**
* 设置 结束 是否上架(0.上架，1.下架) * 设置 结束 是否上架(0.下架，1.上架)
* @param shelvesEnd * @param shelvesEnd
*/ */
public AppQuery shelvesEnd(Integer shelvesEnd){ public AppQuery shelvesEnd(Integer shelvesEnd){
...@@ -1167,7 +1337,7 @@ public class AppQuery extends AppEntity { ...@@ -1167,7 +1337,7 @@ public class AppQuery extends AppEntity {
} }
/** /**
* 设置 增加 是否上架(0.上架，1.下架) * 设置 增加 是否上架(0.下架，1.上架)
* @param shelvesIncrement * @param shelvesIncrement
*/ */
public AppQuery shelvesIncrement(Integer shelvesIncrement){ public AppQuery shelvesIncrement(Integer shelvesIncrement){
...@@ -1176,7 +1346,7 @@ public class AppQuery extends AppEntity { ...@@ -1176,7 +1346,7 @@ public class AppQuery extends AppEntity {
} }
/** /**
* 设置 是否上架(0.上架，1.下架) * 设置 是否上架(0.下架，1.上架)
* @param shelvesList * @param shelvesList
*/ */
public AppQuery shelvesList(List<Integer> shelvesList){ public AppQuery shelvesList(List<Integer> shelvesList){
...@@ -1184,6 +1354,70 @@ public class AppQuery extends AppEntity { ...@@ -1184,6 +1354,70 @@ public class AppQuery extends AppEntity {
return this; return this;
} }
/**
* 设置 类型(1.应用程序,2.url)
* @param appType
*/
public AppQuery appType(Integer appType){
setAppType(appType);
return this;
}
/**
* 设置 开始 类型(1.应用程序,2.url)
* @param appTypeStart
*/
public AppQuery appTypeStart(Integer appTypeStart){
this.appTypeStart = appTypeStart;
return this;
}
/**
* 设置 结束 类型(1.应用程序,2.url)
* @param appTypeEnd
*/
public AppQuery appTypeEnd(Integer appTypeEnd){
this.appTypeEnd = appTypeEnd;
return this;
}
/**
* 设置 增加 类型(1.应用程序,2.url)
* @param appTypeIncrement
*/
public AppQuery appTypeIncrement(Integer appTypeIncrement){
this.appTypeIncrement = appTypeIncrement;
return this;
}
/**
* 设置 类型(1.应用程序,2.url)
* @param appTypeList
*/
public AppQuery appTypeList(List<Integer> appTypeList){
this.appTypeList = appTypeList;
return this;
}
/**
* 设置 文件名称
* @param fileName
*/
public AppQuery fileName(String fileName){
setFileName(fileName);
return this;
}
/**
* 设置 文件名称
* @param fileNameList
*/
public AppQuery fileNameList(List<String> fileNameList){
this.fileNameList = fileNameList;
return this;
}
/** /**
* 设置 文件相对路径地址 * 设置 文件相对路径地址
...@@ -1222,21 +1456,47 @@ public class AppQuery extends AppEntity { ...@@ -1222,21 +1456,47 @@ public class AppQuery extends AppEntity {
return this; return this;
} }
/** /**
* 设置 当前版本 * 设置 当前版本
* @param version * @param version
*/ */
public AppQuery version(String version){ public AppQuery version(Integer version){
setVersion(version); setVersion(version);
return this; return this;
} }
/**
* 设置 开始 当前版本
* @param versionStart
*/
public AppQuery versionStart(Integer versionStart){
this.versionStart = versionStart;
return this;
}
/**
* 设置 结束 当前版本
* @param versionEnd
*/
public AppQuery versionEnd(Integer versionEnd){
this.versionEnd = versionEnd;
return this;
}
/**
* 设置 增加 当前版本
* @param versionIncrement
*/
public AppQuery versionIncrement(Integer versionIncrement){
this.versionIncrement = versionIncrement;
return this;
}
/** /**
* 设置 当前版本 * 设置 当前版本
* @param versionList * @param versionList
*/ */
public AppQuery versionList(List<String> versionList){ public AppQuery versionList(List<Integer> versionList){
this.versionList = versionList; this.versionList = versionList;
return this; return this;
} }
...@@ -1260,6 +1520,25 @@ public class AppQuery extends AppEntity { ...@@ -1260,6 +1520,25 @@ public class AppQuery extends AppEntity {
return this; return this;
} }
/**
* 设置 更新说明
* @param notes
*/
public AppQuery notes(String notes){
setNotes(notes);
return this;
}
/**
* 设置 更新说明
* @param notesList
*/
public AppQuery notesList(List<String> notesList){
this.notesList = notesList;
return this;
}
/** /**
* 设置 是否部署(0.否，1.是) * 设置 是否部署(0.否，1.是)
* @param distribute * @param distribute
...@@ -1307,46 +1586,46 @@ public class AppQuery extends AppEntity { ...@@ -1307,46 +1586,46 @@ public class AppQuery extends AppEntity {
/** /**
* 设置 是否数据更新(0.否，1.是) * 设置 是否数据更新(0.否，1.是)
* @param dateUpdate * @param dataUpdate
*/ */
public AppQuery dateUpdate(Integer dateUpdate){ public AppQuery dataUpdate(Integer dataUpdate){
setDateUpdate(dateUpdate); setDataUpdate(dataUpdate);
return this; return this;
} }
/** /**
* 设置 开始 是否数据更新(0.否，1.是) * 设置 开始 是否数据更新(0.否，1.是)
* @param dateUpdateStart * @param dataUpdateStart
*/ */
public AppQuery dateUpdateStart(Integer dateUpdateStart){ public AppQuery dataUpdateStart(Integer dataUpdateStart){
this.dateUpdateStart = dateUpdateStart; this.dataUpdateStart = dataUpdateStart;
return this; return this;
} }
/** /**
* 设置 结束 是否数据更新(0.否，1.是) * 设置 结束 是否数据更新(0.否，1.是)
* @param dateUpdateEnd * @param dataUpdateEnd
*/ */
public AppQuery dateUpdateEnd(Integer dateUpdateEnd){ public AppQuery dataUpdateEnd(Integer dataUpdateEnd){
this.dateUpdateEnd = dateUpdateEnd; this.dataUpdateEnd = dataUpdateEnd;
return this; return this;
} }
/** /**
* 设置 增加 是否数据更新(0.否，1.是) * 设置 增加 是否数据更新(0.否，1.是)
* @param dateUpdateIncrement * @param dataUpdateIncrement
*/ */
public AppQuery dateUpdateIncrement(Integer dateUpdateIncrement){ public AppQuery dataUpdateIncrement(Integer dataUpdateIncrement){
this.dateUpdateIncrement = dateUpdateIncrement; this.dataUpdateIncrement = dataUpdateIncrement;
return this; return this;
} }
/** /**
* 设置 是否数据更新(0.否，1.是) * 设置 是否数据更新(0.否，1.是)
* @param dateUpdateList * @param dataUpdateList
*/ */
public AppQuery dateUpdateList(List<Integer> dateUpdateList){ public AppQuery dataUpdateList(List<Integer> dataUpdateList){
this.dateUpdateList = dateUpdateList; this.dataUpdateList = dataUpdateList;
return this; return this;
} }
......
base-manager/src/main/java/com/mortals/xhx/module/app/model/AppVersionEntity.java
View file @ 4c59864b
...@@ -7,98 +7,170 @@ import com.mortals.framework.annotation.Excel; ...@@ -7,98 +7,170 @@ 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.AppVersionVo; import com.mortals.xhx.module.app.model.vo.AppVersionVo;
/** /**
* 自助终端应用版本历史实体对象 * 自助终端应用版本历史实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-28 * @date 2022-12-01
*/ */
public class AppVersionEntity extends AppVersionVo { public class AppVersionEntity extends AppVersionVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* app应用Id * app应用Id
*/ */
private Long appId; private Long appId;
/** /**
* 应用名称 * 应用名称
*/ */
private String appName; private String appName;
/** /**
* 版本号 * 版本号
*/ */
private String version; private Integer version;
/** /**
* 更新说明 * 更新说明
*/ */
private String notes; private String notes;
/**
* 文件名称
*/
private String fileName;
/**
* 文件相对路径地址
*/
private String filePath;
/**
* 文件部署路径地址
*/
private String distributeFilePath;
/**
* 是否使用(0.否，1.是)
*/
private Integer used;
public AppVersionEntity(){} public AppVersionEntity(){}
/** /**
* 获取 app应用Id * 获取 app应用Id
* @return Long * @return Long
*/ */
public Long getAppId(){ public Long getAppId(){
return appId; return appId;
} }
/** /**
* 设置 app应用Id * 设置 app应用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 getAppName(){ public String getAppName(){
return appName; return appName;
} }
/** /**
* 设置 应用名称 * 设置 应用名称
* @param appName * @param appName
*/ */
public void setAppName(String appName){ public void setAppName(String appName){
this.appName = appName; this.appName = appName;
} }
/** /**
* 获取 版本号 * 获取 版本号
* @return String * @return Integer
*/ */
public String getVersion(){ public Integer getVersion(){
return version; return version;
} }
/** /**
* 设置 版本号 * 设置 版本号
* @param version * @param version
*/ */
public void setVersion(String version){ public void setVersion(Integer version){
this.version = version; this.version = version;
} }
/** /**
* 获取 更新说明 * 获取 更新说明
* @return String * @return String
*/ */
public String getNotes(){ public String getNotes(){
return notes; return notes;
} }
/** /**
* 设置 更新说明 * 设置 更新说明
* @param notes * @param notes
*/ */
public void setNotes(String notes){ public void setNotes(String notes){
this.notes = notes; this.notes = notes;
} }
/**
* 获取 文件名称
* @return String
*/
public String getFileName(){
return fileName;
}
/**
* 设置 文件名称
* @param fileName
*/
public void setFileName(String fileName){
this.fileName = fileName;
}
/**
* 获取 文件相对路径地址
* @return String
*/
public String getFilePath(){
return filePath;
}
/**
* 设置 文件相对路径地址
* @param filePath
*/
public void setFilePath(String filePath){
this.filePath = filePath;
}
/**
* 获取 文件部署路径地址
* @return String
*/
public String getDistributeFilePath(){
return distributeFilePath;
}
/**
* 设置 文件部署路径地址
* @param distributeFilePath
*/
public void setDistributeFilePath(String distributeFilePath){
this.distributeFilePath = distributeFilePath;
}
/**
* 获取 是否使用(0.否，1.是)
* @return Integer
*/
public Integer getUsed(){
return used;
}
/**
* 设置 是否使用(0.否，1.是)
* @param used
*/
public void setUsed(Integer used){
this.used = used;
}
@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) {
...@@ -106,7 +178,7 @@ public class AppVersionEntity extends AppVersionVo { ...@@ -106,7 +178,7 @@ public class AppVersionEntity extends AppVersionVo {
if (obj instanceof AppVersionEntity) { if (obj instanceof AppVersionEntity) {
AppVersionEntity tmp = (AppVersionEntity) obj; AppVersionEntity tmp = (AppVersionEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
...@@ -118,17 +190,29 @@ public class AppVersionEntity extends AppVersionVo { ...@@ -118,17 +190,29 @@ public class AppVersionEntity extends AppVersionVo {
sb.append(",appName:").append(getAppName()); sb.append(",appName:").append(getAppName());
sb.append(",version:").append(getVersion()); sb.append(",version:").append(getVersion());
sb.append(",notes:").append(getNotes()); sb.append(",notes:").append(getNotes());
sb.append(",fileName:").append(getFileName());
sb.append(",filePath:").append(getFilePath());
sb.append(",distributeFilePath:").append(getDistributeFilePath());
sb.append(",used:").append(getUsed());
return sb.toString(); return sb.toString();
} }
public void initAttrValue(){ public void initAttrValue(){
this.appId = null; this.appId = null;
this.appName = "";
this.version = 0;
this.notes = "";
this.fileName = "";
this.appName = ""; this.filePath = "";
this.version = ""; this.distributeFilePath = "";
this.notes = ""; this.used = 0;
} }
} }
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/app/model/AppVersionQuery.java
View file @ 4c59864b
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.app.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.app.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.app.model.AppVersionEntity; import com.mortals.xhx.module.app.model.AppVersionEntity;
/** /**
* 自助终端应用版本历史查询对象 * 自助终端应用版本历史查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-11-28 * @date 2022-12-01
*/ */
public class AppVersionQuery extends AppVersionEntity { public class AppVersionQuery extends AppVersionEntity {
/** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -36,12 +36,42 @@ public class AppVersionQuery extends AppVersionEntity { ...@@ -36,12 +36,42 @@ public class AppVersionQuery extends AppVersionEntity {
/** 应用名称 */ /** 应用名称 */
private List<String> appNameList; private List<String> appNameList;
/** 版本号 */ /** 开始 版本号 */
private List<String> versionList; private Integer versionStart;
/** 结束 版本号 */
private Integer versionEnd;
/** 增加 版本号 */
private Integer versionIncrement;
/** 版本号列表 */
private List <Integer> versionList;
/** 更新说明 */ /** 更新说明 */
private List<String> notesList; private List<String> notesList;
/** 文件名称 */
private List<String> fileNameList;
/** 文件相对路径地址 */
private List<String> filePathList;
/** 文件部署路径地址 */
private List<String> distributeFilePathList;
/** 开始 是否使用(0.否，1.是) */
private Integer usedStart;
/** 结束 是否使用(0.否，1.是) */
private Integer usedEnd;
/** 增加 是否使用(0.否，1.是) */
private Integer usedIncrement;
/** 是否使用(0.否，1.是)列表 */
private List <Integer> usedList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -75,528 +105,814 @@ public class AppVersionQuery extends AppVersionEntity { ...@@ -75,528 +105,814 @@ public class AppVersionQuery extends AppVersionEntity {
public AppVersionQuery(){} public AppVersionQuery(){}
/** /**
* 获取 开始 主键ID，主键，自增长 * 获取 开始 主键ID，主键，自增长
* @return idStart * @return idStart
*/ */
public Long getIdStart(){ public Long getIdStart(){
return this.idStart; return this.idStart;
} }
/** /**
* 设置 开始 主键ID，主键，自增长 * 设置 开始 主键ID，主键，自增长
* @param idStart * @param idStart
*/ */
public void setIdStart(Long idStart){ public void setIdStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
} }
/** /**
* 获取 结束 主键ID，主键，自增长 * 获取 结束 主键ID，主键，自增长
* @return $idEnd * @return $idEnd
*/ */
public Long getIdEnd(){ public Long getIdEnd(){
return this.idEnd; return this.idEnd;
} }
/** /**
* 设置 结束 主键ID，主键，自增长 * 设置 结束 主键ID，主键，自增长
* @param idEnd * @param idEnd
*/ */
public void setIdEnd(Long idEnd){ public void setIdEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
} }
/** /**
* 获取 增加 主键ID，主键，自增长 * 获取 增加 主键ID，主键，自增长
* @return idIncrement * @return idIncrement
*/ */
public Long getIdIncrement(){ public Long getIdIncrement(){
return this.idIncrement; return this.idIncrement;
} }
/** /**
* 设置 增加 主键ID，主键，自增长 * 设置 增加 主键ID，主键，自增长
* @param idIncrement * @param idIncrement
*/ */
public void setIdIncrement(Long idIncrement){ public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
} }
/** /**
* 获取 主键ID，主键，自增长 * 获取 主键ID，主键，自增长
* @return idList * @return idList
*/ */
public List<Long> getIdList(){ public List<Long> getIdList(){
return this.idList; return this.idList;
} }
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param idList * @param idList
*/ */
public void setIdList(List<Long> idList){ public void setIdList(List<Long> idList){
this.idList = idList; this.idList = idList;
} }
/** /**
* 获取 开始 app应用Id * 获取 开始 app应用Id
* @return appIdStart * @return appIdStart
*/ */
public Long getAppIdStart(){ public Long getAppIdStart(){
return this.appIdStart; return this.appIdStart;
} }
/** /**
* 设置 开始 app应用Id * 设置 开始 app应用Id
* @param appIdStart * @param appIdStart
*/ */
public void setAppIdStart(Long appIdStart){ public void setAppIdStart(Long appIdStart){
this.appIdStart = appIdStart; this.appIdStart = appIdStart;
} }
/** /**
* 获取 结束 app应用Id * 获取 结束 app应用Id
* @return $appIdEnd * @return $appIdEnd
*/ */
public Long getAppIdEnd(){ public Long getAppIdEnd(){
return this.appIdEnd; return this.appIdEnd;
} }
/** /**
* 设置 结束 app应用Id * 设置 结束 app应用Id
* @param appIdEnd * @param appIdEnd
*/ */
public void setAppIdEnd(Long appIdEnd){ public void setAppIdEnd(Long appIdEnd){
this.appIdEnd = appIdEnd; this.appIdEnd = appIdEnd;
} }
/** /**
* 获取 增加 app应用Id * 获取 增加 app应用Id
* @return appIdIncrement * @return appIdIncrement
*/ */
public Long getAppIdIncrement(){ public Long getAppIdIncrement(){
return this.appIdIncrement; return this.appIdIncrement;
} }
/** /**
* 设置 增加 app应用Id * 设置 增加 app应用Id
* @param appIdIncrement * @param appIdIncrement
*/ */
public void setAppIdIncrement(Long appIdIncrement){ public void setAppIdIncrement(Long appIdIncrement){
this.appIdIncrement = appIdIncrement; this.appIdIncrement = appIdIncrement;
} }
/** /**
* 获取 app应用Id * 获取 app应用Id
* @return appIdList * @return appIdList
*/ */
public List<Long> getAppIdList(){ public List<Long> getAppIdList(){
return this.appIdList; return this.appIdList;
} }
/** /**
* 设置 app应用Id * 设置 app应用Id
* @param appIdList * @param appIdList
*/ */
public void setAppIdList(List<Long> appIdList){ public void setAppIdList(List<Long> appIdList){
this.appIdList = appIdList; this.appIdList = appIdList;
} }
/** /**
* 获取 应用名称 * 获取 应用名称
* @return appNameList * @return appNameList
*/ */
public List<String> getAppNameList(){ public List<String> getAppNameList(){
return this.appNameList; return this.appNameList;
} }
/** /**
* 设置 应用名称 * 设置 应用名称
* @param appNameList * @param appNameList
*/ */
public void setAppNameList(List<String> appNameList){ public void setAppNameList(List<String> appNameList){
this.appNameList = appNameList; this.appNameList = appNameList;
} }
/** /**
* 获取 版本号 * 获取 开始 版本号
* @return versionList * @return versionStart
*/ */
public List<String> getVersionList(){ public Integer getVersionStart(){
return this.versionStart;
}
/**
* 设置 开始 版本号
* @param versionStart
*/
public void setVersionStart(Integer versionStart){
this.versionStart = versionStart;
}
/**
* 获取 结束 版本号
* @return $versionEnd
*/
public Integer getVersionEnd(){
return this.versionEnd;
}
/**
* 设置 结束 版本号
* @param versionEnd
*/
public void setVersionEnd(Integer versionEnd){
this.versionEnd = versionEnd;
}
/**
* 获取 增加 版本号
* @return versionIncrement
*/
public Integer getVersionIncrement(){
return this.versionIncrement;
}
/**
* 设置 增加 版本号
* @param versionIncrement
*/
public void setVersionIncrement(Integer versionIncrement){
this.versionIncrement = versionIncrement;
}
/**
* 获取 版本号
* @return versionList
*/
public List<Integer> getVersionList(){
return this.versionList; return this.versionList;
} }
/** /**
* 设置 版本号 * 设置 版本号
* @param versionList * @param versionList
*/ */
public void setVersionList(List<String> versionList){ public void setVersionList(List<Integer> versionList){
this.versionList = versionList; this.versionList = versionList;
} }
/** /**
* 获取 更新说明 * 获取 更新说明
* @return notesList * @return notesList
*/ */
public List<String> getNotesList(){ public List<String> getNotesList(){
return this.notesList; return this.notesList;
} }
/** /**
* 设置 更新说明 * 设置 更新说明
* @param notesList * @param notesList
*/ */
public void setNotesList(List<String> notesList){ public void setNotesList(List<String> notesList){
this.notesList = notesList; this.notesList = notesList;
} }
/** /**
* 获取 开始 创建时间 * 获取 文件名称
* @return createTimeStart * @return fileNameList
*/ */
public List<String> getFileNameList(){
return this.fileNameList;
}
/**
* 设置 文件名称
* @param fileNameList
*/
public void setFileNameList(List<String> fileNameList){
this.fileNameList = fileNameList;
}
/**
* 获取 文件相对路径地址
* @return filePathList
*/
public List<String> getFilePathList(){
return this.filePathList;
}
/**
* 设置 文件相对路径地址
* @param filePathList
*/
public void setFilePathList(List<String> filePathList){
this.filePathList = filePathList;
}
/**
* 获取 文件部署路径地址
* @return distributeFilePathList
*/
public List<String> getDistributeFilePathList(){
return this.distributeFilePathList;
}
/**
* 设置 文件部署路径地址
* @param distributeFilePathList
*/
public void setDistributeFilePathList(List<String> distributeFilePathList){
this.distributeFilePathList = distributeFilePathList;
}
/**
* 获取 开始 是否使用(0.否，1.是)
* @return usedStart
*/
public Integer getUsedStart(){
return this.usedStart;
}
/**
* 设置 开始 是否使用(0.否，1.是)
* @param usedStart
*/
public void setUsedStart(Integer usedStart){
this.usedStart = usedStart;
}
/**
* 获取 结束 是否使用(0.否，1.是)
* @return $usedEnd
*/
public Integer getUsedEnd(){
return this.usedEnd;
}
/**
* 设置 结束 是否使用(0.否，1.是)
* @param usedEnd
*/
public void setUsedEnd(Integer usedEnd){
this.usedEnd = usedEnd;
}
/**
* 获取 增加 是否使用(0.否，1.是)
* @return usedIncrement
*/
public Integer getUsedIncrement(){
return this.usedIncrement;
}
/**
* 设置 增加 是否使用(0.否，1.是)
* @param usedIncrement
*/
public void setUsedIncrement(Integer usedIncrement){
this.usedIncrement = usedIncrement;
}
/**
* 获取 是否使用(0.否，1.是)
* @return usedList
*/
public List<Integer> getUsedList(){
return this.usedList;
}
/**
* 设置 是否使用(0.否，1.是)
* @param usedList
*/
public void setUsedList(List<Integer> usedList){
this.usedList = usedList;
}
/**
* 获取 开始 创建时间
* @return createTimeStart
*/
public String getCreateTimeStart(){ public String getCreateTimeStart(){
return this.createTimeStart; return this.createTimeStart;
} }
/** /**
* 设置 开始 创建时间 * 设置 开始 创建时间
* @param createTimeStart * @param createTimeStart
*/ */
public void setCreateTimeStart(String createTimeStart){ public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart; this.createTimeStart = createTimeStart;
} }
/** /**
* 获取 结束 创建时间 * 获取 结束 创建时间
* @return createTimeEnd * @return createTimeEnd
*/ */
public String getCreateTimeEnd(){ public String getCreateTimeEnd(){
return this.createTimeEnd; return this.createTimeEnd;
} }
/** /**
* 设置 结束 创建时间 * 设置 结束 创建时间
* @param createTimeEnd * @param createTimeEnd
*/ */
public void setCreateTimeEnd(String createTimeEnd){ public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd; this.createTimeEnd = createTimeEnd;
} }
/** /**
* 获取 开始 更新用户 * 获取 开始 更新用户
* @return updateUserIdStart * @return updateUserIdStart
*/ */
public Long getUpdateUserIdStart(){ public Long getUpdateUserIdStart(){
return this.updateUserIdStart; return this.updateUserIdStart;
} }
/** /**
* 设置 开始 更新用户 * 设置 开始 更新用户
* @param updateUserIdStart * @param updateUserIdStart
*/ */
public void setUpdateUserIdStart(Long updateUserIdStart){ public void setUpdateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart; this.updateUserIdStart = updateUserIdStart;
} }
/** /**
* 获取 结束 更新用户 * 获取 结束 更新用户
* @return $updateUserIdEnd * @return $updateUserIdEnd
*/ */
public Long getUpdateUserIdEnd(){ public Long getUpdateUserIdEnd(){
return this.updateUserIdEnd; return this.updateUserIdEnd;
} }
/** /**
* 设置 结束 更新用户 * 设置 结束 更新用户
* @param updateUserIdEnd * @param updateUserIdEnd
*/ */
public void setUpdateUserIdEnd(Long updateUserIdEnd){ public void setUpdateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd; this.updateUserIdEnd = updateUserIdEnd;
} }
/** /**
* 获取 增加 更新用户 * 获取 增加 更新用户
* @return updateUserIdIncrement * @return updateUserIdIncrement
*/ */
public Long getUpdateUserIdIncrement(){ public Long getUpdateUserIdIncrement(){
return this.updateUserIdIncrement; return this.updateUserIdIncrement;
} }
/** /**
* 设置 增加 更新用户 * 设置 增加 更新用户
* @param updateUserIdIncrement * @param updateUserIdIncrement
*/ */
public void setUpdateUserIdIncrement(Long updateUserIdIncrement){ public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement; this.updateUserIdIncrement = updateUserIdIncrement;
} }
/** /**
* 获取 更新用户 * 获取 更新用户
* @return updateUserIdList * @return updateUserIdList
*/ */
public List<Long> getUpdateUserIdList(){ public List<Long> getUpdateUserIdList(){
return this.updateUserIdList; return this.updateUserIdList;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserIdList * @param updateUserIdList
*/ */
public void setUpdateUserIdList(List<Long> updateUserIdList){ public void setUpdateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
} }
/** /**
* 获取 开始 更新时间 * 获取 开始 更新时间
* @return updateTimeStart * @return updateTimeStart
*/ */
public String getUpdateTimeStart(){ public String getUpdateTimeStart(){
return this.updateTimeStart; return this.updateTimeStart;
} }
/** /**
* 设置 开始 更新时间 * 设置 开始 更新时间
* @param updateTimeStart * @param updateTimeStart
*/ */
public void setUpdateTimeStart(String updateTimeStart){ public void setUpdateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart; this.updateTimeStart = updateTimeStart;
} }
/** /**
* 获取 结束 更新时间 * 获取 结束 更新时间
* @return updateTimeEnd * @return updateTimeEnd
*/ */
public String getUpdateTimeEnd(){ public String getUpdateTimeEnd(){
return this.updateTimeEnd; return this.updateTimeEnd;
} }
/** /**
* 设置 结束 更新时间 * 设置 结束 更新时间
* @param updateTimeEnd * @param updateTimeEnd
*/ */
public void setUpdateTimeEnd(String updateTimeEnd){ public void setUpdateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param id * @param id
*/ */
public AppVersionQuery id(Long id){ public AppVersionQuery id(Long id){
setId(id); setId(id);
return this; return this;
} }
/** /**
* 设置 开始 主键ID，主键，自增长 * 设置 开始 主键ID，主键，自增长
* @param idStart * @param idStart
*/ */
public AppVersionQuery idStart(Long idStart){ public AppVersionQuery idStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
return this; return this;
} }
/** /**
* 设置 结束 主键ID，主键，自增长 * 设置 结束 主键ID，主键，自增长
* @param idEnd * @param idEnd
*/ */
public AppVersionQuery idEnd(Long idEnd){ public AppVersionQuery idEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
return this; return this;
} }
/** /**
* 设置 增加 主键ID，主键，自增长 * 设置 增加 主键ID，主键，自增长
* @param idIncrement * @param idIncrement
*/ */
public AppVersionQuery idIncrement(Long idIncrement){ public AppVersionQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
return this; return this;
} }
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param idList * @param idList
*/ */
public AppVersionQuery idList(List<Long> idList){ public AppVersionQuery idList(List<Long> idList){
this.idList = idList; this.idList = idList;
return this; return this;
} }
/** /**
* 设置 app应用Id * 设置 app应用Id
* @param appId * @param appId
*/ */
public AppVersionQuery appId(Long appId){ public AppVersionQuery appId(Long appId){
setAppId(appId); setAppId(appId);
return this; return this;
} }
/** /**
* 设置 开始 app应用Id * 设置 开始 app应用Id
* @param appIdStart * @param appIdStart
*/ */
public AppVersionQuery appIdStart(Long appIdStart){ public AppVersionQuery appIdStart(Long appIdStart){
this.appIdStart = appIdStart; this.appIdStart = appIdStart;
return this; return this;
} }
/** /**
* 设置 结束 app应用Id * 设置 结束 app应用Id
* @param appIdEnd * @param appIdEnd
*/ */
public AppVersionQuery appIdEnd(Long appIdEnd){ public AppVersionQuery appIdEnd(Long appIdEnd){
this.appIdEnd = appIdEnd; this.appIdEnd = appIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 app应用Id * 设置 增加 app应用Id
* @param appIdIncrement * @param appIdIncrement
*/ */
public AppVersionQuery appIdIncrement(Long appIdIncrement){ public AppVersionQuery appIdIncrement(Long appIdIncrement){
this.appIdIncrement = appIdIncrement; this.appIdIncrement = appIdIncrement;
return this; return this;
} }
/** /**
* 设置 app应用Id * 设置 app应用Id
* @param appIdList * @param appIdList
*/ */
public AppVersionQuery appIdList(List<Long> appIdList){ public AppVersionQuery appIdList(List<Long> appIdList){
this.appIdList = appIdList; this.appIdList = appIdList;
return this; return this;
} }
/** /**
* 设置 应用名称 * 设置 应用名称
* @param appName * @param appName
*/ */
public AppVersionQuery appName(String appName){ public AppVersionQuery appName(String appName){
setAppName(appName); setAppName(appName);
return this; return this;
} }
/** /**
* 设置 应用名称 * 设置 应用名称
* @param appNameList * @param appNameList
*/ */
public AppVersionQuery appNameList(List<String> appNameList){ public AppVersionQuery appNameList(List<String> appNameList){
this.appNameList = appNameList; this.appNameList = appNameList;
return this; return this;
} }
/**
/** * 设置 版本号
* 设置 版本号 * @param version
* @param version */
*/ public AppVersionQuery version(Integer version){
public AppVersionQuery version(String version){
setVersion(version); setVersion(version);
return this; return this;
} }
/** /**
* 设置 版本号 * 设置 开始 版本号
* @param versionList * @param versionStart
*/ */
public AppVersionQuery versionList(List<String> versionList){ public AppVersionQuery versionStart(Integer versionStart){
this.versionStart = versionStart;
return this;
}
/**
* 设置 结束 版本号
* @param versionEnd
*/
public AppVersionQuery versionEnd(Integer versionEnd){
this.versionEnd = versionEnd;
return this;
}
/**
* 设置 增加 版本号
* @param versionIncrement
*/
public AppVersionQuery versionIncrement(Integer versionIncrement){
this.versionIncrement = versionIncrement;
return this;
}
/**
* 设置 版本号
* @param versionList
*/
public AppVersionQuery versionList(List<Integer> versionList){
this.versionList = versionList; this.versionList = versionList;
return this; return this;
} }
/** /**
* 设置 更新说明 * 设置 更新说明
* @param notes * @param notes
*/ */
public AppVersionQuery notes(String notes){ public AppVersionQuery notes(String notes){
setNotes(notes); setNotes(notes);
return this; return this;
} }
/** /**
* 设置 更新说明 * 设置 更新说明
* @param notesList * @param notesList
*/ */
public AppVersionQuery notesList(List<String> notesList){ public AppVersionQuery notesList(List<String> notesList){
this.notesList = notesList; this.notesList = notesList;
return this; return this;
} }
/** /**
* 设置 更新用户 * 设置 文件名称
* @param updateUserId * @param fileName
*/ */
public AppVersionQuery fileName(String fileName){
setFileName(fileName);
return this;
}
/**
* 设置 文件名称
* @param fileNameList
*/
public AppVersionQuery fileNameList(List<String> fileNameList){
this.fileNameList = fileNameList;
return this;
}
/**
* 设置 文件相对路径地址
* @param filePath
*/
public AppVersionQuery filePath(String filePath){
setFilePath(filePath);
return this;
}
/**
* 设置 文件相对路径地址
* @param filePathList
*/
public AppVersionQuery filePathList(List<String> filePathList){
this.filePathList = filePathList;
return this;
}
/**
* 设置 文件部署路径地址
* @param distributeFilePath
*/
public AppVersionQuery distributeFilePath(String distributeFilePath){
setDistributeFilePath(distributeFilePath);
return this;
}
/**
* 设置 文件部署路径地址
* @param distributeFilePathList
*/
public AppVersionQuery distributeFilePathList(List<String> distributeFilePathList){
this.distributeFilePathList = distributeFilePathList;
return this;
}
/**
* 设置 是否使用(0.否，1.是)
* @param used
*/
public AppVersionQuery used(Integer used){
setUsed(used);
return this;
}
/**
* 设置 开始 是否使用(0.否，1.是)
* @param usedStart
*/
public AppVersionQuery usedStart(Integer usedStart){
this.usedStart = usedStart;
return this;
}
/**
* 设置 结束 是否使用(0.否，1.是)
* @param usedEnd
*/
public AppVersionQuery usedEnd(Integer usedEnd){
this.usedEnd = usedEnd;
return this;
}
/**
* 设置 增加 是否使用(0.否，1.是)
* @param usedIncrement
*/
public AppVersionQuery usedIncrement(Integer usedIncrement){
this.usedIncrement = usedIncrement;
return this;
}
/**
* 设置 是否使用(0.否，1.是)
* @param usedList
*/
public AppVersionQuery usedList(List<Integer> usedList){
this.usedList = usedList;
return this;
}
/**
* 设置 更新用户
* @param updateUserId
*/
public AppVersionQuery updateUserId(Long updateUserId){ public AppVersionQuery updateUserId(Long updateUserId){
setUpdateUserId(updateUserId); setUpdateUserId(updateUserId);
return this; return this;
} }
/** /**
* 设置 开始 更新用户 * 设置 开始 更新用户
* @param updateUserIdStart * @param updateUserIdStart
*/ */
public AppVersionQuery updateUserIdStart(Long updateUserIdStart){ public AppVersionQuery updateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart; this.updateUserIdStart = updateUserIdStart;
return this; return this;
} }
/** /**
* 设置 结束 更新用户 * 设置 结束 更新用户
* @param updateUserIdEnd * @param updateUserIdEnd
*/ */
public AppVersionQuery updateUserIdEnd(Long updateUserIdEnd){ public AppVersionQuery updateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd; this.updateUserIdEnd = updateUserIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 更新用户 * 设置 增加 更新用户
* @param updateUserIdIncrement * @param updateUserIdIncrement
*/ */
public AppVersionQuery updateUserIdIncrement(Long updateUserIdIncrement){ public AppVersionQuery updateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement; this.updateUserIdIncrement = updateUserIdIncrement;
return this; return this;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserIdList * @param updateUserIdList
*/ */
public AppVersionQuery updateUserIdList(List<Long> updateUserIdList){ public AppVersionQuery updateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
return this; return this;
} }
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
*/ */
public List<AppVersionQuery> getOrConditionList(){ public List<AppVersionQuery> getOrConditionList(){
return this.orConditionList; return this.orConditionList;
} }
/** /**
* 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @param orConditionList * @param orConditionList
*/ */
public void setOrConditionList(List<AppVersionQuery> orConditionList){ public void setOrConditionList(List<AppVersionQuery> orConditionList){
this.orConditionList = orConditionList; this.orConditionList = orConditionList;
} }
/** /**
* 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList * @return andConditionList
*/ */
public List<AppVersionQuery> getAndConditionList(){ public List<AppVersionQuery> getAndConditionList(){
return this.andConditionList; return this.andConditionList;
} }
/** /**
* 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList * @param andConditionList
*/ */
public void setAndConditionList(List<AppVersionQuery> andConditionList){ public void setAndConditionList(List<AppVersionQuery> andConditionList){
this.andConditionList = andConditionList; this.andConditionList = andConditionList;
} }
......
base-manager/src/main/java/com/mortals/xhx/module/app/service/AppService.java
View file @ 4c59864b
...@@ -3,6 +3,7 @@ package com.mortals.xhx.module.app.service; ...@@ -3,6 +3,7 @@ package com.mortals.xhx.module.app.service;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.service.ICRUDService; import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.app.dao.AppDao;
import com.mortals.xhx.module.app.model.AppEntity; import com.mortals.xhx.module.app.model.AppEntity;
import com.mortals.xhx.module.site.model.SiteEntity; import com.mortals.xhx.module.site.model.SiteEntity;
...@@ -24,5 +25,6 @@ public interface AppService extends ICRUDService<AppEntity, Long> { ...@@ -24,5 +25,6 @@ public interface AppService extends ICRUDService<AppEntity, Long> {
Rest<String> cloneAppsBySites(List<AppEntity> appList, List<SiteEntity> siteList, Context context); Rest<String> cloneAppsBySites(List<AppEntity> appList, List<SiteEntity> siteList, Context context);
AppDao getAppDao();
} }
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/app/service/AppVersionService.java
View file @ 4c59864b
package com.mortals.xhx.module.app.service; package com.mortals.xhx.module.app.service;
import com.mortals.framework.common.Rest;
import com.mortals.framework.model.Context;
import com.mortals.framework.service.ICRUDService; import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.app.model.AppEntity;
import com.mortals.xhx.module.app.model.AppVersionEntity; import com.mortals.xhx.module.app.model.AppVersionEntity;
/** /**
* AppVersionService * AppVersionService
* *
...@@ -11,4 +16,9 @@ import com.mortals.xhx.module.app.model.AppVersionEntity; ...@@ -11,4 +16,9 @@ import com.mortals.xhx.module.app.model.AppVersionEntity;
*/ */
public interface AppVersionService extends ICRUDService<AppVersionEntity,Long>{ public interface AppVersionService extends ICRUDService<AppVersionEntity,Long>{
Rest<String> appDistribute(AppVersionEntity appVersionEntity, Context context);
Rest<Void> appUsed(AppVersionEntity appVersionEntity, Context context);
} }
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppDatasetServiceImpl.java
View file @ 4c59864b
...@@ -2,12 +2,14 @@ package com.mortals.xhx.module.app.service.impl; ...@@ -2,12 +2,14 @@ package com.mortals.xhx.module.app.service.impl;
import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.common.key.Constant; import com.mortals.xhx.common.key.Constant;
import com.mortals.xhx.module.app.model.*; import com.mortals.xhx.module.app.model.*;
import com.mortals.xhx.module.app.service.AppInfoFieldService; import com.mortals.xhx.module.app.service.AppInfoFieldService;
import com.mortals.xhx.module.app.service.AppService; import com.mortals.xhx.module.app.service.AppService;
import com.mortals.xhx.module.app.service.AppVersionService; import com.mortals.xhx.module.app.service.AppVersionService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl; import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
...@@ -51,8 +53,8 @@ public class AppDatasetServiceImpl extends AbstractCRUDServiceImpl<AppDatasetDao ...@@ -51,8 +53,8 @@ public class AppDatasetServiceImpl extends AbstractCRUDServiceImpl<AppDatasetDao
} }
//更新版本号 //更新版本号
AppEntity appEntity = appService.get(entity.getAppId(), context); /* AppEntity appEntity = appService.get(entity.getAppId(), context);
saveOrUpdateAppVersion(appEntity, context); saveOrUpdateAppVersion(appEntity, context);*/
super.saveAfter(entity, context); super.saveAfter(entity, context);
} }
...@@ -73,9 +75,6 @@ public class AppDatasetServiceImpl extends AbstractCRUDServiceImpl<AppDatasetDao ...@@ -73,9 +75,6 @@ public class AppDatasetServiceImpl extends AbstractCRUDServiceImpl<AppDatasetDao
appInfoFieldService.save(entity.getAppInfoFieldList()); appInfoFieldService.save(entity.getAppInfoFieldList());
} }
//更新版本号
AppEntity appEntity = appService.get(entity.getAppId(), context);
saveOrUpdateAppVersion(appEntity, context);
super.updateAfter(entity, context); super.updateAfter(entity, context);
} }
...@@ -88,7 +87,7 @@ public class AppDatasetServiceImpl extends AbstractCRUDServiceImpl<AppDatasetDao ...@@ -88,7 +87,7 @@ public class AppDatasetServiceImpl extends AbstractCRUDServiceImpl<AppDatasetDao
super.removeAfter(ids, context, result); super.removeAfter(ids, context, result);
} }
private void saveOrUpdateAppVersion(AppEntity appEntity, Context context) { /* private void saveOrUpdateAppVersion(AppEntity appEntity, Context context) {
if (!ObjectUtils.isEmpty(appEntity)) { if (!ObjectUtils.isEmpty(appEntity)) {
String version = appEntity.getVersion(); String version = appEntity.getVersion();
String versionNum = StrUtil.subAfter(version, Constant.VERSION_PREFIX, false); String versionNum = StrUtil.subAfter(version, Constant.VERSION_PREFIX, false);
...@@ -100,11 +99,13 @@ public class AppDatasetServiceImpl extends AbstractCRUDServiceImpl<AppDatasetDao ...@@ -100,11 +99,13 @@ public class AppDatasetServiceImpl extends AbstractCRUDServiceImpl<AppDatasetDao
versionEntity.setAppId(appEntity.getId()); versionEntity.setAppId(appEntity.getId());
versionEntity.setVersion(Constant.VERSION_PREFIX + newVersionNum); versionEntity.setVersion(Constant.VERSION_PREFIX + newVersionNum);
versionEntity.setNotes("应用数据更新！"); versionEntity.setNotes("应用数据更新！");
versionEntity.setFileName(appEntity.getFileName());
versionEntity.setDistributeFilePath(appVersionEntity.getDistributeFilePath());
versionEntity.setCreateTime(new Date()); versionEntity.setCreateTime(new Date());
versionEntity.setCreateUserId(this.getContextUserId(context)); versionEntity.setCreateUserId(this.getContextUserId(context));
appVersionService.save(versionEntity, context); appVersionService.save(versionEntity, context);
appEntity.setVersion(versionEntity.getVersion()); appEntity.setVersion(versionEntity.getVersion());
appService.update(appEntity, context); appService.update(appEntity, context);
} }
} }*/
} }
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppServiceImpl.java
View file @ 4c59864b
package com.mortals.xhx.module.app.service.impl; package com.mortals.xhx.module.app.service.impl;
import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.mortals.framework.model.DbMatchMode; import com.mortals.framework.model.DbMatchMode;
...@@ -9,6 +10,7 @@ import com.google.common.collect.Maps; ...@@ -9,6 +10,7 @@ import com.google.common.collect.Maps;
import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.FileUtil;
import com.mortals.framework.ap.GlobalSysInfo; import com.mortals.framework.ap.GlobalSysInfo;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.model.PageInfo; import com.mortals.framework.model.PageInfo;
import com.mortals.xhx.base.system.upload.service.UploadService; import com.mortals.xhx.base.system.upload.service.UploadService;
import com.mortals.xhx.common.code.YesNoEnum; import com.mortals.xhx.common.code.YesNoEnum;
...@@ -62,13 +64,12 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L ...@@ -62,13 +64,12 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
@Override @Override
protected void findAfter(AppEntity params, PageInfo pageInfo, Context context, List<AppEntity> list) throws AppException { protected void findAfter(AppEntity params, PageInfo pageInfo, Context context, List<AppEntity> list) throws AppException {
//统计站点 //统计站点
list.forEach(item->{ list.forEach(item -> {
List<AppEntity> appEntityList = this.find(new AppQuery().appCode(item.getAppCode()), context); List<AppEntity> appEntityList = this.find(new AppQuery().appCode(item.getAppCode()), context);
// int count = this.count(new AppQuery().appCode(item.getAppCode()), context); item.setApplianceSiteScope(appEntityList.size());
item.setApplianceSiteScope(appEntityList.size()); item.setSiteIdList(appEntityList.stream().map(AppEntity::getSiteId).collect(Collectors.toList()));
item.setSiteIdList(appEntityList.stream().map(AppEntity::getSiteId).collect(Collectors.toList())); });
});
super.findAfter(params, pageInfo, context, list); super.findAfter(params, pageInfo, context, list);
} }
...@@ -100,7 +101,6 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L ...@@ -100,7 +101,6 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
appEntity.setDistributeFilePath(disPath); appEntity.setDistributeFilePath(disPath);
appEntity.setDistribute(YesNoEnum.YES.getValue()); appEntity.setDistribute(YesNoEnum.YES.getValue());
appEntity.setUpdateTime(new Date()); appEntity.setUpdateTime(new Date());
this.update(appEntity, context); this.update(appEntity, context);
return Rest.ok("应用部署成功！"); return Rest.ok("应用部署成功！");
} }
...@@ -120,7 +120,7 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L ...@@ -120,7 +120,7 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
AppEntity appClone = new AppEntity(); AppEntity appClone = new AppEntity();
appClone.initAttrValue(); appClone.initAttrValue();
BeanUtils.copyProperties(appEntity, appClone, BeanUtil.getNullPropertyNames(appEntity)); BeanUtils.copyProperties(appEntity, appClone, BeanUtil.getNullPropertyNames(appEntity));
appClone.setVersion(appEntity.getVersion()); appClone.setVersion(1);
appClone.setDistribute(YesNoEnum.NO.getValue()); appClone.setDistribute(YesNoEnum.NO.getValue());
appClone.setDownDevCount(0); appClone.setDownDevCount(0);
appClone.setSiteId(siteEntity.getId()); appClone.setSiteId(siteEntity.getId());
...@@ -198,9 +198,14 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L ...@@ -198,9 +198,14 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
} }
@Override
public AppDao getAppDao() {
return this.dao;
}
@Override @Override
protected void saveBefore(AppEntity entity, Context context) throws AppException { protected void saveBefore(AppEntity entity, Context context) throws AppException {
entity.setVersion(Constant.VERSION_PREFIX+"1.0");
super.saveBefore(entity, context); super.saveBefore(entity, context);
} }
...@@ -210,14 +215,72 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L ...@@ -210,14 +215,72 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
AppVersionEntity versionEntity = new AppVersionEntity(); AppVersionEntity versionEntity = new AppVersionEntity();
versionEntity.initAttrValue(); versionEntity.initAttrValue();
versionEntity.setAppId(entity.getId()); versionEntity.setAppId(entity.getId());
versionEntity.setAppName(entity.getAppName());
versionEntity.setVersion(entity.getVersion()); versionEntity.setVersion(entity.getVersion());
versionEntity.setNotes("应用初始创建！"); versionEntity.setNotes("应用初始创建！");
versionEntity.setFileName(entity.getFileName());
versionEntity.setFilePath(entity.getFilePath());
versionEntity.setDistributeFilePath(entity.getDistributeFilePath());
versionEntity.setCreateTime(new Date()); versionEntity.setCreateTime(new Date());
versionEntity.setCreateUserId(this.getContextUserId(context)); versionEntity.setCreateUserId(this.getContextUserId(context));
appVersionService.save(versionEntity,context); appVersionService.save(versionEntity, context);
super.saveAfter(entity, context); super.saveAfter(entity, context);
} }
@Override
public AppEntity update(AppEntity entity, Context context) throws AppException {
this.updateBefore(entity, context);
String filePath = entity.getFilePath();
String fileName = entity.getFileName();
entity.setFilePath(null);
entity.setFileName(null);
int iRet = this.dao.update(entity);
if (iRet == 0) {
throw new AppException(-1002, "更新失败！");
} else {
entity.setFileName(fileName);
entity.setFilePath(filePath);
this.updateAfter(entity, context);
return entity;
}
}
@Override
protected void updateAfter(AppEntity entity, Context context) throws AppException {
AppVersionQuery appVersionQuery = new AppVersionQuery();
appVersionQuery.setAppId(entity.getId());
List<OrderCol> orderColList = new ArrayList<>();
orderColList.add(new OrderCol("version", OrderCol.DESCENDING));
appVersionQuery.setOrderColList(orderColList);
List<AppVersionEntity> appVersionEntities = appVersionService.find(appVersionQuery, context);
//获取最大版本号
if (!ObjectUtils.isEmpty(appVersionEntities)) {
AppVersionEntity curAppVersionEntity = appVersionEntities.get(0);
// String versionNum = StrUtil.subAfter(curAppVersionEntity.getVersion(), Constant.VERSION_PREFIX, false);
Integer versionNum = curAppVersionEntity.getVersion();
// Integer newVersionNum = versionNum++;
AppVersionEntity appVersionEntity = new AppVersionEntity();
appVersionEntity.initAttrValue();
AppVersionEntity versionEntity = new AppVersionEntity();
versionEntity.initAttrValue();
versionEntity.setAppId(entity.getId());
versionEntity.setAppName(entity.getAppName());
versionEntity.setVersion(++versionNum);
versionEntity.setNotes(entity.getNotes());
versionEntity.setFileName(entity.getFileName());
versionEntity.setFilePath(entity.getFilePath());
versionEntity.setDistributeFilePath(entity.getDistributeFilePath());
versionEntity.setCreateTime(new Date());
versionEntity.setCreateUserId(this.getContextUserId(context));
appVersionService.save(versionEntity, context);
}
super.updateAfter(entity, context);
}
@Override @Override
protected void removeAfter(Long[] ids, Context context, int result) throws AppException { protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
//级联删除 appids 相关数据 //级联删除 appids 相关数据
...@@ -238,8 +301,8 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L ...@@ -238,8 +301,8 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
if (!ObjectUtils.isEmpty(appDatasetDeleteList)) { if (!ObjectUtils.isEmpty(appDatasetDeleteList)) {
appDatasetService.removeList(appDatasetDeleteList, context); appDatasetService.removeList(appDatasetDeleteList, context);
List<AppInfoFieldEntity> appInfoFieldDeleteList = appInfoFieldService.find(new AppInfoFieldQuery().datasetIdList(appDatasetDeleteList.stream().map(AppDatasetEntity::getAppId).collect(Collectors.toList()))); List<AppInfoFieldEntity> appInfoFieldDeleteList = appInfoFieldService.find(new AppInfoFieldQuery().datasetIdList(appDatasetDeleteList.stream().map(AppDatasetEntity::getAppId).collect(Collectors.toList())));
if(!ObjectUtils.isEmpty(appInfoFieldDeleteList)){ if (!ObjectUtils.isEmpty(appInfoFieldDeleteList)) {
appInfoFieldService.removeList(appInfoFieldDeleteList,context); appInfoFieldService.removeList(appInfoFieldDeleteList, context);
} }
} }
...@@ -283,7 +346,7 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L ...@@ -283,7 +346,7 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
appInfoFieldEntity.setFieldLen(0); appInfoFieldEntity.setFieldLen(0);
appInfoFieldEntity.setFieldNull(0); appInfoFieldEntity.setFieldNull(0);
appInfoFieldEntity.setIsList(0); appInfoFieldEntity.setIsList(0);
appInfoFieldEntity.setFieldOrderNo(""); appInfoFieldEntity.setFieldOrderNo(1);
appInfoFieldEntity.setRemark(""); appInfoFieldEntity.setRemark("");
appInfoFieldEntity.setId(0L); appInfoFieldEntity.setId(0L);
appInfoFieldEntity.setColPickMode(0); appInfoFieldEntity.setColPickMode(0);
...@@ -307,7 +370,7 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L ...@@ -307,7 +370,7 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
System.out.println(JSON.toJSONString(appClone)); System.out.println(JSON.toJSONString(appClone));
System.out.println(NumberUtil.add("1.0","0.1").setScale(1).toString()); System.out.println(NumberUtil.add("1.0", "0.1").setScale(1).toString());
} }
......
base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppVersionServiceImpl.java
View file @ 4c59864b
package com.mortals.xhx.module.app.service.impl; package com.mortals.xhx.module.app.service.impl;
import cn.hutool.core.io.FileUtil;
import com.mortals.framework.ap.GlobalSysInfo;
import com.mortals.framework.common.Rest;
import com.mortals.framework.model.Context;
import com.mortals.xhx.base.system.upload.service.UploadService;
import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.common.key.Constant;
import com.mortals.xhx.common.utils.ZipUtils;
import com.mortals.xhx.module.app.model.AppEntity;
import com.mortals.xhx.module.app.model.AppVersionQuery;
import com.mortals.xhx.module.app.service.AppService;
import com.mortals.xhx.module.site.model.SiteEntity;
import com.mortals.xhx.module.site.service.SiteService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl; import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.xhx.module.app.dao.AppVersionDao; import com.mortals.xhx.module.app.dao.AppVersionDao;
import com.mortals.xhx.module.app.model.AppVersionEntity; import com.mortals.xhx.module.app.model.AppVersionEntity;
import com.mortals.xhx.module.app.service.AppVersionService; import com.mortals.xhx.module.app.service.AppVersionService;
import java.io.File;
import java.util.Date;
/** /**
* AppVersionService * AppVersionService
* 自助终端应用版本历史 service实现 * 自助终端应用版本历史 service实现
* *
* @author zxfei * @author zxfei
* @date 2022-11-28 * @date 2022-11-28
*/ */
@Service("appVersionService") @Service("appVersionService")
public class AppVersionServiceImpl extends AbstractCRUDServiceImpl<AppVersionDao, AppVersionEntity, Long> implements AppVersionService { public class AppVersionServiceImpl extends AbstractCRUDServiceImpl<AppVersionDao, AppVersionEntity, Long> implements AppVersionService {
@Autowired
private AppService appService;
@Autowired
private SiteService siteService;
@Autowired
private UploadService uploadService;
@Override
public Rest<String> appDistribute(AppVersionEntity appVersionEntity, Context context) {
AppEntity appEntity = appService.get(appVersionEntity.getAppId(), context);
distributeFile(appVersionEntity, appEntity, context);
return Rest.ok("部署应用成功！");
}
private String distributeFile(AppVersionEntity appVersionEntity, AppEntity appEntity, Context context) {
SiteEntity siteCache = siteService.getCache(appEntity.getSiteId().toString());
//判断文件是否存在
String targetFilePath = uploadService.getFilePath(appVersionEntity.getFilePath());
if (FileUtil.isEmpty(new File(targetFilePath))) {
throw new AppException("部署文件不存在！");
}
if (!FileUtil.getSuffix(appVersionEntity.getFilePath()).equals("zip")) {
throw new AppException("部署只支持zip文件！");
}
//部署路径是否存在 如果不存在 创建目录，
//文件构成目录 基础path +站点编码+应用编码 /basepath/sitecode/appcode/v2/
String path = GlobalSysInfo.getParamValue(Constant.APP_BASE_DISTRIBUTE_PATH, "/home/publish/app");
String siteCode = siteCache.getSiteCode();
String appcode = appEntity.getAppCode();
Integer version = appVersionEntity.getVersion();
String disPath = path + File.separator + siteCode + File.separator + appcode + File.separator + version;
//判断目标目录是否存在 如果存在 这删除
if (FileUtil.isDirectory(disPath)) {
FileUtil.del(disPath);
}
ZipUtils.unzip(new File(targetFilePath), disPath);
return disPath;
}
@Override
public Rest<Void> appUsed(AppVersionEntity appVersionEntity, Context context) {
//使用 部署
AppEntity appEntity = appService.get(appVersionEntity.getAppId(), context);
String disPath = distributeFile(appVersionEntity, appEntity, context);
//更新app版本使用
appVersionEntity.setUsed(YesNoEnum.YES.getValue());
appVersionEntity.setDistributeFilePath(disPath);
this.getDao().update(new AppVersionQuery().appId(appVersionEntity.getAppId()).used(YesNoEnum.NO.getValue()));
this.update(appVersionEntity, context);
//更新当前app
appEntity.setFileName(appVersionEntity.getFileName());
appEntity.setFilePath(appVersionEntity.getFilePath());
appEntity.setDistributeFilePath(appVersionEntity.getDistributeFilePath());
appEntity.setVersion(appVersionEntity.getVersion());
appEntity.setDistribute(YesNoEnum.YES.getValue());
appEntity.setUpdateTime(new Date());
appService.getAppDao().update(appEntity);
return Rest.ok("使用应用成功！");
}
} }
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/app/web/AppController.java
View file @ 4c59864b
package com.mortals.xhx.module.app.web; package com.mortals.xhx.module.app.web;
import cn.hutool.core.net.url.UrlBuilder;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
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.AppQuery; import com.mortals.xhx.module.app.model.AppQuery;
import com.mortals.xhx.module.app.service.AppService;
import com.mortals.xhx.module.site.model.SiteEntity; import com.mortals.xhx.module.site.model.SiteEntity;
import com.mortals.xhx.module.site.model.SiteQuery; import com.mortals.xhx.module.site.model.SiteQuery;
import com.mortals.xhx.module.site.service.SiteService; import com.mortals.xhx.module.site.service.SiteService;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
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.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.mortals.framework.model.Context;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.module.app.model.AppEntity;
import com.mortals.xhx.module.app.service.AppService;
import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject;
import java.util.Arrays;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*;
/** /**
* 自助终端应用 * 自助终端应用
* *
...@@ -59,10 +48,11 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService, ...@@ -59,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);
} }
...@@ -125,4 +115,14 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService, ...@@ -125,4 +115,14 @@ public class AppController extends BaseCRUDJsonBodyMappingController<AppService,
} }
public static void main(String[] args) {
String homeUrl = "app/1/2";
String domainUrl = "http://192.168.0.98:11078";
String s = UrlBuilder.of(domainUrl).addPath("app").addPath("1").addPath("2").toString();
System.out.println(s);
}
} }
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/app/web/AppInfoFieldController.java
View file @ 4c59864b
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/main/java/com/mortals/xhx/module/app/web/AppVersionController.java
View file @ 4c59864b
package com.mortals.xhx.module.app.web; package com.mortals.xhx.module.app.web;
import cn.hutool.core.net.url.UrlBuilder;
import com.mortals.framework.ap.GlobalSysInfo;
import com.mortals.framework.common.Rest;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol; import com.mortals.framework.model.OrderCol;
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.YesNoEnum;
import com.mortals.xhx.common.key.Constant;
import com.mortals.xhx.module.app.model.AppEntity;
import com.mortals.xhx.module.app.service.AppService;
import com.mortals.xhx.module.site.model.SiteEntity;
import com.mortals.xhx.module.site.service.SiteService;
import org.apache.commons.lang3.ObjectUtils;
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;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.module.app.model.AppVersionEntity; import com.mortals.xhx.module.app.model.AppVersionEntity;
import com.mortals.xhx.module.app.service.AppVersionService; import com.mortals.xhx.module.app.service.AppVersionService;
...@@ -18,26 +31,33 @@ import com.mortals.framework.util.StringUtils; ...@@ -18,26 +31,33 @@ import com.mortals.framework.util.StringUtils;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*; import static com.mortals.framework.ap.SysConstains.*;
/** /**
* * 自助终端应用版本历史
* 自助终端应用版本历史 *
* * @author zxfei
* @author zxfei * @date 2022-11-28
* @date 2022-11-28 */
*/
@RestController @RestController
@RequestMapping("app/version") @RequestMapping("app/version")
public class AppVersionController extends BaseCRUDJsonBodyMappingController<AppVersionService,AppVersionEntity,Long> { public class AppVersionController extends BaseCRUDJsonBodyMappingController<AppVersionService, AppVersionEntity, Long> {
@Autowired @Autowired
private ParamService paramService; private ParamService paramService;
public AppVersionController(){ @Autowired
super.setModuleDesc( "自助终端应用版本历史"); private SiteService siteService;
@Autowired
private AppService appService;
public AppVersionController() {
super.setModuleDesc("自助终端应用版本历史");
} }
@Override @Override
...@@ -49,9 +69,77 @@ public class AppVersionController extends BaseCRUDJsonBodyMappingController<AppV ...@@ -49,9 +69,77 @@ public class AppVersionController extends BaseCRUDJsonBodyMappingController<AppV
@Override @Override
protected void doListBefore(AppVersionEntity query, Map<String, Object> model, Context context) throws AppException { protected void doListBefore(AppVersionEntity query, Map<String, Object> model, Context context) throws AppException {
List<OrderCol> orderColList = new ArrayList<>(); List<OrderCol> orderColList = new ArrayList<>();
orderColList.add(new OrderCol("version",OrderCol.DESCENDING)); orderColList.add(new OrderCol("version", OrderCol.DESCENDING));
query.setOrderColList(orderColList); query.setOrderColList(orderColList);
super.doListBefore(query, model, context); super.doListBefore(query, model, context);
} }
/**
* app历史版本使用
*/
@PostMapping(value = "used")
public Rest<String> used(Long appVersionId) {
String busiDesc = this.getModuleDesc() + "自助服务应用使用";
Rest<String> rest = Rest.ok(busiDesc + " 【成功】");
try {
if (ObjectUtils.isEmpty(appVersionId)) {
throw new AppException("应用版本Id不能为空！");
}
AppVersionEntity appVersionEntity = this.service.get(appVersionId, getContext());
if (ObjectUtils.isEmpty(appVersionEntity)) {
throw new AppException("当前应用版本不存在！appVersionId:" + appVersionId);
}
if (appVersionEntity.getUsed() == YesNoEnum.YES.getValue()) {
throw new AppException("当前应用使用中！");
}
Rest<Void> usedRest = this.service.appUsed(appVersionEntity, getContext());
recordSysLog(request, busiDesc + " 【成功】");
} catch (Exception e) {
log.error("自助服务应用预览", e);
return Rest.fail(super.convertException(e));
}
return rest;
}
/**
* app应用预览
*/
@GetMapping(value = "preview")
public Rest<String> preview(Long appVersionId) {
String busiDesc = this.getModuleDesc() + "自助服务应用预览";
Rest<String> rest = Rest.ok(busiDesc + " 【成功】");
try {
if (ObjectUtils.isEmpty(appVersionId)) {
throw new AppException("应用版本Id不能为空！");
}
AppVersionEntity appVersionEntity = this.service.get(appVersionId, getContext());
if (ObjectUtils.isEmpty(appVersionEntity)) {
throw new AppException("应用版本未找到！");
}
AppEntity appEntity = appService.get(appVersionEntity.getAppId(), getContext());
if (ObjectUtils.isEmpty(appEntity)) {
throw new AppException("当前应用不存在！appId:" + appVersionEntity.getAppId());
}
Rest<String> disRest = this.service.appDistribute(appVersionEntity, getContext());
SiteEntity siteEntity = siteService.get(appEntity.getSiteId(), getContext());
//请求地址 http://domian/app/siteCode/appcode/html
String domainUrl = GlobalSysInfo.getParamValue(Constant.PARAM_SERVER_HTTP_URL, "http://192.168.0.98:11078");
rest.setData(UrlBuilder.of(domainUrl)
.addPath("app")
.addPath(siteEntity.getSiteCode())
.addPath(appEntity.getAppCode())
.addPath(appEntity.getVersion().toString())
.toString());
recordSysLog(request, busiDesc + " 【成功】");
} catch (Exception e) {
log.error("自助服务应用预览", e);
return Rest.fail(super.convertException(e));
}
return rest;
}
} }
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/matter/service/MatterService.java
View file @ 4c59864b
...@@ -23,7 +23,7 @@ import java.util.Map; ...@@ -23,7 +23,7 @@ import java.util.Map;
* @author zxfei * @author zxfei
* @date 2022-01-12 * @date 2022-01-12
*/ */
public interface MatterService extends ICRUDCacheService<MatterEntity,Long> { public interface MatterService extends ICRUDService<MatterEntity,Long> {
/** /**
* 添加业务到站点 * 添加业务到站点
...@@ -54,7 +54,6 @@ public interface MatterService extends ICRUDCacheService<MatterEntity,Long> { ...@@ -54,7 +54,6 @@ public interface MatterService extends ICRUDCacheService<MatterEntity,Long> {
/** /**
* 添加业务到站点 * 添加业务到站点
* @param matterEntity * @param matterEntity
* @param siteId
* @param context * @param context
*/ */
Rest<SiteMatterEntity> switchMatterToSiteMatterr(MatterEntity matterEntity, SiteEntity siteEntity, Context context); Rest<SiteMatterEntity> switchMatterToSiteMatterr(MatterEntity matterEntity, SiteEntity siteEntity, Context context);
......
base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java
View file @ 4c59864b
...@@ -12,6 +12,7 @@ import com.mortals.framework.model.Context; ...@@ -12,6 +12,7 @@ import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo; import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result; import com.mortals.framework.model.Result;
import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl; import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.util.DataUtil; import com.mortals.framework.util.DataUtil;
import com.mortals.xhx.base.framework.config.InterceptorConfig; import com.mortals.xhx.base.framework.config.InterceptorConfig;
import com.mortals.xhx.common.code.FiletypeEnum; import com.mortals.xhx.common.code.FiletypeEnum;
...@@ -53,7 +54,7 @@ import java.util.stream.Collectors; ...@@ -53,7 +54,7 @@ import java.util.stream.Collectors;
* @date 2022-01-12 * @date 2022-01-12
*/ */
@Service("matterService") @Service("matterService")
public class MatterServiceImpl extends AbstractCRUDCacheServiceImpl<MatterDao, MatterEntity, Long> implements MatterService { public class MatterServiceImpl extends AbstractCRUDServiceImpl<MatterDao, MatterEntity, Long> implements MatterService {
protected Log log = LogFactory.getLog(this.getClass()); protected Log log = LogFactory.getLog(this.getClass());
@Autowired @Autowired
private SiteMatterService siteMatterService; private SiteMatterService siteMatterService;
......
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteMatterServiceImpl.java
View file @ 4c59864b
...@@ -33,7 +33,7 @@ public class SiteMatterServiceImpl extends AbstractCRUDServiceImpl<SiteMatterDao ...@@ -33,7 +33,7 @@ public class SiteMatterServiceImpl extends AbstractCRUDServiceImpl<SiteMatterDao
protected void findAfter(SiteMatterEntity params, PageInfo pageInfo, Context context, List<SiteMatterEntity> list) throws AppException { protected void findAfter(SiteMatterEntity params, PageInfo pageInfo, Context context, List<SiteMatterEntity> list) throws AppException {
list.forEach(item->{ list.forEach(item->{
if(!ObjectUtils.isEmpty(item.getMatterId())){ if(!ObjectUtils.isEmpty(item.getMatterId())){
MatterEntity matterEntity = matterService.getCache(item.getMatterId().toString()); MatterEntity matterEntity = matterService.get(item.getMatterId());
if(!ObjectUtils.isEmpty(matterEntity)){ if(!ObjectUtils.isEmpty(matterEntity)){
item.setBelongDept(matterEntity.getBelongDept()); item.setBelongDept(matterEntity.getBelongDept());
item.setWindowToTheSceneNum(matterEntity.getWindowToTheSceneNum()); item.setWindowToTheSceneNum(matterEntity.getWindowToTheSceneNum());
......
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
View file @ 4c59864b
...@@ -126,14 +126,17 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE ...@@ -126,14 +126,17 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
public List<SiteTreeSelect> siteTree(Context context) { public List<SiteTreeSelect> siteTree(Context context) {
Map<String, AreaEntity> areaMap = new HashMap<>(); Map<String, AreaEntity> areaMap = new HashMap<>();
SiteQuery siteQuery = new SiteQuery(); SiteQuery siteQuery = new SiteQuery();
Set<String> siteSet = Arrays.stream(context.getUser().getSiteIds().split(",")).filter(f -> !f.equals("")).collect(Collectors.toSet()); if (context.getUser().getSiteIds() != null) {
Set<String> siteSet = Arrays.stream(context.getUser().getSiteIds().split(",")).filter(f -> !f.equals("")).collect(Collectors.toSet());
if (!ObjectUtils.isEmpty(siteSet)) { if (!ObjectUtils.isEmpty(siteSet)) {
List<Long> siteIdList = siteSet.stream().map(Long::parseLong).collect(Collectors.toList()); List<Long> siteIdList = siteSet.stream().map(Long::parseLong).collect(Collectors.toList());
if (!ObjectUtils.isEmpty(siteIdList)) { if (!ObjectUtils.isEmpty(siteIdList)) {
siteQuery.idList(siteIdList); siteQuery.idList(siteIdList);
}
} }
} }
//查詢指定的站點ids //查詢指定的站點ids
log.info(String.format("siteQuery==>%s", JSON.toJSONString(siteQuery))); log.info(String.format("siteQuery==>%s", JSON.toJSONString(siteQuery)));
List<SiteEntity> siteList = this.find(siteQuery); List<SiteEntity> siteList = this.find(siteQuery);
......
base-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java
View file @ 4c59864b
...@@ -70,6 +70,9 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman ...@@ -70,6 +70,9 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
try { try {
String ip = super.getRequestIP(request); String ip = super.getRequestIP(request);
WorkmanEntity workmanEntity = this.service.doLogin(query.getLoginName(), query.getLoginPwd(),ip); WorkmanEntity workmanEntity = this.service.doLogin(query.getLoginName(), query.getLoginPwd(),ip);
if(query.getSiteId()!=workmanEntity.getSiteId()){
throw new AppException("当前工作人员不在当前站点下！");
}
ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS); ret.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
ret.put(KEY_RESULT_MSG, "工作人员登录成功！"); ret.put(KEY_RESULT_MSG, "工作人员登录成功！");
ret.put(KEY_RESULT_DATA, workmanEntity); ret.put(KEY_RESULT_DATA, workmanEntity);
...@@ -95,6 +98,7 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman ...@@ -95,6 +98,7 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
} else { } else {
throw new AppException("账户密码修改失败！"); throw new AppException("账户密码修改失败！");
} }
} catch (Exception e) { } catch (Exception e) {
ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE); ret.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
ret.put(KEY_RESULT_MSG, super.convertException(e)); ret.put(KEY_RESULT_MSG, super.convertException(e));
......
base-manager/src/main/resources/sqlmap/module/app/AppInfoFieldMapper.xml
View file @ 4c59864b
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!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"> <mapper namespace="com.mortals.xhx.module.app.dao.ibatis.AppInfoFieldDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
<resultMap type="AppInfoFieldEntity" id="AppInfoFieldEntity-Map"> <resultMap type="AppInfoFieldEntity" id="AppInfoFieldEntity-Map">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="datasetId" column="datasetId" /> <result property="datasetId" column="datasetId" />
<result property="fieldCode" column="fieldCode" /> <result property="fieldCode" column="fieldCode" />
<result property="fieldName" column="fieldName" /> <result property="fieldName" column="fieldName" />
<result property="fieldType" column="fieldType" /> <result property="fieldType" column="fieldType" />
<result property="dataType" column="dataType" /> <result property="dataType" column="dataType" />
<result property="fieldValue" column="fieldValue" /> <result property="fieldValue" column="fieldValue" />
<result property="fieldLen" column="fieldLen" /> <result property="fieldLen" column="fieldLen" />
<result property="fieldNull" column="fieldNull" /> <result property="fieldNull" column="fieldNull" />
<result property="isList" column="isList" /> <result property="isList" column="isList" />
<result property="fieldOrderNo" column="fieldOrderNo" /> <result property="fieldOrderNo" column="fieldOrderNo" />
<result property="remark" column="remark" /> <result property="remark" column="remark" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
</resultMap> </resultMap>
<!-- 表所有列 --> <!-- 表所有列 -->
<sql id="_columns"> <sql id="_columns">
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id, a.id,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('datasetId') or colPickMode == 1 and data.containsKey('datasetId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('datasetId') or colPickMode == 1 and data.containsKey('datasetId')))">
a.datasetId, a.datasetId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldCode') or colPickMode == 1 and data.containsKey('fieldCode')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldCode') or colPickMode == 1 and data.containsKey('fieldCode')))">
a.fieldCode, a.fieldCode,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldName') or colPickMode == 1 and data.containsKey('fieldName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldName') or colPickMode == 1 and data.containsKey('fieldName')))">
a.fieldName, a.fieldName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldType') or colPickMode == 1 and data.containsKey('fieldType')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldType') or colPickMode == 1 and data.containsKey('fieldType')))">
a.fieldType, a.fieldType,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('dataType') or colPickMode == 1 and data.containsKey('dataType')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('dataType') or colPickMode == 1 and data.containsKey('dataType')))">
a.dataType, a.dataType,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldValue') or colPickMode == 1 and data.containsKey('fieldValue')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldValue') or colPickMode == 1 and data.containsKey('fieldValue')))">
a.fieldValue, a.fieldValue,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldLen') or colPickMode == 1 and data.containsKey('fieldLen')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldLen') or colPickMode == 1 and data.containsKey('fieldLen')))">
a.fieldLen, a.fieldLen,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldNull') or colPickMode == 1 and data.containsKey('fieldNull')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldNull') or colPickMode == 1 and data.containsKey('fieldNull')))">
a.fieldNull, a.fieldNull,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isList') or colPickMode == 1 and data.containsKey('isList')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isList') or colPickMode == 1 and data.containsKey('isList')))">
a.isList, a.isList,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldOrderNo') or colPickMode == 1 and data.containsKey('fieldOrderNo')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldOrderNo') or colPickMode == 1 and data.containsKey('fieldOrderNo')))">
a.fieldOrderNo, a.fieldOrderNo,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
a.remark, a.remark,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime, a.createTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId, a.createUserId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
a.updateUserId, a.updateUserId,
</if> </if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
...@@ -144,6 +144,9 @@ ...@@ -144,6 +144,9 @@
<if test="(colPickMode==0 and data.containsKey('fieldOrderNo')) or (colPickMode==1 and !data.containsKey('fieldOrderNo'))"> <if test="(colPickMode==0 and data.containsKey('fieldOrderNo')) or (colPickMode==1 and !data.containsKey('fieldOrderNo'))">
a.fieldOrderNo=#{data.fieldOrderNo}, a.fieldOrderNo=#{data.fieldOrderNo},
</if> </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'))"> <if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
a.remark=#{data.remark}, a.remark=#{data.remark},
</if> </if>
...@@ -177,141 +180,146 @@ ...@@ -177,141 +180,146 @@
<update id="updateBatch" parameterType="paramDto"> <update id="updateBatch" parameterType="paramDto">
update mortals_sys_app_info_field as a update mortals_sys_app_info_field as a
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<trim prefix="datasetId=(case" suffix="ELSE datasetId end),"> <trim prefix="datasetId=(case" suffix="ELSE datasetId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('datasetId')) or (colPickMode==1 and !item.containsKey('datasetId'))"> <when test="(colPickMode==0 and item.containsKey('datasetId')) or (colPickMode==1 and !item.containsKey('datasetId'))">
when a.id=#{item.id} then #{item.datasetId} when a.id=#{item.id} then #{item.datasetId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('datasetIdIncrement')) or (colPickMode==1 and !item.containsKey('datasetIdIncrement'))"> <when test="(colPickMode==0 and item.containsKey('datasetIdIncrement')) or (colPickMode==1 and !item.containsKey('datasetIdIncrement'))">
when a.id=#{item.id} then ifnull(a.datasetId,0) + #{item.datasetIdIncrement} when a.id=#{item.id} then ifnull(a.datasetId,0) + #{item.datasetIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="fieldCode=(case" suffix="ELSE fieldCode end),"> <trim prefix="fieldCode=(case" suffix="ELSE fieldCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('fieldCode')) or (colPickMode==1 and !item.containsKey('fieldCode'))"> <if test="(colPickMode==0 and item.containsKey('fieldCode')) or (colPickMode==1 and !item.containsKey('fieldCode'))">
when a.id=#{item.id} then #{item.fieldCode} when a.id=#{item.id} then #{item.fieldCode}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="fieldName=(case" suffix="ELSE fieldName end),"> <trim prefix="fieldName=(case" suffix="ELSE fieldName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('fieldName')) or (colPickMode==1 and !item.containsKey('fieldName'))"> <if test="(colPickMode==0 and item.containsKey('fieldName')) or (colPickMode==1 and !item.containsKey('fieldName'))">
when a.id=#{item.id} then #{item.fieldName} when a.id=#{item.id} then #{item.fieldName}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="fieldType=(case" suffix="ELSE fieldType end),"> <trim prefix="fieldType=(case" suffix="ELSE fieldType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('fieldType')) or (colPickMode==1 and !item.containsKey('fieldType'))"> <if test="(colPickMode==0 and item.containsKey('fieldType')) or (colPickMode==1 and !item.containsKey('fieldType'))">
when a.id=#{item.id} then #{item.fieldType} when a.id=#{item.id} then #{item.fieldType}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="dataType=(case" suffix="ELSE dataType end),"> <trim prefix="dataType=(case" suffix="ELSE dataType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('dataType')) or (colPickMode==1 and !item.containsKey('dataType'))"> <if test="(colPickMode==0 and item.containsKey('dataType')) or (colPickMode==1 and !item.containsKey('dataType'))">
when a.id=#{item.id} then #{item.dataType} when a.id=#{item.id} then #{item.dataType}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="fieldValue=(case" suffix="ELSE fieldValue end),"> <trim prefix="fieldValue=(case" suffix="ELSE fieldValue end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('fieldValue')) or (colPickMode==1 and !item.containsKey('fieldValue'))"> <if test="(colPickMode==0 and item.containsKey('fieldValue')) or (colPickMode==1 and !item.containsKey('fieldValue'))">
when a.id=#{item.id} then #{item.fieldValue} when a.id=#{item.id} then #{item.fieldValue}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="fieldLen=(case" suffix="ELSE fieldLen end),"> <trim prefix="fieldLen=(case" suffix="ELSE fieldLen end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('fieldLen')) or (colPickMode==1 and !item.containsKey('fieldLen'))"> <when test="(colPickMode==0 and item.containsKey('fieldLen')) or (colPickMode==1 and !item.containsKey('fieldLen'))">
when a.id=#{item.id} then #{item.fieldLen} when a.id=#{item.id} then #{item.fieldLen}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('fieldLenIncrement')) or (colPickMode==1 and !item.containsKey('fieldLenIncrement'))"> <when test="(colPickMode==0 and item.containsKey('fieldLenIncrement')) or (colPickMode==1 and !item.containsKey('fieldLenIncrement'))">
when a.id=#{item.id} then ifnull(a.fieldLen,0) + #{item.fieldLenIncrement} when a.id=#{item.id} then ifnull(a.fieldLen,0) + #{item.fieldLenIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="fieldNull=(case" suffix="ELSE fieldNull end),"> <trim prefix="fieldNull=(case" suffix="ELSE fieldNull end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('fieldNull')) or (colPickMode==1 and !item.containsKey('fieldNull'))"> <when test="(colPickMode==0 and item.containsKey('fieldNull')) or (colPickMode==1 and !item.containsKey('fieldNull'))">
when a.id=#{item.id} then #{item.fieldNull} when a.id=#{item.id} then #{item.fieldNull}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('fieldNullIncrement')) or (colPickMode==1 and !item.containsKey('fieldNullIncrement'))"> <when test="(colPickMode==0 and item.containsKey('fieldNullIncrement')) or (colPickMode==1 and !item.containsKey('fieldNullIncrement'))">
when a.id=#{item.id} then ifnull(a.fieldNull,0) + #{item.fieldNullIncrement} when a.id=#{item.id} then ifnull(a.fieldNull,0) + #{item.fieldNullIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="isList=(case" suffix="ELSE isList end),"> <trim prefix="isList=(case" suffix="ELSE isList end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('isList')) or (colPickMode==1 and !item.containsKey('isList'))"> <when test="(colPickMode==0 and item.containsKey('isList')) or (colPickMode==1 and !item.containsKey('isList'))">
when a.id=#{item.id} then #{item.isList} when a.id=#{item.id} then #{item.isList}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('isListIncrement')) or (colPickMode==1 and !item.containsKey('isListIncrement'))"> <when test="(colPickMode==0 and item.containsKey('isListIncrement')) or (colPickMode==1 and !item.containsKey('isListIncrement'))">
when a.id=#{item.id} then ifnull(a.isList,0) + #{item.isListIncrement} when a.id=#{item.id} then ifnull(a.isList,0) + #{item.isListIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="fieldOrderNo=(case" suffix="ELSE fieldOrderNo end),"> <trim prefix="fieldOrderNo=(case" suffix="ELSE fieldOrderNo end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <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} when a.id=#{item.id} then #{item.fieldOrderNo}
</if> </when>
</foreach> <when test="(colPickMode==0 and item.containsKey('fieldOrderNoIncrement')) or (colPickMode==1 and !item.containsKey('fieldOrderNoIncrement'))">
</trim> when a.id=#{item.id} then ifnull(a.fieldOrderNo,0) + #{item.fieldOrderNoIncrement}
<trim prefix="remark=(case" suffix="ELSE remark end),"> </when>
<foreach collection="data.dataList" item="item" index="index" separator="" > </choose>
<if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))"> </foreach>
when a.id=#{item.id} then #{item.remark} </trim>
</if> <trim prefix="remark=(case" suffix="ELSE remark end),">
</foreach> <foreach collection="data.dataList" item="item" index="index" separator="" >
</trim> <if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
<trim prefix="createTime=(case" suffix="ELSE createTime end),"> when a.id=#{item.id} then #{item.remark}
<foreach collection="data.dataList" item="item" index="index" separator="" > </if>
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))"> </foreach>
when a.id=#{item.id} then #{item.createTime} </trim>
</if> <trim prefix="createTime=(case" suffix="ELSE createTime end),">
</foreach> <foreach collection="data.dataList" item="item" index="index" separator="" >
</trim> <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),"> when a.id=#{item.id} then #{item.createTime}
<foreach collection="data.dataList" item="item" index="index" separator="" > </if>
<choose> </foreach>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))"> </trim>
when a.id=#{item.id} then #{item.createUserId} <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
</when> <foreach collection="data.dataList" item="item" index="index" separator="" >
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))"> <choose>
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement} <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
</when> when a.id=#{item.id} then #{item.createUserId}
</choose> </when>
</foreach> <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
</trim> when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),"> </when>
<foreach collection="data.dataList" item="item" index="index" separator="" > </choose>
<if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))"> </foreach>
when a.id=#{item.id} then #{item.updateTime} </trim>
</if> <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
</foreach> <foreach collection="data.dataList" item="item" index="index" separator="" >
</trim> <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
<trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),"> when a.id=#{item.id} then #{item.updateTime}
<foreach collection="data.dataList" item="item" index="index" separator="" > </if>
<choose> </foreach>
<when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))"> </trim>
when a.id=#{item.id} then #{item.updateUserId} <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
</when> <foreach collection="data.dataList" item="item" index="index" separator="" >
<when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))"> <choose>
when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement} <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
</when> when a.id=#{item.id} then #{item.updateUserId}
</choose> </when>
</foreach> <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
</trim> when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -428,287 +436,293 @@ ...@@ -428,287 +436,293 @@
${_conditionType_} a.id=#{${_conditionParam_}.id} ${_conditionType_} a.id=#{${_conditionParam_}.id}
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('id')"> <if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null "> <if test="conditionParamRef.id != null ">
${_conditionType_} a.id = #{${_conditionParam_}.id} ${_conditionType_} a.id = #{${_conditionParam_}.id}
</if>
<if test="conditionParamRef.id == null">
${_conditionType_} a.id is null
</if>
</if>
<if test="conditionParamRef.containsKey('idList')">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null"> <if test="conditionParamRef.id == null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd} ${_conditionType_} a.id is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('idList')">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('datasetId')"> <if test="conditionParamRef.containsKey('datasetId')">
<if test="conditionParamRef.datasetId != null "> <if test="conditionParamRef.datasetId != null ">
${_conditionType_} a.datasetId = #{${_conditionParam_}.datasetId} ${_conditionType_} a.datasetId = #{${_conditionParam_}.datasetId}
</if>
<if test="conditionParamRef.datasetId == null">
${_conditionType_} a.datasetId is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('datasetIdList')"> <if test="conditionParamRef.datasetId == null">
${_conditionType_} a.datasetId in ${_conditionType_} a.datasetId is null
<foreach collection="conditionParamRef.datasetIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('datasetIdStart') and conditionParamRef.datasetIdStart != null">
${_conditionType_} a.datasetId <![CDATA[ >= ]]> #{${_conditionParam_}.datasetIdStart}
</if>
<if test="conditionParamRef.containsKey('datasetIdEnd') and conditionParamRef.datasetIdEnd != null">
${_conditionType_} a.datasetId <![CDATA[ <= ]]> #{${_conditionParam_}.datasetIdEnd}
</if> </if>
</if>
<if test="conditionParamRef.containsKey('datasetIdList')">
${_conditionType_} a.datasetId in
<foreach collection="conditionParamRef.datasetIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('datasetIdStart') and conditionParamRef.datasetIdStart != null">
${_conditionType_} a.datasetId <![CDATA[ >= ]]> #{${_conditionParam_}.datasetIdStart}
</if>
<if test="conditionParamRef.containsKey('datasetIdEnd') and conditionParamRef.datasetIdEnd != null">
${_conditionType_} a.datasetId <![CDATA[ <= ]]> #{${_conditionParam_}.datasetIdEnd}
</if>
<if test="conditionParamRef.containsKey('fieldCode')"> <if test="conditionParamRef.containsKey('fieldCode')">
<if test="conditionParamRef.fieldCode != null and conditionParamRef.fieldCode != ''"> <if test="conditionParamRef.fieldCode != null and conditionParamRef.fieldCode != ''">
${_conditionType_} a.fieldCode like #{${_conditionParam_}.fieldCode} ${_conditionType_} a.fieldCode like #{${_conditionParam_}.fieldCode}
</if>
<if test="conditionParamRef.fieldCode == null">
${_conditionType_} a.fieldCode is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('fieldCodeList')"> <if test="conditionParamRef.fieldCode == null">
${_conditionType_} a.fieldCode in ${_conditionType_} a.fieldCode is null
<foreach collection="conditionParamRef.fieldCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('fieldCodeList')">
${_conditionType_} a.fieldCode in
<foreach collection="conditionParamRef.fieldCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fieldName')"> <if test="conditionParamRef.containsKey('fieldName')">
<if test="conditionParamRef.fieldName != null and conditionParamRef.fieldName != ''"> <if test="conditionParamRef.fieldName != null and conditionParamRef.fieldName != ''">
${_conditionType_} a.fieldName like #{${_conditionParam_}.fieldName} ${_conditionType_} a.fieldName like #{${_conditionParam_}.fieldName}
</if>
<if test="conditionParamRef.fieldName == null">
${_conditionType_} a.fieldName is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('fieldNameList')"> <if test="conditionParamRef.fieldName == null">
${_conditionType_} a.fieldName in ${_conditionType_} a.fieldName is null
<foreach collection="conditionParamRef.fieldNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('fieldNameList')">
${_conditionType_} a.fieldName in
<foreach collection="conditionParamRef.fieldNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fieldType')"> <if test="conditionParamRef.containsKey('fieldType')">
<if test="conditionParamRef.fieldType != null and conditionParamRef.fieldType != ''"> <if test="conditionParamRef.fieldType != null and conditionParamRef.fieldType != ''">
${_conditionType_} a.fieldType like #{${_conditionParam_}.fieldType} ${_conditionType_} a.fieldType like #{${_conditionParam_}.fieldType}
</if>
<if test="conditionParamRef.fieldType == null">
${_conditionType_} a.fieldType is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('fieldTypeList')"> <if test="conditionParamRef.fieldType == null">
${_conditionType_} a.fieldType in ${_conditionType_} a.fieldType is null
<foreach collection="conditionParamRef.fieldTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('fieldTypeList')">
${_conditionType_} a.fieldType in
<foreach collection="conditionParamRef.fieldTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dataType')"> <if test="conditionParamRef.containsKey('dataType')">
<if test="conditionParamRef.dataType != null and conditionParamRef.dataType != ''"> <if test="conditionParamRef.dataType != null and conditionParamRef.dataType != ''">
${_conditionType_} a.dataType like #{${_conditionParam_}.dataType} ${_conditionType_} a.dataType like #{${_conditionParam_}.dataType}
</if>
<if test="conditionParamRef.dataType == null">
${_conditionType_} a.dataType is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('dataTypeList')"> <if test="conditionParamRef.dataType == null">
${_conditionType_} a.dataType in ${_conditionType_} a.dataType is null
<foreach collection="conditionParamRef.dataTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('dataTypeList')">
${_conditionType_} a.dataType in
<foreach collection="conditionParamRef.dataTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fieldValue')"> <if test="conditionParamRef.containsKey('fieldValue')">
<if test="conditionParamRef.fieldValue != null and conditionParamRef.fieldValue != ''"> <if test="conditionParamRef.fieldValue != null and conditionParamRef.fieldValue != ''">
${_conditionType_} a.fieldValue like #{${_conditionParam_}.fieldValue} ${_conditionType_} a.fieldValue like #{${_conditionParam_}.fieldValue}
</if>
<if test="conditionParamRef.fieldValue == null">
${_conditionType_} a.fieldValue is null
</if>
</if>
<if test="conditionParamRef.containsKey('fieldValueList')">
${_conditionType_} a.fieldValue in
<foreach collection="conditionParamRef.fieldValueList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('fieldLen')"> <if test="conditionParamRef.fieldValue == null">
<if test="conditionParamRef.fieldLen != null "> ${_conditionType_} a.fieldValue is null
${_conditionType_} a.fieldLen = #{${_conditionParam_}.fieldLen}
</if>
<if test="conditionParamRef.fieldLen == null">
${_conditionType_} a.fieldLen is null
</if>
</if>
<if test="conditionParamRef.containsKey('fieldLenList')">
${_conditionType_} a.fieldLen in
<foreach collection="conditionParamRef.fieldLenList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('fieldLenStart') and conditionParamRef.fieldLenStart != null"> </if>
${_conditionType_} a.fieldLen <![CDATA[ >= ]]> #{${_conditionParam_}.fieldLenStart} <if test="conditionParamRef.containsKey('fieldValueList')">
${_conditionType_} a.fieldValue in
<foreach collection="conditionParamRef.fieldValueList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fieldLen')">
<if test="conditionParamRef.fieldLen != null ">
${_conditionType_} a.fieldLen = #{${_conditionParam_}.fieldLen}
</if> </if>
<if test="conditionParamRef.containsKey('fieldLenEnd') and conditionParamRef.fieldLenEnd != null"> <if test="conditionParamRef.fieldLen == null">
${_conditionType_} a.fieldLen <![CDATA[ <= ]]> #{${_conditionParam_}.fieldLenEnd} ${_conditionType_} a.fieldLen is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('fieldLenList')">
${_conditionType_} a.fieldLen in
<foreach collection="conditionParamRef.fieldLenList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fieldLenStart') and conditionParamRef.fieldLenStart != null">
${_conditionType_} a.fieldLen <![CDATA[ >= ]]> #{${_conditionParam_}.fieldLenStart}
</if>
<if test="conditionParamRef.containsKey('fieldLenEnd') and conditionParamRef.fieldLenEnd != null">
${_conditionType_} a.fieldLen <![CDATA[ <= ]]> #{${_conditionParam_}.fieldLenEnd}
</if>
<if test="conditionParamRef.containsKey('fieldNull')"> <if test="conditionParamRef.containsKey('fieldNull')">
<if test="conditionParamRef.fieldNull != null "> <if test="conditionParamRef.fieldNull != null ">
${_conditionType_} a.fieldNull = #{${_conditionParam_}.fieldNull} ${_conditionType_} a.fieldNull = #{${_conditionParam_}.fieldNull}
</if>
<if test="conditionParamRef.fieldNull == null">
${_conditionType_} a.fieldNull is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('fieldNullList')"> <if test="conditionParamRef.fieldNull == null">
${_conditionType_} a.fieldNull in ${_conditionType_} a.fieldNull is null
<foreach collection="conditionParamRef.fieldNullList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fieldNullStart') and conditionParamRef.fieldNullStart != null">
${_conditionType_} a.fieldNull <![CDATA[ >= ]]> #{${_conditionParam_}.fieldNullStart}
</if>
<if test="conditionParamRef.containsKey('fieldNullEnd') and conditionParamRef.fieldNullEnd != null">
${_conditionType_} a.fieldNull <![CDATA[ <= ]]> #{${_conditionParam_}.fieldNullEnd}
</if> </if>
</if>
<if test="conditionParamRef.containsKey('fieldNullList')">
${_conditionType_} a.fieldNull in
<foreach collection="conditionParamRef.fieldNullList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fieldNullStart') and conditionParamRef.fieldNullStart != null">
${_conditionType_} a.fieldNull <![CDATA[ >= ]]> #{${_conditionParam_}.fieldNullStart}
</if>
<if test="conditionParamRef.containsKey('fieldNullEnd') and conditionParamRef.fieldNullEnd != null">
${_conditionType_} a.fieldNull <![CDATA[ <= ]]> #{${_conditionParam_}.fieldNullEnd}
</if>
<if test="conditionParamRef.containsKey('isList')"> <if test="conditionParamRef.containsKey('isList')">
<if test="conditionParamRef.isList != null "> <if test="conditionParamRef.isList != null ">
${_conditionType_} a.isList = #{${_conditionParam_}.isList} ${_conditionType_} a.isList = #{${_conditionParam_}.isList}
</if>
<if test="conditionParamRef.isList == null">
${_conditionType_} a.isList is null
</if>
</if>
<if test="conditionParamRef.containsKey('isListList')">
${_conditionType_} a.isList in
<foreach collection="conditionParamRef.isListList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('isListStart') and conditionParamRef.isListStart != null"> <if test="conditionParamRef.isList == null">
${_conditionType_} a.isList <![CDATA[ >= ]]> #{${_conditionParam_}.isListStart} ${_conditionType_} a.isList is null
</if> </if>
<if test="conditionParamRef.containsKey('isListEnd') and conditionParamRef.isListEnd != null"> </if>
${_conditionType_} a.isList <![CDATA[ <= ]]> #{${_conditionParam_}.isListEnd} <if test="conditionParamRef.containsKey('isListList')">
</if> ${_conditionType_} a.isList in
<foreach collection="conditionParamRef.isListList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isListStart') and conditionParamRef.isListStart != null">
${_conditionType_} a.isList <![CDATA[ >= ]]> #{${_conditionParam_}.isListStart}
</if>
<if test="conditionParamRef.containsKey('isListEnd') and conditionParamRef.isListEnd != null">
${_conditionType_} a.isList <![CDATA[ <= ]]> #{${_conditionParam_}.isListEnd}
</if>
<if test="conditionParamRef.containsKey('fieldOrderNo')"> <if test="conditionParamRef.containsKey('fieldOrderNo')">
<if test="conditionParamRef.fieldOrderNo != null and conditionParamRef.fieldOrderNo != ''"> <if test="conditionParamRef.fieldOrderNo != null ">
${_conditionType_} a.fieldOrderNo like #{${_conditionParam_}.fieldOrderNo} ${_conditionType_} a.fieldOrderNo = #{${_conditionParam_}.fieldOrderNo}
</if>
<if test="conditionParamRef.fieldOrderNo == null">
${_conditionType_} a.fieldOrderNo is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('fieldOrderNoList')"> <if test="conditionParamRef.fieldOrderNo == null">
${_conditionType_} a.fieldOrderNo in ${_conditionType_} a.fieldOrderNo is null
<foreach collection="conditionParamRef.fieldOrderNoList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('fieldOrderNoList')">
${_conditionType_} a.fieldOrderNo in
<foreach collection="conditionParamRef.fieldOrderNoList" open="(" close=")" index="index" item="item" separator=",">
#{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 != ''">
${_conditionType_} a.remark like #{${_conditionParam_}.remark}
</if>
<if test="conditionParamRef.remark == null">
${_conditionType_} a.remark is null
</if>
</if>
<if test="conditionParamRef.containsKey('remarkList')">
${_conditionType_} a.remark in
<foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createTime')"> <if test="conditionParamRef.containsKey('remark')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime} ${_conditionType_} a.remark like #{${_conditionParam_}.remark}
</if>
<if test="conditionParamRef.createTime == null">
${_conditionType_} a.createTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''"> <if test="conditionParamRef.remark == null">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.remark is null
</if> </if>
<if test="conditionParamRef.containsKey('createUserId')"> </if>
<if test="conditionParamRef.createUserId != null "> <if test="conditionParamRef.containsKey('remarkList')">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId} ${_conditionType_} a.remark in
</if> <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
<if test="conditionParamRef.createUserId == null"> #{item}
${_conditionType_} a.createUserId is null </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> <if test="conditionParamRef.createTime == null">
${_conditionType_} a.createUserId in ${_conditionType_} a.createTime is null
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> </if>
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null"> <if test="conditionParamRef.createUserId == null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd} ${_conditionType_} a.createUserId is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('createUserIdList')">
${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('updateTime')"> <if test="conditionParamRef.containsKey('updateTime')">
<if test="conditionParamRef.updateTime != null "> <if test="conditionParamRef.updateTime != null ">
${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime} ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
</if>
<if test="conditionParamRef.updateTime == null">
${_conditionType_} a.updateTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('updateUserId')"> <if test="conditionParamRef.updateTime == null">
<if test="conditionParamRef.updateUserId != null "> ${_conditionType_} a.updateTime is null
${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
</if>
<if test="conditionParamRef.updateUserId == null">
${_conditionType_} a.updateUserId is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdList')"> </if>
${_conditionType_} a.updateUserId in <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
#{item} </if>
</foreach> <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
</if> ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null"> </if>
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart} <if test="conditionParamRef.containsKey('updateUserId')">
<if test="conditionParamRef.updateUserId != null ">
${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null"> <if test="conditionParamRef.updateUserId == null">
${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd} ${_conditionType_} a.updateUserId is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('updateUserIdList')">
${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if>
<if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
...@@ -716,93 +730,93 @@ ...@@ -716,93 +730,93 @@
order by order by
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=","> <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind} ${item.colName} ${item.sortKind}
</foreach> </foreach>
</trim> </trim>
</if> </if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()"> <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by order by
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')"> <if test="orderCol.containsKey('id')">
a.id a.id
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if> <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('datasetId')"> <if test="orderCol.containsKey('datasetId')">
a.datasetId a.datasetId
<if test='orderCol.datasetId != null and "DESC".equalsIgnoreCase(orderCol.datasetId)'>DESC</if> <if test='orderCol.datasetId != null and "DESC".equalsIgnoreCase(orderCol.datasetId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('fieldCode')"> <if test="orderCol.containsKey('fieldCode')">
a.fieldCode a.fieldCode
<if test='orderCol.fieldCode != null and "DESC".equalsIgnoreCase(orderCol.fieldCode)'>DESC</if> <if test='orderCol.fieldCode != null and "DESC".equalsIgnoreCase(orderCol.fieldCode)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('fieldName')"> <if test="orderCol.containsKey('fieldName')">
a.fieldName a.fieldName
<if test='orderCol.fieldName != null and "DESC".equalsIgnoreCase(orderCol.fieldName)'>DESC</if> <if test='orderCol.fieldName != null and "DESC".equalsIgnoreCase(orderCol.fieldName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('fieldType')"> <if test="orderCol.containsKey('fieldType')">
a.fieldType a.fieldType
<if test='orderCol.fieldType != null and "DESC".equalsIgnoreCase(orderCol.fieldType)'>DESC</if> <if test='orderCol.fieldType != null and "DESC".equalsIgnoreCase(orderCol.fieldType)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('dataType')"> <if test="orderCol.containsKey('dataType')">
a.dataType a.dataType
<if test='orderCol.dataType != null and "DESC".equalsIgnoreCase(orderCol.dataType)'>DESC</if> <if test='orderCol.dataType != null and "DESC".equalsIgnoreCase(orderCol.dataType)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('fieldValue')"> <if test="orderCol.containsKey('fieldValue')">
a.fieldValue a.fieldValue
<if test='orderCol.fieldValue != null and "DESC".equalsIgnoreCase(orderCol.fieldValue)'>DESC</if> <if test='orderCol.fieldValue != null and "DESC".equalsIgnoreCase(orderCol.fieldValue)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('fieldLen')"> <if test="orderCol.containsKey('fieldLen')">
a.fieldLen a.fieldLen
<if test='orderCol.fieldLen != null and "DESC".equalsIgnoreCase(orderCol.fieldLen)'>DESC</if> <if test='orderCol.fieldLen != null and "DESC".equalsIgnoreCase(orderCol.fieldLen)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('fieldNull')"> <if test="orderCol.containsKey('fieldNull')">
a.fieldNull a.fieldNull
<if test='orderCol.fieldNull != null and "DESC".equalsIgnoreCase(orderCol.fieldNull)'>DESC</if> <if test='orderCol.fieldNull != null and "DESC".equalsIgnoreCase(orderCol.fieldNull)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('isList')"> <if test="orderCol.containsKey('isList')">
a.isList a.isList
<if test='orderCol.isList != null and "DESC".equalsIgnoreCase(orderCol.isList)'>DESC</if> <if test='orderCol.isList != null and "DESC".equalsIgnoreCase(orderCol.isList)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('fieldOrderNo')"> <if test="orderCol.containsKey('fieldOrderNo')">
a.fieldOrderNo a.fieldOrderNo
<if test='orderCol.fieldOrderNo != null and "DESC".equalsIgnoreCase(orderCol.fieldOrderNo)'>DESC</if> <if test='orderCol.fieldOrderNo != null and "DESC".equalsIgnoreCase(orderCol.fieldOrderNo)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('remark')"> <if test="orderCol.containsKey('remark')">
a.remark a.remark
<if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if> <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('createTime')">
a.createTime a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if> <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createUserId')"> <if test="orderCol.containsKey('createUserId')">
a.createUserId a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if> <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('updateTime')"> <if test="orderCol.containsKey('updateTime')">
a.updateTime a.updateTime
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('updateUserId')"> <if test="orderCol.containsKey('updateUserId')">
a.updateUserId a.updateUserId
<if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if> <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
, ,
</if> </if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
base-manager/src/main/resources/sqlmap/module/app/AppInfoTempleteFieldMapper.xml
View file @ 4c59864b
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!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"> <mapper namespace="com.mortals.xhx.module.app.dao.ibatis.AppInfoTempleteFieldDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
<resultMap type="AppInfoTempleteFieldEntity" id="AppInfoTempleteFieldEntity-Map"> <resultMap type="AppInfoTempleteFieldEntity" id="AppInfoTempleteFieldEntity-Map">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="appId" column="appId" /> <result property="appId" column="appId" />
<result property="fieldCode" column="fieldCode" /> <result property="fieldCode" column="fieldCode" />
<result property="fieldName" column="fieldName" /> <result property="fieldName" column="fieldName" />
<result property="fieldType" column="fieldType" /> <result property="fieldType" column="fieldType" />
<result property="dataType" column="dataType" /> <result property="dataType" column="dataType" />
<result property="fieldValue" column="fieldValue" /> <result property="fieldValue" column="fieldValue" />
<result property="fieldLen" column="fieldLen" /> <result property="fieldLen" column="fieldLen" />
<result property="fieldNull" column="fieldNull" /> <result property="fieldNull" column="fieldNull" />
<result property="isList" column="isList" /> <result property="isList" column="isList" />
<result property="fieldOrderNo" column="fieldOrderNo" /> <result property="fieldOrderNo" column="fieldOrderNo" />
<result property="remark" column="remark" /> <result property="remark" column="remark" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
</resultMap> </resultMap>
<!-- 表所有列 --> <!-- 表所有列 -->
<sql id="_columns"> <sql id="_columns">
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id, a.id,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('appId') or colPickMode == 1 and data.containsKey('appId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('appId') or colPickMode == 1 and data.containsKey('appId')))">
a.appId, a.appId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldCode') or colPickMode == 1 and data.containsKey('fieldCode')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldCode') or colPickMode == 1 and data.containsKey('fieldCode')))">
a.fieldCode, a.fieldCode,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldName') or colPickMode == 1 and data.containsKey('fieldName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldName') or colPickMode == 1 and data.containsKey('fieldName')))">
a.fieldName, a.fieldName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldType') or colPickMode == 1 and data.containsKey('fieldType')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldType') or colPickMode == 1 and data.containsKey('fieldType')))">
a.fieldType, a.fieldType,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('dataType') or colPickMode == 1 and data.containsKey('dataType')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('dataType') or colPickMode == 1 and data.containsKey('dataType')))">
a.dataType, a.dataType,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldValue') or colPickMode == 1 and data.containsKey('fieldValue')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldValue') or colPickMode == 1 and data.containsKey('fieldValue')))">
a.fieldValue, a.fieldValue,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldLen') or colPickMode == 1 and data.containsKey('fieldLen')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldLen') or colPickMode == 1 and data.containsKey('fieldLen')))">
a.fieldLen, a.fieldLen,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldNull') or colPickMode == 1 and data.containsKey('fieldNull')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldNull') or colPickMode == 1 and data.containsKey('fieldNull')))">
a.fieldNull, a.fieldNull,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isList') or colPickMode == 1 and data.containsKey('isList')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isList') or colPickMode == 1 and data.containsKey('isList')))">
a.isList, a.isList,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldOrderNo') or colPickMode == 1 and data.containsKey('fieldOrderNo')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fieldOrderNo') or colPickMode == 1 and data.containsKey('fieldOrderNo')))">
a.fieldOrderNo, a.fieldOrderNo,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('remark') or colPickMode == 1 and data.containsKey('remark')))">
a.remark, a.remark,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime, a.createTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId, a.createUserId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime, a.updateTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
a.updateUserId, a.updateUserId,
</if> </if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
...@@ -144,6 +144,9 @@ ...@@ -144,6 +144,9 @@
<if test="(colPickMode==0 and data.containsKey('fieldOrderNo')) or (colPickMode==1 and !data.containsKey('fieldOrderNo'))"> <if test="(colPickMode==0 and data.containsKey('fieldOrderNo')) or (colPickMode==1 and !data.containsKey('fieldOrderNo'))">
a.fieldOrderNo=#{data.fieldOrderNo}, a.fieldOrderNo=#{data.fieldOrderNo},
</if> </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'))"> <if test="(colPickMode==0 and data.containsKey('remark')) or (colPickMode==1 and !data.containsKey('remark'))">
a.remark=#{data.remark}, a.remark=#{data.remark},
</if> </if>
...@@ -177,141 +180,146 @@ ...@@ -177,141 +180,146 @@
<update id="updateBatch" parameterType="paramDto"> <update id="updateBatch" parameterType="paramDto">
update mortals_sys_app_info_templete_field as a update mortals_sys_app_info_templete_field as a
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<trim prefix="appId=(case" suffix="ELSE appId end),"> <trim prefix="appId=(case" suffix="ELSE appId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('appId')) or (colPickMode==1 and !item.containsKey('appId'))"> <when test="(colPickMode==0 and item.containsKey('appId')) or (colPickMode==1 and !item.containsKey('appId'))">
when a.id=#{item.id} then #{item.appId} when a.id=#{item.id} then #{item.appId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('appIdIncrement')) or (colPickMode==1 and !item.containsKey('appIdIncrement'))"> <when test="(colPickMode==0 and item.containsKey('appIdIncrement')) or (colPickMode==1 and !item.containsKey('appIdIncrement'))">
when a.id=#{item.id} then ifnull(a.appId,0) + #{item.appIdIncrement} when a.id=#{item.id} then ifnull(a.appId,0) + #{item.appIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="fieldCode=(case" suffix="ELSE fieldCode end),"> <trim prefix="fieldCode=(case" suffix="ELSE fieldCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('fieldCode')) or (colPickMode==1 and !item.containsKey('fieldCode'))"> <if test="(colPickMode==0 and item.containsKey('fieldCode')) or (colPickMode==1 and !item.containsKey('fieldCode'))">
when a.id=#{item.id} then #{item.fieldCode} when a.id=#{item.id} then #{item.fieldCode}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="fieldName=(case" suffix="ELSE fieldName end),"> <trim prefix="fieldName=(case" suffix="ELSE fieldName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('fieldName')) or (colPickMode==1 and !item.containsKey('fieldName'))"> <if test="(colPickMode==0 and item.containsKey('fieldName')) or (colPickMode==1 and !item.containsKey('fieldName'))">
when a.id=#{item.id} then #{item.fieldName} when a.id=#{item.id} then #{item.fieldName}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="fieldType=(case" suffix="ELSE fieldType end),"> <trim prefix="fieldType=(case" suffix="ELSE fieldType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('fieldType')) or (colPickMode==1 and !item.containsKey('fieldType'))"> <if test="(colPickMode==0 and item.containsKey('fieldType')) or (colPickMode==1 and !item.containsKey('fieldType'))">
when a.id=#{item.id} then #{item.fieldType} when a.id=#{item.id} then #{item.fieldType}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="dataType=(case" suffix="ELSE dataType end),"> <trim prefix="dataType=(case" suffix="ELSE dataType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('dataType')) or (colPickMode==1 and !item.containsKey('dataType'))"> <if test="(colPickMode==0 and item.containsKey('dataType')) or (colPickMode==1 and !item.containsKey('dataType'))">
when a.id=#{item.id} then #{item.dataType} when a.id=#{item.id} then #{item.dataType}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="fieldValue=(case" suffix="ELSE fieldValue end),"> <trim prefix="fieldValue=(case" suffix="ELSE fieldValue end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('fieldValue')) or (colPickMode==1 and !item.containsKey('fieldValue'))"> <if test="(colPickMode==0 and item.containsKey('fieldValue')) or (colPickMode==1 and !item.containsKey('fieldValue'))">
when a.id=#{item.id} then #{item.fieldValue} when a.id=#{item.id} then #{item.fieldValue}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="fieldLen=(case" suffix="ELSE fieldLen end),"> <trim prefix="fieldLen=(case" suffix="ELSE fieldLen end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('fieldLen')) or (colPickMode==1 and !item.containsKey('fieldLen'))"> <when test="(colPickMode==0 and item.containsKey('fieldLen')) or (colPickMode==1 and !item.containsKey('fieldLen'))">
when a.id=#{item.id} then #{item.fieldLen} when a.id=#{item.id} then #{item.fieldLen}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('fieldLenIncrement')) or (colPickMode==1 and !item.containsKey('fieldLenIncrement'))"> <when test="(colPickMode==0 and item.containsKey('fieldLenIncrement')) or (colPickMode==1 and !item.containsKey('fieldLenIncrement'))">
when a.id=#{item.id} then ifnull(a.fieldLen,0) + #{item.fieldLenIncrement} when a.id=#{item.id} then ifnull(a.fieldLen,0) + #{item.fieldLenIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="fieldNull=(case" suffix="ELSE fieldNull end),"> <trim prefix="fieldNull=(case" suffix="ELSE fieldNull end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('fieldNull')) or (colPickMode==1 and !item.containsKey('fieldNull'))"> <when test="(colPickMode==0 and item.containsKey('fieldNull')) or (colPickMode==1 and !item.containsKey('fieldNull'))">
when a.id=#{item.id} then #{item.fieldNull} when a.id=#{item.id} then #{item.fieldNull}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('fieldNullIncrement')) or (colPickMode==1 and !item.containsKey('fieldNullIncrement'))"> <when test="(colPickMode==0 and item.containsKey('fieldNullIncrement')) or (colPickMode==1 and !item.containsKey('fieldNullIncrement'))">
when a.id=#{item.id} then ifnull(a.fieldNull,0) + #{item.fieldNullIncrement} when a.id=#{item.id} then ifnull(a.fieldNull,0) + #{item.fieldNullIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="isList=(case" suffix="ELSE isList end),"> <trim prefix="isList=(case" suffix="ELSE isList end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('isList')) or (colPickMode==1 and !item.containsKey('isList'))"> <when test="(colPickMode==0 and item.containsKey('isList')) or (colPickMode==1 and !item.containsKey('isList'))">
when a.id=#{item.id} then #{item.isList} when a.id=#{item.id} then #{item.isList}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('isListIncrement')) or (colPickMode==1 and !item.containsKey('isListIncrement'))"> <when test="(colPickMode==0 and item.containsKey('isListIncrement')) or (colPickMode==1 and !item.containsKey('isListIncrement'))">
when a.id=#{item.id} then ifnull(a.isList,0) + #{item.isListIncrement} when a.id=#{item.id} then ifnull(a.isList,0) + #{item.isListIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="fieldOrderNo=(case" suffix="ELSE fieldOrderNo end),"> <trim prefix="fieldOrderNo=(case" suffix="ELSE fieldOrderNo end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <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} when a.id=#{item.id} then #{item.fieldOrderNo}
</if> </when>
</foreach> <when test="(colPickMode==0 and item.containsKey('fieldOrderNoIncrement')) or (colPickMode==1 and !item.containsKey('fieldOrderNoIncrement'))">
</trim> when a.id=#{item.id} then ifnull(a.fieldOrderNo,0) + #{item.fieldOrderNoIncrement}
<trim prefix="remark=(case" suffix="ELSE remark end),"> </when>
<foreach collection="data.dataList" item="item" index="index" separator="" > </choose>
<if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))"> </foreach>
when a.id=#{item.id} then #{item.remark} </trim>
</if> <trim prefix="remark=(case" suffix="ELSE remark end),">
</foreach> <foreach collection="data.dataList" item="item" index="index" separator="" >
</trim> <if test="(colPickMode==0 and item.containsKey('remark')) or (colPickMode==1 and !item.containsKey('remark'))">
<trim prefix="createTime=(case" suffix="ELSE createTime end),"> when a.id=#{item.id} then #{item.remark}
<foreach collection="data.dataList" item="item" index="index" separator="" > </if>
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))"> </foreach>
when a.id=#{item.id} then #{item.createTime} </trim>
</if> <trim prefix="createTime=(case" suffix="ELSE createTime end),">
</foreach> <foreach collection="data.dataList" item="item" index="index" separator="" >
</trim> <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),"> when a.id=#{item.id} then #{item.createTime}
<foreach collection="data.dataList" item="item" index="index" separator="" > </if>
<choose> </foreach>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))"> </trim>
when a.id=#{item.id} then #{item.createUserId} <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
</when> <foreach collection="data.dataList" item="item" index="index" separator="" >
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))"> <choose>
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement} <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
</when> when a.id=#{item.id} then #{item.createUserId}
</choose> </when>
</foreach> <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
</trim> when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),"> </when>
<foreach collection="data.dataList" item="item" index="index" separator="" > </choose>
<if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))"> </foreach>
when a.id=#{item.id} then #{item.updateTime} </trim>
</if> <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
</foreach> <foreach collection="data.dataList" item="item" index="index" separator="" >
</trim> <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
<trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),"> when a.id=#{item.id} then #{item.updateTime}
<foreach collection="data.dataList" item="item" index="index" separator="" > </if>
<choose> </foreach>
<when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))"> </trim>
when a.id=#{item.id} then #{item.updateUserId} <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
</when> <foreach collection="data.dataList" item="item" index="index" separator="" >
<when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))"> <choose>
when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement} <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
</when> when a.id=#{item.id} then #{item.updateUserId}
</choose> </when>
</foreach> <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
</trim> when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -428,287 +436,293 @@ ...@@ -428,287 +436,293 @@
${_conditionType_} a.id=#{${_conditionParam_}.id} ${_conditionType_} a.id=#{${_conditionParam_}.id}
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('id')"> <if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null "> <if test="conditionParamRef.id != null ">
${_conditionType_} a.id = #{${_conditionParam_}.id} ${_conditionType_} a.id = #{${_conditionParam_}.id}
</if>
<if test="conditionParamRef.id == null">
${_conditionType_} a.id is null
</if>
</if>
<if test="conditionParamRef.containsKey('idList')">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null"> <if test="conditionParamRef.id == null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd} ${_conditionType_} a.id is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('idList')">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('appId')"> <if test="conditionParamRef.containsKey('appId')">
<if test="conditionParamRef.appId != null "> <if test="conditionParamRef.appId != null ">
${_conditionType_} a.appId = #{${_conditionParam_}.appId} ${_conditionType_} a.appId = #{${_conditionParam_}.appId}
</if>
<if test="conditionParamRef.appId == null">
${_conditionType_} a.appId is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('appIdList')"> <if test="conditionParamRef.appId == null">
${_conditionType_} a.appId in ${_conditionType_} a.appId is null
<foreach collection="conditionParamRef.appIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('appIdStart') and conditionParamRef.appIdStart != null">
${_conditionType_} a.appId <![CDATA[ >= ]]> #{${_conditionParam_}.appIdStart}
</if>
<if test="conditionParamRef.containsKey('appIdEnd') and conditionParamRef.appIdEnd != null">
${_conditionType_} a.appId <![CDATA[ <= ]]> #{${_conditionParam_}.appIdEnd}
</if> </if>
</if>
<if test="conditionParamRef.containsKey('appIdList')">
${_conditionType_} a.appId in
<foreach collection="conditionParamRef.appIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('appIdStart') and conditionParamRef.appIdStart != null">
${_conditionType_} a.appId <![CDATA[ >= ]]> #{${_conditionParam_}.appIdStart}
</if>
<if test="conditionParamRef.containsKey('appIdEnd') and conditionParamRef.appIdEnd != null">
${_conditionType_} a.appId <![CDATA[ <= ]]> #{${_conditionParam_}.appIdEnd}
</if>
<if test="conditionParamRef.containsKey('fieldCode')"> <if test="conditionParamRef.containsKey('fieldCode')">
<if test="conditionParamRef.fieldCode != null and conditionParamRef.fieldCode != ''"> <if test="conditionParamRef.fieldCode != null and conditionParamRef.fieldCode != ''">
${_conditionType_} a.fieldCode like #{${_conditionParam_}.fieldCode} ${_conditionType_} a.fieldCode like #{${_conditionParam_}.fieldCode}
</if>
<if test="conditionParamRef.fieldCode == null">
${_conditionType_} a.fieldCode is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('fieldCodeList')"> <if test="conditionParamRef.fieldCode == null">
${_conditionType_} a.fieldCode in ${_conditionType_} a.fieldCode is null
<foreach collection="conditionParamRef.fieldCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('fieldCodeList')">
${_conditionType_} a.fieldCode in
<foreach collection="conditionParamRef.fieldCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fieldName')"> <if test="conditionParamRef.containsKey('fieldName')">
<if test="conditionParamRef.fieldName != null and conditionParamRef.fieldName != ''"> <if test="conditionParamRef.fieldName != null and conditionParamRef.fieldName != ''">
${_conditionType_} a.fieldName like #{${_conditionParam_}.fieldName} ${_conditionType_} a.fieldName like #{${_conditionParam_}.fieldName}
</if>
<if test="conditionParamRef.fieldName == null">
${_conditionType_} a.fieldName is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('fieldNameList')"> <if test="conditionParamRef.fieldName == null">
${_conditionType_} a.fieldName in ${_conditionType_} a.fieldName is null
<foreach collection="conditionParamRef.fieldNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('fieldNameList')">
${_conditionType_} a.fieldName in
<foreach collection="conditionParamRef.fieldNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fieldType')"> <if test="conditionParamRef.containsKey('fieldType')">
<if test="conditionParamRef.fieldType != null and conditionParamRef.fieldType != ''"> <if test="conditionParamRef.fieldType != null and conditionParamRef.fieldType != ''">
${_conditionType_} a.fieldType like #{${_conditionParam_}.fieldType} ${_conditionType_} a.fieldType like #{${_conditionParam_}.fieldType}
</if>
<if test="conditionParamRef.fieldType == null">
${_conditionType_} a.fieldType is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('fieldTypeList')"> <if test="conditionParamRef.fieldType == null">
${_conditionType_} a.fieldType in ${_conditionType_} a.fieldType is null
<foreach collection="conditionParamRef.fieldTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('fieldTypeList')">
${_conditionType_} a.fieldType in
<foreach collection="conditionParamRef.fieldTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dataType')"> <if test="conditionParamRef.containsKey('dataType')">
<if test="conditionParamRef.dataType != null and conditionParamRef.dataType != ''"> <if test="conditionParamRef.dataType != null and conditionParamRef.dataType != ''">
${_conditionType_} a.dataType like #{${_conditionParam_}.dataType} ${_conditionType_} a.dataType like #{${_conditionParam_}.dataType}
</if>
<if test="conditionParamRef.dataType == null">
${_conditionType_} a.dataType is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('dataTypeList')"> <if test="conditionParamRef.dataType == null">
${_conditionType_} a.dataType in ${_conditionType_} a.dataType is null
<foreach collection="conditionParamRef.dataTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('dataTypeList')">
${_conditionType_} a.dataType in
<foreach collection="conditionParamRef.dataTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fieldValue')"> <if test="conditionParamRef.containsKey('fieldValue')">
<if test="conditionParamRef.fieldValue != null and conditionParamRef.fieldValue != ''"> <if test="conditionParamRef.fieldValue != null and conditionParamRef.fieldValue != ''">
${_conditionType_} a.fieldValue like #{${_conditionParam_}.fieldValue} ${_conditionType_} a.fieldValue like #{${_conditionParam_}.fieldValue}
</if>
<if test="conditionParamRef.fieldValue == null">
${_conditionType_} a.fieldValue is null
</if>
</if>
<if test="conditionParamRef.containsKey('fieldValueList')">
${_conditionType_} a.fieldValue in
<foreach collection="conditionParamRef.fieldValueList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('fieldLen')"> <if test="conditionParamRef.fieldValue == null">
<if test="conditionParamRef.fieldLen != null "> ${_conditionType_} a.fieldValue is null
${_conditionType_} a.fieldLen = #{${_conditionParam_}.fieldLen}
</if>
<if test="conditionParamRef.fieldLen == null">
${_conditionType_} a.fieldLen is null
</if>
</if>
<if test="conditionParamRef.containsKey('fieldLenList')">
${_conditionType_} a.fieldLen in
<foreach collection="conditionParamRef.fieldLenList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('fieldLenStart') and conditionParamRef.fieldLenStart != null"> </if>
${_conditionType_} a.fieldLen <![CDATA[ >= ]]> #{${_conditionParam_}.fieldLenStart} <if test="conditionParamRef.containsKey('fieldValueList')">
${_conditionType_} a.fieldValue in
<foreach collection="conditionParamRef.fieldValueList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fieldLen')">
<if test="conditionParamRef.fieldLen != null ">
${_conditionType_} a.fieldLen = #{${_conditionParam_}.fieldLen}
</if> </if>
<if test="conditionParamRef.containsKey('fieldLenEnd') and conditionParamRef.fieldLenEnd != null"> <if test="conditionParamRef.fieldLen == null">
${_conditionType_} a.fieldLen <![CDATA[ <= ]]> #{${_conditionParam_}.fieldLenEnd} ${_conditionType_} a.fieldLen is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('fieldLenList')">
${_conditionType_} a.fieldLen in
<foreach collection="conditionParamRef.fieldLenList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fieldLenStart') and conditionParamRef.fieldLenStart != null">
${_conditionType_} a.fieldLen <![CDATA[ >= ]]> #{${_conditionParam_}.fieldLenStart}
</if>
<if test="conditionParamRef.containsKey('fieldLenEnd') and conditionParamRef.fieldLenEnd != null">
${_conditionType_} a.fieldLen <![CDATA[ <= ]]> #{${_conditionParam_}.fieldLenEnd}
</if>
<if test="conditionParamRef.containsKey('fieldNull')"> <if test="conditionParamRef.containsKey('fieldNull')">
<if test="conditionParamRef.fieldNull != null "> <if test="conditionParamRef.fieldNull != null ">
${_conditionType_} a.fieldNull = #{${_conditionParam_}.fieldNull} ${_conditionType_} a.fieldNull = #{${_conditionParam_}.fieldNull}
</if>
<if test="conditionParamRef.fieldNull == null">
${_conditionType_} a.fieldNull is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('fieldNullList')"> <if test="conditionParamRef.fieldNull == null">
${_conditionType_} a.fieldNull in ${_conditionType_} a.fieldNull is null
<foreach collection="conditionParamRef.fieldNullList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fieldNullStart') and conditionParamRef.fieldNullStart != null">
${_conditionType_} a.fieldNull <![CDATA[ >= ]]> #{${_conditionParam_}.fieldNullStart}
</if>
<if test="conditionParamRef.containsKey('fieldNullEnd') and conditionParamRef.fieldNullEnd != null">
${_conditionType_} a.fieldNull <![CDATA[ <= ]]> #{${_conditionParam_}.fieldNullEnd}
</if> </if>
</if>
<if test="conditionParamRef.containsKey('fieldNullList')">
${_conditionType_} a.fieldNull in
<foreach collection="conditionParamRef.fieldNullList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('fieldNullStart') and conditionParamRef.fieldNullStart != null">
${_conditionType_} a.fieldNull <![CDATA[ >= ]]> #{${_conditionParam_}.fieldNullStart}
</if>
<if test="conditionParamRef.containsKey('fieldNullEnd') and conditionParamRef.fieldNullEnd != null">
${_conditionType_} a.fieldNull <![CDATA[ <= ]]> #{${_conditionParam_}.fieldNullEnd}
</if>
<if test="conditionParamRef.containsKey('isList')"> <if test="conditionParamRef.containsKey('isList')">
<if test="conditionParamRef.isList != null "> <if test="conditionParamRef.isList != null ">
${_conditionType_} a.isList = #{${_conditionParam_}.isList} ${_conditionType_} a.isList = #{${_conditionParam_}.isList}
</if>
<if test="conditionParamRef.isList == null">
${_conditionType_} a.isList is null
</if>
</if>
<if test="conditionParamRef.containsKey('isListList')">
${_conditionType_} a.isList in
<foreach collection="conditionParamRef.isListList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('isListStart') and conditionParamRef.isListStart != null"> <if test="conditionParamRef.isList == null">
${_conditionType_} a.isList <![CDATA[ >= ]]> #{${_conditionParam_}.isListStart} ${_conditionType_} a.isList is null
</if> </if>
<if test="conditionParamRef.containsKey('isListEnd') and conditionParamRef.isListEnd != null"> </if>
${_conditionType_} a.isList <![CDATA[ <= ]]> #{${_conditionParam_}.isListEnd} <if test="conditionParamRef.containsKey('isListList')">
</if> ${_conditionType_} a.isList in
<foreach collection="conditionParamRef.isListList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isListStart') and conditionParamRef.isListStart != null">
${_conditionType_} a.isList <![CDATA[ >= ]]> #{${_conditionParam_}.isListStart}
</if>
<if test="conditionParamRef.containsKey('isListEnd') and conditionParamRef.isListEnd != null">
${_conditionType_} a.isList <![CDATA[ <= ]]> #{${_conditionParam_}.isListEnd}
</if>
<if test="conditionParamRef.containsKey('fieldOrderNo')"> <if test="conditionParamRef.containsKey('fieldOrderNo')">
<if test="conditionParamRef.fieldOrderNo != null and conditionParamRef.fieldOrderNo != ''"> <if test="conditionParamRef.fieldOrderNo != null ">
${_conditionType_} a.fieldOrderNo like #{${_conditionParam_}.fieldOrderNo} ${_conditionType_} a.fieldOrderNo = #{${_conditionParam_}.fieldOrderNo}
</if>
<if test="conditionParamRef.fieldOrderNo == null">
${_conditionType_} a.fieldOrderNo is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('fieldOrderNoList')"> <if test="conditionParamRef.fieldOrderNo == null">
${_conditionType_} a.fieldOrderNo in ${_conditionType_} a.fieldOrderNo is null
<foreach collection="conditionParamRef.fieldOrderNoList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('fieldOrderNoList')">
${_conditionType_} a.fieldOrderNo in
<foreach collection="conditionParamRef.fieldOrderNoList" open="(" close=")" index="index" item="item" separator=",">
#{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 != ''">
${_conditionType_} a.remark like #{${_conditionParam_}.remark}
</if>
<if test="conditionParamRef.remark == null">
${_conditionType_} a.remark is null
</if>
</if>
<if test="conditionParamRef.containsKey('remarkList')">
${_conditionType_} a.remark in
<foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createTime')"> <if test="conditionParamRef.containsKey('remark')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.remark != null and conditionParamRef.remark != ''">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime} ${_conditionType_} a.remark like #{${_conditionParam_}.remark}
</if>
<if test="conditionParamRef.createTime == null">
${_conditionType_} a.createTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''"> <if test="conditionParamRef.remark == null">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.remark is null
</if> </if>
<if test="conditionParamRef.containsKey('createUserId')"> </if>
<if test="conditionParamRef.createUserId != null "> <if test="conditionParamRef.containsKey('remarkList')">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId} ${_conditionType_} a.remark in
</if> <foreach collection="conditionParamRef.remarkList" open="(" close=")" index="index" item="item" separator=",">
<if test="conditionParamRef.createUserId == null"> #{item}
${_conditionType_} a.createUserId is null </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> <if test="conditionParamRef.createTime == null">
${_conditionType_} a.createUserId in ${_conditionType_} a.createTime is null
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> </if>
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null"> <if test="conditionParamRef.createUserId == null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd} ${_conditionType_} a.createUserId is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('createUserIdList')">
${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('updateTime')"> <if test="conditionParamRef.containsKey('updateTime')">
<if test="conditionParamRef.updateTime != null "> <if test="conditionParamRef.updateTime != null ">
${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime} ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
</if>
<if test="conditionParamRef.updateTime == null">
${_conditionType_} a.updateTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('updateUserId')"> <if test="conditionParamRef.updateTime == null">
<if test="conditionParamRef.updateUserId != null "> ${_conditionType_} a.updateTime is null
${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
</if>
<if test="conditionParamRef.updateUserId == null">
${_conditionType_} a.updateUserId is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdList')"> </if>
${_conditionType_} a.updateUserId in <if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> ${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
#{item} </if>
</foreach> <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
</if> ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null"> </if>
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart} <if test="conditionParamRef.containsKey('updateUserId')">
<if test="conditionParamRef.updateUserId != null ">
${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null"> <if test="conditionParamRef.updateUserId == null">
${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd} ${_conditionType_} a.updateUserId is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('updateUserIdList')">
${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if>
<if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
...@@ -716,93 +730,93 @@ ...@@ -716,93 +730,93 @@
order by order by
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=","> <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind} ${item.colName} ${item.sortKind}
</foreach> </foreach>
</trim> </trim>
</if> </if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()"> <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by order by
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')"> <if test="orderCol.containsKey('id')">
a.id a.id
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if> <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('appId')"> <if test="orderCol.containsKey('appId')">
a.appId a.appId
<if test='orderCol.appId != null and "DESC".equalsIgnoreCase(orderCol.appId)'>DESC</if> <if test='orderCol.appId != null and "DESC".equalsIgnoreCase(orderCol.appId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('fieldCode')"> <if test="orderCol.containsKey('fieldCode')">
a.fieldCode a.fieldCode
<if test='orderCol.fieldCode != null and "DESC".equalsIgnoreCase(orderCol.fieldCode)'>DESC</if> <if test='orderCol.fieldCode != null and "DESC".equalsIgnoreCase(orderCol.fieldCode)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('fieldName')"> <if test="orderCol.containsKey('fieldName')">
a.fieldName a.fieldName
<if test='orderCol.fieldName != null and "DESC".equalsIgnoreCase(orderCol.fieldName)'>DESC</if> <if test='orderCol.fieldName != null and "DESC".equalsIgnoreCase(orderCol.fieldName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('fieldType')"> <if test="orderCol.containsKey('fieldType')">
a.fieldType a.fieldType
<if test='orderCol.fieldType != null and "DESC".equalsIgnoreCase(orderCol.fieldType)'>DESC</if> <if test='orderCol.fieldType != null and "DESC".equalsIgnoreCase(orderCol.fieldType)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('dataType')"> <if test="orderCol.containsKey('dataType')">
a.dataType a.dataType
<if test='orderCol.dataType != null and "DESC".equalsIgnoreCase(orderCol.dataType)'>DESC</if> <if test='orderCol.dataType != null and "DESC".equalsIgnoreCase(orderCol.dataType)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('fieldValue')"> <if test="orderCol.containsKey('fieldValue')">
a.fieldValue a.fieldValue
<if test='orderCol.fieldValue != null and "DESC".equalsIgnoreCase(orderCol.fieldValue)'>DESC</if> <if test='orderCol.fieldValue != null and "DESC".equalsIgnoreCase(orderCol.fieldValue)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('fieldLen')"> <if test="orderCol.containsKey('fieldLen')">
a.fieldLen a.fieldLen
<if test='orderCol.fieldLen != null and "DESC".equalsIgnoreCase(orderCol.fieldLen)'>DESC</if> <if test='orderCol.fieldLen != null and "DESC".equalsIgnoreCase(orderCol.fieldLen)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('fieldNull')"> <if test="orderCol.containsKey('fieldNull')">
a.fieldNull a.fieldNull
<if test='orderCol.fieldNull != null and "DESC".equalsIgnoreCase(orderCol.fieldNull)'>DESC</if> <if test='orderCol.fieldNull != null and "DESC".equalsIgnoreCase(orderCol.fieldNull)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('isList')"> <if test="orderCol.containsKey('isList')">
a.isList a.isList
<if test='orderCol.isList != null and "DESC".equalsIgnoreCase(orderCol.isList)'>DESC</if> <if test='orderCol.isList != null and "DESC".equalsIgnoreCase(orderCol.isList)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('fieldOrderNo')"> <if test="orderCol.containsKey('fieldOrderNo')">
a.fieldOrderNo a.fieldOrderNo
<if test='orderCol.fieldOrderNo != null and "DESC".equalsIgnoreCase(orderCol.fieldOrderNo)'>DESC</if> <if test='orderCol.fieldOrderNo != null and "DESC".equalsIgnoreCase(orderCol.fieldOrderNo)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('remark')"> <if test="orderCol.containsKey('remark')">
a.remark a.remark
<if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if> <if test='orderCol.remark != null and "DESC".equalsIgnoreCase(orderCol.remark)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('createTime')">
a.createTime a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if> <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createUserId')"> <if test="orderCol.containsKey('createUserId')">
a.createUserId a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if> <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('updateTime')"> <if test="orderCol.containsKey('updateTime')">
a.updateTime a.updateTime
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('updateUserId')"> <if test="orderCol.containsKey('updateUserId')">
a.updateUserId a.updateUserId
<if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if> <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
, ,
</if> </if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
base-manager/src/main/resources/sqlmap/module/app/AppMapper.xml
View file @ 4c59864b
...@@ -15,12 +15,15 @@ ...@@ -15,12 +15,15 @@
<result property="type" column="type" /> <result property="type" column="type" />
<result property="downDevCount" column="downDevCount" /> <result property="downDevCount" column="downDevCount" />
<result property="shelves" column="shelves" /> <result property="shelves" column="shelves" />
<result property="appType" column="appType" />
<result property="fileName" column="fileName" />
<result property="filePath" column="filePath" /> <result property="filePath" column="filePath" />
<result property="distributeFilePath" column="distributeFilePath" /> <result property="distributeFilePath" column="distributeFilePath" />
<result property="version" column="version" /> <result property="version" column="version" />
<result property="summary" column="summary" /> <result property="summary" column="summary" />
<result property="notes" column="notes" />
<result property="distribute" column="distribute" /> <result property="distribute" column="distribute" />
<result property="dateUpdate" column="dateUpdate" /> <result property="dataUpdate" column="dataUpdate" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
...@@ -68,6 +71,12 @@ ...@@ -68,6 +71,12 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('shelves') or colPickMode == 1 and data.containsKey('shelves')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('shelves') or colPickMode == 1 and data.containsKey('shelves')))">
a.shelves, a.shelves,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('appType') or colPickMode == 1 and data.containsKey('appType')))">
a.appType,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileName') or colPickMode == 1 and data.containsKey('fileName')))">
a.fileName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePath') or colPickMode == 1 and data.containsKey('filePath')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePath') or colPickMode == 1 and data.containsKey('filePath')))">
a.filePath, a.filePath,
</if> </if>
...@@ -80,11 +89,14 @@ ...@@ -80,11 +89,14 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('summary') or colPickMode == 1 and data.containsKey('summary')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('summary') or colPickMode == 1 and data.containsKey('summary')))">
a.summary, a.summary,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('notes') or colPickMode == 1 and data.containsKey('notes')))">
a.notes,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('distribute') or colPickMode == 1 and data.containsKey('distribute')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('distribute') or colPickMode == 1 and data.containsKey('distribute')))">
a.distribute, a.distribute,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('dateUpdate') or colPickMode == 1 and data.containsKey('dateUpdate')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('dataUpdate') or colPickMode == 1 and data.containsKey('dataUpdate')))">
a.dateUpdate, a.dataUpdate,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime, a.createTime,
...@@ -106,18 +118,18 @@ ...@@ -106,18 +118,18 @@
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="AppEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="AppEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_app insert into mortals_sys_app
(siteId,siteName,appCode,appName,appIconPath,appThemeName,type,downDevCount,shelves,filePath,distributeFilePath,version,summary,distribute,dateUpdate,createTime,updateUserId,updateTime) (siteId,siteName,appCode,appName,appIconPath,appThemeName,type,downDevCount,shelves,appType,fileName,filePath,distributeFilePath,version,summary,notes,distribute,dataUpdate,createTime,updateUserId,updateTime)
VALUES VALUES
(#{siteId},#{siteName},#{appCode},#{appName},#{appIconPath},#{appThemeName},#{type},#{downDevCount},#{shelves},#{filePath},#{distributeFilePath},#{version},#{summary},#{distribute},#{dateUpdate},#{createTime},#{updateUserId},#{updateTime}) (#{siteId},#{siteName},#{appCode},#{appName},#{appIconPath},#{appThemeName},#{type},#{downDevCount},#{shelves},#{appType},#{fileName},#{filePath},#{distributeFilePath},#{version},#{summary},#{notes},#{distribute},#{dataUpdate},#{createTime},#{updateUserId},#{updateTime})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_app insert into mortals_sys_app
(siteId,siteName,appCode,appName,appIconPath,appThemeName,type,downDevCount,shelves,filePath,distributeFilePath,version,summary,distribute,dateUpdate,createTime,updateUserId,updateTime) (siteId,siteName,appCode,appName,appIconPath,appThemeName,type,downDevCount,shelves,appType,fileName,filePath,distributeFilePath,version,summary,notes,distribute,dataUpdate,createTime,updateUserId,updateTime)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteId},#{item.siteName},#{item.appCode},#{item.appName},#{item.appIconPath},#{item.appThemeName},#{item.type},#{item.downDevCount},#{item.shelves},#{item.filePath},#{item.distributeFilePath},#{item.version},#{item.summary},#{item.distribute},#{item.dateUpdate},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.siteId},#{item.siteName},#{item.appCode},#{item.appName},#{item.appIconPath},#{item.appThemeName},#{item.type},#{item.downDevCount},#{item.shelves},#{item.appType},#{item.fileName},#{item.filePath},#{item.distributeFilePath},#{item.version},#{item.summary},#{item.notes},#{item.distribute},#{item.dataUpdate},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach> </foreach>
</insert> </insert>
...@@ -166,6 +178,15 @@ ...@@ -166,6 +178,15 @@
<if test="(colPickMode==0 and data.containsKey('shelvesIncrement')) or (colPickMode==1 and !data.containsKey('shelvesIncrement'))"> <if test="(colPickMode==0 and data.containsKey('shelvesIncrement')) or (colPickMode==1 and !data.containsKey('shelvesIncrement'))">
a.shelves=ifnull(a.shelves,0) + #{data.shelvesIncrement}, a.shelves=ifnull(a.shelves,0) + #{data.shelvesIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('appType')) or (colPickMode==1 and !data.containsKey('appType'))">
a.appType=#{data.appType},
</if>
<if test="(colPickMode==0 and data.containsKey('appTypeIncrement')) or (colPickMode==1 and !data.containsKey('appTypeIncrement'))">
a.appType=ifnull(a.appType,0) + #{data.appTypeIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('fileName')) or (colPickMode==1 and !data.containsKey('fileName'))">
a.fileName=#{data.fileName},
</if>
<if test="(colPickMode==0 and data.containsKey('filePath')) or (colPickMode==1 and !data.containsKey('filePath'))"> <if test="(colPickMode==0 and data.containsKey('filePath')) or (colPickMode==1 and !data.containsKey('filePath'))">
a.filePath=#{data.filePath}, a.filePath=#{data.filePath},
</if> </if>
...@@ -175,20 +196,26 @@ ...@@ -175,20 +196,26 @@
<if test="(colPickMode==0 and data.containsKey('version')) or (colPickMode==1 and !data.containsKey('version'))"> <if test="(colPickMode==0 and data.containsKey('version')) or (colPickMode==1 and !data.containsKey('version'))">
a.version=#{data.version}, a.version=#{data.version},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('versionIncrement')) or (colPickMode==1 and !data.containsKey('versionIncrement'))">
a.version=ifnull(a.version,0) + #{data.versionIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('summary')) or (colPickMode==1 and !data.containsKey('summary'))"> <if test="(colPickMode==0 and data.containsKey('summary')) or (colPickMode==1 and !data.containsKey('summary'))">
a.summary=#{data.summary}, a.summary=#{data.summary},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('notes')) or (colPickMode==1 and !data.containsKey('notes'))">
a.notes=#{data.notes},
</if>
<if test="(colPickMode==0 and data.containsKey('distribute')) or (colPickMode==1 and !data.containsKey('distribute'))"> <if test="(colPickMode==0 and data.containsKey('distribute')) or (colPickMode==1 and !data.containsKey('distribute'))">
a.distribute=#{data.distribute}, a.distribute=#{data.distribute},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('distributeIncrement')) or (colPickMode==1 and !data.containsKey('distributeIncrement'))"> <if test="(colPickMode==0 and data.containsKey('distributeIncrement')) or (colPickMode==1 and !data.containsKey('distributeIncrement'))">
a.distribute=ifnull(a.distribute,0) + #{data.distributeIncrement}, a.distribute=ifnull(a.distribute,0) + #{data.distributeIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('dateUpdate')) or (colPickMode==1 and !data.containsKey('dateUpdate'))"> <if test="(colPickMode==0 and data.containsKey('dataUpdate')) or (colPickMode==1 and !data.containsKey('dataUpdate'))">
a.dateUpdate=#{data.dateUpdate}, a.dataUpdate=#{data.dataUpdate},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('dateUpdateIncrement')) or (colPickMode==1 and !data.containsKey('dateUpdateIncrement'))"> <if test="(colPickMode==0 and data.containsKey('dataUpdateIncrement')) or (colPickMode==1 and !data.containsKey('dataUpdateIncrement'))">
a.dateUpdate=ifnull(a.dateUpdate,0) + #{data.dateUpdateIncrement}, a.dataUpdate=ifnull(a.dataUpdate,0) + #{data.dataUpdateIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))"> <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime}, a.createTime=#{data.createTime},
...@@ -297,6 +324,25 @@ ...@@ -297,6 +324,25 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="appType=(case" suffix="ELSE appType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('appType')) or (colPickMode==1 and !item.containsKey('appType'))">
when a.id=#{item.id} then #{item.appType}
</when>
<when test="(colPickMode==0 and item.containsKey('appTypeIncrement')) or (colPickMode==1 and !item.containsKey('appTypeIncrement'))">
when a.id=#{item.id} then ifnull(a.appType,0) + #{item.appTypeIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="fileName=(case" suffix="ELSE fileName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('fileName')) or (colPickMode==1 and !item.containsKey('fileName'))">
when a.id=#{item.id} then #{item.fileName}
</if>
</foreach>
</trim>
<trim prefix="filePath=(case" suffix="ELSE filePath end),"> <trim prefix="filePath=(case" suffix="ELSE filePath end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('filePath')) or (colPickMode==1 and !item.containsKey('filePath'))"> <if test="(colPickMode==0 and item.containsKey('filePath')) or (colPickMode==1 and !item.containsKey('filePath'))">
...@@ -313,9 +359,14 @@ ...@@ -313,9 +359,14 @@
</trim> </trim>
<trim prefix="version=(case" suffix="ELSE version end),"> <trim prefix="version=(case" suffix="ELSE version end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('version')) or (colPickMode==1 and !item.containsKey('version'))"> <choose>
when a.id=#{item.id} then #{item.version} <when test="(colPickMode==0 and item.containsKey('version')) or (colPickMode==1 and !item.containsKey('version'))">
</if> when a.id=#{item.id} then #{item.version}
</when>
<when test="(colPickMode==0 and item.containsKey('versionIncrement')) or (colPickMode==1 and !item.containsKey('versionIncrement'))">
when a.id=#{item.id} then ifnull(a.version,0) + #{item.versionIncrement}
</when>
</choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="summary=(case" suffix="ELSE summary end),"> <trim prefix="summary=(case" suffix="ELSE summary end),">
...@@ -325,6 +376,13 @@ ...@@ -325,6 +376,13 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="notes=(case" suffix="ELSE notes end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('notes')) or (colPickMode==1 and !item.containsKey('notes'))">
when a.id=#{item.id} then #{item.notes}
</if>
</foreach>
</trim>
<trim prefix="distribute=(case" suffix="ELSE distribute end),"> <trim prefix="distribute=(case" suffix="ELSE distribute end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
...@@ -337,14 +395,14 @@ ...@@ -337,14 +395,14 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="dateUpdate=(case" suffix="ELSE dateUpdate end),"> <trim prefix="dataUpdate=(case" suffix="ELSE dataUpdate end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('dateUpdate')) or (colPickMode==1 and !item.containsKey('dateUpdate'))"> <when test="(colPickMode==0 and item.containsKey('dataUpdate')) or (colPickMode==1 and !item.containsKey('dataUpdate'))">
when a.id=#{item.id} then #{item.dateUpdate} when a.id=#{item.id} then #{item.dataUpdate}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('dateUpdateIncrement')) or (colPickMode==1 and !item.containsKey('dateUpdateIncrement'))"> <when test="(colPickMode==0 and item.containsKey('dataUpdateIncrement')) or (colPickMode==1 and !item.containsKey('dataUpdateIncrement'))">
when a.id=#{item.id} then ifnull(a.dateUpdate,0) + #{item.dateUpdateIncrement} when a.id=#{item.id} then ifnull(a.dataUpdate,0) + #{item.dataUpdateIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
...@@ -679,6 +737,42 @@ ...@@ -679,6 +737,42 @@
${_conditionType_} a.shelves <![CDATA[ <= ]]> #{${_conditionParam_}.shelvesEnd} ${_conditionType_} a.shelves <![CDATA[ <= ]]> #{${_conditionParam_}.shelvesEnd}
</if> </if>
<if test="conditionParamRef.containsKey('appType')">
<if test="conditionParamRef.appType != null ">
${_conditionType_} a.appType = #{${_conditionParam_}.appType}
</if>
<if test="conditionParamRef.appType == null">
${_conditionType_} a.appType is null
</if>
</if>
<if test="conditionParamRef.containsKey('appTypeList')">
${_conditionType_} a.appType in
<foreach collection="conditionParamRef.appTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('appTypeStart') and conditionParamRef.appTypeStart != null">
${_conditionType_} a.appType <![CDATA[ >= ]]> #{${_conditionParam_}.appTypeStart}
</if>
<if test="conditionParamRef.containsKey('appTypeEnd') and conditionParamRef.appTypeEnd != null">
${_conditionType_} a.appType <![CDATA[ <= ]]> #{${_conditionParam_}.appTypeEnd}
</if>
<if test="conditionParamRef.containsKey('fileName')">
<if test="conditionParamRef.fileName != null and conditionParamRef.fileName != ''">
${_conditionType_} a.fileName like #{${_conditionParam_}.fileName}
</if>
<if test="conditionParamRef.fileName == null">
${_conditionType_} a.fileName is null
</if>
</if>
<if test="conditionParamRef.containsKey('fileNameList')">
${_conditionType_} a.fileName in
<foreach collection="conditionParamRef.fileNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('filePath')"> <if test="conditionParamRef.containsKey('filePath')">
<if test="conditionParamRef.filePath != null and conditionParamRef.filePath != ''"> <if test="conditionParamRef.filePath != null and conditionParamRef.filePath != ''">
...@@ -709,10 +803,9 @@ ...@@ -709,10 +803,9 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('version')"> <if test="conditionParamRef.containsKey('version')">
<if test="conditionParamRef.version != null and conditionParamRef.version != ''"> <if test="conditionParamRef.version != null ">
${_conditionType_} a.version like #{${_conditionParam_}.version} ${_conditionType_} a.version = #{${_conditionParam_}.version}
</if> </if>
<if test="conditionParamRef.version == null"> <if test="conditionParamRef.version == null">
${_conditionType_} a.version is null ${_conditionType_} a.version is null
...@@ -724,6 +817,13 @@ ...@@ -724,6 +817,13 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('versionStart') and conditionParamRef.versionStart != null">
${_conditionType_} a.version <![CDATA[ >= ]]> #{${_conditionParam_}.versionStart}
</if>
<if test="conditionParamRef.containsKey('versionEnd') and conditionParamRef.versionEnd != null">
${_conditionType_} a.version <![CDATA[ <= ]]> #{${_conditionParam_}.versionEnd}
</if>
<if test="conditionParamRef.containsKey('summary')"> <if test="conditionParamRef.containsKey('summary')">
<if test="conditionParamRef.summary != null and conditionParamRef.summary != ''"> <if test="conditionParamRef.summary != null and conditionParamRef.summary != ''">
...@@ -739,6 +839,21 @@ ...@@ -739,6 +839,21 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('notes')">
<if test="conditionParamRef.notes != null and conditionParamRef.notes != ''">
${_conditionType_} a.notes like #{${_conditionParam_}.notes}
</if>
<if test="conditionParamRef.notes == null">
${_conditionType_} a.notes is null
</if>
</if>
<if test="conditionParamRef.containsKey('notesList')">
${_conditionType_} a.notes in
<foreach collection="conditionParamRef.notesList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('distribute')"> <if test="conditionParamRef.containsKey('distribute')">
<if test="conditionParamRef.distribute != null "> <if test="conditionParamRef.distribute != null ">
${_conditionType_} a.distribute = #{${_conditionParam_}.distribute} ${_conditionType_} a.distribute = #{${_conditionParam_}.distribute}
...@@ -760,25 +875,25 @@ ...@@ -760,25 +875,25 @@
${_conditionType_} a.distribute <![CDATA[ <= ]]> #{${_conditionParam_}.distributeEnd} ${_conditionType_} a.distribute <![CDATA[ <= ]]> #{${_conditionParam_}.distributeEnd}
</if> </if>
<if test="conditionParamRef.containsKey('dateUpdate')"> <if test="conditionParamRef.containsKey('dataUpdate')">
<if test="conditionParamRef.dateUpdate != null "> <if test="conditionParamRef.dataUpdate != null ">
${_conditionType_} a.dateUpdate = #{${_conditionParam_}.dateUpdate} ${_conditionType_} a.dataUpdate = #{${_conditionParam_}.dataUpdate}
</if> </if>
<if test="conditionParamRef.dateUpdate == null"> <if test="conditionParamRef.dataUpdate == null">
${_conditionType_} a.dateUpdate is null ${_conditionType_} a.dataUpdate is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('dateUpdateList')"> <if test="conditionParamRef.containsKey('dataUpdateList')">
${_conditionType_} a.dateUpdate in ${_conditionType_} a.dataUpdate in
<foreach collection="conditionParamRef.dateUpdateList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.dataUpdateList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('dateUpdateStart') and conditionParamRef.dateUpdateStart != null"> <if test="conditionParamRef.containsKey('dataUpdateStart') and conditionParamRef.dataUpdateStart != null">
${_conditionType_} a.dateUpdate <![CDATA[ >= ]]> #{${_conditionParam_}.dateUpdateStart} ${_conditionType_} a.dataUpdate <![CDATA[ >= ]]> #{${_conditionParam_}.dataUpdateStart}
</if> </if>
<if test="conditionParamRef.containsKey('dateUpdateEnd') and conditionParamRef.dateUpdateEnd != null"> <if test="conditionParamRef.containsKey('dataUpdateEnd') and conditionParamRef.dataUpdateEnd != null">
${_conditionType_} a.dateUpdate <![CDATA[ <= ]]> #{${_conditionParam_}.dateUpdateEnd} ${_conditionType_} a.dataUpdate <![CDATA[ <= ]]> #{${_conditionParam_}.dataUpdateEnd}
</if> </if>
...@@ -895,6 +1010,16 @@ ...@@ -895,6 +1010,16 @@
<if test='orderCol.shelves != null and "DESC".equalsIgnoreCase(orderCol.shelves)'>DESC</if> <if test='orderCol.shelves != null and "DESC".equalsIgnoreCase(orderCol.shelves)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('appType')">
a.appType
<if test='orderCol.appType != null and "DESC".equalsIgnoreCase(orderCol.appType)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('fileName')">
a.fileName
<if test='orderCol.fileName != null and "DESC".equalsIgnoreCase(orderCol.fileName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('filePath')"> <if test="orderCol.containsKey('filePath')">
a.filePath a.filePath
<if test='orderCol.filePath != null and "DESC".equalsIgnoreCase(orderCol.filePath)'>DESC</if> <if test='orderCol.filePath != null and "DESC".equalsIgnoreCase(orderCol.filePath)'>DESC</if>
...@@ -915,14 +1040,19 @@ ...@@ -915,14 +1040,19 @@
<if test='orderCol.summary != null and "DESC".equalsIgnoreCase(orderCol.summary)'>DESC</if> <if test='orderCol.summary != null and "DESC".equalsIgnoreCase(orderCol.summary)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('notes')">
a.notes
<if test='orderCol.notes != null and "DESC".equalsIgnoreCase(orderCol.notes)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('distribute')"> <if test="orderCol.containsKey('distribute')">
a.distribute a.distribute
<if test='orderCol.distribute != null and "DESC".equalsIgnoreCase(orderCol.distribute)'>DESC</if> <if test='orderCol.distribute != null and "DESC".equalsIgnoreCase(orderCol.distribute)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('dateUpdate')"> <if test="orderCol.containsKey('dataUpdate')">
a.dateUpdate a.dataUpdate
<if test='orderCol.dateUpdate != null and "DESC".equalsIgnoreCase(orderCol.dateUpdate)'>DESC</if> <if test='orderCol.dataUpdate != null and "DESC".equalsIgnoreCase(orderCol.dataUpdate)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('createTime')">
......
base-manager/src/main/resources/sqlmap/module/app/AppVersionMapper.xml
View file @ 4c59864b
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!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.AppVersionDaoImpl"> <mapper namespace="com.mortals.xhx.module.app.dao.ibatis.AppVersionDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
<resultMap type="AppVersionEntity" id="AppVersionEntity-Map"> <resultMap type="AppVersionEntity" id="AppVersionEntity-Map">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="appId" column="appId" /> <result property="appId" column="appId" />
<result property="appName" column="appName" /> <result property="appName" column="appName" />
<result property="version" column="version" /> <result property="version" column="version" />
<result property="notes" column="notes" /> <result property="notes" column="notes" />
<result property="createTime" column="createTime" /> <result property="fileName" column="fileName" />
<result property="updateUserId" column="updateUserId" /> <result property="filePath" column="filePath" />
<result property="updateTime" column="updateTime" /> <result property="distributeFilePath" column="distributeFilePath" />
<result property="used" column="used" />
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
</resultMap> </resultMap>
<!-- 表所有列 --> <!-- 表所有列 -->
<sql id="_columns"> <sql id="_columns">
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id, a.id,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('appId') or colPickMode == 1 and data.containsKey('appId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('appId') or colPickMode == 1 and data.containsKey('appId')))">
a.appId, a.appId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('appName') or colPickMode == 1 and data.containsKey('appName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('appName') or colPickMode == 1 and data.containsKey('appName')))">
a.appName, a.appName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('version') or colPickMode == 1 and data.containsKey('version')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('version') or colPickMode == 1 and data.containsKey('version')))">
a.version, a.version,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('notes') or colPickMode == 1 and data.containsKey('notes')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('notes') or colPickMode == 1 and data.containsKey('notes')))">
a.notes, a.notes,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('fileName') or colPickMode == 1 and data.containsKey('fileName')))">
a.createTime, a.fileName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('filePath') or colPickMode == 1 and data.containsKey('filePath')))">
a.updateUserId, a.filePath,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('distributeFilePath') or colPickMode == 1 and data.containsKey('distributeFilePath')))">
a.updateTime, a.distributeFilePath,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('used') or colPickMode == 1 and data.containsKey('used')))">
a.used,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
a.updateUserId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="AppVersionEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="AppVersionEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_app_version insert into mortals_sys_app_version
(appId,appName,version,notes,createTime,updateUserId,updateTime) (appId,appName,version,notes,fileName,filePath,distributeFilePath,used,createTime,updateUserId,updateTime)
VALUES VALUES
(#{appId},#{appName},#{version},#{notes},#{createTime},#{updateUserId},#{updateTime}) (#{appId},#{appName},#{version},#{notes},#{fileName},#{filePath},#{distributeFilePath},#{used},#{createTime},#{updateUserId},#{updateTime})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_app_version insert into mortals_sys_app_version
(appId,appName,version,notes,createTime,updateUserId,updateTime) (appId,appName,version,notes,fileName,filePath,distributeFilePath,used,createTime,updateUserId,updateTime)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.appId},#{item.appName},#{item.version},#{item.notes},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.appId},#{item.appName},#{item.version},#{item.notes},#{item.fileName},#{item.filePath},#{item.distributeFilePath},#{item.used},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach> </foreach>
</insert> </insert>
...@@ -82,9 +98,27 @@ ...@@ -82,9 +98,27 @@
<if test="(colPickMode==0 and data.containsKey('version')) or (colPickMode==1 and !data.containsKey('version'))"> <if test="(colPickMode==0 and data.containsKey('version')) or (colPickMode==1 and !data.containsKey('version'))">
a.version=#{data.version}, a.version=#{data.version},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('versionIncrement')) or (colPickMode==1 and !data.containsKey('versionIncrement'))">
a.version=ifnull(a.version,0) + #{data.versionIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('notes')) or (colPickMode==1 and !data.containsKey('notes'))"> <if test="(colPickMode==0 and data.containsKey('notes')) or (colPickMode==1 and !data.containsKey('notes'))">
a.notes=#{data.notes}, a.notes=#{data.notes},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('fileName')) or (colPickMode==1 and !data.containsKey('fileName'))">
a.fileName=#{data.fileName},
</if>
<if test="(colPickMode==0 and data.containsKey('filePath')) or (colPickMode==1 and !data.containsKey('filePath'))">
a.filePath=#{data.filePath},
</if>
<if test="(colPickMode==0 and data.containsKey('distributeFilePath')) or (colPickMode==1 and !data.containsKey('distributeFilePath'))">
a.distributeFilePath=#{data.distributeFilePath},
</if>
<if test="(colPickMode==0 and data.containsKey('used')) or (colPickMode==1 and !data.containsKey('used'))">
a.used=#{data.used},
</if>
<if test="(colPickMode==0 and data.containsKey('usedIncrement')) or (colPickMode==1 and !data.containsKey('usedIncrement'))">
a.used=ifnull(a.used,0) + #{data.usedIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))"> <if test="(colPickMode==0 and data.containsKey('createTime')) or (colPickMode==1 and !data.containsKey('createTime'))">
a.createTime=#{data.createTime}, a.createTime=#{data.createTime},
</if> </if>
...@@ -109,65 +143,103 @@ ...@@ -109,65 +143,103 @@
<update id="updateBatch" parameterType="paramDto"> <update id="updateBatch" parameterType="paramDto">
update mortals_sys_app_version as a update mortals_sys_app_version as a
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<trim prefix="appId=(case" suffix="ELSE appId end),"> <trim prefix="appId=(case" suffix="ELSE appId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('appId')) or (colPickMode==1 and !item.containsKey('appId'))"> <when test="(colPickMode==0 and item.containsKey('appId')) or (colPickMode==1 and !item.containsKey('appId'))">
when a.id=#{item.id} then #{item.appId} when a.id=#{item.id} then #{item.appId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('appIdIncrement')) or (colPickMode==1 and !item.containsKey('appIdIncrement'))"> <when test="(colPickMode==0 and item.containsKey('appIdIncrement')) or (colPickMode==1 and !item.containsKey('appIdIncrement'))">
when a.id=#{item.id} then ifnull(a.appId,0) + #{item.appIdIncrement} when a.id=#{item.id} then ifnull(a.appId,0) + #{item.appIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="appName=(case" suffix="ELSE appName end),"> <trim prefix="appName=(case" suffix="ELSE appName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('appName')) or (colPickMode==1 and !item.containsKey('appName'))"> <if test="(colPickMode==0 and item.containsKey('appName')) or (colPickMode==1 and !item.containsKey('appName'))">
when a.id=#{item.id} then #{item.appName} when a.id=#{item.id} then #{item.appName}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="version=(case" suffix="ELSE version end),"> <trim prefix="version=(case" suffix="ELSE version end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('version')) or (colPickMode==1 and !item.containsKey('version'))"> <choose>
<when test="(colPickMode==0 and item.containsKey('version')) or (colPickMode==1 and !item.containsKey('version'))">
when a.id=#{item.id} then #{item.version} when a.id=#{item.id} then #{item.version}
</if> </when>
</foreach> <when test="(colPickMode==0 and item.containsKey('versionIncrement')) or (colPickMode==1 and !item.containsKey('versionIncrement'))">
</trim> when a.id=#{item.id} then ifnull(a.version,0) + #{item.versionIncrement}
<trim prefix="notes=(case" suffix="ELSE notes end),"> </when>
<foreach collection="data.dataList" item="item" index="index" separator="" > </choose>
<if test="(colPickMode==0 and item.containsKey('notes')) or (colPickMode==1 and !item.containsKey('notes'))"> </foreach>
when a.id=#{item.id} then #{item.notes} </trim>
</if> <trim prefix="notes=(case" suffix="ELSE notes end),">
</foreach> <foreach collection="data.dataList" item="item" index="index" separator="" >
</trim> <if test="(colPickMode==0 and item.containsKey('notes')) or (colPickMode==1 and !item.containsKey('notes'))">
<trim prefix="createTime=(case" suffix="ELSE createTime end),"> when a.id=#{item.id} then #{item.notes}
<foreach collection="data.dataList" item="item" index="index" separator="" > </if>
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))"> </foreach>
when a.id=#{item.id} then #{item.createTime} </trim>
</if> <trim prefix="fileName=(case" suffix="ELSE fileName end),">
</foreach> <foreach collection="data.dataList" item="item" index="index" separator="" >
</trim> <if test="(colPickMode==0 and item.containsKey('fileName')) or (colPickMode==1 and !item.containsKey('fileName'))">
<trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),"> when a.id=#{item.id} then #{item.fileName}
<foreach collection="data.dataList" item="item" index="index" separator="" > </if>
<choose> </foreach>
<when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))"> </trim>
when a.id=#{item.id} then #{item.updateUserId} <trim prefix="filePath=(case" suffix="ELSE filePath end),">
</when> <foreach collection="data.dataList" item="item" index="index" separator="" >
<when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))"> <if test="(colPickMode==0 and item.containsKey('filePath')) or (colPickMode==1 and !item.containsKey('filePath'))">
when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement} when a.id=#{item.id} then #{item.filePath}
</when> </if>
</choose> </foreach>
</foreach> </trim>
</trim> <trim prefix="distributeFilePath=(case" suffix="ELSE distributeFilePath end),">
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),"> <foreach collection="data.dataList" item="item" index="index" separator="" >
<foreach collection="data.dataList" item="item" index="index" separator="" > <if test="(colPickMode==0 and item.containsKey('distributeFilePath')) or (colPickMode==1 and !item.containsKey('distributeFilePath'))">
<if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))"> when a.id=#{item.id} then #{item.distributeFilePath}
when a.id=#{item.id} then #{item.updateTime} </if>
</if> </foreach>
</foreach> </trim>
</trim> <trim prefix="used=(case" suffix="ELSE used end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('used')) or (colPickMode==1 and !item.containsKey('used'))">
when a.id=#{item.id} then #{item.used}
</when>
<when test="(colPickMode==0 and item.containsKey('usedIncrement')) or (colPickMode==1 and !item.containsKey('usedIncrement'))">
when a.id=#{item.id} then ifnull(a.used,0) + #{item.usedIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
when a.id=#{item.id} then #{item.createTime}
</if>
</foreach>
</trim>
<trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
when a.id=#{item.id} then #{item.updateUserId}
</when>
<when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
when a.id=#{item.id} then #{item.updateTime}
</if>
</foreach>
</trim>
</trim> </trim>
where id in where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
...@@ -284,197 +356,289 @@ ...@@ -284,197 +356,289 @@
${_conditionType_} a.id=#{${_conditionParam_}.id} ${_conditionType_} a.id=#{${_conditionParam_}.id}
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('id')"> <if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null "> <if test="conditionParamRef.id != null ">
${_conditionType_} a.id = #{${_conditionParam_}.id} ${_conditionType_} a.id = #{${_conditionParam_}.id}
</if>
<if test="conditionParamRef.id == null">
${_conditionType_} a.id is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.id == null">
${_conditionType_} a.id in ${_conditionType_} a.id is null
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null"> </if>
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart} <if test="conditionParamRef.containsKey('idList')">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('appId')">
<if test="conditionParamRef.appId != null ">
${_conditionType_} a.appId = #{${_conditionParam_}.appId}
</if> </if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null"> <if test="conditionParamRef.appId == null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd} ${_conditionType_} a.appId is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('appIdList')">
${_conditionType_} a.appId in
<foreach collection="conditionParamRef.appIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('appIdStart') and conditionParamRef.appIdStart != null">
${_conditionType_} a.appId <![CDATA[ >= ]]> #{${_conditionParam_}.appIdStart}
</if>
<if test="conditionParamRef.containsKey('appIdEnd') and conditionParamRef.appIdEnd != null">
${_conditionType_} a.appId <![CDATA[ <= ]]> #{${_conditionParam_}.appIdEnd}
</if>
<if test="conditionParamRef.containsKey('appId')">
<if test="conditionParamRef.appId != null "> <if test="conditionParamRef.containsKey('appName')">
${_conditionType_} a.appId = #{${_conditionParam_}.appId} <if test="conditionParamRef.appName != null and conditionParamRef.appName != ''">
</if> ${_conditionType_} a.appName like #{${_conditionParam_}.appName}
<if test="conditionParamRef.appId == null">
${_conditionType_} a.appId is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('appIdList')"> <if test="conditionParamRef.appName == null">
${_conditionType_} a.appId in ${_conditionType_} a.appName is null
<foreach collection="conditionParamRef.appIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('appIdStart') and conditionParamRef.appIdStart != null"> </if>
${_conditionType_} a.appId <![CDATA[ >= ]]> #{${_conditionParam_}.appIdStart} <if test="conditionParamRef.containsKey('appNameList')">
${_conditionType_} a.appName in
<foreach collection="conditionParamRef.appNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('version')">
<if test="conditionParamRef.version != null ">
${_conditionType_} a.version = #{${_conditionParam_}.version}
</if> </if>
<if test="conditionParamRef.containsKey('appIdEnd') and conditionParamRef.appIdEnd != null"> <if test="conditionParamRef.version == null">
${_conditionType_} a.appId <![CDATA[ <= ]]> #{${_conditionParam_}.appIdEnd} ${_conditionType_} a.version is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('versionList')">
${_conditionType_} a.version in
<foreach collection="conditionParamRef.versionList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('versionStart') and conditionParamRef.versionStart != null">
${_conditionType_} a.version <![CDATA[ >= ]]> #{${_conditionParam_}.versionStart}
</if>
<if test="conditionParamRef.containsKey('versionEnd') and conditionParamRef.versionEnd != null">
${_conditionType_} a.version <![CDATA[ <= ]]> #{${_conditionParam_}.versionEnd}
</if>
<if test="conditionParamRef.containsKey('appName')"> <if test="conditionParamRef.containsKey('notes')">
<if test="conditionParamRef.appName != null and conditionParamRef.appName != ''"> <if test="conditionParamRef.notes != null and conditionParamRef.notes != ''">
${_conditionType_} a.appName like #{${_conditionParam_}.appName} ${_conditionType_} a.notes like #{${_conditionParam_}.notes}
</if>
<if test="conditionParamRef.appName == null">
${_conditionType_} a.appName is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('appNameList')"> <if test="conditionParamRef.notes == null">
${_conditionType_} a.appName in ${_conditionType_} a.notes is null
<foreach collection="conditionParamRef.appNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('notesList')">
${_conditionType_} a.notes in
<foreach collection="conditionParamRef.notesList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('version')"> <if test="conditionParamRef.containsKey('fileName')">
<if test="conditionParamRef.version != null and conditionParamRef.version != ''"> <if test="conditionParamRef.fileName != null and conditionParamRef.fileName != ''">
${_conditionType_} a.version like #{${_conditionParam_}.version} ${_conditionType_} a.fileName like #{${_conditionParam_}.fileName}
</if>
<if test="conditionParamRef.version == null">
${_conditionType_} a.version is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('versionList')"> <if test="conditionParamRef.fileName == null">
${_conditionType_} a.version in ${_conditionType_} a.fileName is null
<foreach collection="conditionParamRef.versionList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('fileNameList')">
${_conditionType_} a.fileName in
<foreach collection="conditionParamRef.fileNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('notes')"> <if test="conditionParamRef.containsKey('filePath')">
<if test="conditionParamRef.notes != null and conditionParamRef.notes != ''"> <if test="conditionParamRef.filePath != null and conditionParamRef.filePath != ''">
${_conditionType_} a.notes like #{${_conditionParam_}.notes} ${_conditionType_} a.filePath like #{${_conditionParam_}.filePath}
</if>
<if test="conditionParamRef.notes == null">
${_conditionType_} a.notes is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('notesList')"> <if test="conditionParamRef.filePath == null">
${_conditionType_} a.notes in ${_conditionType_} a.filePath is null
<foreach collection="conditionParamRef.notesList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('filePathList')">
${_conditionType_} a.filePath in
<foreach collection="conditionParamRef.filePathList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createTime')"> <if test="conditionParamRef.containsKey('distributeFilePath')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.distributeFilePath != null and conditionParamRef.distributeFilePath != ''">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime} ${_conditionType_} a.distributeFilePath like #{${_conditionParam_}.distributeFilePath}
</if>
<if test="conditionParamRef.createTime == null">
${_conditionType_} a.createTime is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''"> <if test="conditionParamRef.distributeFilePath == null">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.distributeFilePath is null
</if> </if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''"> </if>
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') <if test="conditionParamRef.containsKey('distributeFilePathList')">
${_conditionType_} a.distributeFilePath in
<foreach collection="conditionParamRef.distributeFilePathList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('used')">
<if test="conditionParamRef.used != null ">
${_conditionType_} a.used = #{${_conditionParam_}.used}
</if> </if>
<if test="conditionParamRef.containsKey('updateUserId')"> <if test="conditionParamRef.used == null">
<if test="conditionParamRef.updateUserId != null "> ${_conditionType_} a.used is null
${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
</if>
<if test="conditionParamRef.updateUserId == null">
${_conditionType_} a.updateUserId is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdList')"> </if>
${_conditionType_} a.updateUserId in <if test="conditionParamRef.containsKey('usedList')">
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> ${_conditionType_} a.used in
#{item} <foreach collection="conditionParamRef.usedList" open="(" close=")" index="index" item="item" separator=",">
</foreach> #{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('usedStart') and conditionParamRef.usedStart != null">
${_conditionType_} a.used <![CDATA[ >= ]]> #{${_conditionParam_}.usedStart}
</if>
<if test="conditionParamRef.containsKey('usedEnd') and conditionParamRef.usedEnd != null">
${_conditionType_} a.used <![CDATA[ <= ]]> #{${_conditionParam_}.usedEnd}
</if>
<if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</if>
<if test="conditionParamRef.createTime == null">
${_conditionType_} a.createTime is null
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null"> </if>
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart} <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('updateUserId')">
<if test="conditionParamRef.updateUserId != null ">
${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null"> <if test="conditionParamRef.updateUserId == null">
${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd} ${_conditionType_} a.updateUserId is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('updateUserIdList')">
${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if>
<if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('updateTime')"> <if test="conditionParamRef.containsKey('updateTime')">
<if test="conditionParamRef.updateTime != null "> <if test="conditionParamRef.updateTime != null ">
${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime} ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
</if>
<if test="conditionParamRef.updateTime == null">
${_conditionType_} a.updateTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.updateTime == null">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.updateTime is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
order by order by
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=","> <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind} ${item.colName} ${item.sortKind}
</foreach> </foreach>
</trim> </trim>
</if> </if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()"> <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by order by
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')"> <if test="orderCol.containsKey('id')">
a.id a.id
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if> <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('appId')"> <if test="orderCol.containsKey('appId')">
a.appId a.appId
<if test='orderCol.appId != null and "DESC".equalsIgnoreCase(orderCol.appId)'>DESC</if> <if test='orderCol.appId != null and "DESC".equalsIgnoreCase(orderCol.appId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('appName')"> <if test="orderCol.containsKey('appName')">
a.appName a.appName
<if test='orderCol.appName != null and "DESC".equalsIgnoreCase(orderCol.appName)'>DESC</if> <if test='orderCol.appName != null and "DESC".equalsIgnoreCase(orderCol.appName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('version')"> <if test="orderCol.containsKey('version')">
a.version a.version
<if test='orderCol.version != null and "DESC".equalsIgnoreCase(orderCol.version)'>DESC</if> <if test='orderCol.version != null and "DESC".equalsIgnoreCase(orderCol.version)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('notes')"> <if test="orderCol.containsKey('notes')">
a.notes a.notes
<if test='orderCol.notes != null and "DESC".equalsIgnoreCase(orderCol.notes)'>DESC</if> <if test='orderCol.notes != null and "DESC".equalsIgnoreCase(orderCol.notes)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('fileName')">
a.createTime a.fileName
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if> <if test='orderCol.fileName != null and "DESC".equalsIgnoreCase(orderCol.fileName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('updateUserId')"> <if test="orderCol.containsKey('filePath')">
a.updateUserId a.filePath
<if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if> <if test='orderCol.filePath != null and "DESC".equalsIgnoreCase(orderCol.filePath)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('updateTime')"> <if test="orderCol.containsKey('distributeFilePath')">
a.updateTime a.distributeFilePath
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.distributeFilePath != null and "DESC".equalsIgnoreCase(orderCol.distributeFilePath)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('used')">
a.used
<if test='orderCol.used != null and "DESC".equalsIgnoreCase(orderCol.used)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createTime')">
a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('updateUserId')">
a.updateUserId
<if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('updateTime')">
a.updateTime
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
base-manager/src/test/java/com/mortals/httpclient/app/AppController.http
View file @ 4c59864b
...@@ -34,17 +34,41 @@ Content-Type: application/json ...@@ -34,17 +34,41 @@ Content-Type: application/json
{ {
"siteId":3, "siteId":3,
"siteName":"汇东县", "siteName":"汇东县",
"appCode":"cheshi", "appCode":"ckp",
"appName":"测试应用", "appName":"测试应用",
"appIconPath":"/file/preview/196089969797.jpg", "appIconPath":"/file/preview/196089969797.jpg",
"appThemeName":"应用程序", "appThemeName":"应用程序",
"type":1, "type":1,
"downDevCount":0, "downDevCount":0,
"shelves":0, "shelves":0,
"filePath":"file/uploadfile/1661928678354.zip", "fileName":"窗口屏.zip",
"version":"1.0", "filePath":"/file/uploadfile/1661928678354.zip",
"summary":"vyk2sq", "summary":"vyk2sq"
"distribute":0 }
> {%
client.global.set("App_id", JSON.parse(response.body).data.id);
%}
###自助终端应用更新
POST {{baseUrl}}/app/save
Authorization: {{authToken}}
Content-Type: application/json
{
"id":6,
"siteName":"汇东县",
"appCode":"ckp",
"appName":"测试应用1",
"appIconPath":"/file/preview/196089969797.jpg",
"appThemeName":"应用程序",
"type":1,
"downDevCount":0,
"shelves":0,
"fileName":"窗口屏1.zip",
"filePath":"/file/uploadfile/1664180492089.zip",
"summary":"vyk2sq"
} }
> {% > {%
......
base-manager/src/test/java/com/mortals/httpclient/app/AppVersionController.http
View file @ 4c59864b
...@@ -61,5 +61,13 @@ Authorization: {{authToken}} ...@@ -61,5 +61,13 @@ Authorization: {{authToken}}
Accept: application/json Accept: application/json
###自助终端应用版本使用
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