Skip to content

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

添加应用serviceApi参数字段

parent 123402ec
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 62 deletions
base-manager/src/main/java/com/mortals/xhx/module/app/model/AppEntity.java
View file @ ad2212ed
......@@ -49,6 +49,10 @@ public class AppEntity extends AppVo {
* 链接地址
*/
private String url;
/**
* 服务接口地址
*/
private String serviceApi;
/**
* 下发设备次数
*/
......@@ -93,10 +97,6 @@ public class AppEntity extends AppVo {
* 是否数据更新(0.否，1.是)
*/
private Integer dataUpdate;
/**
* 服务接口地址
*/
private String serviceApi;
/**
* 自助终端应用数据集信息
......@@ -217,6 +217,20 @@ public class AppEntity extends AppVo {
public void setUrl(String url){
this.url = url;
}
/**
* 获取 服务接口地址
* @return String
*/
public String getServiceApi(){
return serviceApi;
}
/**
* 设置 服务接口地址
* @param serviceApi
*/
public void setServiceApi(String serviceApi){
this.serviceApi = serviceApi;
}
/**
* 获取 下发设备次数
* @return Integer
......@@ -371,20 +385,6 @@ public class AppEntity extends AppVo {
public void setDataUpdate(Integer 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(){
......@@ -422,6 +422,7 @@ public class AppEntity extends AppVo {
sb.append(",appThemeName:").append(getAppThemeName());
sb.append(",type:").append(getType());
sb.append(",url:").append(getUrl());
sb.append(",serviceApi:").append(getServiceApi());
sb.append(",downDevCount:").append(getDownDevCount());
sb.append(",shelves:").append(getShelves());
sb.append(",appType:").append(getAppType());
......@@ -433,7 +434,6 @@ public class AppEntity extends AppVo {
sb.append(",notes:").append(getNotes());
sb.append(",distribute:").append(getDistribute());
sb.append(",dataUpdate:").append(getDataUpdate());
sb.append(",serviceApi:").append(getServiceApi());
return sb.toString();
}
......@@ -455,6 +455,8 @@ public class AppEntity extends AppVo {
this.url = null;
this.serviceApi = "";
this.downDevCount = 0;
this.shelves = 0;
......@@ -476,7 +478,5 @@ public class AppEntity extends AppVo {
this.distribute = 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 @ ad2212ed
......@@ -64,6 +64,9 @@ public class AppQuery extends AppEntity {
/** 链接地址 */
private List<String> urlList;
/** 服务接口地址 */
private List<String> serviceApiList;
/** 开始 下发设备次数 */
private Integer downDevCountStart;
......@@ -175,9 +178,6 @@ public class AppQuery extends AppEntity {
/** 结束 更新时间 */
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) */
private List<AppQuery> orConditionList;
......@@ -468,6 +468,21 @@ public class AppQuery extends AppEntity {
public void setUrlList(List<String> urlList){
this.urlList = urlList;
}
/**
* 获取 服务接口地址
* @return serviceApiList
*/
public List<String> getServiceApiList(){
return this.serviceApiList;
}
/**
* 设置 服务接口地址
* @param serviceApiList
*/
public void setServiceApiList(List<String> serviceApiList){
this.serviceApiList = serviceApiList;
}
/**
* 获取 开始 下发设备次数
* @return downDevCountStart
......@@ -1055,21 +1070,6 @@ public class AppQuery extends AppEntity {
this.updateTimeEnd = updateTimeEnd;
}
/**
* 获取 服务接口地址
* @return serviceApiList
*/
public List<String> getServiceApiList(){
return this.serviceApiList;
}
/**
* 设置 服务接口地址
* @param serviceApiList
*/
public void setServiceApiList(List<String> serviceApiList){
this.serviceApiList = serviceApiList;
}
/**
* 设置 主键ID，主键，自增长
* @param id
......@@ -1319,6 +1319,25 @@ public class AppQuery extends AppEntity {
return this;
}
/**
* 设置 服务接口地址
* @param serviceApi
*/
public AppQuery serviceApi(String serviceApi){
setServiceApi(serviceApi);
return this;
}
/**
* 设置 服务接口地址
* @param serviceApiList
*/
public AppQuery serviceApiList(List<String> serviceApiList){
this.serviceApiList = serviceApiList;
return this;
}
/**
* 设置 下发设备次数
* @param downDevCount
......@@ -1731,25 +1750,6 @@ 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)
* @return orConditionList
......
base-manager/src/main/resources/sqlmap/module/app/AppMapper.xml
View file @ ad2212ed
......@@ -14,6 +14,7 @@
<result property="appThemeName" column="appThemeName" />
<result property="type" column="type" />
<result property="url" column="url" />
<result property="serviceApi" column="serviceApi" />
<result property="downDevCount" column="downDevCount" />
<result property="shelves" column="shelves" />
<result property="appType" column="appType" />
......@@ -69,6 +70,9 @@
<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('serviceApi') or colPickMode == 1 and data.containsKey('serviceApi')))">
a.serviceApi,
</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>
......@@ -122,18 +126,18 @@
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="AppEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_app
(siteId,siteName,appCode,appName,appIconPath,appThemeName,type,url,downDevCount,shelves,appType,fileName,filePath,distributeFilePath,version,summary,notes,distribute,dataUpdate,createTime,updateUserId,updateTime)
(siteId,siteName,appCode,appName,appIconPath,appThemeName,type,url,serviceApi,downDevCount,shelves,appType,fileName,filePath,distributeFilePath,version,summary,notes,distribute,dataUpdate,createTime,updateUserId,updateTime)
VALUES
(#{siteId},#{siteName},#{appCode},#{appName},#{appIconPath},#{appThemeName},#{type},#{url},#{downDevCount},#{shelves},#{appType},#{fileName},#{filePath},#{distributeFilePath},#{version},#{summary},#{notes},#{distribute},#{dataUpdate},#{createTime},#{updateUserId},#{updateTime})
(#{siteId},#{siteName},#{appCode},#{appName},#{appIconPath},#{appThemeName},#{type},#{url},#{serviceApi},#{downDevCount},#{shelves},#{appType},#{fileName},#{filePath},#{distributeFilePath},#{version},#{summary},#{notes},#{distribute},#{dataUpdate},#{createTime},#{updateUserId},#{updateTime})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_app
(siteId,siteName,appCode,appName,appIconPath,appThemeName,type,url,downDevCount,shelves,appType,fileName,filePath,distributeFilePath,version,summary,notes,distribute,dataUpdate,createTime,updateUserId,updateTime)
(siteId,siteName,appCode,appName,appIconPath,appThemeName,type,url,serviceApi,downDevCount,shelves,appType,fileName,filePath,distributeFilePath,version,summary,notes,distribute,dataUpdate,createTime,updateUserId,updateTime)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{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.siteId},#{item.siteName},#{item.appCode},#{item.appName},#{item.appIconPath},#{item.appThemeName},#{item.type},#{item.url},#{item.serviceApi},#{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>
</insert>
......@@ -173,6 +177,9 @@
<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('serviceApi')) or (colPickMode==1 and !data.containsKey('serviceApi'))">
a.serviceApi=#{data.serviceApi},
</if>
<if test="(colPickMode==0 and data.containsKey('downDevCount')) or (colPickMode==1 and !data.containsKey('downDevCount'))">
a.downDevCount=#{data.downDevCount},
</if>
......@@ -314,6 +321,13 @@
</if>
</foreach>
</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 prefix="downDevCount=(case" suffix="ELSE downDevCount end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
......@@ -724,6 +738,21 @@
#{item}
</foreach>
</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>
<if test="conditionParamRef.containsKey('downDevCount')">
<if test="conditionParamRef.downDevCount != null ">
${_conditionType_} a.downDevCount = #{${_conditionParam_}.downDevCount}
......@@ -1034,6 +1063,11 @@
<if test='orderCol.url != null and "DESC".equalsIgnoreCase(orderCol.url)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('serviceApi')">
a.serviceApi
<if test='orderCol.serviceApi != null and "DESC".equalsIgnoreCase(orderCol.serviceApi)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('downDevCount')">
a.downDevCount
<if test='orderCol.downDevCount != null and "DESC".equalsIgnoreCase(orderCol.downDevCount)'>DESC</if>
......
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