Skip to content

S
self-service
Commit ad2c8b6a authored by 赵啸非's avatar 赵啸非
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	sst-manager/pom.xml
parents f1c92e8e 8ae42570
Show whitespace changes
Inline Side-by-side
Showing with 7960 additions and 3738 deletions
common-lib/src/main/java/com/mortals/xhx/common/pdu/app/AppCategoryPdu.java 0 → 100644
View file @ ad2c8b6a
package com.mortals.xhx.common.pdu.app;
import com.mortals.framework.model.BaseEntityLong;
import lombok.Data;
@Data
public class AppCategoryPdu extends BaseEntityLong {
private static final long serialVersionUID = 1L;
/**
* 站点Id
*/
private Long siteId;
/**
* 站点名称
*/
private String siteName;
/**
* 分类编码
*/
private String categoryCode;
/**
* 分类名称
*/
private String categoryName;
/**
* 排序字段
*/
private Integer sort;
/**
* 封面
*/
private String cover;
/**
* 备注
*/
private String remark;
@Override
public int hashCode() {
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
if (obj == null) return false;
if (obj instanceof AppCategoryPdu) {
AppCategoryPdu tmp = (AppCategoryPdu) obj;
if (this.getId() == tmp.getId()) {
return true;
}
}
return false;
}
public void initAttrValue(){
this.siteId = -1L;
this.siteName = "";
this.categoryCode = "";
this.categoryName = "";
this.sort = 0;
this.cover = "";
this.remark = "";
}
}
common-lib/src/main/java/com/mortals/xhx/common/pdu/device/DevicePdu.java
View file @ ad2c8b6a
...@@ -200,6 +200,11 @@ public class DevicePdu extends BaseEntityLong { ...@@ -200,6 +200,11 @@ public class DevicePdu extends BaseEntityLong {
* 是否显示小程序二维码(0.否，1.是) * 是否显示小程序二维码(0.否，1.是)
*/ */
private Integer showWechatQrCode; private Integer showWechatQrCode;
/**
* 所属机构
*/
private String orgName;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -310,5 +315,4 @@ public class DevicePdu extends BaseEntityLong { ...@@ -310,5 +315,4 @@ public class DevicePdu extends BaseEntityLong {
this.showWechatQrCode = 1; this.showWechatQrCode = 1;
} }
} }
\ No newline at end of file
common-lib/src/main/java/com/mortals/xhx/common/pdu/site/SiteTreeSelectVO.java
View file @ ad2c8b6a
...@@ -27,6 +27,7 @@ public class SiteTreeSelectVO implements Serializable { ...@@ -27,6 +27,7 @@ public class SiteTreeSelectVO implements Serializable {
* 区域编码 * 区域编码
*/ */
private String areaCode; private String areaCode;
private String areaName;
/** /**
* 是否叶子节点 * 是否叶子节点
*/ */
......
common-lib/src/main/java/com/mortals/xhx/feign/app/IAppFeign.java
View file @ ad2c8b6a
...@@ -2,6 +2,7 @@ package com.mortals.xhx.feign.app; ...@@ -2,6 +2,7 @@ package com.mortals.xhx.feign.app;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.xhx.common.pdu.RespData; import com.mortals.xhx.common.pdu.RespData;
import com.mortals.xhx.common.pdu.app.AppCategoryPdu;
import com.mortals.xhx.common.pdu.app.AppPdu; import com.mortals.xhx.common.pdu.app.AppPdu;
import com.mortals.xhx.common.pdu.app.DeviceBlackappPdu; import com.mortals.xhx.common.pdu.app.DeviceBlackappPdu;
import com.mortals.xhx.common.pdu.device.DevicePdu; import com.mortals.xhx.common.pdu.device.DevicePdu;
...@@ -48,6 +49,15 @@ public interface IAppFeign extends IFeign { ...@@ -48,6 +49,15 @@ public interface IAppFeign extends IFeign {
*/ */
@PostMapping(value = "/device/blackapp/list") @PostMapping(value = "/device/blackapp/list")
Rest<RespData<List<DeviceBlackappPdu>>> blackappList(@RequestBody DeviceBlackappPdu appPdu); Rest<RespData<List<DeviceBlackappPdu>>> blackappList(@RequestBody DeviceBlackappPdu appPdu);
/**
* 自助终端应用分类
*
* @param appPdu
* @return
*/
@PostMapping(value = "/app/category/list")
Rest<RespData<List<AppCategoryPdu>>> categoryList(@RequestBody AppCategoryPdu appPdu);
} }
@Slf4j @Slf4j
...@@ -72,6 +82,11 @@ class AppFeignFallbackFactory implements FallbackFactory<IAppFeign> { ...@@ -72,6 +82,11 @@ class AppFeignFallbackFactory implements FallbackFactory<IAppFeign> {
public Rest<RespData<List<DeviceBlackappPdu>>> blackappList(DeviceBlackappPdu appPdu) { public Rest<RespData<List<DeviceBlackappPdu>>> blackappList(DeviceBlackappPdu appPdu) {
return Rest.fail("暂时无法获取设备应用黑名单，请稍后再试!"); return Rest.fail("暂时无法获取设备应用黑名单，请稍后再试!");
} }
@Override
public Rest<RespData<List<AppCategoryPdu>>> categoryList(AppCategoryPdu appPdu) {
return Rest.fail("暂时无法获取自助终端应用分类，请稍后再试!");
}
}; };
} }
} }
\ No newline at end of file
common-lib/src/main/java/com/mortals/xhx/feign/device/IDeviceFeign.java
View file @ ad2c8b6a
package com.mortals.xhx.feign.device; package com.mortals.xhx.feign.device;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.common.Rest; import com.mortals.framework.common.Rest;
import com.mortals.xhx.common.pdu.RespData; import com.mortals.xhx.common.pdu.RespData;
import com.mortals.xhx.common.pdu.device.DeviceNotifyPdu; import com.mortals.xhx.common.pdu.device.DeviceNotifyPdu;
...@@ -8,8 +9,10 @@ import com.mortals.xhx.feign.IFeign; ...@@ -8,8 +9,10 @@ import com.mortals.xhx.feign.IFeign;
import feign.hystrix.FallbackFactory; import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.List; import java.util.List;
/** /**
...@@ -59,6 +62,15 @@ public interface IDeviceFeign extends IFeign { ...@@ -59,6 +62,15 @@ public interface IDeviceFeign extends IFeign {
@PostMapping(value = "/device/save") @PostMapping(value = "/device/save")
Rest<RespData<DevicePdu>> save(@RequestBody DevicePdu devicePdu,@RequestHeader("Authorization") String authorization); Rest<RespData<DevicePdu>> save(@RequestBody DevicePdu devicePdu,@RequestHeader("Authorization") String authorization);
/**
* 设备启用停用
*
* @param devicePdu
* @return
*/
@PostMapping(value = "/device/enable")
String deviceEnable(@RequestBody DevicePdu devicePdu,@RequestHeader("Authorization") String authorization);
/** /**
* 接收第三方平台下发设备消息 * 接收第三方平台下发设备消息
* @param deviceNotifyPdu * @param deviceNotifyPdu
...@@ -66,6 +78,9 @@ public interface IDeviceFeign extends IFeign { ...@@ -66,6 +78,9 @@ public interface IDeviceFeign extends IFeign {
*/ */
@PostMapping(value = "/notify/downMsg") @PostMapping(value = "/notify/downMsg")
Rest<String> downMsg(@RequestBody DeviceNotifyPdu deviceNotifyPdu); Rest<String> downMsg(@RequestBody DeviceNotifyPdu deviceNotifyPdu);
@PostMapping(value = "/device/importData",consumes= MediaType.MULTIPART_FORM_DATA_VALUE)
String importData(@RequestPart MultipartFile file,@RequestHeader("Authorization") String authorization,@RequestParam("siteId") Long siteId);
} }
...@@ -95,10 +110,27 @@ class DeviceFeignFallbackFactory implements FallbackFactory<IDeviceFeign> { ...@@ -95,10 +110,27 @@ class DeviceFeignFallbackFactory implements FallbackFactory<IDeviceFeign> {
return Rest.fail("暂时无法保存设备，请稍后再试!"); return Rest.fail("暂时无法保存设备，请稍后再试!");
} }
@Override
public String deviceEnable(DevicePdu devicePdu, String authorization) {
JSONObject jsonObject = new JSONObject();
jsonObject.put("code", -1);
jsonObject.put("msg", "暂时无法启用停用设备，请稍后再试!");
return jsonObject.toJSONString();
}
@Override @Override
public Rest<String> downMsg(DeviceNotifyPdu deviceNotifyPdu) { public Rest<String> downMsg(DeviceNotifyPdu deviceNotifyPdu) {
return Rest.fail("暂时无法接收第三方平台下发设备消息，请稍后再试!"); return Rest.fail("暂时无法接收第三方平台下发设备消息，请稍后再试!");
} }
@Override
public String importData(MultipartFile file, String authorization,Long siteId) {
JSONObject jsonObject = new JSONObject();
jsonObject.put("code", -1);
jsonObject.put("msg", "暂时无法导入设备，请稍后再试!");
return jsonObject.toJSONString();
}
}; };
} }
} }
......
sst-manager/db/add_db.sql
View file @ ad2c8b6a
...@@ -236,18 +236,49 @@ PRIMARY KEY (`id`) ...@@ -236,18 +236,49 @@ PRIMARY KEY (`id`)
DROP TABLE IF EXISTS `mortals_xhx_converge_apps`; DROP TABLE IF EXISTS `mortals_xhx_converge_apps`;
CREATE TABLE mortals_xhx_converge_apps( CREATE TABLE mortals_xhx_converge_apps(
`id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长', `id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长',
`siteId` bigint(20) COMMENT '站点id',
`equipmentId` bigint(20) COMMENT '设备ID', `equipmentId` bigint(20) COMMENT '设备ID',
`appEname` varchar(100) COMMENT '应用标识，具有唯一性', `appEname` varchar(100) COMMENT '应用标识，具有唯一性',
`appName` varchar(100) COMMENT '应用名称', `appName` varchar(100) COMMENT '应用名称',
`appSimpleName` varchar(100) COMMENT '应用简称', `appSimpleName` varchar(100) COMMENT '应用简称',
`provider` varchar(100) COMMENT '应用提供方', `provider` varchar(100) COMMENT '应用提供方',
`origin` char(1) COMMENT '应用来源', `origin` char(1) COMMENT '应用来源',
`pv` int(8) COMMENT '应用访问数', `totalPv` int(8) COMMENT '应用访问数',
`uv` int(8) COMMENT '应用访客数', `totalUv` int(8) COMMENT '应用访客数',
`opr` char(1) COMMENT '操作类型', `opr` char(1) COMMENT '操作类型',
`siteId` bigint(20) COMMENT '站点id', `statYearMonth` varchar(100) COMMENT '统计月份，格式yyyy-MM-dd',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备应用'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备应用';
INSERT INTO `mortals_xhx_task` (`name`, `taskKey`, `status`, `excuteService`, `excuteParam`, `excuteHost`, `excuteStrategy`, `excuteDate`, `excuteTime`, `remark`, `lastExcuteHost`, `lastExcuteTime`, `interimExcuteStatus`, `createTime`, `createUserId`, `createUserName`) VALUES ('省平台数据汇聚任务', 'provinceConvergeTask', '0', 'ProvinceConvergeTask', NULL, NULL, '1', '0', '23:30', NULL, NULL, NULL, '0', NOW(), '1', '系统管理员'); INSERT INTO `mortals_xhx_task` (`name`, `taskKey`, `status`, `excuteService`, `excuteParam`, `excuteHost`, `excuteStrategy`, `excuteDate`, `excuteTime`, `remark`, `lastExcuteHost`, `lastExcuteTime`, `interimExcuteStatus`, `createTime`, `createUserId`, `createUserName`) VALUES ('省平台数据汇聚任务', 'provinceConvergeTask', '0', 'ProvinceConvergeTask', NULL, NULL, '1', '0', '23:30', NULL, NULL, NULL, '0', NOW(), '1', '系统管理员');
DROP TABLE IF EXISTS `mortals_xhx_converge_apps_access`;
CREATE TABLE `mortals_xhx_converge_apps_access` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '序号，主键，自增长',
`siteId` bigint(20) DEFAULT NULL COMMENT '站点id',
`applicationId` varchar(128) DEFAULT NULL COMMENT '应用ID',
`applicationName` varchar(128) DEFAULT NULL COMMENT '应用名称',
`startTime` datetime DEFAULT NULL COMMENT '应用打开时间',
`endTime` datetime DEFAULT NULL COMMENT '应用关闭时间',
`userId` varchar(128) DEFAULT NULL COMMENT '用户ID',
`userName` varchar(128) DEFAULT NULL COMMENT '用户名称',
`channelId` varchar(128) DEFAULT NULL COMMENT '渠道ID',
`channelName` varchar(128) DEFAULT NULL COMMENT '渠道名称',
`location` varchar(128) DEFAULT NULL COMMENT '地域',
`clientName` varchar(128) DEFAULT NULL COMMENT '客户端名称',
`version` varchar(128) DEFAULT NULL COMMENT '客户端版本号',
`ecode` varchar(128) DEFAULT NULL COMMENT '设备唯一标识',
`appSimpleName` varchar(128) DEFAULT NULL COMMENT '应用简称',
`provider` varchar(128) DEFAULT NULL COMMENT '应用提供方',
`origin` varchar(1) DEFAULT NULL COMMENT '应用来源',
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8 COMMENT='应用访问';
ALTER TABLE `mortals_xhx_sst_apps_desk` ADD COLUMN `clickSum` int(8) DEFAULT '0' COMMENT '应用点击次数';
ALTER TABLE `mortals_xhx_sst_apps` ADD COLUMN `clickSum` int(8) DEFAULT '0' COMMENT '应用点击次数';
ALTER TABLE `mortals_xhx_sst_agreement` ADD COLUMN `protocolType` tinyint(2) DEFAULT '1' COMMENT '协议类型' AFTER `name`;
INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('协议类型', 'SstAgreement', 'protocolType', '1', '注册协议', '1', '4', '0', NULL, NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` (`name`, `firstOrganize`, `secondOrganize`, `paramKey`, `paramValue`, `validStatus`, `modStatus`, `displayType`, `remark`, `createTime`, `createUserId`, `createUserName`) VALUES ('协议类型', 'SstAgreement', 'protocolType', '2', '申报协议', '1', '4', '0', NULL, NULL, NULL, NULL);
sst-manager/pom.xml
View file @ ad2c8b6a
...@@ -30,6 +30,9 @@ ...@@ -30,6 +30,9 @@
<profiles.kafka.brokers>192.168.0.251:9092</profiles.kafka.brokers> <profiles.kafka.brokers>192.168.0.251:9092</profiles.kafka.brokers>
<profiles.rabbitmq.host>192.168.0.98</profiles.rabbitmq.host> <profiles.rabbitmq.host>192.168.0.98</profiles.rabbitmq.host>
<profiles.rabbitmq.port>5672</profiles.rabbitmq.port> <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
<profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
<profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
<profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
<profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr> <profiles.nacos.server-addr>192.168.0.252:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group> <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace> <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
...@@ -67,14 +70,11 @@ ...@@ -67,14 +70,11 @@
<profiles.kafka.brokers>127.0.0.1:9092</profiles.kafka.brokers> <profiles.kafka.brokers>127.0.0.1:9092</profiles.kafka.brokers>
<profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host> <profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host>
<profiles.rabbitmq.port>5672</profiles.rabbitmq.port> <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
<profiles.rabbitmq.username>taxi_mq</profiles.rabbitmq.username>
<profiles.rabbitmq.password>admin@2020</profiles.rabbitmq.password>
<profiles.rabbitmq.virtualhost>/</profiles.rabbitmq.virtualhost>
<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr> <profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group> <profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace> <profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
<profiles.log.level>info</profiles.log.level> <profiles.log.level>info</profiles.log.level>
<profiles.log.path>/home/mortals/app/logs</profiles.log.path> <profiles.log.path>/mortals/app/logs</profiles.log.path>
<profiles.publish.path>/home/publish</profiles.publish.path> <profiles.publish.path>/home/publish</profiles.publish.path>
</properties> </properties>
</profile> </profile>
...@@ -98,24 +98,6 @@ ...@@ -98,24 +98,6 @@
<profiles.filepath>/mortals/app/data</profiles.filepath> <profiles.filepath>/mortals/app/data</profiles.filepath>
</properties> </properties>
</profile> </profile>
<profile>
<id>sngx</id>
<properties>
<profiles.active>sngx</profiles.active>
<profiles.server.port>19211</profiles.server.port>
<profiles.queue.type>rabbitmq</profiles.queue.type>
<profiles.kafka.brokers>127.0.0.1:9092</profiles.kafka.brokers>
<profiles.rabbitmq.host>127.0.0.1</profiles.rabbitmq.host>
<profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
<profiles.nacos.group>DEFAULT_GROUP</profiles.nacos.group>
<profiles.nacos.namespace>smart-gov</profiles.nacos.namespace>
<profiles.log.level>info</profiles.log.level>
<profiles.log.path>/home/mortals/app/logs</profiles.log.path>
<profiles.publish.path>/home/publish</profiles.publish.path>
</properties>
</profile>
</profiles> </profiles>
<dependencies> <dependencies>
......
sst-manager/src/main/java/com/mortals/xhx/daemon/task/ProvinceConvergeTaskImpl.java
View file @ ad2c8b6a
...@@ -3,13 +3,21 @@ package com.mortals.xhx.daemon.task; ...@@ -3,13 +3,21 @@ package com.mortals.xhx.daemon.task;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.service.ITask; import com.mortals.framework.service.ITask;
import com.mortals.framework.service.ITaskExcuteService; import com.mortals.framework.service.ITaskExcuteService;
import com.mortals.framework.util.DateUtils;
import com.mortals.xhx.feign.site.ISiteFeign; import com.mortals.xhx.feign.site.ISiteFeign;
import com.mortals.xhx.module.converge.model.ConvergeAppsAccessEntity;
import com.mortals.xhx.module.converge.service.ConvergeAppsService;
import com.mortals.xhx.module.converge.service.ConvergeDeviceService; import com.mortals.xhx.module.converge.service.ConvergeDeviceService;
import com.mortals.xhx.module.converge.service.ConvergeSiteService; import com.mortals.xhx.module.converge.service.ConvergeSiteService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.HashMap;
import java.util.Map;
/** /**
* 省平台数据汇聚任务 * 省平台数据汇聚任务
*/ */
...@@ -21,16 +29,38 @@ public class ProvinceConvergeTaskImpl implements ITaskExcuteService { ...@@ -21,16 +29,38 @@ public class ProvinceConvergeTaskImpl implements ITaskExcuteService {
private ConvergeSiteService convergeSiteService; private ConvergeSiteService convergeSiteService;
@Autowired @Autowired
private ConvergeDeviceService convergeDeviceService; private ConvergeDeviceService convergeDeviceService;
@Autowired
private ConvergeAppsService convergeAppsService;
@Override @Override
public void excuteTask(ITask task) throws AppException { public void excuteTask(ITask task) throws AppException {
log.info("开始执行省平台数据汇聚任务..."); log.info("开始执行省平台数据汇聚任务...");
try { try {
convergeSiteService.doConvergeSite(); convergeSiteService.doConvergeSite();
}catch (Exception e){
log.error("汇聚网点数据执行出错",e);
}
try {
convergeDeviceService.doConvergeDevice(); convergeDeviceService.doConvergeDevice();
}catch (Exception e){ }catch (Exception e){
log.error("数据汇聚任务执行出错",e); log.error("汇聚设备数据出错",e);
}
try {
SimpleDateFormat format=new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar=Calendar.getInstance();
calendar.set(Calendar.DAY_OF_MONTH, 1);
String startTime = format.format(calendar.getTime());
calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
String endTime = format.format(calendar.getTime());
Map<String,String> condition = new HashMap<>();
condition.put("startTime",startTime);
condition.put("endTime",endTime);
convergeAppsService.doConvergeApps(condition);
}catch (Exception e){
log.error("汇聚应用数据出错",e);
} }
log.info("省平台数据汇聚任务执行完成"); log.info("省平台数据汇聚任务执行完成");
} }
...@@ -39,4 +69,5 @@ public class ProvinceConvergeTaskImpl implements ITaskExcuteService { ...@@ -39,4 +69,5 @@ public class ProvinceConvergeTaskImpl implements ITaskExcuteService {
public void stopTask(ITask task) throws AppException { public void stopTask(ITask task) throws AppException {
} }
} }
sst-manager/src/main/java/com/mortals/xhx/module/apps/model/vo/AppsInfoVo.java
View file @ ad2c8b6a
...@@ -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/apps/service/impl/AppsInfoServiceImpl.java
View file @ ad2c8b6a
...@@ -62,9 +62,10 @@ public class AppsInfoServiceImpl extends AbstractCRUDServiceImpl<AppsInfoDao, Ap ...@@ -62,9 +62,10 @@ public class AppsInfoServiceImpl extends AbstractCRUDServiceImpl<AppsInfoDao, Ap
public List<AppsInfoEntity> find(AppsInfoEntity entity) throws AppException { public List<AppsInfoEntity> find(AppsInfoEntity entity) throws AppException {
AppPdu appPdu = new AppPdu(); AppPdu appPdu = new AppPdu();
appPdu.setSiteId(entity.getSiteId()); appPdu.setSiteId(entity.getSiteId());
appPdu.setSize(999); appPdu.setSize(-1);
appPdu.setType(1); appPdu.setType(1); //类型(1.终端应用,2.移动端应用)
appPdu.setShelves(1); appPdu.setShelves(1); //是否上架(0.下架，1.上架)
appPdu.setAppName(entity.getName());
Rest<RespData<List<AppPdu>>> rest = appFeign.list(appPdu); Rest<RespData<List<AppPdu>>> rest = appFeign.list(appPdu);
if (rest.getCode().equals(YesNoEnum.YES.getValue())) { if (rest.getCode().equals(YesNoEnum.YES.getValue())) {
List<AppsInfoEntity> appsInfoEntities = new ArrayList<>(); List<AppsInfoEntity> appsInfoEntities = new ArrayList<>();
...@@ -124,6 +125,7 @@ public class AppsInfoServiceImpl extends AbstractCRUDServiceImpl<AppsInfoDao, Ap ...@@ -124,6 +125,7 @@ public class AppsInfoServiceImpl extends AbstractCRUDServiceImpl<AppsInfoDao, Ap
appsInfoEntity.setServiceApi(pdu.getServiceApi()); appsInfoEntity.setServiceApi(pdu.getServiceApi());
appsInfoEntity.setCustUrl(pdu.getCustUrl()); appsInfoEntity.setCustUrl(pdu.getCustUrl());
appsInfoEntity.setAppThemeName(pdu.getAppThemeName()); appsInfoEntity.setAppThemeName(pdu.getAppThemeName());
appsInfoEntity.setCreateTime(pdu.getCreateTime());
return appsInfoEntity; return appsInfoEntity;
} }
} }
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/converge/dao/ConvergeAppsAccessDao.java 0 → 100644
View file @ ad2c8b6a
package com.mortals.xhx.module.converge.dao;
import com.mortals.framework.dao.ICRUDDao;
import com.mortals.xhx.module.converge.model.ConvergeAppsAccessEntity;
import com.mortals.xhx.module.converge.model.vo.AppsAccessVo;
import java.util.List;
import java.util.Map;
/**
* 应用访问Dao
* 应用访问 DAO接口
*
* @author zxfei
* @date 2023-07-03
*/
public interface ConvergeAppsAccessDao extends ICRUDDao<ConvergeAppsAccessEntity,Long>{
/**
* 应用浏览量PV统计
* @return
*/
List<AppsAccessVo> getAppsAccessPv(Map<String,String> condition);
/**
* 应用浏览量UV统计
* @return
*/
List<AppsAccessVo> getAppsAccessUv(Map<String,String> condition);
}
sst-manager/src/main/java/com/mortals/xhx/module/converge/dao/ibatis/ConvergeAppsAccessDaoImpl.java 0 → 100644
View file @ ad2c8b6a
package com.mortals.xhx.module.converge.dao.ibatis;
import com.mortals.xhx.module.converge.model.vo.AppsAccessVo;
import org.springframework.stereotype.Repository;
import com.mortals.xhx.module.converge.dao.ConvergeAppsAccessDao;
import com.mortals.xhx.module.converge.model.ConvergeAppsAccessEntity;
import java.util.Date;
import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
import java.util.List;
import java.util.Map;
/**
* 应用访问DaoImpl DAO接口
*
* @author zxfei
* @date 2023-07-03
*/
@Repository("convergeAppsAccessDao")
public class ConvergeAppsAccessDaoImpl extends BaseCRUDDaoMybatis<ConvergeAppsAccessEntity,Long> implements ConvergeAppsAccessDao {
@Override
public List<AppsAccessVo> getAppsAccessPv(Map<String,String> condition) {
return this.getSqlSession().selectList(this.getSqlId("getAppsAccessPv"),condition);
}
@Override
public List<AppsAccessVo> getAppsAccessUv(Map<String,String> condition) {
return this.getSqlSession().selectList(this.getSqlId("getAppsAccessUv"),condition);
}
}
sst-manager/src/main/java/com/mortals/xhx/module/converge/model/ConvergeAppsAccessEntity.java 0 → 100644
View file @ ad2c8b6a
package com.mortals.xhx.module.converge.model;
import java.util.Date;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.converge.model.vo.ConvergeAppsAccessVo;
import lombok.Data;
/**
* 应用访问实体对象
*
* @author zxfei
* @date 2023-07-04
*/
@Data
public class ConvergeAppsAccessEntity extends ConvergeAppsAccessVo {
private static final long serialVersionUID = 1L;
/**
* 站点id
*/
private Long siteId;
/**
* 应用ID
*/
private String applicationId;
/**
* 应用名称
*/
private String applicationName;
/**
* 应用打开时间
*/
private Date startTime;
/**
* 应用关闭时间
*/
private Date endTime;
/**
* 用户ID
*/
private String userId;
/**
* 用户名称
*/
private String userName;
/**
* 渠道ID
*/
private String channelId;
/**
* 渠道名称
*/
private String channelName;
/**
* 地域
*/
private String location;
/**
* 客户端名称
*/
private String clientName;
/**
* 客户端版本号
*/
private String version;
/**
* 设备唯一标识
*/
private String ecode;
/**
* 应用简称
*/
private String appSimpleName;
/**
* 应用提供方
*/
private String provider;
/**
* 应用来源
*/
private String origin;
@Override
public int hashCode() {
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
if (obj == null) return false;
if (obj instanceof ConvergeAppsAccessEntity) {
ConvergeAppsAccessEntity tmp = (ConvergeAppsAccessEntity) obj;
if (this.getId() == tmp.getId()) {
return true;
}
}
return false;
}
public void initAttrValue(){
this.siteId = -1L;
this.applicationId = "";
this.applicationName = "";
this.startTime = null;
this.endTime = null;
this.userId = "";
this.userName = "";
this.channelId = "";
this.channelName = "";
this.location = "";
this.clientName = "";
this.version = "";
this.ecode = "";
this.appSimpleName = "";
this.provider = "";
this.origin = "";
}
}
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/converge/model/ConvergeAppsAccessQuery.java 0 → 100644
View file @ ad2c8b6a
package com.mortals.xhx.module.converge.model;
import java.util.Date;
import java.util.List;
import com.mortals.xhx.module.converge.model.ConvergeAppsAccessEntity;
/**
* 应用访问查询对象
*
* @author zxfei
* @date 2023-07-04
*/
public class ConvergeAppsAccessQuery extends ConvergeAppsAccessEntity {
/** 开始 序号，主键，自增长 */
private Long idStart;
/** 结束 序号，主键，自增长 */
private Long idEnd;
/** 增加 序号，主键，自增长 */
private Long idIncrement;
/** 序号，主键，自增长列表 */
private List <Long> idList;
/** 序号，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 站点id */
private Long siteIdStart;
/** 结束 站点id */
private Long siteIdEnd;
/** 增加 站点id */
private Long siteIdIncrement;
/** 站点id列表 */
private List <Long> siteIdList;
/** 站点id排除列表 */
private List <Long> siteIdNotList;
/** 应用ID */
private List<String> applicationIdList;
/** 应用ID排除列表 */
private List <String> applicationIdNotList;
/** 应用名称 */
private List<String> applicationNameList;
/** 应用名称排除列表 */
private List <String> applicationNameNotList;
/** 开始 应用打开时间 */
private String startTimeStart;
/** 结束 应用打开时间 */
private String startTimeEnd;
/** 开始 应用关闭时间 */
private String endTimeStart;
/** 结束 应用关闭时间 */
private String endTimeEnd;
/** 用户ID */
private List<String> userIdList;
/** 用户ID排除列表 */
private List <String> userIdNotList;
/** 用户名称 */
private List<String> userNameList;
/** 用户名称排除列表 */
private List <String> userNameNotList;
/** 渠道ID */
private List<String> channelIdList;
/** 渠道ID排除列表 */
private List <String> channelIdNotList;
/** 渠道名称 */
private List<String> channelNameList;
/** 渠道名称排除列表 */
private List <String> channelNameNotList;
/** 地域 */
private List<String> locationList;
/** 地域排除列表 */
private List <String> locationNotList;
/** 客户端名称 */
private List<String> clientNameList;
/** 客户端名称排除列表 */
private List <String> clientNameNotList;
/** 客户端版本号 */
private List<String> versionList;
/** 客户端版本号排除列表 */
private List <String> versionNotList;
/** 设备唯一标识 */
private List<String> ecodeList;
/** 设备唯一标识排除列表 */
private List <String> ecodeNotList;
/** 应用简称 */
private List<String> appSimpleNameList;
/** 应用简称排除列表 */
private List <String> appSimpleNameNotList;
/** 应用提供方 */
private List<String> providerList;
/** 应用提供方排除列表 */
private List <String> providerNotList;
/** 应用来源 */
private List<String> originList;
/** 应用来源排除列表 */
private List <String> originNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<ConvergeAppsAccessQuery> orConditionList;
/** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
private List<ConvergeAppsAccessQuery> andConditionList;
public ConvergeAppsAccessQuery(){}
/**
* 获取 开始 序号，主键，自增长
* @return idStart
*/
public Long getIdStart(){
return this.idStart;
}
/**
* 设置 开始 序号，主键，自增长
* @param idStart
*/
public void setIdStart(Long idStart){
this.idStart = idStart;
}
/**
* 获取 结束 序号，主键，自增长
* @return $idEnd
*/
public Long getIdEnd(){
return this.idEnd;
}
/**
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
public void setIdEnd(Long idEnd){
this.idEnd = idEnd;
}
/**
* 获取 增加 序号，主键，自增长
* @return idIncrement
*/
public Long getIdIncrement(){
return this.idIncrement;
}
/**
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement;
}
/**
* 获取 序号，主键，自增长
* @return idList
*/
public List<Long> getIdList(){
return this.idList;
}
/**
* 设置 序号，主键，自增长
* @param idList
*/
public void setIdList(List<Long> 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
* @return siteIdStart
*/
public Long getSiteIdStart(){
return this.siteIdStart;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
}
/**
* 获取 结束 站点id
* @return $siteIdEnd
*/
public Long getSiteIdEnd(){
return this.siteIdEnd;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
}
/**
* 获取 增加 站点id
* @return siteIdIncrement
*/
public Long getSiteIdIncrement(){
return this.siteIdIncrement;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
}
/**
* 获取 站点id
* @return siteIdList
*/
public List<Long> getSiteIdList(){
return this.siteIdList;
}
/**
* 设置 站点id
* @param siteIdList
*/
public void setSiteIdList(List<Long> 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;
}
/**
* 获取 应用ID
* @return applicationIdList
*/
public List<String> getApplicationIdList(){
return this.applicationIdList;
}
/**
* 设置 应用ID
* @param applicationIdList
*/
public void setApplicationIdList(List<String> applicationIdList){
this.applicationIdList = applicationIdList;
}
/**
* 获取 应用ID
* @return applicationIdNotList
*/
public List<String> getApplicationIdNotList(){
return this.applicationIdNotList;
}
/**
* 设置 应用ID
* @param applicationIdNotList
*/
public void setApplicationIdNotList(List<String> applicationIdNotList){
this.applicationIdNotList = applicationIdNotList;
}
/**
* 获取 应用名称
* @return applicationNameList
*/
public List<String> getApplicationNameList(){
return this.applicationNameList;
}
/**
* 设置 应用名称
* @param applicationNameList
*/
public void setApplicationNameList(List<String> applicationNameList){
this.applicationNameList = applicationNameList;
}
/**
* 获取 应用名称
* @return applicationNameNotList
*/
public List<String> getApplicationNameNotList(){
return this.applicationNameNotList;
}
/**
* 设置 应用名称
* @param applicationNameNotList
*/
public void setApplicationNameNotList(List<String> applicationNameNotList){
this.applicationNameNotList = applicationNameNotList;
}
/**
* 获取 开始 应用打开时间
* @return startTimeStart
*/
public String getStartTimeStart(){
return this.startTimeStart;
}
/**
* 设置 开始 应用打开时间
* @param startTimeStart
*/
public void setStartTimeStart(String startTimeStart){
this.startTimeStart = startTimeStart;
}
/**
* 获取 结束 应用打开时间
* @return startTimeEnd
*/
public String getStartTimeEnd(){
return this.startTimeEnd;
}
/**
* 设置 结束 应用打开时间
* @param startTimeEnd
*/
public void setStartTimeEnd(String startTimeEnd){
this.startTimeEnd = startTimeEnd;
}
/**
* 获取 开始 应用关闭时间
* @return endTimeStart
*/
public String getEndTimeStart(){
return this.endTimeStart;
}
/**
* 设置 开始 应用关闭时间
* @param endTimeStart
*/
public void setEndTimeStart(String endTimeStart){
this.endTimeStart = endTimeStart;
}
/**
* 获取 结束 应用关闭时间
* @return endTimeEnd
*/
public String getEndTimeEnd(){
return this.endTimeEnd;
}
/**
* 设置 结束 应用关闭时间
* @param endTimeEnd
*/
public void setEndTimeEnd(String endTimeEnd){
this.endTimeEnd = endTimeEnd;
}
/**
* 获取 用户ID
* @return userIdList
*/
public List<String> getUserIdList(){
return this.userIdList;
}
/**
* 设置 用户ID
* @param userIdList
*/
public void setUserIdList(List<String> userIdList){
this.userIdList = userIdList;
}
/**
* 获取 用户ID
* @return userIdNotList
*/
public List<String> getUserIdNotList(){
return this.userIdNotList;
}
/**
* 设置 用户ID
* @param userIdNotList
*/
public void setUserIdNotList(List<String> userIdNotList){
this.userIdNotList = userIdNotList;
}
/**
* 获取 用户名称
* @return userNameList
*/
public List<String> getUserNameList(){
return this.userNameList;
}
/**
* 设置 用户名称
* @param userNameList
*/
public void setUserNameList(List<String> userNameList){
this.userNameList = userNameList;
}
/**
* 获取 用户名称
* @return userNameNotList
*/
public List<String> getUserNameNotList(){
return this.userNameNotList;
}
/**
* 设置 用户名称
* @param userNameNotList
*/
public void setUserNameNotList(List<String> userNameNotList){
this.userNameNotList = userNameNotList;
}
/**
* 获取 渠道ID
* @return channelIdList
*/
public List<String> getChannelIdList(){
return this.channelIdList;
}
/**
* 设置 渠道ID
* @param channelIdList
*/
public void setChannelIdList(List<String> channelIdList){
this.channelIdList = channelIdList;
}
/**
* 获取 渠道ID
* @return channelIdNotList
*/
public List<String> getChannelIdNotList(){
return this.channelIdNotList;
}
/**
* 设置 渠道ID
* @param channelIdNotList
*/
public void setChannelIdNotList(List<String> channelIdNotList){
this.channelIdNotList = channelIdNotList;
}
/**
* 获取 渠道名称
* @return channelNameList
*/
public List<String> getChannelNameList(){
return this.channelNameList;
}
/**
* 设置 渠道名称
* @param channelNameList
*/
public void setChannelNameList(List<String> channelNameList){
this.channelNameList = channelNameList;
}
/**
* 获取 渠道名称
* @return channelNameNotList
*/
public List<String> getChannelNameNotList(){
return this.channelNameNotList;
}
/**
* 设置 渠道名称
* @param channelNameNotList
*/
public void setChannelNameNotList(List<String> channelNameNotList){
this.channelNameNotList = channelNameNotList;
}
/**
* 获取 地域
* @return locationList
*/
public List<String> getLocationList(){
return this.locationList;
}
/**
* 设置 地域
* @param locationList
*/
public void setLocationList(List<String> locationList){
this.locationList = locationList;
}
/**
* 获取 地域
* @return locationNotList
*/
public List<String> getLocationNotList(){
return this.locationNotList;
}
/**
* 设置 地域
* @param locationNotList
*/
public void setLocationNotList(List<String> locationNotList){
this.locationNotList = locationNotList;
}
/**
* 获取 客户端名称
* @return clientNameList
*/
public List<String> getClientNameList(){
return this.clientNameList;
}
/**
* 设置 客户端名称
* @param clientNameList
*/
public void setClientNameList(List<String> clientNameList){
this.clientNameList = clientNameList;
}
/**
* 获取 客户端名称
* @return clientNameNotList
*/
public List<String> getClientNameNotList(){
return this.clientNameNotList;
}
/**
* 设置 客户端名称
* @param clientNameNotList
*/
public void setClientNameNotList(List<String> clientNameNotList){
this.clientNameNotList = clientNameNotList;
}
/**
* 获取 客户端版本号
* @return versionList
*/
public List<String> getVersionList(){
return this.versionList;
}
/**
* 设置 客户端版本号
* @param versionList
*/
public void setVersionList(List<String> versionList){
this.versionList = versionList;
}
/**
* 获取 客户端版本号
* @return versionNotList
*/
public List<String> getVersionNotList(){
return this.versionNotList;
}
/**
* 设置 客户端版本号
* @param versionNotList
*/
public void setVersionNotList(List<String> versionNotList){
this.versionNotList = versionNotList;
}
/**
* 获取 设备唯一标识
* @return ecodeList
*/
public List<String> getEcodeList(){
return this.ecodeList;
}
/**
* 设置 设备唯一标识
* @param ecodeList
*/
public void setEcodeList(List<String> ecodeList){
this.ecodeList = ecodeList;
}
/**
* 获取 设备唯一标识
* @return ecodeNotList
*/
public List<String> getEcodeNotList(){
return this.ecodeNotList;
}
/**
* 设置 设备唯一标识
* @param ecodeNotList
*/
public void setEcodeNotList(List<String> ecodeNotList){
this.ecodeNotList = ecodeNotList;
}
/**
* 获取 应用简称
* @return appSimpleNameList
*/
public List<String> getAppSimpleNameList(){
return this.appSimpleNameList;
}
/**
* 设置 应用简称
* @param appSimpleNameList
*/
public void setAppSimpleNameList(List<String> appSimpleNameList){
this.appSimpleNameList = appSimpleNameList;
}
/**
* 获取 应用简称
* @return appSimpleNameNotList
*/
public List<String> getAppSimpleNameNotList(){
return this.appSimpleNameNotList;
}
/**
* 设置 应用简称
* @param appSimpleNameNotList
*/
public void setAppSimpleNameNotList(List<String> appSimpleNameNotList){
this.appSimpleNameNotList = appSimpleNameNotList;
}
/**
* 获取 应用提供方
* @return providerList
*/
public List<String> getProviderList(){
return this.providerList;
}
/**
* 设置 应用提供方
* @param providerList
*/
public void setProviderList(List<String> providerList){
this.providerList = providerList;
}
/**
* 获取 应用提供方
* @return providerNotList
*/
public List<String> getProviderNotList(){
return this.providerNotList;
}
/**
* 设置 应用提供方
* @param providerNotList
*/
public void setProviderNotList(List<String> providerNotList){
this.providerNotList = providerNotList;
}
/**
* 获取 应用来源
* @return originList
*/
public List<String> getOriginList(){
return this.originList;
}
/**
* 设置 应用来源
* @param originList
*/
public void setOriginList(List<String> originList){
this.originList = originList;
}
/**
* 获取 应用来源
* @return originNotList
*/
public List<String> getOriginNotList(){
return this.originNotList;
}
/**
* 设置 应用来源
* @param originNotList
*/
public void setOriginNotList(List<String> originNotList){
this.originNotList = originNotList;
}
/**
* 设置 序号，主键，自增长
* @param id
*/
public ConvergeAppsAccessQuery id(Long id){
setId(id);
return this;
}
/**
* 设置 开始 序号，主键，自增长
* @param idStart
*/
public ConvergeAppsAccessQuery idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 设置 结束 序号，主键，自增长
* @param idEnd
*/
public ConvergeAppsAccessQuery idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 设置 增加 序号，主键，自增长
* @param idIncrement
*/
public ConvergeAppsAccessQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idList
*/
public ConvergeAppsAccessQuery idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public ConvergeAppsAccessQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/**
* 设置 站点id
* @param siteId
*/
public ConvergeAppsAccessQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public ConvergeAppsAccessQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public ConvergeAppsAccessQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public ConvergeAppsAccessQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点id
* @param siteIdList
*/
public ConvergeAppsAccessQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public ConvergeAppsAccessQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
/**
* 设置 应用ID
* @param applicationId
*/
public ConvergeAppsAccessQuery applicationId(String applicationId){
setApplicationId(applicationId);
return this;
}
/**
* 设置 应用ID
* @param applicationIdList
*/
public ConvergeAppsAccessQuery applicationIdList(List<String> applicationIdList){
this.applicationIdList = applicationIdList;
return this;
}
/**
* 设置 应用名称
* @param applicationName
*/
public ConvergeAppsAccessQuery applicationName(String applicationName){
setApplicationName(applicationName);
return this;
}
/**
* 设置 应用名称
* @param applicationNameList
*/
public ConvergeAppsAccessQuery applicationNameList(List<String> applicationNameList){
this.applicationNameList = applicationNameList;
return this;
}
/**
* 设置 用户ID
* @param userId
*/
public ConvergeAppsAccessQuery userId(String userId){
setUserId(userId);
return this;
}
/**
* 设置 用户ID
* @param userIdList
*/
public ConvergeAppsAccessQuery userIdList(List<String> userIdList){
this.userIdList = userIdList;
return this;
}
/**
* 设置 用户名称
* @param userName
*/
public ConvergeAppsAccessQuery userName(String userName){
setUserName(userName);
return this;
}
/**
* 设置 用户名称
* @param userNameList
*/
public ConvergeAppsAccessQuery userNameList(List<String> userNameList){
this.userNameList = userNameList;
return this;
}
/**
* 设置 渠道ID
* @param channelId
*/
public ConvergeAppsAccessQuery channelId(String channelId){
setChannelId(channelId);
return this;
}
/**
* 设置 渠道ID
* @param channelIdList
*/
public ConvergeAppsAccessQuery channelIdList(List<String> channelIdList){
this.channelIdList = channelIdList;
return this;
}
/**
* 设置 渠道名称
* @param channelName
*/
public ConvergeAppsAccessQuery channelName(String channelName){
setChannelName(channelName);
return this;
}
/**
* 设置 渠道名称
* @param channelNameList
*/
public ConvergeAppsAccessQuery channelNameList(List<String> channelNameList){
this.channelNameList = channelNameList;
return this;
}
/**
* 设置 地域
* @param location
*/
public ConvergeAppsAccessQuery location(String location){
setLocation(location);
return this;
}
/**
* 设置 地域
* @param locationList
*/
public ConvergeAppsAccessQuery locationList(List<String> locationList){
this.locationList = locationList;
return this;
}
/**
* 设置 客户端名称
* @param clientName
*/
public ConvergeAppsAccessQuery clientName(String clientName){
setClientName(clientName);
return this;
}
/**
* 设置 客户端名称
* @param clientNameList
*/
public ConvergeAppsAccessQuery clientNameList(List<String> clientNameList){
this.clientNameList = clientNameList;
return this;
}
/**
* 设置 客户端版本号
* @param version
*/
public ConvergeAppsAccessQuery version(String version){
setVersion(version);
return this;
}
/**
* 设置 客户端版本号
* @param versionList
*/
public ConvergeAppsAccessQuery versionList(List<String> versionList){
this.versionList = versionList;
return this;
}
/**
* 设置 设备唯一标识
* @param ecode
*/
public ConvergeAppsAccessQuery ecode(String ecode){
setEcode(ecode);
return this;
}
/**
* 设置 设备唯一标识
* @param ecodeList
*/
public ConvergeAppsAccessQuery ecodeList(List<String> ecodeList){
this.ecodeList = ecodeList;
return this;
}
/**
* 设置 应用简称
* @param appSimpleName
*/
public ConvergeAppsAccessQuery appSimpleName(String appSimpleName){
setAppSimpleName(appSimpleName);
return this;
}
/**
* 设置 应用简称
* @param appSimpleNameList
*/
public ConvergeAppsAccessQuery appSimpleNameList(List<String> appSimpleNameList){
this.appSimpleNameList = appSimpleNameList;
return this;
}
/**
* 设置 应用提供方
* @param provider
*/
public ConvergeAppsAccessQuery provider(String provider){
setProvider(provider);
return this;
}
/**
* 设置 应用提供方
* @param providerList
*/
public ConvergeAppsAccessQuery providerList(List<String> providerList){
this.providerList = providerList;
return this;
}
/**
* 设置 应用来源
* @param origin
*/
public ConvergeAppsAccessQuery origin(String origin){
setOrigin(origin);
return this;
}
/**
* 设置 应用来源
* @param originList
*/
public ConvergeAppsAccessQuery originList(List<String> originList){
this.originList = originList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
*/
public List<ConvergeAppsAccessQuery> getOrConditionList(){
return this.orConditionList;
}
/**
* 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @param orConditionList
*/
public void setOrConditionList(List<ConvergeAppsAccessQuery> orConditionList){
this.orConditionList = orConditionList;
}
/**
* 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList
*/
public List<ConvergeAppsAccessQuery> getAndConditionList(){
return this.andConditionList;
}
/**
* 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList
*/
public void setAndConditionList(List<ConvergeAppsAccessQuery> andConditionList){
this.andConditionList = andConditionList;
}
}
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/converge/model/ConvergeAppsEntity.java
View file @ ad2c8b6a
...@@ -10,12 +10,16 @@ import lombok.Data; ...@@ -10,12 +10,16 @@ import lombok.Data;
* 设备应用实体对象 * 设备应用实体对象
* *
* @author zxfei * @author zxfei
* @date 2023-06-12 * @date 2023-07-06
*/ */
@Data @Data
public class ConvergeAppsEntity extends ConvergeAppsVo { public class ConvergeAppsEntity extends ConvergeAppsVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**
* 站点id
*/
private Long siteId;
/** /**
* 设备ID * 设备ID
*/ */
...@@ -43,19 +47,19 @@ public class ConvergeAppsEntity extends ConvergeAppsVo { ...@@ -43,19 +47,19 @@ public class ConvergeAppsEntity extends ConvergeAppsVo {
/** /**
* 应用访问数 * 应用访问数
*/ */
private Integer pv; private Integer totalPv;
/** /**
* 应用访客数 * 应用访客数
*/ */
private Integer uv; private Integer totalUv;
/** /**
* 操作类型 * 操作类型
*/ */
private String opr; private String opr;
/** /**
* 站点id * 统计月份，格式yyyy-MM-dd
*/ */
private Long siteId; private String statYearMonth;
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -74,6 +78,8 @@ public class ConvergeAppsEntity extends ConvergeAppsVo { ...@@ -74,6 +78,8 @@ public class ConvergeAppsEntity extends ConvergeAppsVo {
public void initAttrValue(){ public void initAttrValue(){
this.siteId = -1L;
this.equipmentId = -1L; this.equipmentId = -1L;
this.appEname = ""; this.appEname = "";
...@@ -86,12 +92,12 @@ public class ConvergeAppsEntity extends ConvergeAppsVo { ...@@ -86,12 +92,12 @@ public class ConvergeAppsEntity extends ConvergeAppsVo {
this.origin = ""; this.origin = "";
this.pv = -1; this.totalPv = -1;
this.uv = -1; this.totalUv = -1;
this.opr = ""; this.opr = "";
this.siteId = -1L; this.statYearMonth = "";
} }
} }
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/converge/model/ConvergeAppsQuery.java
View file @ ad2c8b6a
...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.converge.model.ConvergeAppsEntity; ...@@ -6,7 +6,7 @@ import com.mortals.xhx.module.converge.model.ConvergeAppsEntity;
* 设备应用查询对象 * 设备应用查询对象
* *
* @author zxfei * @author zxfei
* @date 2023-06-12 * @date 2023-07-06
*/ */
public class ConvergeAppsQuery extends ConvergeAppsEntity { public class ConvergeAppsQuery extends ConvergeAppsEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
...@@ -24,6 +24,21 @@ public class ConvergeAppsQuery extends ConvergeAppsEntity { ...@@ -24,6 +24,21 @@ public class ConvergeAppsQuery extends ConvergeAppsEntity {
/** 序号，主键，自增长排除列表 */ /** 序号，主键，自增长排除列表 */
private List <Long> idNotList; private List <Long> idNotList;
/** 开始 站点id */
private Long siteIdStart;
/** 结束 站点id */
private Long siteIdEnd;
/** 增加 站点id */
private Long siteIdIncrement;
/** 站点id列表 */
private List <Long> siteIdList;
/** 站点id排除列表 */
private List <Long> siteIdNotList;
/** 开始 设备ID */ /** 开始 设备ID */
private Long equipmentIdStart; private Long equipmentIdStart;
...@@ -65,55 +80,45 @@ public class ConvergeAppsQuery extends ConvergeAppsEntity { ...@@ -65,55 +80,45 @@ public class ConvergeAppsQuery extends ConvergeAppsEntity {
/** 应用来源排除列表 */ /** 应用来源排除列表 */
private List <String> originNotList; private List <String> originNotList;
/** 开始 应用访问数 */ /** 开始 应用访问数 */
private Integer pvStart; private Integer totalPvStart;
/** 结束 应用访问数 */ /** 结束 应用访问数 */
private Integer pvEnd; private Integer totalPvEnd;
/** 增加 应用访问数 */ /** 增加 应用访问数 */
private Integer pvIncrement; private Integer totalPvIncrement;
/** 应用访问数列表 */ /** 应用访问数列表 */
private List <Integer> pvList; private List <Integer> totalPvList;
/** 应用访问数排除列表 */ /** 应用访问数排除列表 */
private List <Integer> pvNotList; private List <Integer> totalPvNotList;
/** 开始 应用访客数 */ /** 开始 应用访客数 */
private Integer uvStart; private Integer totalUvStart;
/** 结束 应用访客数 */ /** 结束 应用访客数 */
private Integer uvEnd; private Integer totalUvEnd;
/** 增加 应用访客数 */ /** 增加 应用访客数 */
private Integer uvIncrement; private Integer totalUvIncrement;
/** 应用访客数列表 */ /** 应用访客数列表 */
private List <Integer> uvList; private List <Integer> totalUvList;
/** 应用访客数排除列表 */ /** 应用访客数排除列表 */
private List <Integer> uvNotList; private List <Integer> totalUvNotList;
/** 操作类型 */ /** 操作类型 */
private List<String> oprList; private List<String> oprList;
/** 操作类型排除列表 */ /** 操作类型排除列表 */
private List <String> oprNotList; private List <String> oprNotList;
/** 开始 站点id */ /** 统计月份，格式yyyy-MM-dd */
private Long siteIdStart; private List<String> statYearMonthList;
/** 结束 站点id */
private Long siteIdEnd;
/** 增加 站点id */
private Long siteIdIncrement;
/** 站点id列表 */
private List <Long> siteIdList;
/** 站点id排除列表 */
private List <Long> siteIdNotList;
/** 统计月份，格式yyyy-MM-dd排除列表 */
private List <String> statYearMonthNotList;
/** 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<ConvergeAppsQuery> orConditionList; private List<ConvergeAppsQuery> orConditionList;
...@@ -203,6 +208,87 @@ public class ConvergeAppsQuery extends ConvergeAppsEntity { ...@@ -203,6 +208,87 @@ public class ConvergeAppsQuery extends ConvergeAppsEntity {
} }
/**
* 获取 开始 站点id
* @return siteIdStart
*/
public Long getSiteIdStart(){
return this.siteIdStart;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
}
/**
* 获取 结束 站点id
* @return $siteIdEnd
*/
public Long getSiteIdEnd(){
return this.siteIdEnd;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
}
/**
* 获取 增加 站点id
* @return siteIdIncrement
*/
public Long getSiteIdIncrement(){
return this.siteIdIncrement;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
}
/**
* 获取 站点id
* @return siteIdList
*/
public List<Long> getSiteIdList(){
return this.siteIdList;
}
/**
* 设置 站点id
* @param siteIdList
*/
public void setSiteIdList(List<Long> 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;
}
/** /**
* 获取 开始 设备ID * 获取 开始 设备ID
* @return equipmentIdStart * @return equipmentIdStart
...@@ -446,163 +532,163 @@ public class ConvergeAppsQuery extends ConvergeAppsEntity { ...@@ -446,163 +532,163 @@ public class ConvergeAppsQuery extends ConvergeAppsEntity {
/** /**
* 获取 开始 应用访问数 * 获取 开始 应用访问数
* @return pvStart * @return totalPvStart
*/ */
public Integer getPvStart(){ public Integer getTotalPvStart(){
return this.pvStart; return this.totalPvStart;
} }
/** /**
* 设置 开始 应用访问数 * 设置 开始 应用访问数
* @param pvStart * @param totalPvStart
*/ */
public void setPvStart(Integer pvStart){ public void setTotalPvStart(Integer totalPvStart){
this.pvStart = pvStart; this.totalPvStart = totalPvStart;
} }
/** /**
* 获取 结束 应用访问数 * 获取 结束 应用访问数
* @return $pvEnd * @return $totalPvEnd
*/ */
public Integer getPvEnd(){ public Integer getTotalPvEnd(){
return this.pvEnd; return this.totalPvEnd;
} }
/** /**
* 设置 结束 应用访问数 * 设置 结束 应用访问数
* @param pvEnd * @param totalPvEnd
*/ */
public void setPvEnd(Integer pvEnd){ public void setTotalPvEnd(Integer totalPvEnd){
this.pvEnd = pvEnd; this.totalPvEnd = totalPvEnd;
} }
/** /**
* 获取 增加 应用访问数 * 获取 增加 应用访问数
* @return pvIncrement * @return totalPvIncrement
*/ */
public Integer getPvIncrement(){ public Integer getTotalPvIncrement(){
return this.pvIncrement; return this.totalPvIncrement;
} }
/** /**
* 设置 增加 应用访问数 * 设置 增加 应用访问数
* @param pvIncrement * @param totalPvIncrement
*/ */
public void setPvIncrement(Integer pvIncrement){ public void setTotalPvIncrement(Integer totalPvIncrement){
this.pvIncrement = pvIncrement; this.totalPvIncrement = totalPvIncrement;
} }
/** /**
* 获取 应用访问数 * 获取 应用访问数
* @return pvList * @return totalPvList
*/ */
public List<Integer> getPvList(){ public List<Integer> getTotalPvList(){
return this.pvList; return this.totalPvList;
} }
/** /**
* 设置 应用访问数 * 设置 应用访问数
* @param pvList * @param totalPvList
*/ */
public void setPvList(List<Integer> pvList){ public void setTotalPvList(List<Integer> totalPvList){
this.pvList = pvList; this.totalPvList = totalPvList;
} }
/** /**
* 获取 应用访问数 * 获取 应用访问数
* @return pvNotList * @return totalPvNotList
*/ */
public List<Integer> getPvNotList(){ public List<Integer> getTotalPvNotList(){
return this.pvNotList; return this.totalPvNotList;
} }
/** /**
* 设置 应用访问数 * 设置 应用访问数
* @param pvNotList * @param totalPvNotList
*/ */
public void setPvNotList(List<Integer> pvNotList){ public void setTotalPvNotList(List<Integer> totalPvNotList){
this.pvNotList = pvNotList; this.totalPvNotList = totalPvNotList;
} }
/** /**
* 获取 开始 应用访客数 * 获取 开始 应用访客数
* @return uvStart * @return totalUvStart
*/ */
public Integer getUvStart(){ public Integer getTotalUvStart(){
return this.uvStart; return this.totalUvStart;
} }
/** /**
* 设置 开始 应用访客数 * 设置 开始 应用访客数
* @param uvStart * @param totalUvStart
*/ */
public void setUvStart(Integer uvStart){ public void setTotalUvStart(Integer totalUvStart){
this.uvStart = uvStart; this.totalUvStart = totalUvStart;
} }
/** /**
* 获取 结束 应用访客数 * 获取 结束 应用访客数
* @return $uvEnd * @return $totalUvEnd
*/ */
public Integer getUvEnd(){ public Integer getTotalUvEnd(){
return this.uvEnd; return this.totalUvEnd;
} }
/** /**
* 设置 结束 应用访客数 * 设置 结束 应用访客数
* @param uvEnd * @param totalUvEnd
*/ */
public void setUvEnd(Integer uvEnd){ public void setTotalUvEnd(Integer totalUvEnd){
this.uvEnd = uvEnd; this.totalUvEnd = totalUvEnd;
} }
/** /**
* 获取 增加 应用访客数 * 获取 增加 应用访客数
* @return uvIncrement * @return totalUvIncrement
*/ */
public Integer getUvIncrement(){ public Integer getTotalUvIncrement(){
return this.uvIncrement; return this.totalUvIncrement;
} }
/** /**
* 设置 增加 应用访客数 * 设置 增加 应用访客数
* @param uvIncrement * @param totalUvIncrement
*/ */
public void setUvIncrement(Integer uvIncrement){ public void setTotalUvIncrement(Integer totalUvIncrement){
this.uvIncrement = uvIncrement; this.totalUvIncrement = totalUvIncrement;
} }
/** /**
* 获取 应用访客数 * 获取 应用访客数
* @return uvList * @return totalUvList
*/ */
public List<Integer> getUvList(){ public List<Integer> getTotalUvList(){
return this.uvList; return this.totalUvList;
} }
/** /**
* 设置 应用访客数 * 设置 应用访客数
* @param uvList * @param totalUvList
*/ */
public void setUvList(List<Integer> uvList){ public void setTotalUvList(List<Integer> totalUvList){
this.uvList = uvList; this.totalUvList = totalUvList;
} }
/** /**
* 获取 应用访客数 * 获取 应用访客数
* @return uvNotList * @return totalUvNotList
*/ */
public List<Integer> getUvNotList(){ public List<Integer> getTotalUvNotList(){
return this.uvNotList; return this.totalUvNotList;
} }
/** /**
* 设置 应用访客数 * 设置 应用访客数
* @param uvNotList * @param totalUvNotList
*/ */
public void setUvNotList(List<Integer> uvNotList){ public void setTotalUvNotList(List<Integer> totalUvNotList){
this.uvNotList = uvNotList; this.totalUvNotList = totalUvNotList;
} }
...@@ -639,86 +725,37 @@ public class ConvergeAppsQuery extends ConvergeAppsEntity { ...@@ -639,86 +725,37 @@ public class ConvergeAppsQuery extends ConvergeAppsEntity {
} }
/** /**
* 获取 开始 站点id * 获取 统计月份，格式yyyy-MM-dd
* @return siteIdStart * @return statYearMonthList
*/
public Long getSiteIdStart(){
return this.siteIdStart;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
}
/**
* 获取 结束 站点id
* @return $siteIdEnd
*/
public Long getSiteIdEnd(){
return this.siteIdEnd;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
}
/**
* 获取 增加 站点id
* @return siteIdIncrement
*/
public Long getSiteIdIncrement(){
return this.siteIdIncrement;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
}
/**
* 获取 站点id
* @return siteIdList
*/ */
public List<Long> getSiteIdList(){ public List<String> getStatYearMonthList(){
return this.siteIdList; return this.statYearMonthList;
} }
/** /**
* 设置 站点id * 设置 统计月份，格式yyyy-MM-dd
* @param siteIdList * @param statYearMonthList
*/ */
public void setSiteIdList(List<Long> siteIdList){ public void setStatYearMonthList(List<String> statYearMonthList){
this.siteIdList = siteIdList; this.statYearMonthList = statYearMonthList;
} }
/** /**
* 获取 站点id * 获取 统计月份，格式yyyy-MM-dd
* @return siteIdNotList * @return statYearMonthNotList
*/ */
public List<Long> getSiteIdNotList(){ public List<String> getStatYearMonthNotList(){
return this.siteIdNotList; return this.statYearMonthNotList;
} }
/** /**
* 设置 站点id * 设置 统计月份，格式yyyy-MM-dd
* @param siteIdNotList * @param statYearMonthNotList
*/ */
public void setSiteIdNotList(List<Long> siteIdNotList){ public void setStatYearMonthNotList(List<String> statYearMonthNotList){
this.siteIdNotList = siteIdNotList; this.statYearMonthNotList = statYearMonthNotList;
} }
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -773,6 +810,60 @@ public class ConvergeAppsQuery extends ConvergeAppsEntity { ...@@ -773,6 +810,60 @@ public class ConvergeAppsQuery extends ConvergeAppsEntity {
return this; return this;
} }
/**
* 设置 站点id
* @param siteId
*/
public ConvergeAppsQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public ConvergeAppsQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public ConvergeAppsQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点id
* @param siteIdIncrement
*/
public ConvergeAppsQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点id
* @param siteIdList
*/
public ConvergeAppsQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public ConvergeAppsQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
/** /**
* 设置 设备ID * 设置 设备ID
* @param equipmentId * @param equipmentId
...@@ -924,109 +1015,109 @@ public class ConvergeAppsQuery extends ConvergeAppsEntity { ...@@ -924,109 +1015,109 @@ public class ConvergeAppsQuery extends ConvergeAppsEntity {
/** /**
* 设置 应用访问数 * 设置 应用访问数
* @param pv * @param totalPv
*/ */
public ConvergeAppsQuery pv(Integer pv){ public ConvergeAppsQuery totalPv(Integer totalPv){
setPv(pv); setTotalPv(totalPv);
return this; return this;
} }
/** /**
* 设置 开始 应用访问数 * 设置 开始 应用访问数
* @param pvStart * @param totalPvStart
*/ */
public ConvergeAppsQuery pvStart(Integer pvStart){ public ConvergeAppsQuery totalPvStart(Integer totalPvStart){
this.pvStart = pvStart; this.totalPvStart = totalPvStart;
return this; return this;
} }
/** /**
* 设置 结束 应用访问数 * 设置 结束 应用访问数
* @param pvEnd * @param totalPvEnd
*/ */
public ConvergeAppsQuery pvEnd(Integer pvEnd){ public ConvergeAppsQuery totalPvEnd(Integer totalPvEnd){
this.pvEnd = pvEnd; this.totalPvEnd = totalPvEnd;
return this; return this;
} }
/** /**
* 设置 增加 应用访问数 * 设置 增加 应用访问数
* @param pvIncrement * @param totalPvIncrement
*/ */
public ConvergeAppsQuery pvIncrement(Integer pvIncrement){ public ConvergeAppsQuery totalPvIncrement(Integer totalPvIncrement){
this.pvIncrement = pvIncrement; this.totalPvIncrement = totalPvIncrement;
return this; return this;
} }
/** /**
* 设置 应用访问数 * 设置 应用访问数
* @param pvList * @param totalPvList
*/ */
public ConvergeAppsQuery pvList(List<Integer> pvList){ public ConvergeAppsQuery totalPvList(List<Integer> totalPvList){
this.pvList = pvList; this.totalPvList = totalPvList;
return this; return this;
} }
/** /**
* 设置 应用访问数 * 设置 应用访问数
* @param pvNotList * @param totalPvNotList
*/ */
public ConvergeAppsQuery pvNotList(List<Integer> pvNotList){ public ConvergeAppsQuery totalPvNotList(List<Integer> totalPvNotList){
this.pvNotList = pvNotList; this.totalPvNotList = totalPvNotList;
return this; return this;
} }
/** /**
* 设置 应用访客数 * 设置 应用访客数
* @param uv * @param totalUv
*/ */
public ConvergeAppsQuery uv(Integer uv){ public ConvergeAppsQuery totalUv(Integer totalUv){
setUv(uv); setTotalUv(totalUv);
return this; return this;
} }
/** /**
* 设置 开始 应用访客数 * 设置 开始 应用访客数
* @param uvStart * @param totalUvStart
*/ */
public ConvergeAppsQuery uvStart(Integer uvStart){ public ConvergeAppsQuery totalUvStart(Integer totalUvStart){
this.uvStart = uvStart; this.totalUvStart = totalUvStart;
return this; return this;
} }
/** /**
* 设置 结束 应用访客数 * 设置 结束 应用访客数
* @param uvEnd * @param totalUvEnd
*/ */
public ConvergeAppsQuery uvEnd(Integer uvEnd){ public ConvergeAppsQuery totalUvEnd(Integer totalUvEnd){
this.uvEnd = uvEnd; this.totalUvEnd = totalUvEnd;
return this; return this;
} }
/** /**
* 设置 增加 应用访客数 * 设置 增加 应用访客数
* @param uvIncrement * @param totalUvIncrement
*/ */
public ConvergeAppsQuery uvIncrement(Integer uvIncrement){ public ConvergeAppsQuery totalUvIncrement(Integer totalUvIncrement){
this.uvIncrement = uvIncrement; this.totalUvIncrement = totalUvIncrement;
return this; return this;
} }
/** /**
* 设置 应用访客数 * 设置 应用访客数
* @param uvList * @param totalUvList
*/ */
public ConvergeAppsQuery uvList(List<Integer> uvList){ public ConvergeAppsQuery totalUvList(List<Integer> totalUvList){
this.uvList = uvList; this.totalUvList = totalUvList;
return this; return this;
} }
/** /**
* 设置 应用访客数 * 设置 应用访客数
* @param uvNotList * @param totalUvNotList
*/ */
public ConvergeAppsQuery uvNotList(List<Integer> uvNotList){ public ConvergeAppsQuery totalUvNotList(List<Integer> totalUvNotList){
this.uvNotList = uvNotList; this.totalUvNotList = totalUvNotList;
return this; return this;
} }
...@@ -1049,57 +1140,22 @@ public class ConvergeAppsQuery extends ConvergeAppsEntity { ...@@ -1049,57 +1140,22 @@ public class ConvergeAppsQuery extends ConvergeAppsEntity {
return this; return this;
} }
/**
* 设置 站点id
* @param siteId
*/
public ConvergeAppsQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点id
* @param siteIdStart
*/
public ConvergeAppsQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点id
* @param siteIdEnd
*/
public ConvergeAppsQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/** /**
* 设置 增加 站点id * 设置 统计月份，格式yyyy-MM-dd
* @param siteIdIncrement * @param statYearMonth
*/ */
public ConvergeAppsQuery siteIdIncrement(Long siteIdIncrement){ public ConvergeAppsQuery statYearMonth(String statYearMonth){
this.siteIdIncrement = siteIdIncrement; setStatYearMonth(statYearMonth);
return this; return this;
} }
/** /**
* 设置 站点id * 设置 统计月份，格式yyyy-MM-dd
* @param siteIdList * @param statYearMonthList
*/ */
public ConvergeAppsQuery siteIdList(List<Long> siteIdList){ public ConvergeAppsQuery statYearMonthList(List<String> statYearMonthList){
this.siteIdList = siteIdList; this.statYearMonthList = statYearMonthList;
return this;
}
/**
* 设置 站点id
* @param siteIdNotList
*/
public ConvergeAppsQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this; return this;
} }
......
sst-manager/src/main/java/com/mortals/xhx/module/converge/model/vo/AppVO.java
View file @ ad2c8b6a
...@@ -27,11 +27,15 @@ public class AppVO { ...@@ -27,11 +27,15 @@ public class AppVO {
/** /**
* 应用访问数 * 应用访问数
*/ */
private Integer pv; private Integer totalPv;
/** /**
* 应用访客数 * 应用访客数
*/ */
private Integer uv; private Integer totalUv;
/**
* 统计月份，格式yyyy-MM-dd
*/
private String statYearMonth;
/** /**
* 操作类型 * 操作类型
*/ */
......
sst-manager/src/main/java/com/mortals/xhx/module/converge/model/vo/AppsAccessVo.java 0 → 100644
View file @ ad2c8b6a
package com.mortals.xhx.module.converge.model.vo;
import lombok.Data;
@Data
public class AppsAccessVo {
/**
* 站点id
*/
private Long siteId;
/**
* 设备ID
*/
private String equipmentId;
/**
* 应用标识，具有唯一性
*/
private String appEname;
/**
* 应用名称
*/
private String appName;
/**
* 应用简称
*/
private String appSimpleName;
/**
* 应用提供方
*/
private String provider;
/**
* 应用来源
*/
private String origin;
/**
* 应用访问数
*/
private Integer totalPv;
/**
* 应用访客数
*/
private Integer totalUv;
/**
* 统计月份，格式yyyy-MM-dd
*/
private String statYearMonth;
}
sst-manager/src/main/java/com/mortals/xhx/module/converge/model/vo/ConvergeAppsAccessVo.java 0 → 100644
View file @ ad2c8b6a
package com.mortals.xhx.module.converge.model.vo;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.converge.model.ConvergeAppsAccessEntity;
import java.util.ArrayList;
import java.util.List;
import lombok.Data;
import com.mortals.framework.annotation.Excel;
import java.math.BigDecimal;
import java.util.Date;
/**
* 应用访问视图对象
*
* @author zxfei
* @date 2023-07-03
*/
@Data
public class ConvergeAppsAccessVo extends BaseEntityLong {
}
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/converge/service/ConvergeAppsAccessService.java 0 → 100644
View file @ ad2c8b6a
package com.mortals.xhx.module.converge.service;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.converge.model.ConvergeAppsAccessEntity;
import com.mortals.xhx.module.converge.dao.ConvergeAppsAccessDao;
import com.mortals.xhx.module.converge.model.vo.AppsAccessVo;
import java.util.List;
import java.util.Map;
/**
* ConvergeAppsAccessService
*
* 应用访问 service接口
*
* @author zxfei
* @date 2023-07-03
*/
public interface ConvergeAppsAccessService extends ICRUDService<ConvergeAppsAccessEntity,Long>{
ConvergeAppsAccessDao getDao();
/**
* 应用浏览量PV统计
* @return
*/
List<AppsAccessVo> getAppsAccessPv(Map<String,String> condition) throws AppException;
/**
* 应用浏览量UV统计
* @return
*/
List<AppsAccessVo> getAppsAccessUv(Map<String,String> condition) throws AppException;
}
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/converge/service/ConvergeAppsService.java
View file @ ad2c8b6a
package com.mortals.xhx.module.converge.service; package com.mortals.xhx.module.converge.service;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.service.ICRUDService; import com.mortals.framework.service.ICRUDService;
import com.mortals.xhx.module.converge.model.ConvergeAppsAccessEntity;
import com.mortals.xhx.module.converge.model.ConvergeAppsEntity; import com.mortals.xhx.module.converge.model.ConvergeAppsEntity;
import com.mortals.xhx.module.converge.dao.ConvergeAppsDao; import com.mortals.xhx.module.converge.dao.ConvergeAppsDao;
import java.util.Map;
/** /**
* ConvergeAppsService * ConvergeAppsService
* *
...@@ -13,4 +18,10 @@ import com.mortals.xhx.module.converge.dao.ConvergeAppsDao; ...@@ -13,4 +18,10 @@ import com.mortals.xhx.module.converge.dao.ConvergeAppsDao;
public interface ConvergeAppsService extends ICRUDService<ConvergeAppsEntity,Long>{ public interface ConvergeAppsService extends ICRUDService<ConvergeAppsEntity,Long>{
ConvergeAppsDao getDao(); ConvergeAppsDao getDao();
/**
* 天府通办数据汇聚
* @throws AppException
*/
void doConvergeApps(Map<String,String> condition) throws AppException;
} }
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/converge/service/impl/ConvergeAppsAccessServiceImpl.java 0 → 100644
View file @ ad2c8b6a
package com.mortals.xhx.module.converge.service.impl;
import com.mortals.xhx.module.converge.model.vo.AppsAccessVo;
import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.xhx.module.converge.dao.ConvergeAppsAccessDao;
import com.mortals.xhx.module.converge.model.ConvergeAppsAccessEntity;
import com.mortals.xhx.module.converge.service.ConvergeAppsAccessService;
import lombok.extern.slf4j.Slf4j;
import java.util.List;
import java.util.Map;
/**
* ConvergeAppsAccessService
* 应用访问 service实现
*
* @author zxfei
* @date 2023-07-03
*/
@Service("convergeAppsAccessService")
@Slf4j
public class ConvergeAppsAccessServiceImpl extends AbstractCRUDServiceImpl<ConvergeAppsAccessDao, ConvergeAppsAccessEntity, Long> implements ConvergeAppsAccessService {
@Override
public List<AppsAccessVo> getAppsAccessPv(Map<String,String> condition) throws AppException {
return dao.getAppsAccessPv(condition);
}
@Override
public List<AppsAccessVo> getAppsAccessUv(Map<String,String> condition) throws AppException {
return dao.getAppsAccessUv(condition);
}
}
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/converge/service/impl/ConvergeAppsServiceImpl.java
View file @ ad2c8b6a
package com.mortals.xhx.module.converge.service.impl; package com.mortals.xhx.module.converge.service.impl;
import com.mortals.xhx.module.converge.model.*;
import com.mortals.xhx.module.converge.model.vo.AppsAccessVo;
import com.mortals.xhx.module.converge.service.ConvergeAppsAccessService;
import com.mortals.xhx.module.converge.service.ConvergeDeviceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl; import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.xhx.module.converge.dao.ConvergeAppsDao; import com.mortals.xhx.module.converge.dao.ConvergeAppsDao;
import com.mortals.xhx.module.converge.model.ConvergeAppsEntity;
import com.mortals.xhx.module.converge.service.ConvergeAppsService; import com.mortals.xhx.module.converge.service.ConvergeAppsService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** /**
* ConvergeAppsService * ConvergeAppsService
* 设备应用 service实现 * 设备应用 service实现
...@@ -18,4 +29,68 @@ import lombok.extern.slf4j.Slf4j; ...@@ -18,4 +29,68 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j @Slf4j
public class ConvergeAppsServiceImpl extends AbstractCRUDServiceImpl<ConvergeAppsDao, ConvergeAppsEntity, Long> implements ConvergeAppsService { public class ConvergeAppsServiceImpl extends AbstractCRUDServiceImpl<ConvergeAppsDao, ConvergeAppsEntity, Long> implements ConvergeAppsService {
@Autowired
private ConvergeAppsAccessService convergeAppsAccessService;
@Autowired
private ConvergeDeviceService convergeDeviceService;
@Override
public void doConvergeApps(Map<String,String> condition) throws AppException {
List<AppsAccessVo> accessPvList = convergeAppsAccessService.getAppsAccessPv(condition);
List<AppsAccessVo> accessUvList = convergeAppsAccessService.getAppsAccessUv(condition);
if(CollectionUtils.isEmpty(accessPvList)||CollectionUtils.isEmpty(accessUvList)){
return;
}else {
Map<String,AppsAccessVo> uvMap = new HashMap<>();
for (AppsAccessVo vo:accessUvList){
String key = vo.getSiteId()+"_"+vo.getEquipmentId()+"_"+vo.getAppEname()+"_"+vo.getStatYearMonth();
uvMap.put(key,vo);
}
List<ConvergeAppsEntity> appsList = new ArrayList<>();
Map<String, ConvergeDeviceEntity> deviceMap = new HashMap<>();
for(AppsAccessVo item:accessPvList){
ConvergeAppsEntity entity = new ConvergeAppsEntity();
if(deviceMap.containsKey(item.getEquipmentId())){
entity.setEquipmentId(deviceMap.get(item.getEquipmentId()).getId());
}else {
ConvergeDeviceEntity deviceEntity = convergeDeviceService.selectOne(new ConvergeDeviceQuery().logo(item.getEquipmentId()));
if(deviceEntity!=null){
deviceMap.put(item.getEquipmentId(),deviceEntity);
entity.setEquipmentId(deviceEntity.getId());
}else {
entity.setEquipmentId(-1l);
}
}
entity.setAppEname(item.getAppEname());
entity.setAppName(item.getAppName());
entity.setAppSimpleName(item.getAppSimpleName());
entity.setProvider(item.getProvider());
entity.setOrigin(item.getOrigin());
entity.setSiteId(item.getSiteId());
entity.setTotalPv(item.getTotalPv());
entity.setStatYearMonth(item.getStatYearMonth());
String key = item.getSiteId()+"_"+item.getEquipmentId()+"_"+item.getAppEname()+"_"+item.getStatYearMonth();
if(uvMap.containsKey(key)) {
entity.setTotalUv(uvMap.get(key).getTotalUv());
}
appsList.add(entity);
}
for(ConvergeAppsEntity item:appsList){
ConvergeAppsEntity temp = this.selectOne(new ConvergeAppsQuery().appEname(item.getAppEname()).equipmentId(item.getEquipmentId()).siteId(item.getSiteId()).statYearMonth(item.getStatYearMonth()));
if(temp!=null){
item.setId(temp.getId());
if(temp.getTotalPv()==item.getTotalPv()&&temp.getTotalUv()==item.getTotalUv()){
item.setOpr("P");
}else {
item.setOpr("U");
}
this.update(item);
}else {
item.setOpr("A");
this.save(item);
}
}
}
}
} }
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/converge/service/impl/ConvergeSiteServiceImpl.java
View file @ ad2c8b6a
...@@ -6,11 +6,11 @@ import com.mortals.xhx.common.pdu.site.SitePdu; ...@@ -6,11 +6,11 @@ import com.mortals.xhx.common.pdu.site.SitePdu;
import com.mortals.xhx.common.utils.BeanUtil; import com.mortals.xhx.common.utils.BeanUtil;
import com.mortals.xhx.feign.device.IDeviceFeign; import com.mortals.xhx.feign.device.IDeviceFeign;
import com.mortals.xhx.feign.site.ISiteFeign; import com.mortals.xhx.feign.site.ISiteFeign;
import com.mortals.xhx.module.converge.model.ConvergeDeviceEntity; import com.mortals.xhx.module.converge.model.*;
import com.mortals.xhx.module.converge.model.ConvergeDeviceQuery; import com.mortals.xhx.module.converge.model.vo.AppVO;
import com.mortals.xhx.module.converge.model.ConvergeSiteQuery;
import com.mortals.xhx.module.converge.model.vo.BranchVO; import com.mortals.xhx.module.converge.model.vo.BranchVO;
import com.mortals.xhx.module.converge.model.vo.EquipmentVO; import com.mortals.xhx.module.converge.model.vo.EquipmentVO;
import com.mortals.xhx.module.converge.service.ConvergeAppsService;
import com.mortals.xhx.module.converge.service.ConvergeDeviceService; import com.mortals.xhx.module.converge.service.ConvergeDeviceService;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
...@@ -20,7 +20,6 @@ import com.mortals.framework.service.impl.AbstractCRUDServiceImpl; ...@@ -20,7 +20,6 @@ import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.xhx.module.converge.dao.ConvergeSiteDao; import com.mortals.xhx.module.converge.dao.ConvergeSiteDao;
import com.mortals.xhx.module.converge.model.ConvergeSiteEntity;
import com.mortals.xhx.module.converge.service.ConvergeSiteService; import com.mortals.xhx.module.converge.service.ConvergeSiteService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -45,6 +44,8 @@ public class ConvergeSiteServiceImpl extends AbstractCRUDServiceImpl<ConvergeSit ...@@ -45,6 +44,8 @@ public class ConvergeSiteServiceImpl extends AbstractCRUDServiceImpl<ConvergeSit
private ISiteFeign siteFeign; private ISiteFeign siteFeign;
@Autowired @Autowired
private ConvergeDeviceService convergeDeviceService; private ConvergeDeviceService convergeDeviceService;
@Autowired
private ConvergeAppsService convergeAppsService;
@Override @Override
public List<BranchVO> getConvergeData() throws AppException { public List<BranchVO> getConvergeData() throws AppException {
...@@ -60,7 +61,11 @@ public class ConvergeSiteServiceImpl extends AbstractCRUDServiceImpl<ConvergeSit ...@@ -60,7 +61,11 @@ public class ConvergeSiteServiceImpl extends AbstractCRUDServiceImpl<ConvergeSit
for (ConvergeDeviceEntity deviceEntity:deviceEntityList){ for (ConvergeDeviceEntity deviceEntity:deviceEntityList){
EquipmentVO equipmentVO = new EquipmentVO(); EquipmentVO equipmentVO = new EquipmentVO();
BeanUtils.copyProperties(deviceEntity,equipmentVO,BeanUtil.getNullPropertyNames(deviceEntity)); BeanUtils.copyProperties(deviceEntity,equipmentVO,BeanUtil.getNullPropertyNames(deviceEntity));
equipmentVO.setAppStats(Collections.emptyList()); List<ConvergeAppsEntity> apps = convergeAppsService.find(new ConvergeAppsQuery().siteId(deviceEntity.getSiteId()).equipmentId(deviceEntity.getId()));
if(CollectionUtils.isEmpty(apps)){
continue;
}
equipmentVO.setAppStats(convertAppVO(apps));
equipments.add(equipmentVO); equipments.add(equipmentVO);
} }
branchVO.setEquipments(equipments); branchVO.setEquipments(equipments);
...@@ -137,4 +142,18 @@ public class ConvergeSiteServiceImpl extends AbstractCRUDServiceImpl<ConvergeSit ...@@ -137,4 +142,18 @@ public class ConvergeSiteServiceImpl extends AbstractCRUDServiceImpl<ConvergeSit
} }
return true; return true;
} }
private List<AppVO> convertAppVO(List<ConvergeAppsEntity> apps){
if(CollectionUtils.isEmpty(apps)){
return Collections.emptyList();
}else {
List<AppVO> voList = new ArrayList<>();
for (ConvergeAppsEntity item:apps){
AppVO vo = new AppVO();
BeanUtils.copyProperties(item,vo,BeanUtil.getNullPropertyNames(item));
voList.add(vo);
}
return voList;
}
}
} }
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/converge/web/ConvergeAppsAccessController.java 0 → 100644
View file @ ad2c8b6a
package com.mortals.xhx.module.converge.web;
import com.mortals.framework.annotation.RepeatSubmit;
import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.model.BaseEntity;
import com.mortals.framework.service.IUser;
import com.mortals.framework.util.DataUtil;
import com.mortals.framework.util.DateUtils;
import com.mortals.framework.utils.BeanUtil;
import com.mortals.framework.utils.ReflectUtils;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.mortals.framework.model.Context;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.module.converge.model.ConvergeAppsAccessEntity;
import com.mortals.xhx.module.converge.service.ConvergeAppsAccessService;
import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils;
import java.util.*;
import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import static com.mortals.framework.ap.SysConstains.*;
/**
*
* 应用访问
*
* @author zxfei
* @date 2023-07-03
*/
@RestController
@RequestMapping("converge/apps/access")
public class ConvergeAppsAccessController extends BaseCRUDJsonBodyMappingController<ConvergeAppsAccessService,ConvergeAppsAccessEntity,Long> {
@Autowired
private ParamService paramService;
public ConvergeAppsAccessController(){
super.setModuleDesc( "应用访问");
}
@Override
protected void init(Map<String, Object> model, Context context) {
super.init(model, context);
}
@Override
@PostMapping({"save"})
@UnAuth
public String save(@RequestBody ConvergeAppsAccessEntity entity) {
Map<String, Object> model = new HashMap();
Context context = this.getContext();
int code = 1;
String busiDesc = "保存" + this.getModuleDesc();
try {
this.saveBefore(entity, model, context);
if (entity.newEntity()) {
Class<ConvergeAppsAccessEntity> tClass = ReflectUtils.getClassGenricType(this.getClass(), 1);
ConvergeAppsAccessEntity initEntity = (ConvergeAppsAccessEntity)tClass.newInstance();
initEntity.initAttrValue();
BeanUtils.copyProperties(entity, initEntity, BeanUtil.getNullPropertyNames(entity));
entity = initEntity;
busiDesc = "新增" + this.getModuleDesc();
initEntity.setCreateTime(new Date());
IUser user = this.getCurUser();
if (user != null) {
initEntity.setCreateUserId(user.getId());
initEntity.setCreateUser(user.getLoginName());
initEntity.setCreateUserName(user.getRealName());
initEntity.setCreateUserDeptId(user.getDeptId());
initEntity.setCreateUserDeptName(user.getDeptName());
}
this.service.save(initEntity, context);
} else {
busiDesc = "修改" + this.getModuleDesc();
entity.setUpdateTime(new Date());
IUser user = this.getCurUser();
if (user != null) {
entity.setUpdateUserId(user.getId());
entity.setUpdateUser(user.getLoginName());
entity.setUpdateUserName(user.getRealName());
entity.setUpdateUserDeptId(user.getDeptId());
entity.setUpdateUserDeptName(user.getDeptName());
}
this.service.update(entity, context);
}
model.put("id", entity.getId());
code = this.saveAfter(entity, model, context);
model.put("entity", entity);
model.put("message_info", busiDesc + "成功");
this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
} catch (Exception var9) {
this.doException(this.request, busiDesc, model, var9);
model.put("entity", entity);
this.init(model, context);
code = this.saveException(entity, model, context, var9);
}
this.init(model, context);
JSONObject ret = new JSONObject();
ret.put("code", code);
ret.put("msg", model.remove("message_info"));
ret.put("data", model);
return ret.toJSONString();
}
@GetMapping({"bury"})
@UnAuth
public String bury(HttpServletRequest request, HttpServletResponse response) {
Map<String, Object> model = new HashMap();
Context context = this.getContext();
int code = 1;
String busiDesc = "保存" + this.getModuleDesc();
ConvergeAppsAccessEntity entity = new ConvergeAppsAccessEntity();
entity.setSiteId(DataUtil.converStr2Long(request.getParameter("siteId"),0l));
entity.setApplicationId(request.getParameter("applicationId"));
entity.setApplicationName(request.getParameter("applicationName"));
if(StringUtils.isNotEmpty(request.getParameter("startTime"))) {
entity.setStartTime(DateUtils.StrToDateTime(request.getParameter("startTime")));
}
if(StringUtils.isNotEmpty(request.getParameter("endTime"))) {
entity.setEndTime(DateUtils.StrToDateTime(request.getParameter("endTime")));
}
entity.setChannelId(request.getParameter("channelId"));
entity.setChannelName(request.getParameter("channelName"));
entity.setLocation(request.getParameter("location"));
entity.setClientName(request.getParameter("clientName"));
entity.setVersion(request.getParameter("version"));
entity.setEcode(request.getParameter("ecode"));
entity.setAppSimpleName(request.getParameter("appSimpleName"));
entity.setProvider(request.getParameter("provider"));
entity.setOrigin(request.getParameter("origin"));
try {
this.saveBefore(entity, model, context);
if (entity.newEntity()) {
Class<ConvergeAppsAccessEntity> tClass = ReflectUtils.getClassGenricType(this.getClass(), 1);
ConvergeAppsAccessEntity initEntity = (ConvergeAppsAccessEntity)tClass.newInstance();
initEntity.initAttrValue();
BeanUtils.copyProperties(entity, initEntity, BeanUtil.getNullPropertyNames(entity));
entity = initEntity;
busiDesc = "新增" + this.getModuleDesc();
initEntity.setCreateTime(new Date());
IUser user = this.getCurUser();
if (user != null) {
initEntity.setCreateUserId(user.getId());
initEntity.setCreateUser(user.getLoginName());
initEntity.setCreateUserName(user.getRealName());
initEntity.setCreateUserDeptId(user.getDeptId());
initEntity.setCreateUserDeptName(user.getDeptName());
}
this.service.save(initEntity, context);
}
model.put("id", entity.getId());
code = this.saveAfter(entity, model, context);
model.put("entity", entity);
model.put("message_info", busiDesc + "成功");
this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + entity.getId() + "]");
} catch (Exception var9) {
this.doException(this.request, busiDesc, model, var9);
model.put("entity", entity);
this.init(model, context);
code = this.saveException(entity, model, context, var9);
}
this.init(model, context);
JSONObject ret = new JSONObject();
ret.put("code", code);
ret.put("msg", model.remove("message_info"));
ret.put("data", model);
return ret.toJSONString();
}
}
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/converge/web/ConvergeSiteController.java
View file @ ad2c8b6a
package com.mortals.xhx.module.converge.web; package com.mortals.xhx.module.converge.web;
import com.mortals.framework.annotation.UnAuth; 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.model.PageInfo; import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result; import com.mortals.framework.model.Result;
import com.mortals.framework.util.DateUtils;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.module.converge.model.vo.BranchVO; import com.mortals.xhx.module.converge.model.vo.BranchVO;
import com.mortals.xhx.module.converge.service.ConvergeAppsService;
import com.mortals.xhx.module.converge.service.ConvergeDeviceService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
...@@ -19,6 +23,7 @@ import com.mortals.xhx.module.converge.service.ConvergeSiteService; ...@@ -19,6 +23,7 @@ import com.mortals.xhx.module.converge.service.ConvergeSiteService;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import com.mortals.framework.util.StringUtils; import com.mortals.framework.util.StringUtils;
import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
...@@ -38,6 +43,10 @@ public class ConvergeSiteController extends BaseCRUDJsonBodyMappingController<Co ...@@ -38,6 +43,10 @@ public class ConvergeSiteController extends BaseCRUDJsonBodyMappingController<Co
@Autowired @Autowired
private ParamService paramService; private ParamService paramService;
@Autowired
private ConvergeDeviceService convergeDeviceService;
@Autowired
private ConvergeAppsService convergeAppsService;
public ConvergeSiteController(){ public ConvergeSiteController(){
super.setModuleDesc( "网点信息"); super.setModuleDesc( "网点信息");
...@@ -80,4 +89,37 @@ public class ConvergeSiteController extends BaseCRUDJsonBodyMappingController<Co ...@@ -80,4 +89,37 @@ public class ConvergeSiteController extends BaseCRUDJsonBodyMappingController<Co
} }
return JSONObject.toJSONString(model.get("data")); return JSONObject.toJSONString(model.get("data"));
} }
@Override
protected void doListBefore(ConvergeSiteEntity query, Map<String, Object> model, Context context) throws AppException {
log.info("开始执行省平台数据汇聚任务...");
try {
this.service.doConvergeSite();
}catch (Exception e){
log.error("汇聚网点数据执行出错",e);
}
try {
convergeDeviceService.doConvergeDevice();
}catch (Exception e){
log.error("汇聚设备数据出错",e);
}
try {
SimpleDateFormat format=new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar=Calendar.getInstance();
calendar.set(Calendar.DAY_OF_MONTH, 1);
String startTime = format.format(calendar.getTime());
calendar.set(Calendar.DAY_OF_MONTH, calendar.getActualMaximum(Calendar.DAY_OF_MONTH));
String endTime = format.format(calendar.getTime());
Map<String,String> condition = new HashMap<>();
condition.put("startTime",startTime);
condition.put("endTime",endTime);
convergeAppsService.doConvergeApps(condition);
}catch (Exception e){
log.error("汇聚应用数据出错",e);
}
log.info("省平台数据汇聚任务执行完成");
}
} }
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceEntity.java
View file @ ad2c8b6a
...@@ -20,10 +20,12 @@ public class DeviceEntity extends DeviceVo { ...@@ -20,10 +20,12 @@ public class DeviceEntity extends DeviceVo {
/** /**
* 设备名称 * 设备名称
*/ */
@Excel(name = "设备名称")
private String deviceName; private String deviceName;
/** /**
* 设备编码,SN码等，默认为MAC地址 * 设备编码,SN码等，默认为MAC地址
*/ */
@Excel(name = "设备编码")
private String deviceCode; private String deviceCode;
/** /**
* 设备的MAC地址 * 设备的MAC地址
...@@ -40,6 +42,7 @@ public class DeviceEntity extends DeviceVo { ...@@ -40,6 +42,7 @@ public class DeviceEntity extends DeviceVo {
/** /**
* 站点名称 * 站点名称
*/ */
@Excel(name = "站点名称")
private String siteName; private String siteName;
/** /**
* 平台系统Id * 平台系统Id
...@@ -48,6 +51,7 @@ public class DeviceEntity extends DeviceVo { ...@@ -48,6 +51,7 @@ public class DeviceEntity extends DeviceVo {
/** /**
* 平台系统名称 * 平台系统名称
*/ */
@Excel(name = "平台系统名称")
private String platformName; private String platformName;
/** /**
* 产品Id * 产品Id
...@@ -56,6 +60,7 @@ public class DeviceEntity extends DeviceVo { ...@@ -56,6 +60,7 @@ public class DeviceEntity extends DeviceVo {
/** /**
* 产品名称 * 产品名称
*/ */
@Excel(name = "产品名称")
private String productName; private String productName;
/** /**
* 皮肤id * 皮肤id
...@@ -76,6 +81,7 @@ public class DeviceEntity extends DeviceVo { ...@@ -76,6 +81,7 @@ public class DeviceEntity extends DeviceVo {
/** /**
* 设备生产厂商名称 * 设备生产厂商名称
*/ */
@Excel(name = "设备生产厂商名称")
private String deviceFirmname; private String deviceFirmname;
/** /**
* 设备来源(0.子设备，1.网关设备，2.直连设备) * 设备来源(0.子设备，1.网关设备，2.直连设备)
...@@ -96,10 +102,12 @@ public class DeviceEntity extends DeviceVo { ...@@ -96,10 +102,12 @@ public class DeviceEntity extends DeviceVo {
/** /**
* 所属楼栋 * 所属楼栋
*/ */
@Excel(name = "所属楼栋")
private Integer deviceInBuilding; private Integer deviceInBuilding;
/** /**
* 所属楼层 * 所属楼层
*/ */
@Excel(name = "所属楼层")
private Integer deviceInFloor; private Integer deviceInFloor;
/** /**
* 保修期至 * 保修期至
...@@ -108,10 +116,12 @@ public class DeviceEntity extends DeviceVo { ...@@ -108,10 +116,12 @@ public class DeviceEntity extends DeviceVo {
/** /**
* 负责人 * 负责人
*/ */
@Excel(name = "负责人")
private String leadingOfficial; private String leadingOfficial;
/** /**
* 联系电话 * 联系电话
*/ */
@Excel(name = "联系电话")
private String leadingOfficialTelephone; private String leadingOfficialTelephone;
/** /**
* 是否接收异常短(0.否，1.是) * 是否接收异常短(0.否，1.是)
...@@ -168,6 +178,7 @@ public class DeviceEntity extends DeviceVo { ...@@ -168,6 +178,7 @@ public class DeviceEntity extends DeviceVo {
/** /**
* 设备来源(0.旧设备，1.新设备) * 设备来源(0.旧设备，1.新设备)
*/ */
@Excel(name = "设备来源", readConverterExp = "0=旧设备,1=新设备")
private Integer source; private Integer source;
/** /**
* 设备SN码 * 设备SN码
...@@ -180,6 +191,7 @@ public class DeviceEntity extends DeviceVo { ...@@ -180,6 +191,7 @@ public class DeviceEntity extends DeviceVo {
/** /**
* 产品编码 * 产品编码
*/ */
@Excel(name = "产品类型")
private String productCode; private String productCode;
/** /**
* 大厅Id * 大厅Id
...@@ -188,6 +200,7 @@ public class DeviceEntity extends DeviceVo { ...@@ -188,6 +200,7 @@ public class DeviceEntity extends DeviceVo {
/** /**
* 大厅名称 * 大厅名称
*/ */
@Excel(name = "大厅名称")
private String hallName; private String hallName;
/** /**
* 是否显示短信(0.否，1.是) * 是否显示短信(0.否，1.是)
......
sst-manager/src/main/java/com/mortals/xhx/module/device/model/vo/DeviceVo.java
View file @ ad2c8b6a
...@@ -25,11 +25,7 @@ public class DeviceVo extends BaseEntityLong { ...@@ -25,11 +25,7 @@ public class DeviceVo extends BaseEntityLong {
*/ */
private String platformCode; private String platformCode;
/**
* 产品编码
*/
@Excel(name = "产品类型",cacheDict = "productDict" ,type = Excel.Type.IMPORT)
private String productCode;
/** /**
......
sst-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java
View file @ ad2c8b6a
package com.mortals.xhx.module.device.web; package com.mortals.xhx.module.device.web;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.annotation.RepeatSubmit;
import com.mortals.framework.annotation.UnAuth; 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.model.BaseEntity;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo; import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result; import com.mortals.framework.model.Result;
import com.mortals.framework.service.IUser;
import com.mortals.framework.utils.ReflectUtils;
import com.mortals.framework.utils.poi.ExcelUtil;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.common.code.YesNoEnum; import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.common.pdu.RespData; import com.mortals.xhx.common.pdu.RespData;
...@@ -27,11 +32,9 @@ import org.springframework.beans.BeanUtils; ...@@ -27,11 +32,9 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.ArrayList; import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
...@@ -92,6 +95,7 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe ...@@ -92,6 +95,7 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
model.put("notActive", not_active); model.put("notActive", not_active);
model.put("stopUsing", stop_using); model.put("stopUsing", stop_using);
model.put("pageInfo", result.getPageInfo()); model.put("pageInfo", result.getPageInfo());
model.put("dict",result.getDict());
this.parsePageInfo(model, result.getPageInfo()); this.parsePageInfo(model, result.getPageInfo());
code = this.doListAfter(query, model, context); code = this.doListAfter(query, model, context);
model.put("message_info", busiDesc + "成功"); model.put("message_info", busiDesc + "成功");
...@@ -109,7 +113,6 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe ...@@ -109,7 +113,6 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
return ret; return ret;
} }
@RequestMapping(value = {"info"},method = {RequestMethod.POST, RequestMethod.GET}) @RequestMapping(value = {"info"},method = {RequestMethod.POST, RequestMethod.GET})
@UnAuth @UnAuth
public String info(Long id) { public String info(Long id) {
...@@ -313,4 +316,122 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe ...@@ -313,4 +316,122 @@ public class DeviceController extends BaseCRUDJsonBodyMappingController<DeviceSe
return ret; return ret;
} }
@PostMapping({"m/save"})
@RepeatSubmit
public String save(@RequestBody DevicePdu devicePdu,@RequestHeader("Authorization") String authorization) {
Map<String, Object> model = new HashMap();
Context context = this.getContext();
String busiDesc = "保存" + this.getModuleDesc();
int code = 1;
try {
Rest<RespData<DevicePdu>> rest = deviceFeign.save(devicePdu,authorization);
if (rest.getCode()>0){
code = 1;
model.put("entity", rest.getData().getData());
model.put("message_info", busiDesc + "成功");
this.recordSysLog(this.request, busiDesc + " 【成功】 [id:" + devicePdu.getId() + "]");
}else {
code = -1;
model.put("message_info", rest.getMsg());
}
} catch (Exception var9) {
this.doException(this.request, busiDesc, model, var9);
model.put("entity", devicePdu);
this.init(model, context);
code = -1;
}
this.init(model, context);
JSONObject ret = new JSONObject();
ret.put("code", code);
ret.put("msg", model.remove("message_info"));
ret.put("data", model);
return ret.toJSONString();
}
@PostMapping({"m/list"})
@UnAuth
public Rest<Object> mlist(@RequestBody DevicePdu query) {
Rest<Object> ret = new Rest();
Map<String, Object> model = new HashMap();
Context context = this.getContext();
String busiDesc = "查询" + this.getModuleDesc();
int code;
try {
Rest<RespData<List<DevicePdu>>> rest = deviceFeign.list(query);
if (rest.getCode().equals(YesNoEnum.YES.getValue())) {
model.put("data", rest.getData().getData());
int onlineTotal = 0;
int offlineTotal = 0;
int not_active = 0;
int stop_using = 0;
for (DevicePdu deviceEntity : rest.getData().getData()) {
if (deviceEntity.getDeviceStatus() == 0) {
not_active++;
}
if (deviceEntity.getDeviceStatus() == 1) {
offlineTotal++;
}
if (deviceEntity.getDeviceStatus() == 2) {
onlineTotal++;
}
if (deviceEntity.getEnabled() == 0) {
stop_using++;
}
}
model.put("online", onlineTotal);
model.put("offline", offlineTotal);
model.put("notActive", not_active);
model.put("stopUsing", stop_using);
model.put("pageInfo", rest.getData().getPageInfo());
//model.put("dict", rest.getData().getDict());
}
ret.setCode(rest.getCode());
ret.setMsg(rest.getMsg());
ret.setData(model);
ret.setDict(rest.getDict());
} catch (Exception var9) {
code = -1;
ret.setCode(code);
this.doException(this.request, busiDesc, model, var9);
ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
}
return ret;
}
/**
* 设备启用停用
*/
@PostMapping(value = "m/enable")
public String deviceEnable(@RequestBody DevicePdu devicePdu,@RequestHeader("Authorization") String authorization) {
JSONObject jsonObject = new JSONObject();
Map<String, Object> model = new HashMap<>();
String busiDesc = "启用停用设备";
try {
String resp = deviceFeign.deviceEnable(devicePdu,authorization);
jsonObject.put(KEY_RESULT_DATA, model);
jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
} catch (Exception e) {
log.error("设备启用停用消息", e);
jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
jsonObject.put(KEY_RESULT_MSG, super.convertException(e));
}
return jsonObject.toJSONString();
}
@PostMapping({"m/importData"})
public String importData(MultipartFile file,@RequestHeader("Authorization") String authorization,@RequestParam("siteId") Long siteId) {
return deviceFeign.importData(file,authorization,siteId);
}
} }
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/sst/model/SstAgreementEntity.java
View file @ ad2c8b6a
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.SstAgreementVo; import com.mortals.xhx.module.sst.model.vo.SstAgreementVo;
import lombok.Data;
/** /**
* 协议管理实体对象 * 协议管理实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-12-26 * @date 2023-07-10
*/ */
@Data
public class SstAgreementEntity extends SstAgreementVo { public class SstAgreementEntity extends SstAgreementVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -32,70 +32,10 @@ public class SstAgreementEntity extends SstAgreementVo { ...@@ -32,70 +32,10 @@ public class SstAgreementEntity extends SstAgreementVo {
* 协议内容 * 协议内容
*/ */
private String content; private String content;
public SstAgreementEntity(){}
/**
* 获取 站点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(){ private Integer protocolType;
return describe;
}
/**
* 设置 协议描述
* @param describe
*/
public void setDescribe(String describe){
this.describe = describe;
}
/**
* 获取 协议内容
* @return String
*/
public String getContent(){
return content;
}
/**
* 设置 协议内容
* @param content
*/
public void setContent(String content){
this.content = content;
}
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
...@@ -112,23 +52,16 @@ public class SstAgreementEntity extends SstAgreementVo { ...@@ -112,23 +52,16 @@ public class SstAgreementEntity extends SstAgreementVo {
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(",content:").append(getContent());
return sb.toString();
}
public void initAttrValue(){ public void initAttrValue(){
this.siteId = null; this.siteId = -1L;
this.name = ""; this.name = "";
this.describe = ""; this.describe = "";
this.content = ""; this.content = "";
this.protocolType = 1;
} }
} }
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/sst/model/SstAgreementQuery.java
View file @ ad2c8b6a
...@@ -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.SstAgreementEntity; import com.mortals.xhx.module.sst.model.SstAgreementEntity;
/** /**
* 协议管理查询对象 * 协议管理查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-12-26 * @date 2023-07-10
*/ */
public class SstAgreementQuery extends SstAgreementEntity { public class SstAgreementQuery extends SstAgreementEntity {
/** 开始 序号，主键，自增长 */ /** 开始 序号，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -21,6 +21,9 @@ public class SstAgreementQuery extends SstAgreementEntity { ...@@ -21,6 +21,9 @@ public class SstAgreementQuery extends SstAgreementEntity {
/** 序号，主键，自增长列表 */ /** 序号，主键，自增长列表 */
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 SstAgreementQuery extends SstAgreementEntity { ...@@ -33,15 +36,24 @@ public class SstAgreementQuery extends SstAgreementEntity {
/** 站点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> contentList; private List<String> contentList;
/** 协议内容排除列表 */
private List <String> contentNotList;
/** 开始 创建用户 */ /** 开始 创建用户 */
private Long createUserIdStart; private Long createUserIdStart;
...@@ -54,6 +66,9 @@ public class SstAgreementQuery extends SstAgreementEntity { ...@@ -54,6 +66,9 @@ public class SstAgreementQuery extends SstAgreementEntity {
/** 创建用户列表 */ /** 创建用户列表 */
private List <Long> createUserIdList; private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -72,12 +87,30 @@ public class SstAgreementQuery extends SstAgreementEntity { ...@@ -72,12 +87,30 @@ public class SstAgreementQuery extends SstAgreementEntity {
/** 更新用户列表 */ /** 更新用户列表 */
private List <Long> updateUserIdList; private List <Long> updateUserIdList;
/** 更新用户排除列表 */
private List <Long> updateUserIdNotList;
/** 开始 更新时间 */ /** 开始 更新时间 */
private String updateTimeStart; private String updateTimeStart;
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 开始 协议类型 */
private Integer protocolTypeStart;
/** 结束 协议类型 */
private Integer protocolTypeEnd;
/** 增加 协议类型 */
private Integer protocolTypeIncrement;
/** 协议类型列表 */
private List <Integer> protocolTypeList;
/** 协议类型排除列表 */
private List <Integer> protocolTypeNotList;
/** 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<SstAgreementQuery> orConditionList; private List<SstAgreementQuery> orConditionList;
...@@ -150,6 +183,23 @@ public class SstAgreementQuery extends SstAgreementEntity { ...@@ -150,6 +183,23 @@ public class SstAgreementQuery extends SstAgreementEntity {
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
...@@ -214,6 +264,23 @@ public class SstAgreementQuery extends SstAgreementEntity { ...@@ -214,6 +264,23 @@ public class SstAgreementQuery extends SstAgreementEntity {
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
...@@ -229,6 +296,23 @@ public class SstAgreementQuery extends SstAgreementEntity { ...@@ -229,6 +296,23 @@ public class SstAgreementQuery extends SstAgreementEntity {
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
...@@ -244,6 +328,23 @@ public class SstAgreementQuery extends SstAgreementEntity { ...@@ -244,6 +328,23 @@ public class SstAgreementQuery extends SstAgreementEntity {
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 contentList * @return contentList
...@@ -259,6 +360,23 @@ public class SstAgreementQuery extends SstAgreementEntity { ...@@ -259,6 +360,23 @@ public class SstAgreementQuery extends SstAgreementEntity {
public void setContentList(List<String> contentList){ public void setContentList(List<String> contentList){
this.contentList = contentList; this.contentList = contentList;
} }
/**
* 获取 协议内容
* @return contentNotList
*/
public List<String> getContentNotList(){
return this.contentNotList;
}
/**
* 设置 协议内容
* @param contentNotList
*/
public void setContentNotList(List<String> contentNotList){
this.contentNotList = contentNotList;
}
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @return createUserIdStart * @return createUserIdStart
...@@ -323,6 +441,23 @@ public class SstAgreementQuery extends SstAgreementEntity { ...@@ -323,6 +441,23 @@ public class SstAgreementQuery extends SstAgreementEntity {
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
...@@ -419,6 +554,23 @@ public class SstAgreementQuery extends SstAgreementEntity { ...@@ -419,6 +554,23 @@ public class SstAgreementQuery extends SstAgreementEntity {
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
...@@ -451,6 +603,87 @@ public class SstAgreementQuery extends SstAgreementEntity { ...@@ -451,6 +603,87 @@ public class SstAgreementQuery extends SstAgreementEntity {
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/**
* 获取 开始 协议类型
* @return protocolTypeStart
*/
public Integer getProtocolTypeStart(){
return this.protocolTypeStart;
}
/**
* 设置 开始 协议类型
* @param protocolTypeStart
*/
public void setProtocolTypeStart(Integer protocolTypeStart){
this.protocolTypeStart = protocolTypeStart;
}
/**
* 获取 结束 协议类型
* @return $protocolTypeEnd
*/
public Integer getProtocolTypeEnd(){
return this.protocolTypeEnd;
}
/**
* 设置 结束 协议类型
* @param protocolTypeEnd
*/
public void setProtocolTypeEnd(Integer protocolTypeEnd){
this.protocolTypeEnd = protocolTypeEnd;
}
/**
* 获取 增加 协议类型
* @return protocolTypeIncrement
*/
public Integer getProtocolTypeIncrement(){
return this.protocolTypeIncrement;
}
/**
* 设置 增加 协议类型
* @param protocolTypeIncrement
*/
public void setProtocolTypeIncrement(Integer protocolTypeIncrement){
this.protocolTypeIncrement = protocolTypeIncrement;
}
/**
* 获取 协议类型
* @return protocolTypeList
*/
public List<Integer> getProtocolTypeList(){
return this.protocolTypeList;
}
/**
* 设置 协议类型
* @param protocolTypeList
*/
public void setProtocolTypeList(List<Integer> protocolTypeList){
this.protocolTypeList = protocolTypeList;
}
/**
* 获取 协议类型
* @return protocolTypeNotList
*/
public List<Integer> getProtocolTypeNotList(){
return this.protocolTypeNotList;
}
/**
* 设置 协议类型
* @param protocolTypeNotList
*/
public void setProtocolTypeNotList(List<Integer> protocolTypeNotList){
this.protocolTypeNotList = protocolTypeNotList;
}
/** /**
* 设置 序号，主键，自增长 * 设置 序号，主键，自增长
* @param id * @param id
...@@ -496,6 +729,15 @@ public class SstAgreementQuery extends SstAgreementEntity { ...@@ -496,6 +729,15 @@ public class SstAgreementQuery extends SstAgreementEntity {
return this; return this;
} }
/**
* 设置 序号，主键，自增长
* @param idNotList
*/
public SstAgreementQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/** /**
* 设置 站点id * 设置 站点id
* @param siteId * @param siteId
...@@ -541,6 +783,15 @@ public class SstAgreementQuery extends SstAgreementEntity { ...@@ -541,6 +783,15 @@ public class SstAgreementQuery extends SstAgreementEntity {
return this; return this;
} }
/**
* 设置 站点id
* @param siteIdNotList
*/
public SstAgreementQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
/** /**
* 设置 协议名称 * 设置 协议名称
...@@ -643,6 +894,15 @@ public class SstAgreementQuery extends SstAgreementEntity { ...@@ -643,6 +894,15 @@ public class SstAgreementQuery extends SstAgreementEntity {
return this; return this;
} }
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public SstAgreementQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/** /**
* 设置 更新用户 * 设置 更新用户
...@@ -689,6 +949,69 @@ public class SstAgreementQuery extends SstAgreementEntity { ...@@ -689,6 +949,69 @@ public class SstAgreementQuery extends SstAgreementEntity {
return this; return this;
} }
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public SstAgreementQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
return this;
}
/**
* 设置 协议类型
* @param protocolType
*/
public SstAgreementQuery protocolType(Integer protocolType){
setProtocolType(protocolType);
return this;
}
/**
* 设置 开始 协议类型
* @param protocolTypeStart
*/
public SstAgreementQuery protocolTypeStart(Integer protocolTypeStart){
this.protocolTypeStart = protocolTypeStart;
return this;
}
/**
* 设置 结束 协议类型
* @param protocolTypeEnd
*/
public SstAgreementQuery protocolTypeEnd(Integer protocolTypeEnd){
this.protocolTypeEnd = protocolTypeEnd;
return this;
}
/**
* 设置 增加 协议类型
* @param protocolTypeIncrement
*/
public SstAgreementQuery protocolTypeIncrement(Integer protocolTypeIncrement){
this.protocolTypeIncrement = protocolTypeIncrement;
return this;
}
/**
* 设置 协议类型
* @param protocolTypeList
*/
public SstAgreementQuery protocolTypeList(List<Integer> protocolTypeList){
this.protocolTypeList = protocolTypeList;
return this;
}
/**
* 设置 协议类型
* @param protocolTypeNotList
*/
public SstAgreementQuery protocolTypeNotList(List<Integer> protocolTypeNotList){
this.protocolTypeNotList = protocolTypeNotList;
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)
......
sst-manager/src/main/java/com/mortals/xhx/module/sst/model/SstAppsDeskEntity.java
View file @ ad2c8b6a
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 @ ad2c8b6a
...@@ -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 @ ad2c8b6a
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 @ ad2c8b6a
...@@ -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/model/vo/SstBasicVo.java
View file @ ad2c8b6a
...@@ -24,6 +24,8 @@ public class SstBasicVo extends BaseEntityLong { ...@@ -24,6 +24,8 @@ public class SstBasicVo extends BaseEntityLong {
/** 设备编码 */ /** 设备编码 */
private String deviceCode; private String deviceCode;
private String appName;
public String getShowAppIds() { public String getShowAppIds() {
return showAppIds; return showAppIds;
} }
...@@ -63,4 +65,12 @@ public class SstBasicVo extends BaseEntityLong { ...@@ -63,4 +65,12 @@ public class SstBasicVo extends BaseEntityLong {
public void setDeviceCode(String deviceCode) { public void setDeviceCode(String deviceCode) {
this.deviceCode = deviceCode; this.deviceCode = deviceCode;
} }
public String getAppName() {
return appName;
}
public void setAppName(String appName) {
this.appName = appName;
}
} }
\ No newline at end of file
sst-manager/src/main/java/com/mortals/xhx/module/sst/service/SstAppsDeskService.java
View file @ ad2c8b6a
...@@ -36,7 +36,7 @@ public interface SstAppsDeskService extends ICRUDService<SstAppsDeskEntity,Long> ...@@ -36,7 +36,7 @@ public interface SstAppsDeskService extends ICRUDService<SstAppsDeskEntity,Long>
* @param siteId 站点ID * @param siteId 站点ID
* @return * @return
*/ */
Map<String, Object> getAppListBySite(String deviceCode,Long siteId,String host); Map<String, Object> getAppListBySite(String deviceCode,Long siteId,String host,String appName);
/** /**
* 应用下架 * 应用下架
...@@ -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 @ ad2c8b6a
...@@ -38,7 +38,7 @@ public interface SstAppsService extends ICRUDService<SstAppsEntity,Long>{ ...@@ -38,7 +38,7 @@ public interface SstAppsService extends ICRUDService<SstAppsEntity,Long>{
* @param siteId 站点ID * @param siteId 站点ID
* @return * @return
*/ */
Map<String, Object> getAppListBySite(String deviceCode,Long siteId,String host); Map<String, Object> getAppListBySite(String deviceCode,Long siteId,String host,String appName);
/** /**
* 应用下架 * 应用下架
...@@ -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 @ ad2c8b6a
...@@ -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;
...@@ -145,9 +145,10 @@ public class SstAppsDeskServiceImpl extends AbstractCRUDServiceImpl<SstAppsDeskD ...@@ -145,9 +145,10 @@ public class SstAppsDeskServiceImpl extends AbstractCRUDServiceImpl<SstAppsDeskD
} }
@Override @Override
public Map<String, Object> getAppListBySite(String deviceCode,Long siteId,String host) { 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);
...@@ -168,6 +169,7 @@ public class SstAppsDeskServiceImpl extends AbstractCRUDServiceImpl<SstAppsDeskD ...@@ -168,6 +169,7 @@ public class SstAppsDeskServiceImpl extends AbstractCRUDServiceImpl<SstAppsDeskD
} }
AppsInfoEntity appsInfoQuery = new AppsInfoEntity(); AppsInfoEntity appsInfoQuery = new AppsInfoEntity();
appsInfoQuery.setSiteId(siteId); appsInfoQuery.setSiteId(siteId);
appsInfoQuery.setName(appName);
List<AppsInfoEntity> allApps = appsInfoService.find(appsInfoQuery); List<AppsInfoEntity> allApps = appsInfoService.find(appsInfoQuery);
for(AppsInfoEntity appsInfoEntity:allApps){ for(AppsInfoEntity appsInfoEntity:allApps){
if(com.mortals.framework.util.StringUtils.isNotEmpty(host)) { if(com.mortals.framework.util.StringUtils.isNotEmpty(host)) {
...@@ -180,15 +182,20 @@ public class SstAppsDeskServiceImpl extends AbstractCRUDServiceImpl<SstAppsDeskD ...@@ -180,15 +182,20 @@ public class SstAppsDeskServiceImpl extends AbstractCRUDServiceImpl<SstAppsDeskD
if(CollectionUtils.isNotEmpty(appsEntities)){ if(CollectionUtils.isNotEmpty(appsEntities)){
List<AppsInfoEntity> showApps = new ArrayList<>(); List<AppsInfoEntity> showApps = new ArrayList<>();
List<AppsInfoEntity> hotApps = new ArrayList<>(); List<AppsInfoEntity> hotApps = new ArrayList<>();
for(SstAppsDeskEntity SstAppsDeskEntity:appsEntities){ for(SstAppsDeskEntity sstAppsDeskEntity:appsEntities){
if(black.containsKey(SstAppsDeskEntity.getAppId())){ if(black.containsKey(sstAppsDeskEntity.getAppId())){
continue; continue;
} }
if(SstAppsDeskEntity.getShowBasic()==1){ if(!appInfoMap.containsKey(sstAppsDeskEntity.getAppId())){
showApps.add(appInfoMap.get(SstAppsDeskEntity.getAppId())); continue;
} }
if(SstAppsDeskEntity.getShowHot()==1){ appInfoMap.get(sstAppsDeskEntity.getAppId()).setClickSum(sstAppsDeskEntity.getClickSum());
hotApps.add(appInfoMap.get(SstAppsDeskEntity.getAppId())); appInfoMap.get(sstAppsDeskEntity.getAppId()).setSort(sstAppsDeskEntity.getBasicSort());
if(sstAppsDeskEntity.getShowBasic()==1){
showApps.add(appInfoMap.get(sstAppsDeskEntity.getAppId()));
}
if(sstAppsDeskEntity.getShowHot()==1){
hotApps.add(appInfoMap.get(sstAppsDeskEntity.getAppId()));
} }
} }
siteApp.put("showApps", showApps); siteApp.put("showApps", showApps);
...@@ -206,4 +213,16 @@ public class SstAppsDeskServiceImpl extends AbstractCRUDServiceImpl<SstAppsDeskD ...@@ -206,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 @ ad2c8b6a
...@@ -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;
...@@ -147,9 +148,10 @@ public class SstAppsServiceImpl extends AbstractCRUDServiceImpl<SstAppsDao, SstA ...@@ -147,9 +148,10 @@ public class SstAppsServiceImpl extends AbstractCRUDServiceImpl<SstAppsDao, SstA
} }
@Override @Override
public Map<String, Object> getAppListBySite(String deviceCode,Long siteId,String host) { 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);
...@@ -171,6 +173,7 @@ public class SstAppsServiceImpl extends AbstractCRUDServiceImpl<SstAppsDao, SstA ...@@ -171,6 +173,7 @@ public class SstAppsServiceImpl extends AbstractCRUDServiceImpl<SstAppsDao, SstA
AppsInfoEntity appsInfoQuery = new AppsInfoEntity(); AppsInfoEntity appsInfoQuery = new AppsInfoEntity();
appsInfoQuery.setSiteId(siteId); appsInfoQuery.setSiteId(siteId);
appsInfoQuery.setName(appName);
List<AppsInfoEntity> allApps = appsInfoService.find(appsInfoQuery); List<AppsInfoEntity> allApps = appsInfoService.find(appsInfoQuery);
for(AppsInfoEntity appsInfoEntity:allApps){ for(AppsInfoEntity appsInfoEntity:allApps){
if(com.mortals.framework.util.StringUtils.isNotEmpty(host)) { if(com.mortals.framework.util.StringUtils.isNotEmpty(host)) {
...@@ -187,6 +190,11 @@ public class SstAppsServiceImpl extends AbstractCRUDServiceImpl<SstAppsDao, SstA ...@@ -187,6 +190,11 @@ public class SstAppsServiceImpl extends AbstractCRUDServiceImpl<SstAppsDao, SstA
if(black.containsKey(sstAppsEntity.getAppId())){ if(black.containsKey(sstAppsEntity.getAppId())){
continue; continue;
} }
if(!appInfoMap.containsKey(sstAppsEntity.getAppId())){
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()));
} }
...@@ -209,4 +217,16 @@ public class SstAppsServiceImpl extends AbstractCRUDServiceImpl<SstAppsDao, SstA ...@@ -209,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/SstAgreementController.java
View file @ ad2c8b6a
...@@ -42,6 +42,7 @@ public class SstAgreementController extends BaseCRUDJsonBodyMappingController<Ss ...@@ -42,6 +42,7 @@ public class SstAgreementController extends BaseCRUDJsonBodyMappingController<Ss
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model, "protocolType", paramService.getParamBySecondOrganize("SstAgreement","protocolType"));
super.init(model, context); super.init(model, context);
} }
......
sst-manager/src/main/java/com/mortals/xhx/module/sst/web/SstAppsController.java
View file @ ad2c8b6a
package com.mortals.xhx.module.sst.web; package com.mortals.xhx.module.sst.web;
import com.mortals.framework.annotation.RepeatSubmit; import com.mortals.framework.annotation.RepeatSubmit;
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;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.pdu.RespData;
import com.mortals.xhx.common.pdu.app.AppCategoryPdu;
import com.mortals.xhx.common.pdu.site.SitePdu;
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.*;
...@@ -40,6 +46,8 @@ public class SstAppsController extends BaseCRUDJsonBodyMappingController<SstApps ...@@ -40,6 +46,8 @@ public class SstAppsController extends BaseCRUDJsonBodyMappingController<SstApps
private ParamService paramService; private ParamService paramService;
@Autowired @Autowired
private SstAppsDeskService sstAppsDeskService; private SstAppsDeskService sstAppsDeskService;
@Autowired
private IAppFeign appFeign;
public SstAppsController(){ public SstAppsController(){
super.setModuleDesc( "应用编排"); super.setModuleDesc( "应用编排");
...@@ -79,4 +87,62 @@ public class SstAppsController extends BaseCRUDJsonBodyMappingController<SstApps ...@@ -79,4 +87,62 @@ public class SstAppsController extends BaseCRUDJsonBodyMappingController<SstApps
return ret; return ret;
} }
@PostMapping({"category/list"})
@UnAuth
public Rest<Object> categoryList(@RequestBody AppCategoryPdu query) {
Rest<Object> ret = new Rest();
Map<String, Object> model = new HashMap();
Context context = this.getContext();
String busiDesc = "查询应用分类列表";
int code;
try {
Rest<RespData<List<AppCategoryPdu>>> result = appFeign.categoryList(query);
code = result.getCode();
if(code > 0) {
model.put("data", result.getData().getData());
model.put("pageInfo", result.getData().getPageInfo());
model.put("dict", result.getData().getDict());
}
model.put("message_info", busiDesc + "成功");
this.recordSysLog(this.request, busiDesc + " 【成功】");
} catch (Exception var9) {
code = -1;
this.doException(this.request, busiDesc, model, var9);
}
ret.setCode(code);
ret.setData(model);
ret.setDict(model.get("dict"));
ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
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 @ ad2c8b6a
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 @ ad2c8b6a
...@@ -236,12 +236,13 @@ public class SstBasicController extends BaseCRUDJsonBodyMappingController<SstBas ...@@ -236,12 +236,13 @@ public class SstBasicController extends BaseCRUDJsonBodyMappingController<SstBas
SiteTreeSelectVO rootNode = new SiteTreeSelectVO(); SiteTreeSelectVO rootNode = new SiteTreeSelectVO();
rootNode.setId("6182157d00ce41559e001a89d87f4057"); rootNode.setId("6182157d00ce41559e001a89d87f4057");
rootNode.setAreaCode("510000000000"); rootNode.setAreaCode("510000000000");
rootNode.setAreaName("四川省");
rootNode.setLabel("四川省"); rootNode.setLabel("四川省");
rootNode.setType("area"); rootNode.setType("area");
rootNode.setIcon("el-icon-folder"); rootNode.setIcon("el-icon-folder");
rootNode.setIsLeaf(false); rootNode.setIsLeaf(false);
rootNode.setLatitude("30.595081"); rootNode.setLatitude("28.732286");
rootNode.setLongitude("104.062983"); rootNode.setLongitude("104.623552");
rootNode.setSiteCount(getChildrenCount(resultList,2,siteMap,siteDeviceMap)-1); rootNode.setSiteCount(getChildrenCount(resultList,2,siteMap,siteDeviceMap)-1);
rootNode.setChildren(resultList); rootNode.setChildren(resultList);
rootNode.setLevel(1); rootNode.setLevel(1);
...@@ -358,11 +359,15 @@ public class SstBasicController extends BaseCRUDJsonBodyMappingController<SstBas ...@@ -358,11 +359,15 @@ public class SstBasicController extends BaseCRUDJsonBodyMappingController<SstBas
}else { }else {
host=""; host="";
} }
if(StringUtils.isNotEmpty(query.getAppName())){
query.setAppName("%"+query.getAppName()+"%");
}
log.info("server-name:"+serverName+",server-port:"+serverPort); log.info("server-name:"+serverName+",server-port:"+serverPort);
Map<String, Object> sstApps = sstAppsService.getAppListBySite(query.getDeviceCode(),query.getSiteId(),host); Map<String, Object> sstApps = sstAppsService.getAppListBySite(query.getDeviceCode(),query.getSiteId(),host,query.getAppName());
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);
...@@ -407,11 +412,15 @@ public class SstBasicController extends BaseCRUDJsonBodyMappingController<SstBas ...@@ -407,11 +412,15 @@ public class SstBasicController extends BaseCRUDJsonBodyMappingController<SstBas
}else { }else {
host=""; host="";
} }
if(StringUtils.isNotEmpty(query.getAppName())){
query.setAppName("%"+query.getAppName()+"%");
}
log.info("server-name:"+serverName+",server-port:"+serverPort); log.info("server-name:"+serverName+",server-port:"+serverPort);
Map<String, Object> sstAppsDesk = sstAppsDeskService.getAppListBySite(query.getDeviceCode(),query.getSiteId(),host); Map<String, Object> sstAppsDesk = sstAppsDeskService.getAppListBySite(query.getDeviceCode(),query.getSiteId(),host,query.getAppName());
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);
...@@ -435,4 +444,18 @@ public class SstBasicController extends BaseCRUDJsonBodyMappingController<SstBas ...@@ -435,4 +444,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/converge/ConvergeAppsAccessMapper.xml 0 → 100644
View file @ ad2c8b6a
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.converge.dao.ibatis.ConvergeAppsAccessDaoImpl">
<!-- 字段和属性映射 -->
<resultMap type="ConvergeAppsAccessEntity" id="ConvergeAppsAccessEntity-Map">
<id property="id" column="id" />
<result property="siteId" column="siteId" />
<result property="applicationId" column="applicationId" />
<result property="applicationName" column="applicationName" />
<result property="startTime" column="startTime" />
<result property="endTime" column="endTime" />
<result property="userId" column="userId" />
<result property="userName" column="userName" />
<result property="channelId" column="channelId" />
<result property="channelName" column="channelName" />
<result property="location" column="location" />
<result property="clientName" column="clientName" />
<result property="version" column="version" />
<result property="ecode" column="ecode" />
<result property="appSimpleName" column="appSimpleName" />
<result property="provider" column="provider" />
<result property="origin" column="origin" />
</resultMap>
<!-- 表所有列 -->
<sql id="_columns">
<trim suffixOverrides="," suffix="">
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('applicationId') or colPickMode == 1 and data.containsKey('applicationId')))">
a.applicationId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('applicationName') or colPickMode == 1 and data.containsKey('applicationName')))">
a.applicationName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('startTime') or colPickMode == 1 and data.containsKey('startTime')))">
a.startTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('endTime') or colPickMode == 1 and data.containsKey('endTime')))">
a.endTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('userId') or colPickMode == 1 and data.containsKey('userId')))">
a.userId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('userName') or colPickMode == 1 and data.containsKey('userName')))">
a.userName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('channelId') or colPickMode == 1 and data.containsKey('channelId')))">
a.channelId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('channelName') or colPickMode == 1 and data.containsKey('channelName')))">
a.channelName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('location') or colPickMode == 1 and data.containsKey('location')))">
a.location,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('clientName') or colPickMode == 1 and data.containsKey('clientName')))">
a.clientName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('version') or colPickMode == 1 and data.containsKey('version')))">
a.version,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ecode') or colPickMode == 1 and data.containsKey('ecode')))">
a.ecode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('appSimpleName') or colPickMode == 1 and data.containsKey('appSimpleName')))">
a.appSimpleName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('provider') or colPickMode == 1 and data.containsKey('provider')))">
a.provider,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('origin') or colPickMode == 1 and data.containsKey('origin')))">
a.origin,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="ConvergeAppsAccessEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_converge_apps_access
(siteId,applicationId,applicationName,startTime,endTime,userId,userName,channelId,channelName,location,clientName,version,ecode,appSimpleName,provider,origin)
VALUES
(#{siteId},#{applicationId},#{applicationName},#{startTime},#{endTime},#{userId},#{userName},#{channelId},#{channelName},#{location},#{clientName},#{version},#{ecode},#{appSimpleName},#{provider},#{origin})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_converge_apps_access
(siteId,applicationId,applicationName,startTime,endTime,userId,userName,channelId,channelName,location,clientName,version,ecode,appSimpleName,provider,origin)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteId},#{item.applicationId},#{item.applicationName},#{item.startTime},#{item.endTime},#{item.userId},#{item.userName},#{item.channelId},#{item.channelName},#{item.location},#{item.clientName},#{item.version},#{item.ecode},#{item.appSimpleName},#{item.provider},#{item.origin})
</foreach>
</insert>
<!-- 根据ParamDto更新 -->
<update id="update" parameterType="paramDto">
update mortals_xhx_converge_apps_access as a
set
<trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
a.siteId=#{data.siteId},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('applicationId')) or (colPickMode==1 and !data.containsKey('applicationId'))">
a.applicationId=#{data.applicationId},
</if>
<if test="(colPickMode==0 and data.containsKey('applicationName')) or (colPickMode==1 and !data.containsKey('applicationName'))">
a.applicationName=#{data.applicationName},
</if>
<if test="(colPickMode==0 and data.containsKey('startTime')) or (colPickMode==1 and !data.containsKey('startTime'))">
a.startTime=#{data.startTime},
</if>
<if test="(colPickMode==0 and data.containsKey('endTime')) or (colPickMode==1 and !data.containsKey('endTime'))">
a.endTime=#{data.endTime},
</if>
<if test="(colPickMode==0 and data.containsKey('userId')) or (colPickMode==1 and !data.containsKey('userId'))">
a.userId=#{data.userId},
</if>
<if test="(colPickMode==0 and data.containsKey('userName')) or (colPickMode==1 and !data.containsKey('userName'))">
a.userName=#{data.userName},
</if>
<if test="(colPickMode==0 and data.containsKey('channelId')) or (colPickMode==1 and !data.containsKey('channelId'))">
a.channelId=#{data.channelId},
</if>
<if test="(colPickMode==0 and data.containsKey('channelName')) or (colPickMode==1 and !data.containsKey('channelName'))">
a.channelName=#{data.channelName},
</if>
<if test="(colPickMode==0 and data.containsKey('location')) or (colPickMode==1 and !data.containsKey('location'))">
a.location=#{data.location},
</if>
<if test="(colPickMode==0 and data.containsKey('clientName')) or (colPickMode==1 and !data.containsKey('clientName'))">
a.clientName=#{data.clientName},
</if>
<if test="(colPickMode==0 and data.containsKey('version')) or (colPickMode==1 and !data.containsKey('version'))">
a.version=#{data.version},
</if>
<if test="(colPickMode==0 and data.containsKey('ecode')) or (colPickMode==1 and !data.containsKey('ecode'))">
a.ecode=#{data.ecode},
</if>
<if test="(colPickMode==0 and data.containsKey('appSimpleName')) or (colPickMode==1 and !data.containsKey('appSimpleName'))">
a.appSimpleName=#{data.appSimpleName},
</if>
<if test="(colPickMode==0 and data.containsKey('provider')) or (colPickMode==1 and !data.containsKey('provider'))">
a.provider=#{data.provider},
</if>
<if test="(colPickMode==0 and data.containsKey('origin')) or (colPickMode==1 and !data.containsKey('origin'))">
a.origin=#{data.origin},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</update>
<!-- 批量更新 -->
<update id="updateBatch" parameterType="paramDto">
update mortals_xhx_converge_apps_access as a
<trim prefix="set" suffixOverrides=",">
<trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId}
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="applicationId=(case" suffix="ELSE applicationId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('applicationId')) or (colPickMode==1 and !item.containsKey('applicationId'))">
when a.id=#{item.id} then #{item.applicationId}
</if>
</foreach>
</trim>
<trim prefix="applicationName=(case" suffix="ELSE applicationName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('applicationName')) or (colPickMode==1 and !item.containsKey('applicationName'))">
when a.id=#{item.id} then #{item.applicationName}
</if>
</foreach>
</trim>
<trim prefix="startTime=(case" suffix="ELSE startTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('startTime')) or (colPickMode==1 and !item.containsKey('startTime'))">
when a.id=#{item.id} then #{item.startTime}
</if>
</foreach>
</trim>
<trim prefix="endTime=(case" suffix="ELSE endTime end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('endTime')) or (colPickMode==1 and !item.containsKey('endTime'))">
when a.id=#{item.id} then #{item.endTime}
</if>
</foreach>
</trim>
<trim prefix="userId=(case" suffix="ELSE userId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('userId')) or (colPickMode==1 and !item.containsKey('userId'))">
when a.id=#{item.id} then #{item.userId}
</if>
</foreach>
</trim>
<trim prefix="userName=(case" suffix="ELSE userName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('userName')) or (colPickMode==1 and !item.containsKey('userName'))">
when a.id=#{item.id} then #{item.userName}
</if>
</foreach>
</trim>
<trim prefix="channelId=(case" suffix="ELSE channelId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('channelId')) or (colPickMode==1 and !item.containsKey('channelId'))">
when a.id=#{item.id} then #{item.channelId}
</if>
</foreach>
</trim>
<trim prefix="channelName=(case" suffix="ELSE channelName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('channelName')) or (colPickMode==1 and !item.containsKey('channelName'))">
when a.id=#{item.id} then #{item.channelName}
</if>
</foreach>
</trim>
<trim prefix="location=(case" suffix="ELSE location end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('location')) or (colPickMode==1 and !item.containsKey('location'))">
when a.id=#{item.id} then #{item.location}
</if>
</foreach>
</trim>
<trim prefix="clientName=(case" suffix="ELSE clientName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('clientName')) or (colPickMode==1 and !item.containsKey('clientName'))">
when a.id=#{item.id} then #{item.clientName}
</if>
</foreach>
</trim>
<trim prefix="version=(case" suffix="ELSE version end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('version')) or (colPickMode==1 and !item.containsKey('version'))">
when a.id=#{item.id} then #{item.version}
</if>
</foreach>
</trim>
<trim prefix="ecode=(case" suffix="ELSE ecode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('ecode')) or (colPickMode==1 and !item.containsKey('ecode'))">
when a.id=#{item.id} then #{item.ecode}
</if>
</foreach>
</trim>
<trim prefix="appSimpleName=(case" suffix="ELSE appSimpleName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('appSimpleName')) or (colPickMode==1 and !item.containsKey('appSimpleName'))">
when a.id=#{item.id} then #{item.appSimpleName}
</if>
</foreach>
</trim>
<trim prefix="provider=(case" suffix="ELSE provider end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('provider')) or (colPickMode==1 and !item.containsKey('provider'))">
when a.id=#{item.id} then #{item.provider}
</if>
</foreach>
</trim>
<trim prefix="origin=(case" suffix="ELSE origin end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('origin')) or (colPickMode==1 and !item.containsKey('origin'))">
when a.id=#{item.id} then #{item.origin}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</update>
<!-- 根据主健查询 -->
<select id="getByKey" parameterType="paramDto" resultMap="ConvergeAppsAccessEntity-Map">
select <include refid="_columns"/>
from mortals_xhx_converge_apps_access as a
where a.id=#{condition.id}
</select>
<!-- 根据主健删除 -->
<delete id="deleteByKey" parameterType="paramDto">
delete a.* from mortals_xhx_converge_apps_access as a where a.id=#{condition.id}
</delete>
<!-- 根据主健删除一批，针对单一主健有效 -->
<delete id="deleteByKeys">
delete from mortals_xhx_converge_apps_access where id in
<foreach collection="array" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_xhx_converge_apps_access where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_xhx_converge_apps_access where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_converge_apps_access as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</delete>
<!-- 获取列表 -->
<select id="getList" parameterType="paramDto" resultMap="ConvergeAppsAccessEntity-Map">
select <include refid="_columns"/>
from mortals_xhx_converge_apps_access as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
<include refid="_orderCols_"/>
</select>
<!-- 获取 -->
<select id="getListCount" parameterType="paramDto" resultType="int">
select count(1)
from mortals_xhx_converge_apps_access as a
<trim suffixOverrides="where" suffix="">
where
<trim prefixOverrides="and" prefix="">
<include refid="_condition_"/>
</trim>
</trim>
</select>
<!-- 条件映射 -->
<sql id="_condition_">
<if test="condition != null and !condition.isEmpty()">
<!-- 条件映射-普通条件 -->
<include refid="_condition_param_">
<property name="_conditionParam_" value="condition"/>
<property name="_conditionType_" value="and"/>
</include>
<!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
<if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
and
<foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
<trim prefixOverrides="or" prefix="(" suffix=")">
<include refid="_condition_param_">
<property name="_conditionParam_" value="andCondition"/>
<property name="_conditionType_" value="or"/>
</include>
</trim>
</foreach>
</if>
<!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
<if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
and
<foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
<trim prefixOverrides="and" prefix="(" suffix=")">
<include refid="_condition_param_">
<property name="_conditionParam_" value="orCondition"/>
<property name="_conditionType_" value="and"/>
</include>
</trim>
</foreach>
</if>
</if>
</sql>
<!-- 条件映射-代参数 -->
<sql id="_condition_param_">
<bind name="conditionParamRef" value="${_conditionParam_}"/>
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null">
${_conditionType_} a.id=#{${_conditionParam_}.id}
</if>
</if>
<if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null ">
${_conditionType_} a.id = #{${_conditionParam_}.id}
</if>
<if test="conditionParamRef.id == null">
${_conditionType_} a.id is null
</if>
</if>
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</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">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
<if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</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">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
<if test="conditionParamRef.containsKey('applicationId')">
<if test="conditionParamRef.applicationId != null and conditionParamRef.applicationId != ''">
${_conditionType_} a.applicationId like #{${_conditionParam_}.applicationId}
</if>
<if test="conditionParamRef.applicationId == null">
${_conditionType_} a.applicationId is null
</if>
</if>
<if test="conditionParamRef.containsKey('applicationIdList') and conditionParamRef.applicationIdList.size() > 0">
${_conditionType_} a.applicationId in
<foreach collection="conditionParamRef.applicationIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('applicationIdNotList') and conditionParamRef.applicationIdNotList.size() > 0">
${_conditionType_} a.applicationId not in
<foreach collection="conditionParamRef.applicationIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('applicationName')">
<if test="conditionParamRef.applicationName != null and conditionParamRef.applicationName != ''">
${_conditionType_} a.applicationName like #{${_conditionParam_}.applicationName}
</if>
<if test="conditionParamRef.applicationName == null">
${_conditionType_} a.applicationName is null
</if>
</if>
<if test="conditionParamRef.containsKey('applicationNameList') and conditionParamRef.applicationNameList.size() > 0">
${_conditionType_} a.applicationName in
<foreach collection="conditionParamRef.applicationNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('applicationNameNotList') and conditionParamRef.applicationNameNotList.size() > 0">
${_conditionType_} a.applicationName not in
<foreach collection="conditionParamRef.applicationNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('startTime')">
<if test="conditionParamRef.startTime != null ">
${_conditionType_} a.startTime = #{${_conditionParam_}.startTime}
</if>
<if test="conditionParamRef.startTime == null">
${_conditionType_} a.startTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('startTimeStart') and conditionParamRef.startTimeStart != null and conditionParamRef.startTimeStart!=''">
${_conditionType_} a.startTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.startTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('startTimeEnd') and conditionParamRef.startTimeEnd != null and conditionParamRef.startTimeEnd!=''">
${_conditionType_} a.startTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.startTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('endTime')">
<if test="conditionParamRef.endTime != null ">
${_conditionType_} a.endTime = #{${_conditionParam_}.endTime}
</if>
<if test="conditionParamRef.endTime == null">
${_conditionType_} a.endTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('endTimeStart') and conditionParamRef.endTimeStart != null and conditionParamRef.endTimeStart!=''">
${_conditionType_} a.endTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.endTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('endTimeEnd') and conditionParamRef.endTimeEnd != null and conditionParamRef.endTimeEnd!=''">
${_conditionType_} a.endTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.endTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('userId')">
<if test="conditionParamRef.userId != null and conditionParamRef.userId != ''">
${_conditionType_} a.userId like #{${_conditionParam_}.userId}
</if>
<if test="conditionParamRef.userId == null">
${_conditionType_} a.userId is null
</if>
</if>
<if test="conditionParamRef.containsKey('userIdList') and conditionParamRef.userIdList.size() > 0">
${_conditionType_} a.userId in
<foreach collection="conditionParamRef.userIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('userIdNotList') and conditionParamRef.userIdNotList.size() > 0">
${_conditionType_} a.userId not in
<foreach collection="conditionParamRef.userIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('userName')">
<if test="conditionParamRef.userName != null and conditionParamRef.userName != ''">
${_conditionType_} a.userName like #{${_conditionParam_}.userName}
</if>
<if test="conditionParamRef.userName == null">
${_conditionType_} a.userName is null
</if>
</if>
<if test="conditionParamRef.containsKey('userNameList') and conditionParamRef.userNameList.size() > 0">
${_conditionType_} a.userName in
<foreach collection="conditionParamRef.userNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('userNameNotList') and conditionParamRef.userNameNotList.size() > 0">
${_conditionType_} a.userName not in
<foreach collection="conditionParamRef.userNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('channelId')">
<if test="conditionParamRef.channelId != null and conditionParamRef.channelId != ''">
${_conditionType_} a.channelId like #{${_conditionParam_}.channelId}
</if>
<if test="conditionParamRef.channelId == null">
${_conditionType_} a.channelId is null
</if>
</if>
<if test="conditionParamRef.containsKey('channelIdList') and conditionParamRef.channelIdList.size() > 0">
${_conditionType_} a.channelId in
<foreach collection="conditionParamRef.channelIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('channelIdNotList') and conditionParamRef.channelIdNotList.size() > 0">
${_conditionType_} a.channelId not in
<foreach collection="conditionParamRef.channelIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('channelName')">
<if test="conditionParamRef.channelName != null and conditionParamRef.channelName != ''">
${_conditionType_} a.channelName like #{${_conditionParam_}.channelName}
</if>
<if test="conditionParamRef.channelName == null">
${_conditionType_} a.channelName is null
</if>
</if>
<if test="conditionParamRef.containsKey('channelNameList') and conditionParamRef.channelNameList.size() > 0">
${_conditionType_} a.channelName in
<foreach collection="conditionParamRef.channelNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('channelNameNotList') and conditionParamRef.channelNameNotList.size() > 0">
${_conditionType_} a.channelName not in
<foreach collection="conditionParamRef.channelNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('location')">
<if test="conditionParamRef.location != null and conditionParamRef.location != ''">
${_conditionType_} a.location like #{${_conditionParam_}.location}
</if>
<if test="conditionParamRef.location == null">
${_conditionType_} a.location is null
</if>
</if>
<if test="conditionParamRef.containsKey('locationList') and conditionParamRef.locationList.size() > 0">
${_conditionType_} a.location in
<foreach collection="conditionParamRef.locationList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('locationNotList') and conditionParamRef.locationNotList.size() > 0">
${_conditionType_} a.location not in
<foreach collection="conditionParamRef.locationNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('clientName')">
<if test="conditionParamRef.clientName != null and conditionParamRef.clientName != ''">
${_conditionType_} a.clientName like #{${_conditionParam_}.clientName}
</if>
<if test="conditionParamRef.clientName == null">
${_conditionType_} a.clientName is null
</if>
</if>
<if test="conditionParamRef.containsKey('clientNameList') and conditionParamRef.clientNameList.size() > 0">
${_conditionType_} a.clientName in
<foreach collection="conditionParamRef.clientNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('clientNameNotList') and conditionParamRef.clientNameNotList.size() > 0">
${_conditionType_} a.clientName not in
<foreach collection="conditionParamRef.clientNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('version')">
<if test="conditionParamRef.version != null and conditionParamRef.version != ''">
${_conditionType_} a.version like #{${_conditionParam_}.version}
</if>
<if test="conditionParamRef.version == null">
${_conditionType_} a.version is null
</if>
</if>
<if test="conditionParamRef.containsKey('versionList') and conditionParamRef.versionList.size() > 0">
${_conditionType_} a.version in
<foreach collection="conditionParamRef.versionList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('versionNotList') and conditionParamRef.versionNotList.size() > 0">
${_conditionType_} a.version not in
<foreach collection="conditionParamRef.versionNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('ecode')">
<if test="conditionParamRef.ecode != null and conditionParamRef.ecode != ''">
${_conditionType_} a.ecode like #{${_conditionParam_}.ecode}
</if>
<if test="conditionParamRef.ecode == null">
${_conditionType_} a.ecode is null
</if>
</if>
<if test="conditionParamRef.containsKey('ecodeList') and conditionParamRef.ecodeList.size() > 0">
${_conditionType_} a.ecode in
<foreach collection="conditionParamRef.ecodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('ecodeNotList') and conditionParamRef.ecodeNotList.size() > 0">
${_conditionType_} a.ecode not in
<foreach collection="conditionParamRef.ecodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('appSimpleName')">
<if test="conditionParamRef.appSimpleName != null and conditionParamRef.appSimpleName != ''">
${_conditionType_} a.appSimpleName like #{${_conditionParam_}.appSimpleName}
</if>
<if test="conditionParamRef.appSimpleName == null">
${_conditionType_} a.appSimpleName is null
</if>
</if>
<if test="conditionParamRef.containsKey('appSimpleNameList') and conditionParamRef.appSimpleNameList.size() > 0">
${_conditionType_} a.appSimpleName in
<foreach collection="conditionParamRef.appSimpleNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('appSimpleNameNotList') and conditionParamRef.appSimpleNameNotList.size() > 0">
${_conditionType_} a.appSimpleName not in
<foreach collection="conditionParamRef.appSimpleNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('provider')">
<if test="conditionParamRef.provider != null and conditionParamRef.provider != ''">
${_conditionType_} a.provider like #{${_conditionParam_}.provider}
</if>
<if test="conditionParamRef.provider == null">
${_conditionType_} a.provider is null
</if>
</if>
<if test="conditionParamRef.containsKey('providerList') and conditionParamRef.providerList.size() > 0">
${_conditionType_} a.provider in
<foreach collection="conditionParamRef.providerList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('providerNotList') and conditionParamRef.providerNotList.size() > 0">
${_conditionType_} a.provider not in
<foreach collection="conditionParamRef.providerNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('origin')">
<if test="conditionParamRef.origin != null and conditionParamRef.origin != ''">
${_conditionType_} a.origin like #{${_conditionParam_}.origin}
</if>
<if test="conditionParamRef.origin == null">
${_conditionType_} a.origin is null
</if>
</if>
<if test="conditionParamRef.containsKey('originList') and conditionParamRef.originList.size() > 0">
${_conditionType_} a.origin in
<foreach collection="conditionParamRef.originList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('originNotList') and conditionParamRef.originNotList.size() > 0">
${_conditionType_} a.origin not in
<foreach collection="conditionParamRef.originNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind}
</foreach>
</trim>
</if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by
<trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')">
a.id
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('applicationId')">
a.applicationId
<if test='orderCol.applicationId != null and "DESC".equalsIgnoreCase(orderCol.applicationId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('applicationName')">
a.applicationName
<if test='orderCol.applicationName != null and "DESC".equalsIgnoreCase(orderCol.applicationName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('startTime')">
a.startTime
<if test='orderCol.startTime != null and "DESC".equalsIgnoreCase(orderCol.startTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('endTime')">
a.endTime
<if test='orderCol.endTime != null and "DESC".equalsIgnoreCase(orderCol.endTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('userId')">
a.userId
<if test='orderCol.userId != null and "DESC".equalsIgnoreCase(orderCol.userId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('userName')">
a.userName
<if test='orderCol.userName != null and "DESC".equalsIgnoreCase(orderCol.userName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('channelId')">
a.channelId
<if test='orderCol.channelId != null and "DESC".equalsIgnoreCase(orderCol.channelId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('channelName')">
a.channelName
<if test='orderCol.channelName != null and "DESC".equalsIgnoreCase(orderCol.channelName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('location')">
a.location
<if test='orderCol.location != null and "DESC".equalsIgnoreCase(orderCol.location)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('clientName')">
a.clientName
<if test='orderCol.clientName != null and "DESC".equalsIgnoreCase(orderCol.clientName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('version')">
a.version
<if test='orderCol.version != null and "DESC".equalsIgnoreCase(orderCol.version)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('ecode')">
a.ecode
<if test='orderCol.ecode != null and "DESC".equalsIgnoreCase(orderCol.ecode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('appSimpleName')">
a.appSimpleName
<if test='orderCol.appSimpleName != null and "DESC".equalsIgnoreCase(orderCol.appSimpleName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('provider')">
a.provider
<if test='orderCol.provider != null and "DESC".equalsIgnoreCase(orderCol.provider)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('origin')">
a.origin
<if test='orderCol.origin != null and "DESC".equalsIgnoreCase(orderCol.origin)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
<sql id="_group_by_">
<if test="groupList != null and !groupList.isEmpty()">
GROUP BY
<trim suffixOverrides="," suffix="">
<foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
${item}
</foreach>
</trim>
</if>
</sql>
</mapper>
\ No newline at end of file
sst-manager/src/main/resources/sqlmap/module/converge/ConvergeAppsAccessMapperExt.xml 0 → 100644
View file @ ad2c8b6a
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.converge.dao.ibatis.ConvergeAppsAccessDaoImpl">
<!-- 页面浏览量PV统计 -->
<select id="getAppsAccessPv" parameterType="map" resultType="com.mortals.xhx.module.converge.model.vo.AppsAccessVo">
SELECT
siteId,
ecode as equipmentId,
applicationId as appEname,
applicationName AS appName,
appSimpleName,
provider,
origin,
DATE_FORMAT(startTime,'%Y-%m') as statYearMonth,
count(1) as totalPv
FROM
mortals_xhx_converge_apps_access
WHERE
startTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{startTime},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
AND
startTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{endTime},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
GROUP BY
siteId,
applicationId,
ecode,
DATE_FORMAT(startTime,'%Y-%m')
</select>
<!-- 页面浏览量UV统计 -->
<select id="getAppsAccessUv" parameterType="map" resultType="com.mortals.xhx.module.converge.model.vo.AppsAccessVo">
SELECT
siteId,
ecode AS equipmentId,
applicationId AS appEname,
applicationName AS appName,
appSimpleName,
provider,
origin,
statYearMonth,
count(1) AS totalUv
FROM
(
SELECT
siteId,
ecode,
applicationId,
applicationName,
appSimpleName,
provider,
origin,
count(1),
DATE_FORMAT(startTime,'%Y-%m') AS statYearMonth
FROM
mortals_xhx_converge_apps_access
WHERE
startTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{startTime},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
AND
startTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{endTime},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
GROUP BY
siteId,
applicationId,
ecode,
DATE_FORMAT(startTime,'%Y-%m-%d')
) AS a
GROUP BY
siteId,
applicationId,
ecode
</select>
</mapper>
\ No newline at end of file
sst-manager/src/main/resources/sqlmap/module/converge/ConvergeAppsMapper.xml
View file @ ad2c8b6a
...@@ -6,16 +6,17 @@ ...@@ -6,16 +6,17 @@
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
<resultMap type="ConvergeAppsEntity" id="ConvergeAppsEntity-Map"> <resultMap type="ConvergeAppsEntity" id="ConvergeAppsEntity-Map">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="siteId" column="siteId" />
<result property="equipmentId" column="equipmentId" /> <result property="equipmentId" column="equipmentId" />
<result property="appEname" column="appEname" /> <result property="appEname" column="appEname" />
<result property="appName" column="appName" /> <result property="appName" column="appName" />
<result property="appSimpleName" column="appSimpleName" /> <result property="appSimpleName" column="appSimpleName" />
<result property="provider" column="provider" /> <result property="provider" column="provider" />
<result property="origin" column="origin" /> <result property="origin" column="origin" />
<result property="pv" column="pv" /> <result property="totalPv" column="totalPv" />
<result property="uv" column="uv" /> <result property="totalUv" column="totalUv" />
<result property="opr" column="opr" /> <result property="opr" column="opr" />
<result property="siteId" column="siteId" /> <result property="statYearMonth" column="statYearMonth" />
</resultMap> </resultMap>
...@@ -26,6 +27,9 @@ ...@@ -26,6 +27,9 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id, a.id,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('equipmentId') or colPickMode == 1 and data.containsKey('equipmentId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('equipmentId') or colPickMode == 1 and data.containsKey('equipmentId')))">
a.equipmentId, a.equipmentId,
</if> </if>
...@@ -44,35 +48,35 @@ ...@@ -44,35 +48,35 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('origin') or colPickMode == 1 and data.containsKey('origin')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('origin') or colPickMode == 1 and data.containsKey('origin')))">
a.origin, a.origin,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('pv') or colPickMode == 1 and data.containsKey('pv')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('totalPv') or colPickMode == 1 and data.containsKey('totalPv')))">
a.pv, a.totalPv,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('uv') or colPickMode == 1 and data.containsKey('uv')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('totalUv') or colPickMode == 1 and data.containsKey('totalUv')))">
a.uv, a.totalUv,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('opr') or colPickMode == 1 and data.containsKey('opr')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('opr') or colPickMode == 1 and data.containsKey('opr')))">
a.opr, a.opr,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('statYearMonth') or colPickMode == 1 and data.containsKey('statYearMonth')))">
a.siteId, a.statYearMonth,
</if> </if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="ConvergeAppsEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="ConvergeAppsEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_converge_apps insert into mortals_xhx_converge_apps
(equipmentId,appEname,appName,appSimpleName,provider,origin,pv,uv,opr,siteId) (siteId,equipmentId,appEname,appName,appSimpleName,provider,origin,totalPv,totalUv,opr,statYearMonth)
VALUES VALUES
(#{equipmentId},#{appEname},#{appName},#{appSimpleName},#{provider},#{origin},#{pv},#{uv},#{opr},#{siteId}) (#{siteId},#{equipmentId},#{appEname},#{appName},#{appSimpleName},#{provider},#{origin},#{totalPv},#{totalUv},#{opr},#{statYearMonth})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_converge_apps insert into mortals_xhx_converge_apps
(equipmentId,appEname,appName,appSimpleName,provider,origin,pv,uv,opr,siteId) (siteId,equipmentId,appEname,appName,appSimpleName,provider,origin,totalPv,totalUv,opr,statYearMonth)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.equipmentId},#{item.appEname},#{item.appName},#{item.appSimpleName},#{item.provider},#{item.origin},#{item.pv},#{item.uv},#{item.opr},#{item.siteId}) (#{item.siteId},#{item.equipmentId},#{item.appEname},#{item.appName},#{item.appSimpleName},#{item.provider},#{item.origin},#{item.totalPv},#{item.totalUv},#{item.opr},#{item.statYearMonth})
</foreach> </foreach>
</insert> </insert>
...@@ -82,6 +86,12 @@ ...@@ -82,6 +86,12 @@
update mortals_xhx_converge_apps as a update mortals_xhx_converge_apps as a
set set
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
a.siteId=#{data.siteId},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('equipmentId')) or (colPickMode==1 and !data.containsKey('equipmentId'))"> <if test="(colPickMode==0 and data.containsKey('equipmentId')) or (colPickMode==1 and !data.containsKey('equipmentId'))">
a.equipmentId=#{data.equipmentId}, a.equipmentId=#{data.equipmentId},
</if> </if>
...@@ -103,26 +113,23 @@ ...@@ -103,26 +113,23 @@
<if test="(colPickMode==0 and data.containsKey('origin')) or (colPickMode==1 and !data.containsKey('origin'))"> <if test="(colPickMode==0 and data.containsKey('origin')) or (colPickMode==1 and !data.containsKey('origin'))">
a.origin=#{data.origin}, a.origin=#{data.origin},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('pv')) or (colPickMode==1 and !data.containsKey('pv'))"> <if test="(colPickMode==0 and data.containsKey('totalPv')) or (colPickMode==1 and !data.containsKey('totalPv'))">
a.pv=#{data.pv}, a.totalPv=#{data.totalPv},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('pvIncrement')) or (colPickMode==1 and !data.containsKey('pvIncrement'))"> <if test="(colPickMode==0 and data.containsKey('totalPvIncrement')) or (colPickMode==1 and !data.containsKey('totalPvIncrement'))">
a.pv=ifnull(a.pv,0) + #{data.pvIncrement}, a.totalPv=ifnull(a.totalPv,0) + #{data.totalPvIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('uv')) or (colPickMode==1 and !data.containsKey('uv'))"> <if test="(colPickMode==0 and data.containsKey('totalUv')) or (colPickMode==1 and !data.containsKey('totalUv'))">
a.uv=#{data.uv}, a.totalUv=#{data.totalUv},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('uvIncrement')) or (colPickMode==1 and !data.containsKey('uvIncrement'))"> <if test="(colPickMode==0 and data.containsKey('totalUvIncrement')) or (colPickMode==1 and !data.containsKey('totalUvIncrement'))">
a.uv=ifnull(a.uv,0) + #{data.uvIncrement}, a.totalUv=ifnull(a.totalUv,0) + #{data.totalUvIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('opr')) or (colPickMode==1 and !data.containsKey('opr'))"> <if test="(colPickMode==0 and data.containsKey('opr')) or (colPickMode==1 and !data.containsKey('opr'))">
a.opr=#{data.opr}, a.opr=#{data.opr},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))"> <if test="(colPickMode==0 and data.containsKey('statYearMonth')) or (colPickMode==1 and !data.containsKey('statYearMonth'))">
a.siteId=#{data.siteId}, a.statYearMonth=#{data.statYearMonth},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if> </if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
...@@ -136,6 +143,18 @@ ...@@ -136,6 +143,18 @@
<update id="updateBatch" parameterType="paramDto"> <update id="updateBatch" parameterType="paramDto">
update mortals_xhx_converge_apps as a update mortals_xhx_converge_apps as a
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId}
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="equipmentId=(case" suffix="ELSE equipmentId end),"> <trim prefix="equipmentId=(case" suffix="ELSE equipmentId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
...@@ -183,26 +202,26 @@ ...@@ -183,26 +202,26 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="pv=(case" suffix="ELSE pv end),"> <trim prefix="totalPv=(case" suffix="ELSE totalPv end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('pv')) or (colPickMode==1 and !item.containsKey('pv'))"> <when test="(colPickMode==0 and item.containsKey('totalPv')) or (colPickMode==1 and !item.containsKey('totalPv'))">
when a.id=#{item.id} then #{item.pv} when a.id=#{item.id} then #{item.totalPv}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('pvIncrement')) or (colPickMode==1 and !item.containsKey('pvIncrement'))"> <when test="(colPickMode==0 and item.containsKey('totalPvIncrement')) or (colPickMode==1 and !item.containsKey('totalPvIncrement'))">
when a.id=#{item.id} then ifnull(a.pv,0) + #{item.pvIncrement} when a.id=#{item.id} then ifnull(a.totalPv,0) + #{item.totalPvIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="uv=(case" suffix="ELSE uv end),"> <trim prefix="totalUv=(case" suffix="ELSE totalUv end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('uv')) or (colPickMode==1 and !item.containsKey('uv'))"> <when test="(colPickMode==0 and item.containsKey('totalUv')) or (colPickMode==1 and !item.containsKey('totalUv'))">
when a.id=#{item.id} then #{item.uv} when a.id=#{item.id} then #{item.totalUv}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('uvIncrement')) or (colPickMode==1 and !item.containsKey('uvIncrement'))"> <when test="(colPickMode==0 and item.containsKey('totalUvIncrement')) or (colPickMode==1 and !item.containsKey('totalUvIncrement'))">
when a.id=#{item.id} then ifnull(a.uv,0) + #{item.uvIncrement} when a.id=#{item.id} then ifnull(a.totalUv,0) + #{item.totalUvIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
...@@ -214,16 +233,11 @@ ...@@ -214,16 +233,11 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="siteId=(case" suffix="ELSE siteId end),"> <trim prefix="statYearMonth=(case" suffix="ELSE statYearMonth end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <if test="(colPickMode==0 and item.containsKey('statYearMonth')) or (colPickMode==1 and !item.containsKey('statYearMonth'))">
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))"> when a.id=#{item.id} then #{item.statYearMonth}
when a.id=#{item.id} then #{item.siteId} </if>
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach> </foreach>
</trim> </trim>
</trim> </trim>
...@@ -369,6 +383,33 @@ ...@@ -369,6 +383,33 @@
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd} ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if> </if>
<if test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
<if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</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">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
<if test="conditionParamRef.containsKey('equipmentId')"> <if test="conditionParamRef.containsKey('equipmentId')">
<if test="conditionParamRef.equipmentId != null "> <if test="conditionParamRef.equipmentId != null ">
${_conditionType_} a.equipmentId = #{${_conditionParam_}.equipmentId} ${_conditionType_} a.equipmentId = #{${_conditionParam_}.equipmentId}
...@@ -501,58 +542,58 @@ ...@@ -501,58 +542,58 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('pv')"> <if test="conditionParamRef.containsKey('totalPv')">
<if test="conditionParamRef.pv != null "> <if test="conditionParamRef.totalPv != null ">
${_conditionType_} a.pv = #{${_conditionParam_}.pv} ${_conditionType_} a.totalPv = #{${_conditionParam_}.totalPv}
</if> </if>
<if test="conditionParamRef.pv == null"> <if test="conditionParamRef.totalPv == null">
${_conditionType_} a.pv is null ${_conditionType_} a.totalPv is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('pvList') and conditionParamRef.pvList.size() > 0"> <if test="conditionParamRef.containsKey('totalPvList') and conditionParamRef.totalPvList.size() > 0">
${_conditionType_} a.pv in ${_conditionType_} a.totalPv in
<foreach collection="conditionParamRef.pvList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.totalPvList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('pvNotList') and conditionParamRef.pvNotList.size() > 0"> <if test="conditionParamRef.containsKey('totalPvNotList') and conditionParamRef.totalPvNotList.size() > 0">
${_conditionType_} a.pv not in ${_conditionType_} a.totalPv not in
<foreach collection="conditionParamRef.pvNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.totalPvNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('pvStart') and conditionParamRef.pvStart != null"> <if test="conditionParamRef.containsKey('totalPvStart') and conditionParamRef.totalPvStart != null">
${_conditionType_} a.pv <![CDATA[ >= ]]> #{${_conditionParam_}.pvStart} ${_conditionType_} a.totalPv <![CDATA[ >= ]]> #{${_conditionParam_}.totalPvStart}
</if> </if>
<if test="conditionParamRef.containsKey('pvEnd') and conditionParamRef.pvEnd != null"> <if test="conditionParamRef.containsKey('totalPvEnd') and conditionParamRef.totalPvEnd != null">
${_conditionType_} a.pv <![CDATA[ <= ]]> #{${_conditionParam_}.pvEnd} ${_conditionType_} a.totalPv <![CDATA[ <= ]]> #{${_conditionParam_}.totalPvEnd}
</if> </if>
<if test="conditionParamRef.containsKey('uv')"> <if test="conditionParamRef.containsKey('totalUv')">
<if test="conditionParamRef.uv != null "> <if test="conditionParamRef.totalUv != null ">
${_conditionType_} a.uv = #{${_conditionParam_}.uv} ${_conditionType_} a.totalUv = #{${_conditionParam_}.totalUv}
</if> </if>
<if test="conditionParamRef.uv == null"> <if test="conditionParamRef.totalUv == null">
${_conditionType_} a.uv is null ${_conditionType_} a.totalUv is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('uvList') and conditionParamRef.uvList.size() > 0"> <if test="conditionParamRef.containsKey('totalUvList') and conditionParamRef.totalUvList.size() > 0">
${_conditionType_} a.uv in ${_conditionType_} a.totalUv in
<foreach collection="conditionParamRef.uvList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.totalUvList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('uvNotList') and conditionParamRef.uvNotList.size() > 0"> <if test="conditionParamRef.containsKey('totalUvNotList') and conditionParamRef.totalUvNotList.size() > 0">
${_conditionType_} a.uv not in ${_conditionType_} a.totalUv not in
<foreach collection="conditionParamRef.uvNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.totalUvNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('uvStart') and conditionParamRef.uvStart != null"> <if test="conditionParamRef.containsKey('totalUvStart') and conditionParamRef.totalUvStart != null">
${_conditionType_} a.uv <![CDATA[ >= ]]> #{${_conditionParam_}.uvStart} ${_conditionType_} a.totalUv <![CDATA[ >= ]]> #{${_conditionParam_}.totalUvStart}
</if> </if>
<if test="conditionParamRef.containsKey('uvEnd') and conditionParamRef.uvEnd != null"> <if test="conditionParamRef.containsKey('totalUvEnd') and conditionParamRef.totalUvEnd != null">
${_conditionType_} a.uv <![CDATA[ <= ]]> #{${_conditionParam_}.uvEnd} ${_conditionType_} a.totalUv <![CDATA[ <= ]]> #{${_conditionParam_}.totalUvEnd}
</if> </if>
...@@ -576,33 +617,27 @@ ...@@ -576,33 +617,27 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.siteId != null "> <if test="conditionParamRef.containsKey('statYearMonth')">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId} <if test="conditionParamRef.statYearMonth != null and conditionParamRef.statYearMonth != ''">
${_conditionType_} a.statYearMonth like #{${_conditionParam_}.statYearMonth}
</if> </if>
<if test="conditionParamRef.siteId == null"> <if test="conditionParamRef.statYearMonth == null">
${_conditionType_} a.siteId is null ${_conditionType_} a.statYearMonth is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0"> <if test="conditionParamRef.containsKey('statYearMonthList') and conditionParamRef.statYearMonthList.size() > 0">
${_conditionType_} a.siteId in ${_conditionType_} a.statYearMonth in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.statYearMonthList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0"> <if test="conditionParamRef.containsKey('statYearMonthNotList') and conditionParamRef.statYearMonthNotList.size() > 0">
${_conditionType_} a.siteId not in ${_conditionType_} a.statYearMonth not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.statYearMonthNotList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -621,6 +656,11 @@ ...@@ -621,6 +656,11 @@
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if> <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('equipmentId')"> <if test="orderCol.containsKey('equipmentId')">
a.equipmentId a.equipmentId
<if test='orderCol.equipmentId != null and "DESC".equalsIgnoreCase(orderCol.equipmentId)'>DESC</if> <if test='orderCol.equipmentId != null and "DESC".equalsIgnoreCase(orderCol.equipmentId)'>DESC</if>
...@@ -651,14 +691,14 @@ ...@@ -651,14 +691,14 @@
<if test='orderCol.origin != null and "DESC".equalsIgnoreCase(orderCol.origin)'>DESC</if> <if test='orderCol.origin != null and "DESC".equalsIgnoreCase(orderCol.origin)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('pv')"> <if test="orderCol.containsKey('totalPv')">
a.pv a.totalPv
<if test='orderCol.pv != null and "DESC".equalsIgnoreCase(orderCol.pv)'>DESC</if> <if test='orderCol.totalPv != null and "DESC".equalsIgnoreCase(orderCol.totalPv)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('uv')"> <if test="orderCol.containsKey('totalUv')">
a.uv a.totalUv
<if test='orderCol.uv != null and "DESC".equalsIgnoreCase(orderCol.uv)'>DESC</if> <if test='orderCol.totalUv != null and "DESC".equalsIgnoreCase(orderCol.totalUv)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('opr')"> <if test="orderCol.containsKey('opr')">
...@@ -666,9 +706,9 @@ ...@@ -666,9 +706,9 @@
<if test='orderCol.opr != null and "DESC".equalsIgnoreCase(orderCol.opr)'>DESC</if> <if test='orderCol.opr != null and "DESC".equalsIgnoreCase(orderCol.opr)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('siteId')"> <if test="orderCol.containsKey('statYearMonth')">
a.siteId a.statYearMonth
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if> <if test='orderCol.statYearMonth != null and "DESC".equalsIgnoreCase(orderCol.statYearMonth)'>DESC</if>
, ,
</if> </if>
</trim> </trim>
......
sst-manager/src/main/resources/sqlmap/module/sst/SstAgreementMapper.xml
View file @ ad2c8b6a
<?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.SstAgreementDaoImpl"> <mapper namespace="com.mortals.xhx.module.sst.dao.ibatis.SstAgreementDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,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="protocolType" column="protocolType" />
</resultMap> </resultMap>
...@@ -28,7 +29,7 @@ ...@@ -28,7 +29,7 @@
a.siteId, a.siteId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('name') or colPickMode == 1 and data.containsKey('name')))">
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`,
...@@ -48,23 +49,26 @@ ...@@ -48,23 +49,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('protocolType') or colPickMode == 1 and data.containsKey('protocolType')))">
a.protocolType,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="SstAgreementEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="SstAgreementEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_sst_agreement insert into mortals_xhx_sst_agreement
(siteId,`name`,`describe`,content,createUserId,createTime,updateUserId,updateTime) (siteId,name,`describe`,content,createUserId,createTime,updateUserId,updateTime,protocolType)
VALUES VALUES
(#{siteId},#{name},#{describe},#{content},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{siteId},#{name},#{describe},#{content},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{protocolType})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_sst_agreement insert into mortals_xhx_sst_agreement
(siteId,`name`,`describe`,content,createUserId,createTime,updateUserId,updateTime) (siteId,name,`describe`,content,createUserId,createTime,updateUserId,updateTime,protocolType)
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.content},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.siteId},#{item.name},#{item.describe},#{item.content},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.protocolType})
</foreach> </foreach>
</insert> </insert>
...@@ -81,7 +85,7 @@ ...@@ -81,7 +85,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},
...@@ -107,6 +111,12 @@ ...@@ -107,6 +111,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('protocolType')) or (colPickMode==1 and !data.containsKey('protocolType'))">
a.protocolType=#{data.protocolType},
</if>
<if test="(colPickMode==0 and data.containsKey('protocolTypeIncrement')) or (colPickMode==1 and !data.containsKey('protocolTypeIncrement'))">
a.protocolType=ifnull(a.protocolType,0) + #{data.protocolTypeIncrement},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -138,7 +148,7 @@ ...@@ -138,7 +148,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}
...@@ -190,6 +200,18 @@ ...@@ -190,6 +200,18 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="protocolType=(case" suffix="ELSE protocolType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('protocolType')) or (colPickMode==1 and !item.containsKey('protocolType'))">
when a.id=#{item.id} then #{item.protocolType}
</when>
<when test="(colPickMode==0 and item.containsKey('protocolTypeIncrement')) or (colPickMode==1 and !item.containsKey('protocolTypeIncrement'))">
when a.id=#{item.id} then ifnull(a.protocolType,0) + #{item.protocolTypeIncrement}
</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=")">
...@@ -314,12 +336,18 @@ ...@@ -314,12 +336,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>
...@@ -335,12 +363,18 @@ ...@@ -335,12 +363,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>
...@@ -351,18 +385,24 @@ ...@@ -351,18 +385,24 @@
<if test="conditionParamRef.containsKey('name')"> <if test="conditionParamRef.containsKey('name')">
<if test="conditionParamRef.name != null and conditionParamRef.name != ''"> <if test="conditionParamRef.name != null and conditionParamRef.name != ''">
${_conditionType_} a.`name` like #{${_conditionParam_}.name} ${_conditionType_} a.name like #{${_conditionParam_}.name}
</if> </if>
<if test="conditionParamRef.name == null"> <if test="conditionParamRef.name == null">
${_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 != ''">
...@@ -372,12 +412,18 @@ ...@@ -372,12 +412,18 @@
${_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('content')"> <if test="conditionParamRef.containsKey('content')">
<if test="conditionParamRef.content != null and conditionParamRef.content != ''"> <if test="conditionParamRef.content != null and conditionParamRef.content != ''">
...@@ -387,12 +433,18 @@ ...@@ -387,12 +433,18 @@
${_conditionType_} a.content is null ${_conditionType_} a.content is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('contentList')"> <if test="conditionParamRef.containsKey('contentList') and conditionParamRef.contentList.size() > 0">
${_conditionType_} a.content in ${_conditionType_} a.content in
<foreach collection="conditionParamRef.contentList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.contentList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('contentNotList') and conditionParamRef.contentNotList.size() > 0">
${_conditionType_} a.content not in
<foreach collection="conditionParamRef.contentNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserId')"> <if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null "> <if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId} ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
...@@ -401,12 +453,18 @@ ...@@ -401,12 +453,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>
...@@ -437,12 +495,18 @@ ...@@ -437,12 +495,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>
...@@ -465,6 +529,33 @@ ...@@ -465,6 +529,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('protocolType')">
<if test="conditionParamRef.protocolType != null ">
${_conditionType_} a.protocolType = #{${_conditionParam_}.protocolType}
</if>
<if test="conditionParamRef.protocolType == null">
${_conditionType_} a.protocolType is null
</if>
</if>
<if test="conditionParamRef.containsKey('protocolTypeList') and conditionParamRef.protocolTypeList.size() > 0">
${_conditionType_} a.protocolType in
<foreach collection="conditionParamRef.protocolTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('protocolTypeNotList') and conditionParamRef.protocolTypeNotList.size() > 0">
${_conditionType_} a.protocolType not in
<foreach collection="conditionParamRef.protocolTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('protocolTypeStart') and conditionParamRef.protocolTypeStart != null">
${_conditionType_} a.protocolType <![CDATA[ >= ]]> #{${_conditionParam_}.protocolTypeStart}
</if>
<if test="conditionParamRef.containsKey('protocolTypeEnd') and conditionParamRef.protocolTypeEnd != null">
${_conditionType_} a.protocolType <![CDATA[ <= ]]> #{${_conditionParam_}.protocolTypeEnd}
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -489,7 +580,7 @@ ...@@ -489,7 +580,7 @@
, ,
</if> </if>
<if test="orderCol.containsKey('name')"> <if test="orderCol.containsKey('name')">
a.`name` a.name
<if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>DESC</if> <if test='orderCol.name != null and "DESC".equalsIgnoreCase(orderCol.name)'>DESC</if>
, ,
</if> </if>
...@@ -523,6 +614,11 @@ ...@@ -523,6 +614,11 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('protocolType')">
a.protocolType
<if test='orderCol.protocolType != null and "DESC".equalsIgnoreCase(orderCol.protocolType)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
sst-manager/src/main/resources/sqlmap/module/sst/SstAppsDeskMapper.xml
View file @ ad2c8b6a
<?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 @ ad2c8b6a
<?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