Commit d242eb2e authored by 廖旭伟's avatar 廖旭伟

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

parent 8c2a02f2
...@@ -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
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
...@@ -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
......
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
...@@ -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
...@@ -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
...@@ -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
...@@ -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
...@@ -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
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
...@@ -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
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