Skip to content

S
smart_gov_platform
Commit 123402ec authored by 赵啸非's avatar 赵啸非
Browse files
Options

添加应用serviceApi参数字段

parent af583dd2
Hide whitespace changes
Inline Side-by-side
Showing with 919 additions and 109 deletions
base-manager/db/base_modules.sql
View file @ 123402ec
...@@ -945,6 +945,7 @@ CREATE TABLE mortals_sys_app( ...@@ -945,6 +945,7 @@ CREATE TABLE mortals_sys_app(
`appThemeName` varchar(256) COMMENT '应用主题名称', `appThemeName` varchar(256) COMMENT '应用主题名称',
`type` tinyint(2) DEFAULT '1' COMMENT '类型(1.终端应用,2.移动端应用)', `type` tinyint(2) DEFAULT '1' COMMENT '类型(1.终端应用,2.移动端应用)',
`url` varchar(255) COMMENT '链接地址', `url` varchar(255) COMMENT '链接地址',
`serviceApi` varchar(255) COMMENT '服务接口地址',
`downDevCount` int(4) DEFAULT '0' COMMENT '下发设备次数', `downDevCount` int(4) DEFAULT '0' COMMENT '下发设备次数',
`shelves` tinyint(2) DEFAULT '0' COMMENT '是否上架(0.下架，1.上架)', `shelves` tinyint(2) DEFAULT '0' COMMENT '是否上架(0.下架，1.上架)',
`appType` tinyint(2) DEFAULT '1' COMMENT '类型(1.应用程序,2.url)', `appType` tinyint(2) DEFAULT '1' COMMENT '类型(1.应用程序,2.url)',
......
base-manager/doc/api.md
View file @ 123402ec
...@@ -9124,41 +9124,44 @@ type|Integer|否|类型(1.终端应用,2.移动端应用) ...@@ -9124,41 +9124,44 @@ type|Integer|否|类型(1.终端应用,2.移动端应用)
参数名称| 参数类型 |描述 参数名称| 参数类型 |描述
:---|:--------|:------ :---|:--------|:------
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，主键，自增长
  siteId| Long |站点Id   siteId|Long|站点Id
  siteName| String |站点名称   siteName|String|站点名称
  appCode| String |应用编码   appCode|String|应用编码
  appName| String |应用名称   appName|String|应用名称
  appIconPath| String |应用图标   appIconPath|String|应用图标
  appThemeName| String |应用主题名称   appThemeName|String|应用主题名称
  type| Integer |类型(1.终端应用,2.移动端应用)   type|Integer|类型(1.终端应用,2.移动端应用)
  downDevCount| Integer |下发设备次数   url|String|链接地址
  shelves| Integer |是否上架(1.上架，0.下架)   downDevCount|Integer|下发设备次数
  filePath| String |文件相对路径地址   shelves|Integer|是否上架(0.下架，1.上架)
  distributeFilePath| String |文件部署路径地址   appType|Integer|类型(1.应用程序,2.url)
  version| String |当前版本   fileName|String|文件名称
  summary| String |简介   filePath|String|文件相对路径地址
  distribute| Integer |是否部署(0.否，1.是)   distributeFilePath|String|文件部署路径地址
  dataUpdate| Integer |是否数据更新(0.否，1.是)   version|Integer|当前版本
  appDatasetList| array |数据结果集   summary|String|简介
  applianceSiteScope| Integer |适用站点范围数量   notes|String|更新说明
  siteIdList| array |适用范围站点列表   distribute|Integer|是否部署(0.否，1.是)
  createTime| Date |创建时间   dataUpdate|Integer|是否数据更新(0.否，1.是)
  updateUserId| Long |更新用户   createTime|Date|创建时间
  updateTime| Date |更新时间   updateUserId|Long|更新用户
dict| object |字典对象   updateTime|Date|更新时间
 type| object |字典属性对象，详见附录   serviceApi|String|服务接口地址
 shelves| object |字典属性对象，详见附录 dict|object|字典对象
 distribute| object |字典属性对象，详见附录  type|object|字典属性对象，详见附录
 dateUpdate| object |字典属性对象，详见附录  shelves|object|字典属性对象，详见附录
 appType|object|字典属性对象，详见附录
 distribute|object|字典属性对象，详见附录
 dataUpdate|object|字典属性对象，详见附录
**响应消息样例:** **响应消息样例:**
...@@ -9207,22 +9210,28 @@ data|object|数据对象 ...@@ -9207,22 +9210,28 @@ data|object|数据对象
 appIconPath|String|应用图标  appIconPath|String|应用图标
 appThemeName|String|应用主题名称  appThemeName|String|应用主题名称
 type|Integer|类型(1.终端应用,2.移动端应用)  type|Integer|类型(1.终端应用,2.移动端应用)
 url|String|链接地址
 downDevCount|Integer|下发设备次数  downDevCount|Integer|下发设备次数
 shelves|Integer|是否上架(1.上架，0.下架)  shelves|Integer|是否上架(0.下架，1.上架)
 appType|Integer|类型(1.应用程序,2.url)
 fileName|String|文件名称
 filePath|String|文件相对路径地址  filePath|String|文件相对路径地址
 distributeFilePath|String|文件部署路径地址  distributeFilePath|String|文件部署路径地址
 version|String|当前版本  version|Integer|当前版本
 summary|String|简介  summary|String|简介
 notes|String|更新说明
 distribute|Integer|是否部署(0.否，1.是)  distribute|Integer|是否部署(0.否，1.是)
 dateUpdate|Integer|是否数据更新(0.否，1.是)  dataUpdate|Integer|是否数据更新(0.否，1.是)
 createTime|Date|创建时间  createTime|Date|创建时间
 updateUserId|Long|更新用户  updateUserId|Long|更新用户
 updateTime|Date|更新时间  updateTime|Date|更新时间
 serviceApi|String|服务接口地址
dict|object|字典对象 dict|object|字典对象
 type|object|字典属性对象，详见附录  type|object|字典属性对象，详见附录
 shelves|object|字典属性对象，详见附录  shelves|object|字典属性对象，详见附录
 appType|object|字典属性对象，详见附录
 distribute|object|字典属性对象，详见附录  distribute|object|字典属性对象，详见附录
 dateUpdate|object|字典属性对象，详见附录  dataUpdate|object|字典属性对象，详见附录
**响应消息样例:** **响应消息样例:**
...@@ -9274,11 +9283,19 @@ appName|String|否|应用名称 ...@@ -9274,11 +9283,19 @@ appName|String|否|应用名称
appIconPath|String|否|应用图标 appIconPath|String|否|应用图标
appThemeName|String|否|应用主题名称 appThemeName|String|否|应用主题名称
type|Integer|否|类型(1.终端应用,2.移动端应用) type|Integer|否|类型(1.终端应用,2.移动端应用)
appType|Integer|否|类型(1.应用程序,2.url) url|String|否|链接地址
downDevCount|Integer|否|下发设备次数
shelves|Integer|否|是否上架(0.下架，1.上架) shelves|Integer|否|是否上架(0.下架，1.上架)
appType|Integer|否|类型(1.应用程序,2.url)
fileName|String|否|文件名称
filePath|String|否|文件相对路径地址 filePath|String|否|文件相对路径地址
distributeFilePath|String|否|文件部署路径地址
version|Integer|否|当前版本
summary|String|否|简介 summary|String|否|简介
notes|String|否|更新说明
distribute|Integer|否|是否部署(0.否，1.是)
dataUpdate|Integer|否|是否数据更新(0.否，1.是) dataUpdate|Integer|否|是否数据更新(0.否，1.是)
serviceApi|String|否|服务接口地址
**请求样例:** **请求样例:**
......
base-manager/src/main/java/com/mortals/xhx/module/app/model/AppEntity.java
View file @ 123402ec
...@@ -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-12-14 * @date 2023-01-07
*/ */
public class AppEntity extends AppVo { public class AppEntity extends AppVo {
...@@ -93,6 +93,10 @@ public class AppEntity extends AppVo { ...@@ -93,6 +93,10 @@ public class AppEntity extends AppVo {
* 是否数据更新(0.否，1.是) * 是否数据更新(0.否，1.是)
*/ */
private Integer dataUpdate; private Integer dataUpdate;
/**
* 服务接口地址
*/
private String serviceApi;
/** /**
* 自助终端应用数据集信息 * 自助终端应用数据集信息
...@@ -367,6 +371,20 @@ public class AppEntity extends AppVo { ...@@ -367,6 +371,20 @@ public class AppEntity extends AppVo {
public void setDataUpdate(Integer dataUpdate){ public void setDataUpdate(Integer dataUpdate){
this.dataUpdate = dataUpdate; this.dataUpdate = dataUpdate;
} }
/**
* 获取 服务接口地址
* @return String
*/
public String getServiceApi(){
return serviceApi;
}
/**
* 设置 服务接口地址
* @param serviceApi
*/
public void setServiceApi(String serviceApi){
this.serviceApi = serviceApi;
}
public List<AppDatasetEntity> getAppDatasetList(){ public List<AppDatasetEntity> getAppDatasetList(){
...@@ -415,6 +433,7 @@ public class AppEntity extends AppVo { ...@@ -415,6 +433,7 @@ public class AppEntity extends AppVo {
sb.append(",notes:").append(getNotes()); sb.append(",notes:").append(getNotes());
sb.append(",distribute:").append(getDistribute()); sb.append(",distribute:").append(getDistribute());
sb.append(",dataUpdate:").append(getDataUpdate()); sb.append(",dataUpdate:").append(getDataUpdate());
sb.append(",serviceApi:").append(getServiceApi());
return sb.toString(); return sb.toString();
} }
...@@ -457,5 +476,7 @@ public class AppEntity extends AppVo { ...@@ -457,5 +476,7 @@ public class AppEntity extends AppVo {
this.distribute = 0; this.distribute = 0;
this.dataUpdate = 0; this.dataUpdate = 0;
this.serviceApi = "";
} }
} }
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/app/model/AppQuery.java
View file @ 123402ec
...@@ -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-12-14 * @date 2023-01-07
*/ */
public class AppQuery extends AppEntity { public class AppQuery extends AppEntity {
/** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
...@@ -175,6 +175,9 @@ public class AppQuery extends AppEntity { ...@@ -175,6 +175,9 @@ public class AppQuery extends AppEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 服务接口地址 */
private List<String> serviceApiList;
/** 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) */
private List<AppQuery> orConditionList; private List<AppQuery> orConditionList;
...@@ -1052,6 +1055,21 @@ public class AppQuery extends AppEntity { ...@@ -1052,6 +1055,21 @@ public class AppQuery extends AppEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 服务接口地址
* @return serviceApiList
*/
public List<String> getServiceApiList(){
return this.serviceApiList;
}
/**
* 设置 服务接口地址
* @param serviceApiList
*/
public void setServiceApiList(List<String> serviceApiList){
this.serviceApiList = serviceApiList;
}
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param id * @param id
...@@ -1713,6 +1731,25 @@ public class AppQuery extends AppEntity { ...@@ -1713,6 +1731,25 @@ public class AppQuery extends AppEntity {
} }
/**
* 设置 服务接口地址
* @param serviceApi
*/
public AppQuery serviceApi(String serviceApi){
setServiceApi(serviceApi);
return this;
}
/**
* 设置 服务接口地址
* @param serviceApiList
*/
public AppQuery serviceApiList(List<String> serviceApiList){
this.serviceApiList = serviceApiList;
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
......
base-manager/src/main/resources/sqlmap/module/app/AppDatasetMapper.xml
View file @ 123402ec
<?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.AppDatasetDaoImpl"> <mapper namespace="com.mortals.xhx.module.app.dao.ibatis.AppDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
<resultMap type="AppDatasetEntity" id="AppDatasetEntity-Map"> <resultMap type="AppEntity" id="AppEntity-Map">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="appId" column="appId" /> <result property="siteId" column="siteId" />
<result property="siteName" column="siteName" />
<result property="appCode" column="appCode" />
<result property="appName" column="appName" />
<result property="appIconPath" column="appIconPath" />
<result property="appThemeName" column="appThemeName" />
<result property="type" column="type" />
<result property="url" column="url" />
<result property="downDevCount" column="downDevCount" />
<result property="shelves" column="shelves" />
<result property="appType" column="appType" />
<result property="fileName" column="fileName" />
<result property="filePath" column="filePath" />
<result property="distributeFilePath" column="distributeFilePath" />
<result property="version" column="version" />
<result property="summary" column="summary" />
<result property="notes" column="notes" />
<result property="distribute" column="distribute" />
<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" />
<collection property="appInfoFieldList" column="id" ofType="AppInfoFieldEntity" javaType="ArrayList" select="getAppInfoFieldByDatasetId"></collection> <result property="serviceApi" column="serviceApi" />
<collection property="appDatasetList" column="id" ofType="AppDatasetEntity" javaType="ArrayList" select="getAppDatasetByAppId"></collection>
</resultMap> </resultMap>
<resultMap type="AppInfoFieldEntity" id="AppInfoFieldEntity-Map"> <resultMap type="AppDatasetEntity" id="AppDatasetEntity-Map">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="datasetId" column="datasetId" /> <result property="appId" column="appId" />
<result property="fieldCode" column="fieldCode" />
<result property="fieldName" column="fieldName" />
<result property="fieldType" column="fieldType" />
<result property="dataType" column="dataType" />
<result property="fieldValue" column="fieldValue" />
<result property="fieldLen" column="fieldLen" />
<result property="fieldNull" column="fieldNull" />
<result property="isList" column="isList" />
<result property="fieldOrderNo" column="fieldOrderNo" />
<result property="remark" column="remark" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" />
<result property="updateTime" column="updateTime" />
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
</resultMap> </resultMap>
...@@ -38,8 +46,62 @@ ...@@ -38,8 +46,62 @@
<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('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.appId, a.siteId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
a.siteName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('appCode') or colPickMode == 1 and data.containsKey('appCode')))">
a.appCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('appName') or colPickMode == 1 and data.containsKey('appName')))">
a.appName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('appIconPath') or colPickMode == 1 and data.containsKey('appIconPath')))">
a.appIconPath,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('appThemeName') or colPickMode == 1 and data.containsKey('appThemeName')))">
a.appThemeName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('type') or colPickMode == 1 and data.containsKey('type')))">
a.type,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('url') or colPickMode == 1 and data.containsKey('url')))">
a.url,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('downDevCount') or colPickMode == 1 and data.containsKey('downDevCount')))">
a.downDevCount,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('shelves') or colPickMode == 1 and data.containsKey('shelves')))">
a.shelves,
</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')))">
a.filePath,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('distributeFilePath') or colPickMode == 1 and data.containsKey('distributeFilePath')))">
a.distributeFilePath,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('version') or colPickMode == 1 and data.containsKey('version')))">
a.version,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('summary') or colPickMode == 1 and data.containsKey('summary')))">
a.summary,
</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')))">
a.distribute,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('dataUpdate') or colPickMode == 1 and data.containsKey('dataUpdate')))">
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,
...@@ -50,43 +112,121 @@ ...@@ -50,43 +112,121 @@
<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('serviceApi') or colPickMode == 1 and data.containsKey('serviceApi')))">
a.serviceApi,
</if>
</trim> </trim>
</sql> </sql>
<!-- 子表所有列 --> <!-- 子表所有列 -->
<sql id="_columns_sub"> <sql id="_columns_sub">
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
b.id,b.datasetId,b.fieldCode,b.fieldName,b.fieldType,b.dataType,b.fieldValue,b.fieldLen,b.fieldNull,b.isList,b.fieldOrderNo,b.remark,b.createTime,b.createUserId,b.updateTime,b.updateUserId, b.id,b.appId,b.createTime,b.updateUserId,b.updateTime,
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="AppDatasetEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="AppEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_app_dataset insert into mortals_sys_app
(appId,createTime,updateUserId,updateTime) (siteId,siteName,appCode,appName,appIconPath,appThemeName,type,url,downDevCount,shelves,appType,fileName,filePath,distributeFilePath,version,summary,notes,distribute,dataUpdate,createTime,updateUserId,updateTime,serviceApi)
VALUES VALUES
(#{appId},#{createTime},#{updateUserId},#{updateTime}) (#{siteId},#{siteName},#{appCode},#{appName},#{appIconPath},#{appThemeName},#{type},#{url},#{downDevCount},#{shelves},#{appType},#{fileName},#{filePath},#{distributeFilePath},#{version},#{summary},#{notes},#{distribute},#{dataUpdate},#{createTime},#{updateUserId},#{updateTime},#{serviceApi})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_app_dataset insert into mortals_sys_app
(appId,createTime,updateUserId,updateTime) (siteId,siteName,appCode,appName,appIconPath,appThemeName,type,url,downDevCount,shelves,appType,fileName,filePath,distributeFilePath,version,summary,notes,distribute,dataUpdate,createTime,updateUserId,updateTime,serviceApi)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.appId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.siteId},#{item.siteName},#{item.appCode},#{item.appName},#{item.appIconPath},#{item.appThemeName},#{item.type},#{item.url},#{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},#{item.serviceApi})
</foreach> </foreach>
</insert> </insert>
<!-- 根据ParamDto更新 --> <!-- 根据ParamDto更新 -->
<update id="update" parameterType="paramDto"> <update id="update" parameterType="paramDto">
update mortals_sys_app_dataset as a update mortals_sys_app as a
set set
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('appId')) or (colPickMode==1 and !data.containsKey('appId'))"> <if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
a.appId=#{data.appId}, a.siteId=#{data.siteId},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('siteName')) or (colPickMode==1 and !data.containsKey('siteName'))">
a.siteName=#{data.siteName},
</if>
<if test="(colPickMode==0 and data.containsKey('appCode')) or (colPickMode==1 and !data.containsKey('appCode'))">
a.appCode=#{data.appCode},
</if>
<if test="(colPickMode==0 and data.containsKey('appName')) or (colPickMode==1 and !data.containsKey('appName'))">
a.appName=#{data.appName},
</if>
<if test="(colPickMode==0 and data.containsKey('appIconPath')) or (colPickMode==1 and !data.containsKey('appIconPath'))">
a.appIconPath=#{data.appIconPath},
</if>
<if test="(colPickMode==0 and data.containsKey('appThemeName')) or (colPickMode==1 and !data.containsKey('appThemeName'))">
a.appThemeName=#{data.appThemeName},
</if>
<if test="(colPickMode==0 and data.containsKey('type')) or (colPickMode==1 and !data.containsKey('type'))">
a.type=#{data.type},
</if>
<if test="(colPickMode==0 and data.containsKey('typeIncrement')) or (colPickMode==1 and !data.containsKey('typeIncrement'))">
a.type=ifnull(a.type,0) + #{data.typeIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('url')) or (colPickMode==1 and !data.containsKey('url'))">
a.url=#{data.url},
</if>
<if test="(colPickMode==0 and data.containsKey('downDevCount')) or (colPickMode==1 and !data.containsKey('downDevCount'))">
a.downDevCount=#{data.downDevCount},
</if>
<if test="(colPickMode==0 and data.containsKey('downDevCountIncrement')) or (colPickMode==1 and !data.containsKey('downDevCountIncrement'))">
a.downDevCount=ifnull(a.downDevCount,0) + #{data.downDevCountIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('shelves')) or (colPickMode==1 and !data.containsKey('shelves'))">
a.shelves=#{data.shelves},
</if>
<if test="(colPickMode==0 and data.containsKey('shelvesIncrement')) or (colPickMode==1 and !data.containsKey('shelvesIncrement'))">
a.shelves=ifnull(a.shelves,0) + #{data.shelvesIncrement},
</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'))">
a.filePath=#{data.filePath},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('appIdIncrement')) or (colPickMode==1 and !data.containsKey('appIdIncrement'))"> <if test="(colPickMode==0 and data.containsKey('distributeFilePath')) or (colPickMode==1 and !data.containsKey('distributeFilePath'))">
a.appId=ifnull(a.appId,0) + #{data.appIdIncrement}, a.distributeFilePath=#{data.distributeFilePath},
</if>
<if test="(colPickMode==0 and data.containsKey('version')) or (colPickMode==1 and !data.containsKey('version'))">
a.version=#{data.version},
</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'))">
a.summary=#{data.summary},
</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'))">
a.distribute=#{data.distribute},
</if>
<if test="(colPickMode==0 and data.containsKey('distributeIncrement')) or (colPickMode==1 and !data.containsKey('distributeIncrement'))">
a.distribute=ifnull(a.distribute,0) + #{data.distributeIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('dataUpdate')) or (colPickMode==1 and !data.containsKey('dataUpdate'))">
a.dataUpdate=#{data.dataUpdate},
</if>
<if test="(colPickMode==0 and data.containsKey('dataUpdateIncrement')) or (colPickMode==1 and !data.containsKey('dataUpdateIncrement'))">
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},
...@@ -100,6 +240,9 @@ ...@@ -100,6 +240,9 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('serviceApi')) or (colPickMode==1 and !data.containsKey('serviceApi'))">
a.serviceApi=#{data.serviceApi},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -110,16 +253,177 @@ ...@@ -110,16 +253,177 @@
</update> </update>
<!-- 批量更新 --> <!-- 批量更新 -->
<update id="updateBatch" parameterType="paramDto"> <update id="updateBatch" parameterType="paramDto">
update mortals_sys_app_dataset as a update mortals_sys_app as a
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<trim prefix="appId=(case" suffix="ELSE appId end),"> <trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId}
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="siteName=(case" suffix="ELSE siteName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('siteName')) or (colPickMode==1 and !item.containsKey('siteName'))">
when a.id=#{item.id} then #{item.siteName}
</if>
</foreach>
</trim>
<trim prefix="appCode=(case" suffix="ELSE appCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('appCode')) or (colPickMode==1 and !item.containsKey('appCode'))">
when a.id=#{item.id} then #{item.appCode}
</if>
</foreach>
</trim>
<trim prefix="appName=(case" suffix="ELSE appName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('appName')) or (colPickMode==1 and !item.containsKey('appName'))">
when a.id=#{item.id} then #{item.appName}
</if>
</foreach>
</trim>
<trim prefix="appIconPath=(case" suffix="ELSE appIconPath end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('appIconPath')) or (colPickMode==1 and !item.containsKey('appIconPath'))">
when a.id=#{item.id} then #{item.appIconPath}
</if>
</foreach>
</trim>
<trim prefix="appThemeName=(case" suffix="ELSE appThemeName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('appThemeName')) or (colPickMode==1 and !item.containsKey('appThemeName'))">
when a.id=#{item.id} then #{item.appThemeName}
</if>
</foreach>
</trim>
<trim prefix="type=(case" suffix="ELSE type 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('type')) or (colPickMode==1 and !item.containsKey('type'))">
when a.id=#{item.id} then #{item.appId} when a.id=#{item.id} then #{item.type}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('appIdIncrement')) or (colPickMode==1 and !item.containsKey('appIdIncrement'))"> <when test="(colPickMode==0 and item.containsKey('typeIncrement')) or (colPickMode==1 and !item.containsKey('typeIncrement'))">
when a.id=#{item.id} then ifnull(a.appId,0) + #{item.appIdIncrement} when a.id=#{item.id} then ifnull(a.type,0) + #{item.typeIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="url=(case" suffix="ELSE url end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('url')) or (colPickMode==1 and !item.containsKey('url'))">
when a.id=#{item.id} then #{item.url}
</if>
</foreach>
</trim>
<trim prefix="downDevCount=(case" suffix="ELSE downDevCount end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('downDevCount')) or (colPickMode==1 and !item.containsKey('downDevCount'))">
when a.id=#{item.id} then #{item.downDevCount}
</when>
<when test="(colPickMode==0 and item.containsKey('downDevCountIncrement')) or (colPickMode==1 and !item.containsKey('downDevCountIncrement'))">
when a.id=#{item.id} then ifnull(a.downDevCount,0) + #{item.downDevCountIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="shelves=(case" suffix="ELSE shelves end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('shelves')) or (colPickMode==1 and !item.containsKey('shelves'))">
when a.id=#{item.id} then #{item.shelves}
</when>
<when test="(colPickMode==0 and item.containsKey('shelvesIncrement')) or (colPickMode==1 and !item.containsKey('shelvesIncrement'))">
when a.id=#{item.id} then ifnull(a.shelves,0) + #{item.shelvesIncrement}
</when>
</choose>
</foreach>
</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),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('filePath')) or (colPickMode==1 and !item.containsKey('filePath'))">
when a.id=#{item.id} then #{item.filePath}
</if>
</foreach>
</trim>
<trim prefix="distributeFilePath=(case" suffix="ELSE distributeFilePath end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('distributeFilePath')) or (colPickMode==1 and !item.containsKey('distributeFilePath'))">
when a.id=#{item.id} then #{item.distributeFilePath}
</if>
</foreach>
</trim>
<trim prefix="version=(case" suffix="ELSE version end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<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>
<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>
</trim>
<trim prefix="summary=(case" suffix="ELSE summary end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('summary')) or (colPickMode==1 and !item.containsKey('summary'))">
when a.id=#{item.id} then #{item.summary}
</if>
</foreach>
</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),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('distribute')) or (colPickMode==1 and !item.containsKey('distribute'))">
when a.id=#{item.id} then #{item.distribute}
</when>
<when test="(colPickMode==0 and item.containsKey('distributeIncrement')) or (colPickMode==1 and !item.containsKey('distributeIncrement'))">
when a.id=#{item.id} then ifnull(a.distribute,0) + #{item.distributeIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="dataUpdate=(case" suffix="ELSE dataUpdate end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('dataUpdate')) or (colPickMode==1 and !item.containsKey('dataUpdate'))">
when a.id=#{item.id} then #{item.dataUpdate}
</when>
<when test="(colPickMode==0 and item.containsKey('dataUpdateIncrement')) or (colPickMode==1 and !item.containsKey('dataUpdateIncrement'))">
when a.id=#{item.id} then ifnull(a.dataUpdate,0) + #{item.dataUpdateIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
...@@ -150,6 +454,13 @@ ...@@ -150,6 +454,13 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="serviceApi=(case" suffix="ELSE serviceApi end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('serviceApi')) or (colPickMode==1 and !item.containsKey('serviceApi'))">
when a.id=#{item.id} then #{item.serviceApi}
</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=")">
...@@ -157,25 +468,25 @@ ...@@ -157,25 +468,25 @@
</foreach> </foreach>
</update> </update>
<!-- 根据主健查询 --> <!-- 根据主健查询 -->
<select id="getByKey" parameterType="paramDto" resultMap="AppDatasetEntity-Map"> <select id="getByKey" parameterType="paramDto" resultMap="AppEntity-Map">
select <include refid="_columns"/> select <include refid="_columns"/>
from mortals_sys_app_dataset as a from mortals_sys_app as a
where a.id=#{condition.id} where a.id=#{condition.id}
</select> </select>
<!-- 根据主健删除 --> <!-- 根据主健删除 -->
<delete id="deleteByKey" parameterType="paramDto"> <delete id="deleteByKey" parameterType="paramDto">
delete a.* from mortals_sys_app_dataset as a where a.id=#{condition.id} delete a.* from mortals_sys_app as a where a.id=#{condition.id}
</delete> </delete>
<!-- 根据主健删除一批，针对单一主健有效 --> <!-- 根据主健删除一批，针对单一主健有效 -->
<delete id="deleteByKeys"> <delete id="deleteByKeys">
delete from mortals_sys_app_dataset where id in delete from mortals_sys_app where id in
<foreach collection="array" item="item" index="index" open="(" separator="," close=")"> <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
#{item} #{item}
</foreach> </foreach>
</delete> </delete>
<!-- 根据主健列表删除一批，针对单一主健有效 --> <!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList"> <delete id="deleteByKeyList">
delete from mortals_sys_app_dataset where id in delete from mortals_sys_app where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")"> <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item} #{item}
</foreach> </foreach>
...@@ -183,14 +494,14 @@ ...@@ -183,14 +494,14 @@
<!-- 根据对象列表删除一批，针对单一主健有效 --> <!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList"> <delete id="deleteByEntityList">
delete from mortals_sys_app_dataset where id in delete from mortals_sys_app where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")"> <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id} #{item.id}
</foreach> </foreach>
</delete> </delete>
<!-- 根据paramDto删除一批 --> <!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto"> <delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_sys_app_dataset as a delete a.* from mortals_sys_app as a
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
<trim prefixOverrides="and" prefix=""> <trim prefixOverrides="and" prefix="">
...@@ -199,9 +510,9 @@ ...@@ -199,9 +510,9 @@
</trim> </trim>
</delete> </delete>
<!-- 获取列表 --> <!-- 获取列表 -->
<select id="getList" parameterType="paramDto" resultMap="AppDatasetEntity-Map"> <select id="getList" parameterType="paramDto" resultMap="AppEntity-Map">
select <include refid="_columns"/> select <include refid="_columns"/>
from mortals_sys_app_dataset as a from mortals_sys_app as a
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
<trim prefixOverrides="and" prefix=""> <trim prefixOverrides="and" prefix="">
...@@ -211,11 +522,11 @@ ...@@ -211,11 +522,11 @@
<include refid="_orderCols_"/> <include refid="_orderCols_"/>
</select> </select>
<!-- 获取子列表 --> <!-- 获取子列表 -->
<select id="getAppInfoFieldByDatasetId" parameterType="java.lang.Long" resultMap="AppInfoFieldEntity-Map"> <select id="getAppDatasetByAppId" parameterType="java.lang.Long" resultMap="AppDatasetEntity-Map">
select <include refid="_columns_sub"/> select <include refid="_columns_sub"/>
from mortals_sys_app_info_field as b from mortals_sys_app_dataset as b
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where b.datasetId = #{id} where b.appId = #{id}
</trim> </trim>
</select> </select>
...@@ -224,7 +535,7 @@ ...@@ -224,7 +535,7 @@
<!-- 获取 --> <!-- 获取 -->
<select id="getListCount" parameterType="paramDto" resultType="int"> <select id="getListCount" parameterType="paramDto" resultType="int">
select count(1) select count(1)
from mortals_sys_app_dataset as a from mortals_sys_app as a
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
<trim prefixOverrides="and" prefix=""> <trim prefixOverrides="and" prefix="">
...@@ -295,25 +606,337 @@ ...@@ -295,25 +606,337 @@
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd} ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if> </if>
<if test="conditionParamRef.containsKey('appId')"> <if test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.appId != null "> <if test="conditionParamRef.siteId != null ">
${_conditionType_} a.appId = #{${_conditionParam_}.appId} ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if> </if>
<if test="conditionParamRef.appId == null"> <if test="conditionParamRef.siteId == null">
${_conditionType_} a.appId is null ${_conditionType_} a.siteId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('appIdList')"> <if test="conditionParamRef.containsKey('siteIdList')">
${_conditionType_} a.appId in ${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.appIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('appIdStart') and conditionParamRef.appIdStart != null"> <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.appId <![CDATA[ >= ]]> #{${_conditionParam_}.appIdStart} ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
<if test="conditionParamRef.containsKey('siteName')">
<if test="conditionParamRef.siteName != null and conditionParamRef.siteName != ''">
${_conditionType_} a.siteName like #{${_conditionParam_}.siteName}
</if>
<if test="conditionParamRef.siteName == null">
${_conditionType_} a.siteName is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('appIdEnd') and conditionParamRef.appIdEnd != null"> <if test="conditionParamRef.containsKey('siteNameList')">
${_conditionType_} a.appId <![CDATA[ <= ]]> #{${_conditionParam_}.appIdEnd} ${_conditionType_} a.siteName in
<foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('appCode')">
<if test="conditionParamRef.appCode != null and conditionParamRef.appCode != ''">
${_conditionType_} a.appCode like #{${_conditionParam_}.appCode}
</if>
<if test="conditionParamRef.appCode == null">
${_conditionType_} a.appCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('appCodeList')">
${_conditionType_} a.appCode in
<foreach collection="conditionParamRef.appCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('appName')">
<if test="conditionParamRef.appName != null and conditionParamRef.appName != ''">
${_conditionType_} a.appName like #{${_conditionParam_}.appName}
</if>
<if test="conditionParamRef.appName == null">
${_conditionType_} a.appName is null
</if>
</if>
<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('appIconPath')">
<if test="conditionParamRef.appIconPath != null and conditionParamRef.appIconPath != ''">
${_conditionType_} a.appIconPath like #{${_conditionParam_}.appIconPath}
</if>
<if test="conditionParamRef.appIconPath == null">
${_conditionType_} a.appIconPath is null
</if>
</if>
<if test="conditionParamRef.containsKey('appIconPathList')">
${_conditionType_} a.appIconPath in
<foreach collection="conditionParamRef.appIconPathList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('appThemeName')">
<if test="conditionParamRef.appThemeName != null and conditionParamRef.appThemeName != ''">
${_conditionType_} a.appThemeName like #{${_conditionParam_}.appThemeName}
</if>
<if test="conditionParamRef.appThemeName == null">
${_conditionType_} a.appThemeName is null
</if>
</if>
<if test="conditionParamRef.containsKey('appThemeNameList')">
${_conditionType_} a.appThemeName in
<foreach collection="conditionParamRef.appThemeNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('type')">
<if test="conditionParamRef.type != null ">
${_conditionType_} a.type = #{${_conditionParam_}.type}
</if>
<if test="conditionParamRef.type == null">
${_conditionType_} a.type is null
</if>
</if>
<if test="conditionParamRef.containsKey('typeList')">
${_conditionType_} a.type in
<foreach collection="conditionParamRef.typeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('typeStart') and conditionParamRef.typeStart != null">
${_conditionType_} a.type <![CDATA[ >= ]]> #{${_conditionParam_}.typeStart}
</if>
<if test="conditionParamRef.containsKey('typeEnd') and conditionParamRef.typeEnd != null">
${_conditionType_} a.type <![CDATA[ <= ]]> #{${_conditionParam_}.typeEnd}
</if>
<if test="conditionParamRef.containsKey('url')">
<if test="conditionParamRef.url != null and conditionParamRef.url != ''">
${_conditionType_} a.url like #{${_conditionParam_}.url}
</if>
<if test="conditionParamRef.url == null">
${_conditionType_} a.url is null
</if>
</if>
<if test="conditionParamRef.containsKey('urlList')">
${_conditionType_} a.url in
<foreach collection="conditionParamRef.urlList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('downDevCount')">
<if test="conditionParamRef.downDevCount != null ">
${_conditionType_} a.downDevCount = #{${_conditionParam_}.downDevCount}
</if>
<if test="conditionParamRef.downDevCount == null">
${_conditionType_} a.downDevCount is null
</if>
</if>
<if test="conditionParamRef.containsKey('downDevCountList')">
${_conditionType_} a.downDevCount in
<foreach collection="conditionParamRef.downDevCountList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('downDevCountStart') and conditionParamRef.downDevCountStart != null">
${_conditionType_} a.downDevCount <![CDATA[ >= ]]> #{${_conditionParam_}.downDevCountStart}
</if>
<if test="conditionParamRef.containsKey('downDevCountEnd') and conditionParamRef.downDevCountEnd != null">
${_conditionType_} a.downDevCount <![CDATA[ <= ]]> #{${_conditionParam_}.downDevCountEnd}
</if>
<if test="conditionParamRef.containsKey('shelves')">
<if test="conditionParamRef.shelves != null ">
${_conditionType_} a.shelves = #{${_conditionParam_}.shelves}
</if>
<if test="conditionParamRef.shelves == null">
${_conditionType_} a.shelves is null
</if>
</if>
<if test="conditionParamRef.containsKey('shelvesList')">
${_conditionType_} a.shelves in
<foreach collection="conditionParamRef.shelvesList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('shelvesStart') and conditionParamRef.shelvesStart != null">
${_conditionType_} a.shelves <![CDATA[ >= ]]> #{${_conditionParam_}.shelvesStart}
</if>
<if test="conditionParamRef.containsKey('shelvesEnd') and conditionParamRef.shelvesEnd != null">
${_conditionType_} a.shelves <![CDATA[ <= ]]> #{${_conditionParam_}.shelvesEnd}
</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.filePath != null and conditionParamRef.filePath != ''">
${_conditionType_} a.filePath like #{${_conditionParam_}.filePath}
</if>
<if test="conditionParamRef.filePath == null">
${_conditionType_} a.filePath is null
</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('distributeFilePath')">
<if test="conditionParamRef.distributeFilePath != null and conditionParamRef.distributeFilePath != ''">
${_conditionType_} a.distributeFilePath like #{${_conditionParam_}.distributeFilePath}
</if>
<if test="conditionParamRef.distributeFilePath == null">
${_conditionType_} a.distributeFilePath is null
</if>
</if>
<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('version')">
<if test="conditionParamRef.version != null ">
${_conditionType_} a.version = #{${_conditionParam_}.version}
</if>
<if test="conditionParamRef.version == null">
${_conditionType_} a.version is null
</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('summary')">
<if test="conditionParamRef.summary != null and conditionParamRef.summary != ''">
${_conditionType_} a.summary like #{${_conditionParam_}.summary}
</if>
<if test="conditionParamRef.summary == null">
${_conditionType_} a.summary is null
</if>
</if>
<if test="conditionParamRef.containsKey('summaryList')">
${_conditionType_} a.summary in
<foreach collection="conditionParamRef.summaryList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</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.distribute != null ">
${_conditionType_} a.distribute = #{${_conditionParam_}.distribute}
</if>
<if test="conditionParamRef.distribute == null">
${_conditionType_} a.distribute is null
</if>
</if>
<if test="conditionParamRef.containsKey('distributeList')">
${_conditionType_} a.distribute in
<foreach collection="conditionParamRef.distributeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('distributeStart') and conditionParamRef.distributeStart != null">
${_conditionType_} a.distribute <![CDATA[ >= ]]> #{${_conditionParam_}.distributeStart}
</if>
<if test="conditionParamRef.containsKey('distributeEnd') and conditionParamRef.distributeEnd != null">
${_conditionType_} a.distribute <![CDATA[ <= ]]> #{${_conditionParam_}.distributeEnd}
</if>
<if test="conditionParamRef.containsKey('dataUpdate')">
<if test="conditionParamRef.dataUpdate != null ">
${_conditionType_} a.dataUpdate = #{${_conditionParam_}.dataUpdate}
</if>
<if test="conditionParamRef.dataUpdate == null">
${_conditionType_} a.dataUpdate is null
</if>
</if>
<if test="conditionParamRef.containsKey('dataUpdateList')">
${_conditionType_} a.dataUpdate in
<foreach collection="conditionParamRef.dataUpdateList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('dataUpdateStart') and conditionParamRef.dataUpdateStart != null">
${_conditionType_} a.dataUpdate <![CDATA[ >= ]]> #{${_conditionParam_}.dataUpdateStart}
</if>
<if test="conditionParamRef.containsKey('dataUpdateEnd') and conditionParamRef.dataUpdateEnd != null">
${_conditionType_} a.dataUpdate <![CDATA[ <= ]]> #{${_conditionParam_}.dataUpdateEnd}
</if> </if>
...@@ -367,6 +990,21 @@ ...@@ -367,6 +990,21 @@
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <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') ${_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('serviceApi')">
<if test="conditionParamRef.serviceApi != null and conditionParamRef.serviceApi != ''">
${_conditionType_} a.serviceApi like #{${_conditionParam_}.serviceApi}
</if>
<if test="conditionParamRef.serviceApi == null">
${_conditionType_} a.serviceApi is null
</if>
</if>
<if test="conditionParamRef.containsKey('serviceApiList')">
${_conditionType_} a.serviceApi in
<foreach collection="conditionParamRef.serviceApiList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -385,9 +1023,99 @@ ...@@ -385,9 +1023,99 @@
<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('siteId')">
a.appId a.siteId
<if test='orderCol.appId != null and "DESC".equalsIgnoreCase(orderCol.appId)'>DESC</if> <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('siteName')">
a.siteName
<if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('appCode')">
a.appCode
<if test='orderCol.appCode != null and "DESC".equalsIgnoreCase(orderCol.appCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('appName')">
a.appName
<if test='orderCol.appName != null and "DESC".equalsIgnoreCase(orderCol.appName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('appIconPath')">
a.appIconPath
<if test='orderCol.appIconPath != null and "DESC".equalsIgnoreCase(orderCol.appIconPath)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('appThemeName')">
a.appThemeName
<if test='orderCol.appThemeName != null and "DESC".equalsIgnoreCase(orderCol.appThemeName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('type')">
a.type
<if test='orderCol.type != null and "DESC".equalsIgnoreCase(orderCol.type)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('url')">
a.url
<if test='orderCol.url != null and "DESC".equalsIgnoreCase(orderCol.url)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('downDevCount')">
a.downDevCount
<if test='orderCol.downDevCount != null and "DESC".equalsIgnoreCase(orderCol.downDevCount)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('shelves')">
a.shelves
<if test='orderCol.shelves != null and "DESC".equalsIgnoreCase(orderCol.shelves)'>DESC</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')">
a.filePath
<if test='orderCol.filePath != null and "DESC".equalsIgnoreCase(orderCol.filePath)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('distributeFilePath')">
a.distributeFilePath
<if test='orderCol.distributeFilePath != null and "DESC".equalsIgnoreCase(orderCol.distributeFilePath)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('version')">
a.version
<if test='orderCol.version != null and "DESC".equalsIgnoreCase(orderCol.version)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('summary')">
a.summary
<if test='orderCol.summary != null and "DESC".equalsIgnoreCase(orderCol.summary)'>DESC</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')">
a.distribute
<if test='orderCol.distribute != null and "DESC".equalsIgnoreCase(orderCol.distribute)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('dataUpdate')">
a.dataUpdate
<if test='orderCol.dataUpdate != null and "DESC".equalsIgnoreCase(orderCol.dataUpdate)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('createTime')">
...@@ -405,6 +1133,11 @@ ...@@ -405,6 +1133,11 @@
<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('serviceApi')">
a.serviceApi
<if test='orderCol.serviceApi != null and "DESC".equalsIgnoreCase(orderCol.serviceApi)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
deploy.sh
View file @ 123402ec
...@@ -302,6 +302,7 @@ setup_rabbitmq() { ...@@ -302,6 +302,7 @@ setup_rabbitmq() {
systemctl daemon-reload systemctl daemon-reload
systemctl start rabbitmq-server systemctl start rabbitmq-server
rabbitmq-plugins enable rabbitmq_management rabbitmq-plugins enable rabbitmq_management
rabbitmq-plugins enable rabbitmq_web_stomp rabbitmq_web_stomp_examples
rabbitmqctl add_user ${RABBITMQ_USER} ${RABBITMQ_PASSWORD} # 添加用户 rabbitmqctl add_user ${RABBITMQ_USER} ${RABBITMQ_PASSWORD} # 添加用户
rabbitmqctl set_user_tags ${RABBITMQ_USER} administrator # 设置用户角色,分配操作权限 rabbitmqctl set_user_tags ${RABBITMQ_USER} administrator # 设置用户角色,分配操作权限
......
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