Skip to content

S
self-service
Commit d242eb2e authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

增加应用访问量点击接口;应用按访问量倒序;应用列表接口增加分类统计数据

parent 8c2a02f2
Show whitespace changes
Inline Side-by-side
Showing with 3290 additions and 2656 deletions
sst-manager/src/main/java/com/mortals/xhx/module/apps/model/vo/AppsInfoVo.java
View file @ d242eb2e
...@@ -32,4 +32,8 @@ public class AppsInfoVo extends BaseEntityLong { ...@@ -32,4 +32,8 @@ public class AppsInfoVo extends BaseEntityLong {
* 应用主题id * 应用主题id
*/ */
private String appThemeName; private String appThemeName;
/**
* 应用点击次数
*/
private Integer clickSum;
} }
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/sst/model/SstAppsDeskEntity.java
View file @ d242eb2e
package com.mortals.xhx.module.sst.model; package com.mortals.xhx.module.sst.model;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.sst.model.vo.SstAppsDeskVo; import com.mortals.xhx.module.sst.model.vo.SstAppsDeskVo;
import lombok.Data;
/** /**
* 桌面终端应用编排实体对象 * 桌面终端应用编排实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-09 * @date 2023-07-05
*/ */
@Data
public class SstAppsDeskEntity extends SstAppsDeskVo { public class SstAppsDeskEntity extends SstAppsDeskVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -52,140 +52,10 @@ public class SstAppsDeskEntity extends SstAppsDeskVo { ...@@ -52,140 +52,10 @@ public class SstAppsDeskEntity extends SstAppsDeskVo {
* 热门应用排序号 * 热门应用排序号
*/ */
private Integer hotSort; private Integer hotSort;
public SstAppsDeskEntity(){}
/**
* 获取 站点id
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点id
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
/**
* 获取 应用id
* @return Long
*/
public Long getAppId(){
return appId;
}
/**
* 设置 应用id
* @param appId
*/
public void setAppId(Long appId){
this.appId = appId;
}
/**
* 获取 应用名称
* @return String
*/
public String getName(){
return name;
}
/**
* 设置 应用名称
* @param name
*/
public void setName(String name){
this.name = name;
}
/**
* 获取 应用描述
* @return String
*/
public String getDescribe(){
return describe;
}
/**
* 设置 应用描述
* @param describe
*/
public void setDescribe(String describe){
this.describe = describe;
}
/**
* 获取 应用访问地址
* @return String
*/
public String getUrl(){
return url;
}
/** /**
* 设置 应用访问地址 * 应用点击次数
* @param url
*/ */
public void setUrl(String url){ private Integer clickSum;
this.url = url;
}
/**
* 获取 是否展示基础应用1是0否
* @return Integer
*/
public Integer getShowBasic(){
return showBasic;
}
/**
* 设置 是否展示基础应用1是0否
* @param showBasic
*/
public void setShowBasic(Integer showBasic){
this.showBasic = showBasic;
}
/**
* 获取 基础应用排序号
* @return Integer
*/
public Integer getBasicSort(){
return basicSort;
}
/**
* 设置 基础应用排序号
* @param basicSort
*/
public void setBasicSort(Integer basicSort){
this.basicSort = basicSort;
}
/**
* 获取 是否展示热门应用1是0否
* @return Integer
*/
public Integer getShowHot(){
return showHot;
}
/**
* 设置 是否展示热门应用1是0否
* @param showHot
*/
public void setShowHot(Integer showHot){
this.showHot = showHot;
}
/**
* 获取 热门应用排序号
* @return Integer
*/
public Integer getHotSort(){
return hotSort;
}
/**
* 设置 热门应用排序号
* @param hotSort
*/
public void setHotSort(Integer hotSort){
this.hotSort = hotSort;
}
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -202,25 +72,11 @@ public class SstAppsDeskEntity extends SstAppsDeskVo { ...@@ -202,25 +72,11 @@ public class SstAppsDeskEntity extends SstAppsDeskVo {
return false; return false;
} }
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",siteId:").append(getSiteId());
sb.append(",appId:").append(getAppId());
sb.append(",name:").append(getName());
sb.append(",describe:").append(getDescribe());
sb.append(",url:").append(getUrl());
sb.append(",showBasic:").append(getShowBasic());
sb.append(",basicSort:").append(getBasicSort());
sb.append(",showHot:").append(getShowHot());
sb.append(",hotSort:").append(getHotSort());
return sb.toString();
}
public void initAttrValue(){ public void initAttrValue(){
this.siteId = null; this.siteId = -1L;
this.appId = null; this.appId = -1L;
this.name = ""; this.name = "";
...@@ -230,10 +86,12 @@ public class SstAppsDeskEntity extends SstAppsDeskVo { ...@@ -230,10 +86,12 @@ public class SstAppsDeskEntity extends SstAppsDeskVo {
this.showBasic = 1; this.showBasic = 1;
this.basicSort = null; this.basicSort = -1;
this.showHot = 1; this.showHot = 1;
this.hotSort = null; this.hotSort = -1;
this.clickSum = -1;
} }
} }
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/sst/model/SstAppsDeskQuery.java
View file @ d242eb2e
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.sst.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.sst.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.sst.model.SstAppsDeskEntity; import com.mortals.xhx.module.sst.model.SstAppsDeskEntity;
/** /**
* 桌面终端应用编排查询对象 * 桌面终端应用编排查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-04-09 * @date 2023-07-05
*/ */
public class SstAppsDeskQuery extends SstAppsDeskEntity { public class SstAppsDeskQuery extends SstAppsDeskEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -171,6 +171,21 @@ public class SstAppsDeskQuery extends SstAppsDeskEntity { ...@@ -171,6 +171,21 @@ public class SstAppsDeskQuery extends SstAppsDeskEntity {
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 开始 应用点击次数 */
private Integer clickSumStart;
/** 结束 应用点击次数 */
private Integer clickSumEnd;
/** 增加 应用点击次数 */
private Integer clickSumIncrement;
/** 应用点击次数列表 */
private List <Integer> clickSumList;
/** 应用点击次数排除列表 */
private List <Integer> clickSumNotList;
/** 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<SstAppsDeskQuery> orConditionList; private List<SstAppsDeskQuery> orConditionList;
...@@ -1068,6 +1083,87 @@ public class SstAppsDeskQuery extends SstAppsDeskEntity { ...@@ -1068,6 +1083,87 @@ public class SstAppsDeskQuery extends SstAppsDeskEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 开始 应用点击次数
* @return clickSumStart
*/
public Integer getClickSumStart(){
return this.clickSumStart;
}
/**
* 设置 开始 应用点击次数
* @param clickSumStart
*/
public void setClickSumStart(Integer clickSumStart){
this.clickSumStart = clickSumStart;
}
/**
* 获取 结束 应用点击次数
* @return $clickSumEnd
*/
public Integer getClickSumEnd(){
return this.clickSumEnd;
}
/**
* 设置 结束 应用点击次数
* @param clickSumEnd
*/
public void setClickSumEnd(Integer clickSumEnd){
this.clickSumEnd = clickSumEnd;
}
/**
* 获取 增加 应用点击次数
* @return clickSumIncrement
*/
public Integer getClickSumIncrement(){
return this.clickSumIncrement;
}
/**
* 设置 增加 应用点击次数
* @param clickSumIncrement
*/
public void setClickSumIncrement(Integer clickSumIncrement){
this.clickSumIncrement = clickSumIncrement;
}
/**
* 获取 应用点击次数
* @return clickSumList
*/
public List<Integer> getClickSumList(){
return this.clickSumList;
}
/**
* 设置 应用点击次数
* @param clickSumList
*/
public void setClickSumList(List<Integer> clickSumList){
this.clickSumList = clickSumList;
}
/**
* 获取 应用点击次数
* @return clickSumNotList
*/
public List<Integer> getClickSumNotList(){
return this.clickSumNotList;
}
/**
* 设置 应用点击次数
* @param clickSumNotList
*/
public void setClickSumNotList(List<Integer> clickSumNotList){
this.clickSumNotList = clickSumNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -1613,6 +1709,60 @@ public class SstAppsDeskQuery extends SstAppsDeskEntity { ...@@ -1613,6 +1709,60 @@ public class SstAppsDeskQuery extends SstAppsDeskEntity {
} }
/**
* 设置 应用点击次数
* @param clickSum
*/
public SstAppsDeskQuery clickSum(Integer clickSum){
setClickSum(clickSum);
return this;
}
/**
* 设置 开始 应用点击次数
* @param clickSumStart
*/
public SstAppsDeskQuery clickSumStart(Integer clickSumStart){
this.clickSumStart = clickSumStart;
return this;
}
/**
* 设置 结束 应用点击次数
* @param clickSumEnd
*/
public SstAppsDeskQuery clickSumEnd(Integer clickSumEnd){
this.clickSumEnd = clickSumEnd;
return this;
}
/**
* 设置 增加 应用点击次数
* @param clickSumIncrement
*/
public SstAppsDeskQuery clickSumIncrement(Integer clickSumIncrement){
this.clickSumIncrement = clickSumIncrement;
return this;
}
/**
* 设置 应用点击次数
* @param clickSumList
*/
public SstAppsDeskQuery clickSumList(List<Integer> clickSumList){
this.clickSumList = clickSumList;
return this;
}
/**
* 设置 应用点击次数
* @param clickSumNotList
*/
public SstAppsDeskQuery clickSumNotList(List<Integer> clickSumNotList){
this.clickSumNotList = clickSumNotList;
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
......
sst-manager/src/main/java/com/mortals/xhx/module/sst/model/SstAppsEntity.java
View file @ d242eb2e
package com.mortals.xhx.module.sst.model; package com.mortals.xhx.module.sst.model;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.sst.model.vo.SstAppsVo; import com.mortals.xhx.module.sst.model.vo.SstAppsVo;
import lombok.Data;
/** /**
* 应用编排实体对象 * 应用编排实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-12-26 * @date 2023-07-05
*/ */
@Data
public class SstAppsEntity extends SstAppsVo { public class SstAppsEntity extends SstAppsVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -52,140 +52,10 @@ public class SstAppsEntity extends SstAppsVo { ...@@ -52,140 +52,10 @@ public class SstAppsEntity extends SstAppsVo {
* 应用id * 应用id
*/ */
private Long appId; private Long appId;
public SstAppsEntity(){}
/**
* 获取 站点id
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点id
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
/**
* 获取 应用名称
* @return String
*/
public String getName(){
return name;
}
/**
* 设置 应用名称
* @param name
*/
public void setName(String name){
this.name = name;
}
/**
* 获取 应用描述
* @return String
*/
public String getDescribe(){
return describe;
}
/**
* 设置 应用描述
* @param describe
*/
public void setDescribe(String describe){
this.describe = describe;
}
/**
* 获取 应用访问地址
* @return String
*/
public String getUrl(){
return url;
}
/**
* 设置 应用访问地址
* @param url
*/
public void setUrl(String url){
this.url = url;
}
/**
* 获取 是否展示基础应用1是0否
* @return Integer
*/
public Integer getShowBasic(){
return showBasic;
}
/** /**
* 设置 是否展示基础应用1是0否 * 应用点击次数
* @param showBasic
*/ */
public void setShowBasic(Integer showBasic){ private Integer clickSum;
this.showBasic = showBasic;
}
/**
* 获取 基础应用排序号
* @return Integer
*/
public Integer getBasicSort(){
return basicSort;
}
/**
* 设置 基础应用排序号
* @param basicSort
*/
public void setBasicSort(Integer basicSort){
this.basicSort = basicSort;
}
/**
* 获取 是否展示热门应用1是0否
* @return Integer
*/
public Integer getShowHot(){
return showHot;
}
/**
* 设置 是否展示热门应用1是0否
* @param showHot
*/
public void setShowHot(Integer showHot){
this.showHot = showHot;
}
/**
* 获取 热门应用排序号
* @return Integer
*/
public Integer getHotSort(){
return hotSort;
}
/**
* 设置 热门应用排序号
* @param hotSort
*/
public void setHotSort(Integer hotSort){
this.hotSort = hotSort;
}
/**
* 获取 应用id
* @return Long
*/
public Long getAppId(){
return appId;
}
/**
* 设置 应用id
* @param appId
*/
public void setAppId(Long appId){
this.appId = appId;
}
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -202,23 +72,9 @@ public class SstAppsEntity extends SstAppsVo { ...@@ -202,23 +72,9 @@ public class SstAppsEntity extends SstAppsVo {
return false; return false;
} }
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",siteId:").append(getSiteId());
sb.append(",name:").append(getName());
sb.append(",describe:").append(getDescribe());
sb.append(",url:").append(getUrl());
sb.append(",showBasic:").append(getShowBasic());
sb.append(",basicSort:").append(getBasicSort());
sb.append(",showHot:").append(getShowHot());
sb.append(",hotSort:").append(getHotSort());
sb.append(",appId:").append(getAppId());
return sb.toString();
}
public void initAttrValue(){ public void initAttrValue(){
this.siteId = null; this.siteId = -1L;
this.name = ""; this.name = "";
...@@ -228,12 +84,14 @@ public class SstAppsEntity extends SstAppsVo { ...@@ -228,12 +84,14 @@ public class SstAppsEntity extends SstAppsVo {
this.showBasic = 1; this.showBasic = 1;
this.basicSort = null; this.basicSort = -1;
this.showHot = 1; this.showHot = 1;
this.hotSort = null; this.hotSort = -1;
this.appId = -1L;
this.appId = null; this.clickSum = -1;
} }
} }
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/sst/model/SstAppsQuery.java
View file @ d242eb2e
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.sst.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.sst.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.sst.model.SstAppsEntity; import com.mortals.xhx.module.sst.model.SstAppsEntity;
/** /**
* 应用编排查询对象 * 应用编排查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-12-26 * @date 2023-07-05
*/ */
public class SstAppsQuery extends SstAppsEntity { public class SstAppsQuery extends SstAppsEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -21,6 +21,9 @@ public class SstAppsQuery extends SstAppsEntity { ...@@ -21,6 +21,9 @@ public class SstAppsQuery extends SstAppsEntity {
/** 序号，主键，自增长列表 */ /** 序号，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 站点id */ /** 开始 站点id */
private Long siteIdStart; private Long siteIdStart;
...@@ -33,15 +36,24 @@ public class SstAppsQuery extends SstAppsEntity { ...@@ -33,15 +36,24 @@ public class SstAppsQuery extends SstAppsEntity {
/** 站点id列表 */ /** 站点id列表 */
private List <Long> siteIdList; private List <Long> siteIdList;
/** 站点id排除列表 */
private List <Long> siteIdNotList;
/** 应用名称 */ /** 应用名称 */
private List<String> nameList; private List<String> nameList;
/** 应用名称排除列表 */
private List <String> nameNotList;
/** 应用描述 */ /** 应用描述 */
private List<String> describeList; private List<String> describeList;
/** 应用描述排除列表 */
private List <String> describeNotList;
/** 应用访问地址 */ /** 应用访问地址 */
private List<String> urlList; private List<String> urlList;
/** 应用访问地址排除列表 */
private List <String> urlNotList;
/** 开始 是否展示基础应用1是0否 */ /** 开始 是否展示基础应用1是0否 */
private Integer showBasicStart; private Integer showBasicStart;
...@@ -54,6 +66,9 @@ public class SstAppsQuery extends SstAppsEntity { ...@@ -54,6 +66,9 @@ public class SstAppsQuery extends SstAppsEntity {
/** 是否展示基础应用1是0否列表 */ /** 是否展示基础应用1是0否列表 */
private List <Integer> showBasicList; private List <Integer> showBasicList;
/** 是否展示基础应用1是0否排除列表 */
private List <Integer> showBasicNotList;
/** 开始 基础应用排序号 */ /** 开始 基础应用排序号 */
private Integer basicSortStart; private Integer basicSortStart;
...@@ -66,6 +81,9 @@ public class SstAppsQuery extends SstAppsEntity { ...@@ -66,6 +81,9 @@ public class SstAppsQuery extends SstAppsEntity {
/** 基础应用排序号列表 */ /** 基础应用排序号列表 */
private List <Integer> basicSortList; private List <Integer> basicSortList;
/** 基础应用排序号排除列表 */
private List <Integer> basicSortNotList;
/** 开始 是否展示热门应用1是0否 */ /** 开始 是否展示热门应用1是0否 */
private Integer showHotStart; private Integer showHotStart;
...@@ -78,6 +96,9 @@ public class SstAppsQuery extends SstAppsEntity { ...@@ -78,6 +96,9 @@ public class SstAppsQuery extends SstAppsEntity {
/** 是否展示热门应用1是0否列表 */ /** 是否展示热门应用1是0否列表 */
private List <Integer> showHotList; private List <Integer> showHotList;
/** 是否展示热门应用1是0否排除列表 */
private List <Integer> showHotNotList;
/** 开始 热门应用排序号 */ /** 开始 热门应用排序号 */
private Integer hotSortStart; private Integer hotSortStart;
...@@ -90,6 +111,9 @@ public class SstAppsQuery extends SstAppsEntity { ...@@ -90,6 +111,9 @@ public class SstAppsQuery extends SstAppsEntity {
/** 热门应用排序号列表 */ /** 热门应用排序号列表 */
private List <Integer> hotSortList; private List <Integer> hotSortList;
/** 热门应用排序号排除列表 */
private List <Integer> hotSortNotList;
/** 开始 创建用户 */ /** 开始 创建用户 */
private Long createUserIdStart; private Long createUserIdStart;
...@@ -102,6 +126,9 @@ public class SstAppsQuery extends SstAppsEntity { ...@@ -102,6 +126,9 @@ public class SstAppsQuery extends SstAppsEntity {
/** 创建用户列表 */ /** 创建用户列表 */
private List <Long> createUserIdList; private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -120,6 +147,9 @@ public class SstAppsQuery extends SstAppsEntity { ...@@ -120,6 +147,9 @@ public class SstAppsQuery extends SstAppsEntity {
/** 更新用户列表 */ /** 更新用户列表 */
private List <Long> updateUserIdList; private List <Long> updateUserIdList;
/** 更新用户排除列表 */
private List <Long> updateUserIdNotList;
/** 开始 更新时间 */ /** 开始 更新时间 */
private String updateTimeStart; private String updateTimeStart;
...@@ -138,6 +168,24 @@ public class SstAppsQuery extends SstAppsEntity { ...@@ -138,6 +168,24 @@ public class SstAppsQuery extends SstAppsEntity {
/** 应用id列表 */ /** 应用id列表 */
private List <Long> appIdList; private List <Long> appIdList;
/** 应用id排除列表 */
private List <Long> appIdNotList;
/** 开始 应用点击次数 */
private Integer clickSumStart;
/** 结束 应用点击次数 */
private Integer clickSumEnd;
/** 增加 应用点击次数 */
private Integer clickSumIncrement;
/** 应用点击次数列表 */
private List <Integer> clickSumList;
/** 应用点击次数排除列表 */
private List <Integer> clickSumNotList;
/** 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<SstAppsQuery> orConditionList; private List<SstAppsQuery> orConditionList;
...@@ -210,6 +258,23 @@ public class SstAppsQuery extends SstAppsEntity { ...@@ -210,6 +258,23 @@ public class SstAppsQuery extends SstAppsEntity {
this.idList = idList; this.idList = idList;
} }
/**
* 获取 序号，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/** /**
* 获取 开始 站点id * 获取 开始 站点id
* @return siteIdStart * @return siteIdStart
...@@ -274,6 +339,23 @@ public class SstAppsQuery extends SstAppsEntity { ...@@ -274,6 +339,23 @@ public class SstAppsQuery extends SstAppsEntity {
this.siteIdList = siteIdList; this.siteIdList = siteIdList;
} }
/**
* 获取 站点id
* @return siteIdNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/** /**
* 获取 应用名称 * 获取 应用名称
* @return nameList * @return nameList
...@@ -289,6 +371,23 @@ public class SstAppsQuery extends SstAppsEntity { ...@@ -289,6 +371,23 @@ public class SstAppsQuery extends SstAppsEntity {
public void setNameList(List<String> nameList){ public void setNameList(List<String> nameList){
this.nameList = nameList; this.nameList = nameList;
} }
/**
* 获取 应用名称
* @return nameNotList
*/
public List<String> getNameNotList(){
return this.nameNotList;
}
/**
* 设置 应用名称
* @param nameNotList
*/
public void setNameNotList(List<String> nameNotList){
this.nameNotList = nameNotList;
}
/** /**
* 获取 应用描述 * 获取 应用描述
* @return describeList * @return describeList
...@@ -304,6 +403,23 @@ public class SstAppsQuery extends SstAppsEntity { ...@@ -304,6 +403,23 @@ public class SstAppsQuery extends SstAppsEntity {
public void setDescribeList(List<String> describeList){ public void setDescribeList(List<String> describeList){
this.describeList = describeList; this.describeList = describeList;
} }
/**
* 获取 应用描述
* @return describeNotList
*/
public List<String> getDescribeNotList(){
return this.describeNotList;
}
/**
* 设置 应用描述
* @param describeNotList
*/
public void setDescribeNotList(List<String> describeNotList){
this.describeNotList = describeNotList;
}
/** /**
* 获取 应用访问地址 * 获取 应用访问地址
* @return urlList * @return urlList
...@@ -319,6 +435,23 @@ public class SstAppsQuery extends SstAppsEntity { ...@@ -319,6 +435,23 @@ public class SstAppsQuery extends SstAppsEntity {
public void setUrlList(List<String> urlList){ public void setUrlList(List<String> urlList){
this.urlList = urlList; this.urlList = urlList;
} }
/**
* 获取 应用访问地址
* @return urlNotList
*/
public List<String> getUrlNotList(){
return this.urlNotList;
}
/**
* 设置 应用访问地址
* @param urlNotList
*/
public void setUrlNotList(List<String> urlNotList){
this.urlNotList = urlNotList;
}
/** /**
* 获取 开始 是否展示基础应用1是0否 * 获取 开始 是否展示基础应用1是0否
* @return showBasicStart * @return showBasicStart
...@@ -383,6 +516,23 @@ public class SstAppsQuery extends SstAppsEntity { ...@@ -383,6 +516,23 @@ public class SstAppsQuery extends SstAppsEntity {
this.showBasicList = showBasicList; this.showBasicList = showBasicList;
} }
/**
* 获取 是否展示基础应用1是0否
* @return showBasicNotList
*/
public List<Integer> getShowBasicNotList(){
return this.showBasicNotList;
}
/**
* 设置 是否展示基础应用1是0否
* @param showBasicNotList
*/
public void setShowBasicNotList(List<Integer> showBasicNotList){
this.showBasicNotList = showBasicNotList;
}
/** /**
* 获取 开始 基础应用排序号 * 获取 开始 基础应用排序号
* @return basicSortStart * @return basicSortStart
...@@ -447,6 +597,23 @@ public class SstAppsQuery extends SstAppsEntity { ...@@ -447,6 +597,23 @@ public class SstAppsQuery extends SstAppsEntity {
this.basicSortList = basicSortList; this.basicSortList = basicSortList;
} }
/**
* 获取 基础应用排序号
* @return basicSortNotList
*/
public List<Integer> getBasicSortNotList(){
return this.basicSortNotList;
}
/**
* 设置 基础应用排序号
* @param basicSortNotList
*/
public void setBasicSortNotList(List<Integer> basicSortNotList){
this.basicSortNotList = basicSortNotList;
}
/** /**
* 获取 开始 是否展示热门应用1是0否 * 获取 开始 是否展示热门应用1是0否
* @return showHotStart * @return showHotStart
...@@ -511,6 +678,23 @@ public class SstAppsQuery extends SstAppsEntity { ...@@ -511,6 +678,23 @@ public class SstAppsQuery extends SstAppsEntity {
this.showHotList = showHotList; this.showHotList = showHotList;
} }
/**
* 获取 是否展示热门应用1是0否
* @return showHotNotList
*/
public List<Integer> getShowHotNotList(){
return this.showHotNotList;
}
/**
* 设置 是否展示热门应用1是0否
* @param showHotNotList
*/
public void setShowHotNotList(List<Integer> showHotNotList){
this.showHotNotList = showHotNotList;
}
/** /**
* 获取 开始 热门应用排序号 * 获取 开始 热门应用排序号
* @return hotSortStart * @return hotSortStart
...@@ -575,6 +759,23 @@ public class SstAppsQuery extends SstAppsEntity { ...@@ -575,6 +759,23 @@ public class SstAppsQuery extends SstAppsEntity {
this.hotSortList = hotSortList; this.hotSortList = hotSortList;
} }
/**
* 获取 热门应用排序号
* @return hotSortNotList
*/
public List<Integer> getHotSortNotList(){
return this.hotSortNotList;
}
/**
* 设置 热门应用排序号
* @param hotSortNotList
*/
public void setHotSortNotList(List<Integer> hotSortNotList){
this.hotSortNotList = hotSortNotList;
}
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @return createUserIdStart * @return createUserIdStart
...@@ -639,6 +840,23 @@ public class SstAppsQuery extends SstAppsEntity { ...@@ -639,6 +840,23 @@ public class SstAppsQuery extends SstAppsEntity {
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
} }
/**
* 获取 创建用户
* @return createUserIdNotList
*/
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
...@@ -735,6 +953,23 @@ public class SstAppsQuery extends SstAppsEntity { ...@@ -735,6 +953,23 @@ public class SstAppsQuery extends SstAppsEntity {
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
} }
/**
* 获取 更新用户
* @return updateUserIdNotList
*/
public List<Long> getUpdateUserIdNotList(){
return this.updateUserIdNotList;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
}
/** /**
* 获取 开始 更新时间 * 获取 开始 更新时间
* @return updateTimeStart * @return updateTimeStart
...@@ -831,6 +1066,104 @@ public class SstAppsQuery extends SstAppsEntity { ...@@ -831,6 +1066,104 @@ public class SstAppsQuery extends SstAppsEntity {
this.appIdList = appIdList; this.appIdList = appIdList;
} }
/**
* 获取 应用id
* @return appIdNotList
*/
public List<Long> getAppIdNotList(){
return this.appIdNotList;
}
/**
* 设置 应用id
* @param appIdNotList
*/
public void setAppIdNotList(List<Long> appIdNotList){
this.appIdNotList = appIdNotList;
}
/**
* 获取 开始 应用点击次数
* @return clickSumStart
*/
public Integer getClickSumStart(){
return this.clickSumStart;
}
/**
* 设置 开始 应用点击次数
* @param clickSumStart
*/
public void setClickSumStart(Integer clickSumStart){
this.clickSumStart = clickSumStart;
}
/**
* 获取 结束 应用点击次数
* @return $clickSumEnd
*/
public Integer getClickSumEnd(){
return this.clickSumEnd;
}
/**
* 设置 结束 应用点击次数
* @param clickSumEnd
*/
public void setClickSumEnd(Integer clickSumEnd){
this.clickSumEnd = clickSumEnd;
}
/**
* 获取 增加 应用点击次数
* @return clickSumIncrement
*/
public Integer getClickSumIncrement(){
return this.clickSumIncrement;
}
/**
* 设置 增加 应用点击次数
* @param clickSumIncrement
*/
public void setClickSumIncrement(Integer clickSumIncrement){
this.clickSumIncrement = clickSumIncrement;
}
/**
* 获取 应用点击次数
* @return clickSumList
*/
public List<Integer> getClickSumList(){
return this.clickSumList;
}
/**
* 设置 应用点击次数
* @param clickSumList
*/
public void setClickSumList(List<Integer> clickSumList){
this.clickSumList = clickSumList;
}
/**
* 获取 应用点击次数
* @return clickSumNotList
*/
public List<Integer> getClickSumNotList(){
return this.clickSumNotList;
}
/**
* 设置 应用点击次数
* @param clickSumNotList
*/
public void setClickSumNotList(List<Integer> clickSumNotList){
this.clickSumNotList = clickSumNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -876,6 +1209,15 @@ public class SstAppsQuery extends SstAppsEntity { ...@@ -876,6 +1209,15 @@ public class SstAppsQuery extends SstAppsEntity {
return this; return this;
} }
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public SstAppsQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/** /**
* 设置 站点id * 设置 站点id
* @param siteId * @param siteId
...@@ -921,6 +1263,15 @@ public class SstAppsQuery extends SstAppsEntity { ...@@ -921,6 +1263,15 @@ public class SstAppsQuery extends SstAppsEntity {
return this; return this;
} }
/**
* 设置 站点id
* @param siteIdNotList
*/
public SstAppsQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
/** /**
* 设置 应用名称 * 设置 应用名称
...@@ -1023,6 +1374,15 @@ public class SstAppsQuery extends SstAppsEntity { ...@@ -1023,6 +1374,15 @@ public class SstAppsQuery extends SstAppsEntity {
return this; return this;
} }
/**
* 设置 是否展示基础应用1是0否
* @param showBasicNotList
*/
public SstAppsQuery showBasicNotList(List<Integer> showBasicNotList){
this.showBasicNotList = showBasicNotList;
return this;
}
/** /**
* 设置 基础应用排序号 * 设置 基础应用排序号
* @param basicSort * @param basicSort
...@@ -1068,6 +1428,15 @@ public class SstAppsQuery extends SstAppsEntity { ...@@ -1068,6 +1428,15 @@ public class SstAppsQuery extends SstAppsEntity {
return this; return this;
} }
/**
* 设置 基础应用排序号
* @param basicSortNotList
*/
public SstAppsQuery basicSortNotList(List<Integer> basicSortNotList){
this.basicSortNotList = basicSortNotList;
return this;
}
/** /**
* 设置 是否展示热门应用1是0否 * 设置 是否展示热门应用1是0否
* @param showHot * @param showHot
...@@ -1113,6 +1482,15 @@ public class SstAppsQuery extends SstAppsEntity { ...@@ -1113,6 +1482,15 @@ public class SstAppsQuery extends SstAppsEntity {
return this; return this;
} }
/**
* 设置 是否展示热门应用1是0否
* @param showHotNotList
*/
public SstAppsQuery showHotNotList(List<Integer> showHotNotList){
this.showHotNotList = showHotNotList;
return this;
}
/** /**
* 设置 热门应用排序号 * 设置 热门应用排序号
* @param hotSort * @param hotSort
...@@ -1158,6 +1536,15 @@ public class SstAppsQuery extends SstAppsEntity { ...@@ -1158,6 +1536,15 @@ public class SstAppsQuery extends SstAppsEntity {
return this; return this;
} }
/**
* 设置 热门应用排序号
* @param hotSortNotList
*/
public SstAppsQuery hotSortNotList(List<Integer> hotSortNotList){
this.hotSortNotList = hotSortNotList;
return this;
}
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserId * @param createUserId
...@@ -1203,6 +1590,15 @@ public class SstAppsQuery extends SstAppsEntity { ...@@ -1203,6 +1590,15 @@ public class SstAppsQuery extends SstAppsEntity {
return this; return this;
} }
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public SstAppsQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/** /**
* 设置 更新用户 * 设置 更新用户
...@@ -1249,6 +1645,15 @@ public class SstAppsQuery extends SstAppsEntity { ...@@ -1249,6 +1645,15 @@ public class SstAppsQuery extends SstAppsEntity {
return this; return this;
} }
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public SstAppsQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
return this;
}
/** /**
* 设置 应用id * 设置 应用id
...@@ -1295,6 +1700,69 @@ public class SstAppsQuery extends SstAppsEntity { ...@@ -1295,6 +1700,69 @@ public class SstAppsQuery extends SstAppsEntity {
return this; return this;
} }
/**
* 设置 应用id
* @param appIdNotList
*/
public SstAppsQuery appIdNotList(List<Long> appIdNotList){
this.appIdNotList = appIdNotList;
return this;
}
/**
* 设置 应用点击次数
* @param clickSum
*/
public SstAppsQuery clickSum(Integer clickSum){
setClickSum(clickSum);
return this;
}
/**
* 设置 开始 应用点击次数
* @param clickSumStart
*/
public SstAppsQuery clickSumStart(Integer clickSumStart){
this.clickSumStart = clickSumStart;
return this;
}
/**
* 设置 结束 应用点击次数
* @param clickSumEnd
*/
public SstAppsQuery clickSumEnd(Integer clickSumEnd){
this.clickSumEnd = clickSumEnd;
return this;
}
/**
* 设置 增加 应用点击次数
* @param clickSumIncrement
*/
public SstAppsQuery clickSumIncrement(Integer clickSumIncrement){
this.clickSumIncrement = clickSumIncrement;
return this;
}
/**
* 设置 应用点击次数
* @param clickSumList
*/
public SstAppsQuery clickSumList(List<Integer> clickSumList){
this.clickSumList = clickSumList;
return this;
}
/**
* 设置 应用点击次数
* @param clickSumNotList
*/
public SstAppsQuery clickSumNotList(List<Integer> clickSumNotList){
this.clickSumNotList = clickSumNotList;
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
......
sst-manager/src/main/java/com/mortals/xhx/module/sst/service/SstAppsDeskService.java
View file @ d242eb2e
...@@ -44,4 +44,10 @@ public interface SstAppsDeskService extends ICRUDService<SstAppsDeskEntity,Long> ...@@ -44,4 +44,10 @@ public interface SstAppsDeskService extends ICRUDService<SstAppsDeskEntity,Long>
* @param userId * @param userId
*/ */
void forbidden(Long appId,Long userId); void forbidden(Long appId,Long userId);
/**
* 增加应用点击次数
* @param appId
*/
void clickCountAdd(Long appId,Long siteId);
} }
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/sst/service/SstAppsService.java
View file @ d242eb2e
...@@ -46,4 +46,10 @@ public interface SstAppsService extends ICRUDService<SstAppsEntity,Long>{ ...@@ -46,4 +46,10 @@ public interface SstAppsService extends ICRUDService<SstAppsEntity,Long>{
* @param userId * @param userId
*/ */
void forbidden(Long appId,Long userId); void forbidden(Long appId,Long userId);
/**
* 增加应用点击次数
* @param appId
*/
void clickCountAdd(Long appId,Long siteId);
} }
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/sst/service/impl/SstAppsDeskServiceImpl.java
View file @ d242eb2e
...@@ -8,7 +8,7 @@ import com.mortals.xhx.common.utils.StringUtils; ...@@ -8,7 +8,7 @@ import com.mortals.xhx.common.utils.StringUtils;
import com.mortals.xhx.feign.app.IAppFeign; import com.mortals.xhx.feign.app.IAppFeign;
import com.mortals.xhx.module.apps.model.AppsInfoEntity; import com.mortals.xhx.module.apps.model.AppsInfoEntity;
import com.mortals.xhx.module.apps.service.AppsInfoService; import com.mortals.xhx.module.apps.service.AppsInfoService;
import com.mortals.xhx.module.sst.model.SstAppsDeskEntity; import com.mortals.xhx.module.sst.model.*;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -148,6 +148,7 @@ public class SstAppsDeskServiceImpl extends AbstractCRUDServiceImpl<SstAppsDeskD ...@@ -148,6 +148,7 @@ public class SstAppsDeskServiceImpl extends AbstractCRUDServiceImpl<SstAppsDeskD
public Map<String, Object> getAppListBySite(String deviceCode,Long siteId,String host,String appName) { public Map<String, Object> getAppListBySite(String deviceCode,Long siteId,String host,String appName) {
SstAppsDeskEntity query = new SstAppsDeskEntity(); SstAppsDeskEntity query = new SstAppsDeskEntity();
Map<String,String> orderCols = new HashMap<>(); Map<String,String> orderCols = new HashMap<>();
orderCols.put("clickSum","DESC");
orderCols.put("basicSort","DESC"); orderCols.put("basicSort","DESC");
query.setOrderCols(orderCols); query.setOrderCols(orderCols);
query.setSiteId(siteId); query.setSiteId(siteId);
...@@ -188,6 +189,8 @@ public class SstAppsDeskServiceImpl extends AbstractCRUDServiceImpl<SstAppsDeskD ...@@ -188,6 +189,8 @@ public class SstAppsDeskServiceImpl extends AbstractCRUDServiceImpl<SstAppsDeskD
if(!appInfoMap.containsKey(sstAppsDeskEntity.getAppId())){ if(!appInfoMap.containsKey(sstAppsDeskEntity.getAppId())){
continue; continue;
} }
appInfoMap.get(sstAppsDeskEntity.getAppId()).setClickSum(sstAppsDeskEntity.getClickSum());
appInfoMap.get(sstAppsDeskEntity.getAppId()).setSort(sstAppsDeskEntity.getBasicSort());
if(sstAppsDeskEntity.getShowBasic()==1){ if(sstAppsDeskEntity.getShowBasic()==1){
showApps.add(appInfoMap.get(sstAppsDeskEntity.getAppId())); showApps.add(appInfoMap.get(sstAppsDeskEntity.getAppId()));
} }
...@@ -210,4 +213,16 @@ public class SstAppsDeskServiceImpl extends AbstractCRUDServiceImpl<SstAppsDeskD ...@@ -210,4 +213,16 @@ public class SstAppsDeskServiceImpl extends AbstractCRUDServiceImpl<SstAppsDeskD
condition.put("appId",appId); condition.put("appId",appId);
this.dao.delete(condition); this.dao.delete(condition);
} }
@Override
public void clickCountAdd(Long appId, Long siteId) {
SstAppsDeskEntity sstAppsDeskEntity = this.selectOne(new SstAppsDeskQuery().appId(appId).siteId(siteId));
if(sstAppsDeskEntity!=null){
Map<String,Object> condition = new HashMap<>();
condition.put("id",sstAppsDeskEntity.getId());
Map<String,Object> data = new HashMap<>();
data.put("clickSumIncrement",1);
this.dao.update(data,condition);
}
}
} }
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/sst/service/impl/SstAppsServiceImpl.java
View file @ d242eb2e
...@@ -9,6 +9,7 @@ import com.mortals.xhx.common.utils.StringUtils; ...@@ -9,6 +9,7 @@ import com.mortals.xhx.common.utils.StringUtils;
import com.mortals.xhx.feign.app.IAppFeign; import com.mortals.xhx.feign.app.IAppFeign;
import com.mortals.xhx.module.apps.model.AppsInfoEntity; import com.mortals.xhx.module.apps.model.AppsInfoEntity;
import com.mortals.xhx.module.apps.service.AppsInfoService; import com.mortals.xhx.module.apps.service.AppsInfoService;
import com.mortals.xhx.module.sst.model.SstAppsQuery;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.checkerframework.checker.units.qual.A; import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -150,6 +151,7 @@ public class SstAppsServiceImpl extends AbstractCRUDServiceImpl<SstAppsDao, SstA ...@@ -150,6 +151,7 @@ public class SstAppsServiceImpl extends AbstractCRUDServiceImpl<SstAppsDao, SstA
public Map<String, Object> getAppListBySite(String deviceCode,Long siteId,String host,String appName) { public Map<String, Object> getAppListBySite(String deviceCode,Long siteId,String host,String appName) {
SstAppsEntity query = new SstAppsEntity(); SstAppsEntity query = new SstAppsEntity();
Map<String,String> orderCols = new HashMap<>(); Map<String,String> orderCols = new HashMap<>();
orderCols.put("clickSum","DESC");
orderCols.put("basicSort","DESC"); orderCols.put("basicSort","DESC");
query.setOrderCols(orderCols); query.setOrderCols(orderCols);
query.setSiteId(siteId); query.setSiteId(siteId);
...@@ -191,6 +193,8 @@ public class SstAppsServiceImpl extends AbstractCRUDServiceImpl<SstAppsDao, SstA ...@@ -191,6 +193,8 @@ public class SstAppsServiceImpl extends AbstractCRUDServiceImpl<SstAppsDao, SstA
if(!appInfoMap.containsKey(sstAppsEntity.getAppId())){ if(!appInfoMap.containsKey(sstAppsEntity.getAppId())){
continue; continue;
} }
appInfoMap.get(sstAppsEntity.getAppId()).setClickSum(sstAppsEntity.getClickSum());
appInfoMap.get(sstAppsEntity.getAppId()).setSort(sstAppsEntity.getBasicSort());
if(sstAppsEntity.getShowBasic()==1){ if(sstAppsEntity.getShowBasic()==1){
showApps.add(appInfoMap.get(sstAppsEntity.getAppId())); showApps.add(appInfoMap.get(sstAppsEntity.getAppId()));
} }
...@@ -213,4 +217,16 @@ public class SstAppsServiceImpl extends AbstractCRUDServiceImpl<SstAppsDao, SstA ...@@ -213,4 +217,16 @@ public class SstAppsServiceImpl extends AbstractCRUDServiceImpl<SstAppsDao, SstA
condition.put("appId",appId); condition.put("appId",appId);
this.dao.delete(condition); this.dao.delete(condition);
} }
@Override
public void clickCountAdd(Long appId,Long siteId) {
SstAppsEntity sstAppsEntity = this.selectOne(new SstAppsQuery().appId(appId).siteId(siteId));
if(sstAppsEntity!=null){
Map<String,Object> condition = new HashMap<>();
condition.put("id",sstAppsEntity.getId());
Map<String,Object> data = new HashMap<>();
data.put("clickSumIncrement",1);
this.dao.update(data,condition);
}
}
} }
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/sst/web/SstAppsController.java
View file @ d242eb2e
...@@ -12,6 +12,7 @@ import com.mortals.xhx.common.pdu.site.SitePdu; ...@@ -12,6 +12,7 @@ import com.mortals.xhx.common.pdu.site.SitePdu;
import com.mortals.xhx.feign.app.IAppFeign; import com.mortals.xhx.feign.app.IAppFeign;
import com.mortals.xhx.module.sst.service.SstAppsDeskService; import com.mortals.xhx.module.sst.service.SstAppsDeskService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
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.*;
...@@ -117,4 +118,31 @@ public class SstAppsController extends BaseCRUDJsonBodyMappingController<SstApps ...@@ -117,4 +118,31 @@ public class SstAppsController extends BaseCRUDJsonBodyMappingController<SstApps
ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString()); ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
return ret; return ret;
} }
@GetMapping(value = {"click"})
@UnAuth
public String clickSum(@RequestParam("appId") Long appId,@RequestParam("siteId") Long siteId) {
Map<String, Object> model = new HashMap();
if (appId == null) {
return this.createFailJsonResp("请选择待查看" + this.getModuleDesc() + "信息");
} else {
JSONObject ret = new JSONObject();
String busiDesc = "查看" + this.getModuleDesc();
Context context = this.getContext();
try {
this.service.clickCountAdd(appId,siteId);
model.put("message_info","操作成功");
} catch (Exception var8) {
this.doException(this.request, busiDesc, model, var8);
Object msg = model.get("message_info");
return this.createFailJsonResp(msg == null ? "系统异常" : msg.toString());
}
this.init(model, context);
ret.put("data", model);
ret.put("code", 1);
ret.put("msg", model.remove("message_info"));
return ret.toJSONString();
}
}
} }
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/sst/web/SstAppsDeskController.java
View file @ d242eb2e
package com.mortals.xhx.module.sst.web; package com.mortals.xhx.module.sst.web;
import com.mortals.framework.annotation.UnAuth;
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.service.IUser; import com.mortals.framework.service.IUser;
...@@ -34,7 +35,7 @@ import static com.mortals.framework.ap.SysConstains.*; ...@@ -34,7 +35,7 @@ import static com.mortals.framework.ap.SysConstains.*;
* @date 2023-04-09 * @date 2023-04-09
*/ */
@RestController @RestController
@RequestMapping("sst/apps/desk") @RequestMapping("apps/desk")
public class SstAppsDeskController extends BaseCRUDJsonBodyMappingController<SstAppsDeskService,SstAppsDeskEntity,Long> { public class SstAppsDeskController extends BaseCRUDJsonBodyMappingController<SstAppsDeskService,SstAppsDeskEntity,Long> {
@Autowired @Autowired
...@@ -76,4 +77,31 @@ public class SstAppsDeskController extends BaseCRUDJsonBodyMappingController<Sst ...@@ -76,4 +77,31 @@ public class SstAppsDeskController extends BaseCRUDJsonBodyMappingController<Sst
ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString()); ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
return ret; return ret;
} }
@GetMapping(value = {"click"})
@UnAuth
public String clickSum(@RequestParam("appId") Long appId,@RequestParam("siteId") Long siteId) {
Map<String, Object> model = new HashMap();
if (appId == null) {
return this.createFailJsonResp("请选择待查看" + this.getModuleDesc() + "信息");
} else {
JSONObject ret = new JSONObject();
String busiDesc = "查看" + this.getModuleDesc();
Context context = this.getContext();
try {
this.service.clickCountAdd(appId,siteId);
model.put("message_info","操作成功");
} catch (Exception var8) {
this.doException(this.request, busiDesc, model, var8);
Object msg = model.get("message_info");
return this.createFailJsonResp(msg == null ? "系统异常" : msg.toString());
}
this.init(model, context);
ret.put("data", model);
ret.put("code", 1);
ret.put("msg", model.remove("message_info"));
return ret.toJSONString();
}
}
} }
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/sst/web/SstBasicController.java
View file @ d242eb2e
...@@ -366,6 +366,7 @@ public class SstBasicController extends BaseCRUDJsonBodyMappingController<SstBas ...@@ -366,6 +366,7 @@ public class SstBasicController extends BaseCRUDJsonBodyMappingController<SstBas
model.put("showApps", sstApps.get("showApps")); model.put("showApps", sstApps.get("showApps"));
model.put("hotApps", sstApps.get("hotApps")); model.put("hotApps", sstApps.get("hotApps"));
model.put("allApps", sstApps.get("allApps")); model.put("allApps", sstApps.get("allApps"));
model.put("appThemeCount",groupAppTheme((List<AppsInfoEntity>)sstApps.get("showApps")));
AppPdu appPdu = new AppPdu(); AppPdu appPdu = new AppPdu();
appPdu.setSiteId(query.getSiteId()); appPdu.setSiteId(query.getSiteId());
appPdu.setSize(999); appPdu.setSize(999);
...@@ -418,6 +419,7 @@ public class SstBasicController extends BaseCRUDJsonBodyMappingController<SstBas ...@@ -418,6 +419,7 @@ public class SstBasicController extends BaseCRUDJsonBodyMappingController<SstBas
model.put("showApps", sstAppsDesk.get("showApps")); model.put("showApps", sstAppsDesk.get("showApps"));
model.put("hotApps", sstAppsDesk.get("hotApps")); model.put("hotApps", sstAppsDesk.get("hotApps"));
model.put("allApps", sstAppsDesk.get("allApps")); model.put("allApps", sstAppsDesk.get("allApps"));
model.put("appThemeCount",groupAppTheme((List<AppsInfoEntity>)sstAppsDesk.get("showApps")));
AppPdu appPdu = new AppPdu(); AppPdu appPdu = new AppPdu();
appPdu.setSiteId(query.getSiteId()); appPdu.setSiteId(query.getSiteId());
appPdu.setSize(999); appPdu.setSize(999);
...@@ -441,4 +443,18 @@ public class SstBasicController extends BaseCRUDJsonBodyMappingController<SstBas ...@@ -441,4 +443,18 @@ public class SstBasicController extends BaseCRUDJsonBodyMappingController<SstBas
return ret; return ret;
} }
private Map<String,Integer> groupAppTheme(List<AppsInfoEntity> appList){
if(CollectionUtils.isEmpty(appList)){
return null;
}
Map<String,List<AppsInfoEntity>> group = appList.stream().collect(Collectors.groupingBy(AppsInfoEntity::getAppThemeName));
Map<String,Integer> result = new HashMap<>();
for (Map.Entry<String, List<AppsInfoEntity>> itemMap: group.entrySet()) {
String key = itemMap.getKey();
List<AppsInfoEntity> value = itemMap.getValue();
result.put(key,value.size());
}
return result;
}
} }
\ No newline at end of file
sst-manager/src/main/resources/sqlmap/module/sst/SstAppsDeskMapper.xml
View file @ d242eb2e
<?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.sst.dao.ibatis.SstAppsDeskDaoImpl"> <mapper namespace="com.mortals.xhx.module.sst.dao.ibatis.SstAppsDeskDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
<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" />
<result property="clickSum" column="clickSum" />
</resultMap> </resultMap>
...@@ -39,7 +40,7 @@ ...@@ -39,7 +40,7 @@
a.name, a.name,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('describe') or colPickMode == 1 and data.containsKey('describe')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('describe') or colPickMode == 1 and data.containsKey('describe')))">
a.describe, a.`describe`,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('url') or colPickMode == 1 and data.containsKey('url')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('url') or colPickMode == 1 and data.containsKey('url')))">
a.url, a.url,
...@@ -68,23 +69,26 @@ ...@@ -68,23 +69,26 @@
<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('clickSum') or colPickMode == 1 and data.containsKey('clickSum')))">
a.clickSum,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="SstAppsDeskEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="SstAppsDeskEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_sst_apps_desk insert into mortals_xhx_sst_apps_desk
(siteId,appId,`name`,`describe`,url,showBasic,basicSort,showHot,hotSort,createUserId,createTime,updateUserId,updateTime) (siteId,appId,name,`describe`,url,showBasic,basicSort,showHot,hotSort,createUserId,createTime,updateUserId,updateTime,clickSum)
VALUES VALUES
(#{siteId},#{appId},#{name},#{describe},#{url},#{showBasic},#{basicSort},#{showHot},#{hotSort},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{siteId},#{appId},#{name},#{describe},#{url},#{showBasic},#{basicSort},#{showHot},#{hotSort},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{clickSum})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_sst_apps_desk insert into mortals_xhx_sst_apps_desk
(siteId,appId,`name`,`describe`,url,showBasic,basicSort,showHot,hotSort,createUserId,createTime,updateUserId,updateTime) (siteId,appId,name,`describe`,url,showBasic,basicSort,showHot,hotSort,createUserId,createTime,updateUserId,updateTime,clickSum)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteId},#{item.appId},#{item.name},#{item.describe},#{item.url},#{item.showBasic},#{item.basicSort},#{item.showHot},#{item.hotSort},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.siteId},#{item.appId},#{item.name},#{item.describe},#{item.url},#{item.showBasic},#{item.basicSort},#{item.showHot},#{item.hotSort},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.clickSum})
</foreach> </foreach>
</insert> </insert>
...@@ -107,7 +111,7 @@ ...@@ -107,7 +111,7 @@
a.appId=ifnull(a.appId,0) + #{data.appIdIncrement}, a.appId=ifnull(a.appId,0) + #{data.appIdIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('name')) or (colPickMode==1 and !data.containsKey('name'))"> <if test="(colPickMode==0 and data.containsKey('name')) or (colPickMode==1 and !data.containsKey('name'))">
a.`name`=#{data.name}, a.name=#{data.name},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('describe')) or (colPickMode==1 and !data.containsKey('describe'))"> <if test="(colPickMode==0 and data.containsKey('describe')) or (colPickMode==1 and !data.containsKey('describe'))">
a.`describe`=#{data.describe}, a.`describe`=#{data.describe},
...@@ -157,6 +161,12 @@ ...@@ -157,6 +161,12 @@
<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('clickSum')) or (colPickMode==1 and !data.containsKey('clickSum'))">
a.clickSum=#{data.clickSum},
</if>
<if test="(colPickMode==0 and data.containsKey('clickSumIncrement')) or (colPickMode==1 and !data.containsKey('clickSumIncrement'))">
a.clickSum=ifnull(a.clickSum,0) + #{data.clickSumIncrement},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -200,7 +210,7 @@ ...@@ -200,7 +210,7 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="describe=(case" suffix="ELSE describe end),"> <trim prefix="`describe`=(case" suffix="ELSE `describe` 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('describe')) or (colPickMode==1 and !item.containsKey('describe'))"> <if test="(colPickMode==0 and item.containsKey('describe')) or (colPickMode==1 and !item.containsKey('describe'))">
when a.id=#{item.id} then #{item.describe} when a.id=#{item.id} then #{item.describe}
...@@ -300,6 +310,18 @@ ...@@ -300,6 +310,18 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="clickSum=(case" suffix="ELSE clickSum end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('clickSum')) or (colPickMode==1 and !item.containsKey('clickSum'))">
when a.id=#{item.id} then #{item.clickSum}
</when>
<when test="(colPickMode==0 and item.containsKey('clickSumIncrement')) or (colPickMode==1 and !item.containsKey('clickSumIncrement'))">
when a.id=#{item.id} then ifnull(a.clickSum,0) + #{item.clickSumIncrement}
</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=")">
...@@ -424,13 +446,13 @@ ...@@ -424,13 +446,13 @@
${_conditionType_} a.id is null ${_conditionType_} a.id is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in ${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('idNotList')"> <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
${_conditionType_} a.id not in ${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -451,13 +473,13 @@ ...@@ -451,13 +473,13 @@
${_conditionType_} a.siteId is null ${_conditionType_} a.siteId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('siteIdList')"> <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in ${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" 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('siteIdNotList')"> <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in ${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -478,13 +500,13 @@ ...@@ -478,13 +500,13 @@
${_conditionType_} a.appId is null ${_conditionType_} a.appId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('appIdList')"> <if test="conditionParamRef.containsKey('appIdList') and conditionParamRef.appIdList.size() > 0">
${_conditionType_} a.appId in ${_conditionType_} a.appId in
<foreach collection="conditionParamRef.appIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.appIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('appIdNotList')"> <if test="conditionParamRef.containsKey('appIdNotList') and conditionParamRef.appIdNotList.size() > 0">
${_conditionType_} a.appId not in ${_conditionType_} a.appId not in
<foreach collection="conditionParamRef.appIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.appIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -506,13 +528,13 @@ ...@@ -506,13 +528,13 @@
${_conditionType_} a.name is null ${_conditionType_} a.name is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('nameList')"> <if test="conditionParamRef.containsKey('nameList') and conditionParamRef.nameList.size() > 0">
${_conditionType_} a.name in ${_conditionType_} a.name in
<foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('nameNotList')"> <if test="conditionParamRef.containsKey('nameNotList') and conditionParamRef.nameNotList.size() > 0">
${_conditionType_} a.name not in ${_conditionType_} a.name not in
<foreach collection="conditionParamRef.nameNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.nameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -521,20 +543,20 @@ ...@@ -521,20 +543,20 @@
<if test="conditionParamRef.containsKey('describe')"> <if test="conditionParamRef.containsKey('describe')">
<if test="conditionParamRef.describe != null and conditionParamRef.describe != ''"> <if test="conditionParamRef.describe != null and conditionParamRef.describe != ''">
${_conditionType_} a.describe like #{${_conditionParam_}.describe} ${_conditionType_} a.`describe` like #{${_conditionParam_}.describe}
</if> </if>
<if test="conditionParamRef.describe == null"> <if test="conditionParamRef.describe == null">
${_conditionType_} a.describe is null ${_conditionType_} a.`describe` is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('describeList')"> <if test="conditionParamRef.containsKey('describeList') and conditionParamRef.describeList.size() > 0">
${_conditionType_} a.describe in ${_conditionType_} a.`describe` in
<foreach collection="conditionParamRef.describeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.describeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('describeNotList')"> <if test="conditionParamRef.containsKey('describeNotList') and conditionParamRef.describeNotList.size() > 0">
${_conditionType_} a.describe not in ${_conditionType_} a.`describe` not in
<foreach collection="conditionParamRef.describeNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.describeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
...@@ -548,13 +570,13 @@ ...@@ -548,13 +570,13 @@
${_conditionType_} a.url is null ${_conditionType_} a.url is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('urlList')"> <if test="conditionParamRef.containsKey('urlList') and conditionParamRef.urlList.size() > 0">
${_conditionType_} a.url in ${_conditionType_} a.url in
<foreach collection="conditionParamRef.urlList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.urlList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('urlNotList')"> <if test="conditionParamRef.containsKey('urlNotList') and conditionParamRef.urlNotList.size() > 0">
${_conditionType_} a.url not in ${_conditionType_} a.url not in
<foreach collection="conditionParamRef.urlNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.urlNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -568,13 +590,13 @@ ...@@ -568,13 +590,13 @@
${_conditionType_} a.showBasic is null ${_conditionType_} a.showBasic is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('showBasicList')"> <if test="conditionParamRef.containsKey('showBasicList') and conditionParamRef.showBasicList.size() > 0">
${_conditionType_} a.showBasic in ${_conditionType_} a.showBasic in
<foreach collection="conditionParamRef.showBasicList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.showBasicList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('showBasicNotList')"> <if test="conditionParamRef.containsKey('showBasicNotList') and conditionParamRef.showBasicNotList.size() > 0">
${_conditionType_} a.showBasic not in ${_conditionType_} a.showBasic not in
<foreach collection="conditionParamRef.showBasicNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.showBasicNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -595,13 +617,13 @@ ...@@ -595,13 +617,13 @@
${_conditionType_} a.basicSort is null ${_conditionType_} a.basicSort is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('basicSortList')"> <if test="conditionParamRef.containsKey('basicSortList') and conditionParamRef.basicSortList.size() > 0">
${_conditionType_} a.basicSort in ${_conditionType_} a.basicSort in
<foreach collection="conditionParamRef.basicSortList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.basicSortList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('basicSortNotList')"> <if test="conditionParamRef.containsKey('basicSortNotList') and conditionParamRef.basicSortNotList.size() > 0">
${_conditionType_} a.basicSort not in ${_conditionType_} a.basicSort not in
<foreach collection="conditionParamRef.basicSortNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.basicSortNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -622,13 +644,13 @@ ...@@ -622,13 +644,13 @@
${_conditionType_} a.showHot is null ${_conditionType_} a.showHot is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('showHotList')"> <if test="conditionParamRef.containsKey('showHotList') and conditionParamRef.showHotList.size() > 0">
${_conditionType_} a.showHot in ${_conditionType_} a.showHot in
<foreach collection="conditionParamRef.showHotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.showHotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('showHotNotList')"> <if test="conditionParamRef.containsKey('showHotNotList') and conditionParamRef.showHotNotList.size() > 0">
${_conditionType_} a.showHot not in ${_conditionType_} a.showHot not in
<foreach collection="conditionParamRef.showHotNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.showHotNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -649,13 +671,13 @@ ...@@ -649,13 +671,13 @@
${_conditionType_} a.hotSort is null ${_conditionType_} a.hotSort is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('hotSortList')"> <if test="conditionParamRef.containsKey('hotSortList') and conditionParamRef.hotSortList.size() > 0">
${_conditionType_} a.hotSort in ${_conditionType_} a.hotSort in
<foreach collection="conditionParamRef.hotSortList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.hotSortList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('hotSortNotList')"> <if test="conditionParamRef.containsKey('hotSortNotList') and conditionParamRef.hotSortNotList.size() > 0">
${_conditionType_} a.hotSort not in ${_conditionType_} a.hotSort not in
<foreach collection="conditionParamRef.hotSortNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.hotSortNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -676,13 +698,13 @@ ...@@ -676,13 +698,13 @@
${_conditionType_} a.createUserId is null ${_conditionType_} a.createUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in ${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdNotList')"> <if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in ${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -718,13 +740,13 @@ ...@@ -718,13 +740,13 @@
${_conditionType_} a.updateUserId is null ${_conditionType_} a.updateUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdList')"> <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in ${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdNotList')"> <if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_conditionType_} a.updateUserId not in ${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
...@@ -752,6 +774,33 @@ ...@@ -752,6 +774,33 @@
<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('clickSum')">
<if test="conditionParamRef.clickSum != null ">
${_conditionType_} a.clickSum = #{${_conditionParam_}.clickSum}
</if>
<if test="conditionParamRef.clickSum == null">
${_conditionType_} a.clickSum is null
</if>
</if>
<if test="conditionParamRef.containsKey('clickSumList') and conditionParamRef.clickSumList.size() > 0">
${_conditionType_} a.clickSum in
<foreach collection="conditionParamRef.clickSumList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('clickSumNotList') and conditionParamRef.clickSumNotList.size() > 0">
${_conditionType_} a.clickSum not in
<foreach collection="conditionParamRef.clickSumNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('clickSumStart') and conditionParamRef.clickSumStart != null">
${_conditionType_} a.clickSum <![CDATA[ >= ]]> #{${_conditionParam_}.clickSumStart}
</if>
<if test="conditionParamRef.containsKey('clickSumEnd') and conditionParamRef.clickSumEnd != null">
${_conditionType_} a.clickSum <![CDATA[ <= ]]> #{${_conditionParam_}.clickSumEnd}
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -786,7 +835,7 @@ ...@@ -786,7 +835,7 @@
, ,
</if> </if>
<if test="orderCol.containsKey('describe')"> <if test="orderCol.containsKey('describe')">
a.describe a.`describe`
<if test='orderCol.describe != null and "DESC".equalsIgnoreCase(orderCol.describe)'>DESC</if> <if test='orderCol.describe != null and "DESC".equalsIgnoreCase(orderCol.describe)'>DESC</if>
, ,
</if> </if>
...@@ -800,6 +849,11 @@ ...@@ -800,6 +849,11 @@
<if test='orderCol.showBasic != null and "DESC".equalsIgnoreCase(orderCol.showBasic)'>DESC</if> <if test='orderCol.showBasic != null and "DESC".equalsIgnoreCase(orderCol.showBasic)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('clickSum')">
a.clickSum
<if test='orderCol.clickSum != null and "DESC".equalsIgnoreCase(orderCol.clickSum)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('basicSort')"> <if test="orderCol.containsKey('basicSort')">
a.basicSort a.basicSort
<if test='orderCol.basicSort != null and "DESC".equalsIgnoreCase(orderCol.basicSort)'>DESC</if> <if test='orderCol.basicSort != null and "DESC".equalsIgnoreCase(orderCol.basicSort)'>DESC</if>
...@@ -835,6 +889,7 @@ ...@@ -835,6 +889,7 @@
<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>
</trim> </trim>
</if> </if>
</sql> </sql>
......
sst-manager/src/main/resources/sqlmap/module/sst/SstAppsMapper.xml
View file @ d242eb2e
<?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.sst.dao.ibatis.SstAppsDaoImpl"> <mapper namespace="com.mortals.xhx.module.sst.dao.ibatis.SstAppsDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
<result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
<result property="appId" column="appId" /> <result property="appId" column="appId" />
<result property="clickSum" column="clickSum" />
</resultMap> </resultMap>
...@@ -36,7 +37,7 @@ ...@@ -36,7 +37,7 @@
a.name, a.name,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('describe') or colPickMode == 1 and data.containsKey('describe')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('describe') or colPickMode == 1 and data.containsKey('describe')))">
a.describe, a.`describe`,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('url') or colPickMode == 1 and data.containsKey('url')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('url') or colPickMode == 1 and data.containsKey('url')))">
a.url, a.url,
...@@ -68,23 +69,26 @@ ...@@ -68,23 +69,26 @@
<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('clickSum') or colPickMode == 1 and data.containsKey('clickSum')))">
a.clickSum,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="SstAppsEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="SstAppsEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_sst_apps insert into mortals_xhx_sst_apps
(siteId,`name`,`describe`,url,showBasic,basicSort,showHot,hotSort,createUserId,createTime,updateUserId,updateTime,appId) (siteId,name,`describe`,url,showBasic,basicSort,showHot,hotSort,createUserId,createTime,updateUserId,updateTime,appId,clickSum)
VALUES VALUES
(#{siteId},#{name},#{describe},#{url},#{showBasic},#{basicSort},#{showHot},#{hotSort},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{appId}) (#{siteId},#{name},#{describe},#{url},#{showBasic},#{basicSort},#{showHot},#{hotSort},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{appId},#{clickSum})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_sst_apps insert into mortals_xhx_sst_apps
(siteId,`name`,`describe`,url,showBasic,basicSort,showHot,hotSort,createUserId,createTime,updateUserId,updateTime,appId) (siteId,name,`describe`,url,showBasic,basicSort,showHot,hotSort,createUserId,createTime,updateUserId,updateTime,appId,clickSum)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteId},#{item.name},#{item.describe},#{item.url},#{item.showBasic},#{item.basicSort},#{item.showHot},#{item.hotSort},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.appId}) (#{item.siteId},#{item.name},#{item.describe},#{item.url},#{item.showBasic},#{item.basicSort},#{item.showHot},#{item.hotSort},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.appId},#{item.clickSum})
</foreach> </foreach>
</insert> </insert>
...@@ -101,7 +105,7 @@ ...@@ -101,7 +105,7 @@
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement}, a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('name')) or (colPickMode==1 and !data.containsKey('name'))"> <if test="(colPickMode==0 and data.containsKey('name')) or (colPickMode==1 and !data.containsKey('name'))">
a.`name`=#{data.name}, a.name=#{data.name},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('describe')) or (colPickMode==1 and !data.containsKey('describe'))"> <if test="(colPickMode==0 and data.containsKey('describe')) or (colPickMode==1 and !data.containsKey('describe'))">
a.`describe`=#{data.describe}, a.`describe`=#{data.describe},
...@@ -157,6 +161,12 @@ ...@@ -157,6 +161,12 @@
<if test="(colPickMode==0 and data.containsKey('appIdIncrement')) or (colPickMode==1 and !data.containsKey('appIdIncrement'))"> <if test="(colPickMode==0 and data.containsKey('appIdIncrement')) or (colPickMode==1 and !data.containsKey('appIdIncrement'))">
a.appId=ifnull(a.appId,0) + #{data.appIdIncrement}, a.appId=ifnull(a.appId,0) + #{data.appIdIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('clickSum')) or (colPickMode==1 and !data.containsKey('clickSum'))">
a.clickSum=#{data.clickSum},
</if>
<if test="(colPickMode==0 and data.containsKey('clickSumIncrement')) or (colPickMode==1 and !data.containsKey('clickSumIncrement'))">
a.clickSum=ifnull(a.clickSum,0) + #{data.clickSumIncrement},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -188,7 +198,7 @@ ...@@ -188,7 +198,7 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="describe=(case" suffix="ELSE describe end),"> <trim prefix="`describe`=(case" suffix="ELSE `describe` 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('describe')) or (colPickMode==1 and !item.containsKey('describe'))"> <if test="(colPickMode==0 and item.containsKey('describe')) or (colPickMode==1 and !item.containsKey('describe'))">
when a.id=#{item.id} then #{item.describe} when a.id=#{item.id} then #{item.describe}
...@@ -300,6 +310,18 @@ ...@@ -300,6 +310,18 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="clickSum=(case" suffix="ELSE clickSum end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('clickSum')) or (colPickMode==1 and !item.containsKey('clickSum'))">
when a.id=#{item.id} then #{item.clickSum}
</when>
<when test="(colPickMode==0 and item.containsKey('clickSumIncrement')) or (colPickMode==1 and !item.containsKey('clickSumIncrement'))">
when a.id=#{item.id} then ifnull(a.clickSum,0) + #{item.clickSumIncrement}
</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=")">
...@@ -424,12 +446,18 @@ ...@@ -424,12 +446,18 @@
${_conditionType_} a.id is null ${_conditionType_} a.id is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in ${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null"> <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart} ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
...@@ -445,12 +473,18 @@ ...@@ -445,12 +473,18 @@
${_conditionType_} a.siteId is null ${_conditionType_} a.siteId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('siteIdList')"> <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in ${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" 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('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null"> <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart} ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if> </if>
...@@ -467,27 +501,39 @@ ...@@ -467,27 +501,39 @@
${_conditionType_} a.name is null ${_conditionType_} a.name is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('nameList')"> <if test="conditionParamRef.containsKey('nameList') and conditionParamRef.nameList.size() > 0">
${_conditionType_} a.name in ${_conditionType_} a.name in
<foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.nameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('nameNotList') and conditionParamRef.nameNotList.size() > 0">
${_conditionType_} a.name not in
<foreach collection="conditionParamRef.nameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('describe')"> <if test="conditionParamRef.containsKey('describe')">
<if test="conditionParamRef.describe != null and conditionParamRef.describe != ''"> <if test="conditionParamRef.describe != null and conditionParamRef.describe != ''">
${_conditionType_} a.describe like #{${_conditionParam_}.describe} ${_conditionType_} a.`describe` like #{${_conditionParam_}.describe}
</if> </if>
<if test="conditionParamRef.describe == null"> <if test="conditionParamRef.describe == null">
${_conditionType_} a.describe is null ${_conditionType_} a.`describe` is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('describeList')"> <if test="conditionParamRef.containsKey('describeList') and conditionParamRef.describeList.size() > 0">
${_conditionType_} a.describe in ${_conditionType_} a.`describe` in
<foreach collection="conditionParamRef.describeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.describeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('describeNotList') and conditionParamRef.describeNotList.size() > 0">
${_conditionType_} a.`describe` not in
<foreach collection="conditionParamRef.describeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('url')"> <if test="conditionParamRef.containsKey('url')">
<if test="conditionParamRef.url != null and conditionParamRef.url != ''"> <if test="conditionParamRef.url != null and conditionParamRef.url != ''">
...@@ -497,12 +543,18 @@ ...@@ -497,12 +543,18 @@
${_conditionType_} a.url is null ${_conditionType_} a.url is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('urlList')"> <if test="conditionParamRef.containsKey('urlList') and conditionParamRef.urlList.size() > 0">
${_conditionType_} a.url in ${_conditionType_} a.url in
<foreach collection="conditionParamRef.urlList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.urlList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('urlNotList') and conditionParamRef.urlNotList.size() > 0">
${_conditionType_} a.url not in
<foreach collection="conditionParamRef.urlNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('showBasic')"> <if test="conditionParamRef.containsKey('showBasic')">
<if test="conditionParamRef.showBasic != null "> <if test="conditionParamRef.showBasic != null ">
${_conditionType_} a.showBasic = #{${_conditionParam_}.showBasic} ${_conditionType_} a.showBasic = #{${_conditionParam_}.showBasic}
...@@ -511,12 +563,18 @@ ...@@ -511,12 +563,18 @@
${_conditionType_} a.showBasic is null ${_conditionType_} a.showBasic is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('showBasicList')"> <if test="conditionParamRef.containsKey('showBasicList') and conditionParamRef.showBasicList.size() > 0">
${_conditionType_} a.showBasic in ${_conditionType_} a.showBasic in
<foreach collection="conditionParamRef.showBasicList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.showBasicList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('showBasicNotList') and conditionParamRef.showBasicNotList.size() > 0">
${_conditionType_} a.showBasic not in
<foreach collection="conditionParamRef.showBasicNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('showBasicStart') and conditionParamRef.showBasicStart != null"> <if test="conditionParamRef.containsKey('showBasicStart') and conditionParamRef.showBasicStart != null">
${_conditionType_} a.showBasic <![CDATA[ >= ]]> #{${_conditionParam_}.showBasicStart} ${_conditionType_} a.showBasic <![CDATA[ >= ]]> #{${_conditionParam_}.showBasicStart}
</if> </if>
...@@ -532,12 +590,18 @@ ...@@ -532,12 +590,18 @@
${_conditionType_} a.basicSort is null ${_conditionType_} a.basicSort is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('basicSortList')"> <if test="conditionParamRef.containsKey('basicSortList') and conditionParamRef.basicSortList.size() > 0">
${_conditionType_} a.basicSort in ${_conditionType_} a.basicSort in
<foreach collection="conditionParamRef.basicSortList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.basicSortList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('basicSortNotList') and conditionParamRef.basicSortNotList.size() > 0">
${_conditionType_} a.basicSort not in
<foreach collection="conditionParamRef.basicSortNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('basicSortStart') and conditionParamRef.basicSortStart != null"> <if test="conditionParamRef.containsKey('basicSortStart') and conditionParamRef.basicSortStart != null">
${_conditionType_} a.basicSort <![CDATA[ >= ]]> #{${_conditionParam_}.basicSortStart} ${_conditionType_} a.basicSort <![CDATA[ >= ]]> #{${_conditionParam_}.basicSortStart}
</if> </if>
...@@ -553,12 +617,18 @@ ...@@ -553,12 +617,18 @@
${_conditionType_} a.showHot is null ${_conditionType_} a.showHot is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('showHotList')"> <if test="conditionParamRef.containsKey('showHotList') and conditionParamRef.showHotList.size() > 0">
${_conditionType_} a.showHot in ${_conditionType_} a.showHot in
<foreach collection="conditionParamRef.showHotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.showHotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('showHotNotList') and conditionParamRef.showHotNotList.size() > 0">
${_conditionType_} a.showHot not in
<foreach collection="conditionParamRef.showHotNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('showHotStart') and conditionParamRef.showHotStart != null"> <if test="conditionParamRef.containsKey('showHotStart') and conditionParamRef.showHotStart != null">
${_conditionType_} a.showHot <![CDATA[ >= ]]> #{${_conditionParam_}.showHotStart} ${_conditionType_} a.showHot <![CDATA[ >= ]]> #{${_conditionParam_}.showHotStart}
</if> </if>
...@@ -574,12 +644,18 @@ ...@@ -574,12 +644,18 @@
${_conditionType_} a.hotSort is null ${_conditionType_} a.hotSort is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('hotSortList')"> <if test="conditionParamRef.containsKey('hotSortList') and conditionParamRef.hotSortList.size() > 0">
${_conditionType_} a.hotSort in ${_conditionType_} a.hotSort in
<foreach collection="conditionParamRef.hotSortList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.hotSortList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('hotSortNotList') and conditionParamRef.hotSortNotList.size() > 0">
${_conditionType_} a.hotSort not in
<foreach collection="conditionParamRef.hotSortNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('hotSortStart') and conditionParamRef.hotSortStart != null"> <if test="conditionParamRef.containsKey('hotSortStart') and conditionParamRef.hotSortStart != null">
${_conditionType_} a.hotSort <![CDATA[ >= ]]> #{${_conditionParam_}.hotSortStart} ${_conditionType_} a.hotSort <![CDATA[ >= ]]> #{${_conditionParam_}.hotSortStart}
</if> </if>
...@@ -595,12 +671,18 @@ ...@@ -595,12 +671,18 @@
${_conditionType_} a.createUserId is null ${_conditionType_} a.createUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in ${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if> </if>
...@@ -631,12 +713,18 @@ ...@@ -631,12 +713,18 @@
${_conditionType_} a.updateUserId is null ${_conditionType_} a.updateUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdList')"> <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in ${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null"> <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart} ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if> </if>
...@@ -667,12 +755,18 @@ ...@@ -667,12 +755,18 @@
${_conditionType_} a.appId is null ${_conditionType_} a.appId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('appIdList')"> <if test="conditionParamRef.containsKey('appIdList') and conditionParamRef.appIdList.size() > 0">
${_conditionType_} a.appId in ${_conditionType_} a.appId in
<foreach collection="conditionParamRef.appIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.appIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('appIdNotList') and conditionParamRef.appIdNotList.size() > 0">
${_conditionType_} a.appId not in
<foreach collection="conditionParamRef.appIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('appIdStart') and conditionParamRef.appIdStart != null"> <if test="conditionParamRef.containsKey('appIdStart') and conditionParamRef.appIdStart != null">
${_conditionType_} a.appId <![CDATA[ >= ]]> #{${_conditionParam_}.appIdStart} ${_conditionType_} a.appId <![CDATA[ >= ]]> #{${_conditionParam_}.appIdStart}
</if> </if>
...@@ -680,6 +774,33 @@ ...@@ -680,6 +774,33 @@
${_conditionType_} a.appId <![CDATA[ <= ]]> #{${_conditionParam_}.appIdEnd} ${_conditionType_} a.appId <![CDATA[ <= ]]> #{${_conditionParam_}.appIdEnd}
</if> </if>
<if test="conditionParamRef.containsKey('clickSum')">
<if test="conditionParamRef.clickSum != null ">
${_conditionType_} a.clickSum = #{${_conditionParam_}.clickSum}
</if>
<if test="conditionParamRef.clickSum == null">
${_conditionType_} a.clickSum is null
</if>
</if>
<if test="conditionParamRef.containsKey('clickSumList') and conditionParamRef.clickSumList.size() > 0">
${_conditionType_} a.clickSum in
<foreach collection="conditionParamRef.clickSumList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('clickSumNotList') and conditionParamRef.clickSumNotList.size() > 0">
${_conditionType_} a.clickSum not in
<foreach collection="conditionParamRef.clickSumNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('clickSumStart') and conditionParamRef.clickSumStart != null">
${_conditionType_} a.clickSum <![CDATA[ >= ]]> #{${_conditionParam_}.clickSumStart}
</if>
<if test="conditionParamRef.containsKey('clickSumEnd') and conditionParamRef.clickSumEnd != null">
${_conditionType_} a.clickSum <![CDATA[ <= ]]> #{${_conditionParam_}.clickSumEnd}
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -709,7 +830,7 @@ ...@@ -709,7 +830,7 @@
, ,
</if> </if>
<if test="orderCol.containsKey('describe')"> <if test="orderCol.containsKey('describe')">
a.describe a.`describe`
<if test='orderCol.describe != null and "DESC".equalsIgnoreCase(orderCol.describe)'>DESC</if> <if test='orderCol.describe != null and "DESC".equalsIgnoreCase(orderCol.describe)'>DESC</if>
, ,
</if> </if>
...@@ -723,6 +844,11 @@ ...@@ -723,6 +844,11 @@
<if test='orderCol.showBasic != null and "DESC".equalsIgnoreCase(orderCol.showBasic)'>DESC</if> <if test='orderCol.showBasic != null and "DESC".equalsIgnoreCase(orderCol.showBasic)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('clickSum')">
a.clickSum
<if test='orderCol.clickSum != null and "DESC".equalsIgnoreCase(orderCol.clickSum)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('basicSort')"> <if test="orderCol.containsKey('basicSort')">
a.basicSort a.basicSort
<if test='orderCol.basicSort != null and "DESC".equalsIgnoreCase(orderCol.basicSort)'>DESC</if> <if test='orderCol.basicSort != null and "DESC".equalsIgnoreCase(orderCol.basicSort)'>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