Merge remote-tracking branch 'remotes/origin/dev' into test
wei.peng
5 years ago
commit
6544b76276
@ -0,0 +1,28 @@
|
||||
package cn.estsh.i3plus.core.api.iservice.busi;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* 授权检查
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 20-3-23 下午5:12
|
||||
* @Modify:
|
||||
**/
|
||||
public interface ILicenseClickService {
|
||||
|
||||
/**
|
||||
* 检查用户数量
|
||||
*/
|
||||
void checkLicenseNumberUser();
|
||||
|
||||
/**
|
||||
* 检查 组织数量
|
||||
*/
|
||||
void checkLicenseNumberOrganize();
|
||||
|
||||
/**
|
||||
* 检查 登录数量
|
||||
*/
|
||||
void checkLicenseNumberLogin();
|
||||
|
||||
}
|
||||
@ -0,0 +1,96 @@
|
||||
package cn.estsh.i3plus.core.apiservice.controller;
|
||||
|
||||
import cn.estsh.i3plus.core.apiservice.schedulejob.CoreLogClearJob;
|
||||
import cn.estsh.i3plus.platform.common.tool.HttpClientTool;
|
||||
import cn.estsh.i3plus.platform.common.tool.SerializeTool;
|
||||
import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
|
||||
import cn.estsh.i3plus.platform.plugin.elasticsearch.ElasticSearchPack;
|
||||
import cn.estsh.i3plus.platform.plugin.elasticsearch.ElasticSearchTool;
|
||||
import cn.estsh.i3plus.platform.plugin.license.ImppLicense;
|
||||
import cn.estsh.i3plus.platform.plugin.license.ImppLicenseTool;
|
||||
import cn.estsh.i3plus.platform.plugin.license.serviceimpl.SenseLockUtil;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
|
||||
import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate;
|
||||
import cn.estsh.impp.framework.base.controller.CoreBaseController;
|
||||
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
|
||||
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
|
||||
import cn.estsh.impp.framework.boot.util.ResultBean;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
import java.util.Base64;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 20-3-10 下午1:16
|
||||
* @Modify:
|
||||
**/
|
||||
@RestController
|
||||
@Api(tags = "测试Demo ")
|
||||
@RequestMapping(PlatformConstWords.BASE_URL + "/demo")
|
||||
public class DemoController extends CoreBaseController {
|
||||
|
||||
@Autowired
|
||||
private CoreLogClearJob coreLogClearJob;
|
||||
|
||||
@GetMapping(value = "/query")
|
||||
@ApiOperation(value = "添加操作日志", notes = "添加操作日志，可用于国际化")
|
||||
public ResultBean insertLogOperate() {
|
||||
try {
|
||||
// org.elasticsearch.common.xcontent.DeprecationHandler handler;
|
||||
ElasticSearchTool.init("http://192.168.3.40:9200");
|
||||
ElasticSearchPack pack = ElasticSearchPack.imppBuild(SysLogOperate.class);
|
||||
List<SysLogOperate> list = ElasticSearchTool.searchList(pack, SysLogOperate.class);
|
||||
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(list);
|
||||
} catch (ImppBusiException busExcep) {
|
||||
return ResultBean.fail(busExcep).build();
|
||||
} catch (Exception e) {
|
||||
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@GetMapping(value = "/license")
|
||||
@ApiOperation(value = "添加操作日志", notes = "添加操作日志，可用于国际化")
|
||||
public ResultBean license() {
|
||||
try{
|
||||
ImppLicense license = ImppLicenseTool.getLicense();
|
||||
|
||||
// SenseLockUtil lockUtil = SenseLockUtil.getSenseLockUtil(10086);
|
||||
//// lockUtil.checkAPIKey();
|
||||
// String readValue = lockUtil.getReadValue();
|
||||
// System.out.println(readValue);
|
||||
// ImppLicense readLicense = (ImppLicense) SerializeTool.deserializationByte(Base64.getDecoder().decode(readValue));
|
||||
// System.out.println(JSON.toJSONString(readLicense));
|
||||
//
|
||||
// String writeValue = lockUtil.getWriteValue();
|
||||
// System.out.println(writeValue);
|
||||
// ImppLicense writeLicense = (ImppLicense) SerializeTool.deserializationByte(Base64.getDecoder().decode(writeValue));
|
||||
// System.out.println(JSON.toJSONString(writeLicense));
|
||||
//
|
||||
// String publicValue = lockUtil.getPublicValue();
|
||||
// System.out.println(publicValue);
|
||||
// ImppLicense publicLicense = (ImppLicense) SerializeTool.deserializationByte(Base64.getDecoder().decode(publicValue));
|
||||
// System.out.println(JSON.toJSONString(publicLicense));
|
||||
// System.out.println("Hello World ~!");
|
||||
|
||||
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(license);
|
||||
} catch (ImppBusiException busExcep) {
|
||||
return ResultBean.fail(busExcep).build();
|
||||
} catch (Exception e) {
|
||||
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,236 @@
|
||||
package cn.estsh.i3plus.core.apiservice.controller;
|
||||
|
||||
import cn.estsh.i3plus.core.api.iservice.base.ISysLogService;
|
||||
import cn.estsh.i3plus.core.api.iservice.busi.*;
|
||||
import cn.estsh.i3plus.core.apiservice.controller.busi.PersonnelController;
|
||||
import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
|
||||
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
|
||||
import cn.estsh.i3plus.pojo.model.platform.UserDetailModel;
|
||||
import cn.estsh.i3plus.pojo.platform.bean.SysDepartment;
|
||||
import cn.estsh.i3plus.pojo.platform.bean.SysPosition;
|
||||
import cn.estsh.i3plus.pojo.platform.bean.SysRole;
|
||||
import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate;
|
||||
import cn.estsh.impp.framework.base.controller.CoreBaseController;
|
||||
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
|
||||
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
|
||||
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
|
||||
import cn.estsh.impp.framework.boot.util.ResultBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.apache.commons.lang3.RandomStringUtils;
|
||||
import org.apache.commons.lang3.RandomUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.Executors;
|
||||
|
||||
/**
|
||||
* @Description : 系统资源服务demo
|
||||
* @Reference :
|
||||
* @Author : alwaysfrin
|
||||
* @CreateDate : 2018-09-26 10:34
|
||||
* @Modify:
|
||||
**/
|
||||
@RestController
|
||||
@Api(tags = "系统服务demo")
|
||||
@RequestMapping(PlatformConstWords.BASE_URL + "/test/user-info")
|
||||
public class DemoUserInfoController extends CoreBaseController {
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(DemoUserInfoController.class);
|
||||
|
||||
@Autowired
|
||||
private IPersonnelService personnelService;
|
||||
|
||||
@Autowired
|
||||
private ISysOrganizeService organizeService;
|
||||
|
||||
@Autowired
|
||||
private ISysDepartmentService departmentService;
|
||||
|
||||
@Autowired
|
||||
private ISysRoleService roleService;
|
||||
|
||||
@Autowired
|
||||
private ISysPositionService positionService;
|
||||
|
||||
@Autowired
|
||||
private ISysDictionaryService dictionaryService;
|
||||
|
||||
ExecutorService executorService = Executors.newFixedThreadPool(100);
|
||||
|
||||
private List<SysRole> roleList;
|
||||
private List<SysDepartment> departmentList;
|
||||
private List<SysPosition> positionList;
|
||||
private Random roleListRandom;//默认构造方法
|
||||
private Random departmentListRandom;//默认构造方法
|
||||
private Random positionListRandom;//默认构造方法
|
||||
|
||||
private static Random random = new Random(10);
|
||||
|
||||
@Autowired
|
||||
private PersonnelController personnelController;
|
||||
|
||||
|
||||
/**
|
||||
* 添加操作日志
|
||||
*
|
||||
* @return 处理结果
|
||||
*/
|
||||
@PostMapping(value = "/insert")
|
||||
@ApiOperation(value = "添加操作日志", notes = "添加操作日志，可用于国际化")
|
||||
public ResultBean insertLogOperate() {
|
||||
try {
|
||||
initData();
|
||||
for (int i = 0; i < 350; i++) {
|
||||
executorService.execute(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
for (int j = 0; j < 20000; j++) {
|
||||
try {
|
||||
System.out.println(Thread.currentThread().getName() + "----> Start insert " + j);
|
||||
personnelController.insertUserDetailModel(getUserDetailModel());
|
||||
System.out.println(Thread.currentThread().getName() + "----> End insert " + j);
|
||||
}catch (Exception e){
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
|
||||
} catch (ImppBusiException busExcep) {
|
||||
return ResultBean.fail(busExcep).build();
|
||||
} catch (Exception e) {
|
||||
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||
}
|
||||
}
|
||||
|
||||
public void initData() {
|
||||
roleList = roleService.findSysRoleAll();
|
||||
departmentList = departmentService.findSysDepartmentList();
|
||||
positionList = positionService.findSysPositionAll();
|
||||
|
||||
roleListRandom = new Random(roleList.size() - 1);
|
||||
departmentListRandom = new Random(departmentList.size() - 1);
|
||||
positionListRandom = new Random(positionList.size() - 1);
|
||||
}
|
||||
|
||||
public synchronized UserDetailModel getUserDetailModel() {
|
||||
UserDetailModel model = new UserDetailModel();
|
||||
|
||||
model.setInfoName(RandomStringUtils.randomAlphanumeric(RandomUtils.nextInt(20, 50)));
|
||||
model.setInfoEmpNo(RandomStringUtils.randomAlphanumeric(RandomUtils.nextInt(20, 50)));
|
||||
model.setInfoEmployeeType(2);
|
||||
model.setInfoGrade(2);
|
||||
model.setInfoSex(2);
|
||||
model.setInfoMarriage(2);
|
||||
model.setInfoCardType(1);
|
||||
model.setInfoCardNumber(RandomStringUtils.randomAlphanumeric(18));
|
||||
model.setInfoSchoolEducation(1);
|
||||
model.setInfoSchoolLeaveDate("2020-03-09 19:38:41");
|
||||
model.setInfoRace(2);
|
||||
model.setInfoJoinDate("2020-03-09 19:39:12");
|
||||
model.setInfoResignationDate("2020-03-09 19:39:12");
|
||||
model.setInfoPoliticalStatus(2);
|
||||
model.setInfoBornDate("2020-03-09 19:39:59");
|
||||
model.setUserLoginName(RandomStringUtils.randomAlphanumeric(RandomUtils.nextInt(15, 20)));
|
||||
model.setUserLoginPassword("123456");
|
||||
model.setUserLanguageCode("CN/zh");
|
||||
model.setUserPhone(RandomStringUtils.randomAlphanumeric(11));
|
||||
model.setUserEmail(RandomStringUtils.randomAlphanumeric(11) + "qq.com");
|
||||
|
||||
model.setInfoDepartmentId(getSysDepartment().getId().toString());
|
||||
model.setInfoDepartmentIdList(getSysDepartmentList());
|
||||
model.setInfoPositionId(getSysPosition().getId().toString());
|
||||
model.setInfoPositionIdList(getSysPositionList());
|
||||
model.setUserDepartmentId(getSysDepartment().getId().toString());
|
||||
model.setUserDepartmentIdList(getSysDepartmentList());
|
||||
model.setUserRoleIdList(getSysRoleList());
|
||||
|
||||
return model;
|
||||
}
|
||||
|
||||
|
||||
public SysRole getSysRole() {
|
||||
return roleList.get(roleListRandom.nextInt(roleList.size()));
|
||||
}
|
||||
|
||||
public List<String> getSysRoleList() {
|
||||
List<String> result = new ArrayList<>();
|
||||
int length = random.nextInt(5);
|
||||
for (int i = 0; i < length; i++) {
|
||||
result.add(roleList.get(roleListRandom.nextInt(roleList.size())).getId().toString());
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
public SysDepartment getSysDepartment() {
|
||||
return departmentList.get(departmentListRandom.nextInt(departmentList.size()));
|
||||
}
|
||||
|
||||
public List<String> getSysDepartmentList() {
|
||||
List<String> result = new ArrayList<>();
|
||||
int length = random.nextInt(5);
|
||||
for (int i = 0; i < length; i++) {
|
||||
result.add(departmentList.get(departmentListRandom.nextInt(departmentList.size())).getId().toString());
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
public SysPosition getSysPosition() {
|
||||
do {
|
||||
return positionList.get(positionListRandom.nextInt(positionList.size()));
|
||||
} while (true);
|
||||
}
|
||||
|
||||
public List<String> getSysPositionList() {
|
||||
List<String> result = new ArrayList<>();
|
||||
int length = random.nextInt(5);
|
||||
for (int i = 0; i < length; i++) {
|
||||
result.add(positionList.get(positionListRandom.nextInt(positionList.size())).getId().toString());
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
//➜ ~ df -h
|
||||
//文件系统 容量 已用 可用 已用% 挂载点
|
||||
//udev 12G 0 12G 0% /dev
|
||||
//tmpfs 2.4G 4.2M 2.4G 1% /run
|
||||
///dev/mapper/ubuntu--vg-root 457G 130G 304G 30% /
|
||||
//tmpfs 12G 206M 12G 2% /dev/shm
|
||||
//tmpfs 5.0M 4.0K 5.0M 1% /run/lock
|
||||
//tmpfs 12G 0 12G 0% /sys/fs/cgroup
|
||||
///dev/loop1 25M 25M 0 100% /snap/snapd/6434
|
||||
///dev/loop2 55M 55M 0 100% /snap/core18/1668
|
||||
///dev/loop3 397M 397M 0 100% /snap/redis-desktop-manager/332
|
||||
///dev/loop4 92M 92M 0 100% /snap/core/8689
|
||||
///dev/loop5 25M 25M 0 100% /snap/snapd/6240
|
||||
///dev/loop6 398M 398M 0 100% /snap/redis-desktop-manager/335
|
||||
///dev/loop11 45M 45M 0 100% /snap/gtk-common-themes/1440
|
||||
///dev/loop8 45M 45M 0 100% /snap/gtk-common-themes/1353
|
||||
///dev/loop9 225M 225M 0 100% /snap/wine-platform-runtime/89
|
||||
///dev/loop10 74M 74M 0 100% /snap/wine-platform-3-stable/6
|
||||
///dev/loop12 4.0M 4.0M 0 100% /snap/notepad-plus-plus/225
|
||||
///dev/loop13 55M 55M 0 100% /snap/core18/1650
|
||||
///dev/loop14 92M 92M 0 100% /snap/core/8592
|
||||
///dev/nvme0n1p1 511M 6.1M 505M 2% /boot/efi
|
||||
///dev/sda1 1.8T 286G 1.5T 17% /works
|
||||
//tmpfs 2.4G 16K 2.4G 1% /run/user/121
|
||||
//tmpfs 2.4G 80K 2.4G 1% /run/user/1001
|
||||
///dev/loop15 4.0M 4.0M 0 100% /snap/notepad-plus-plus/227
|
||||
///dev/loop16 225M 225M 0 100% /snap/wine-platform-runtime/94
|
||||
//➜ ~
|
||||
//
|
||||
|
||||
}
|
||||
@ -1,178 +1,223 @@
|
||||
package cn.estsh.i3plus.core.apiservice.serviceimpl.base;
|
||||
|
||||
import cn.estsh.i3plus.core.api.iservice.base.ISysLogService;
|
||||
import cn.estsh.i3plus.core.apiservice.util.NoSqlPack;
|
||||
import cn.estsh.i3plus.platform.common.util.CommonConstWords;
|
||||
import cn.estsh.i3plus.platform.plugin.elasticsearch.ElasticSearchPack;
|
||||
import cn.estsh.i3plus.platform.plugin.elasticsearch.ElasticSearchTool;
|
||||
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
|
||||
import cn.estsh.i3plus.pojo.platform.platbean.SysLogException;
|
||||
import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate;
|
||||
import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem;
|
||||
import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
|
||||
import cn.estsh.impp.framework.boot.util.ImppLog;
|
||||
import org.elasticsearch.search.aggregations.Aggregation;
|
||||
import org.elasticsearch.search.aggregations.bucket.terms.ParsedTerms;
|
||||
import org.elasticsearch.search.aggregations.bucket.terms.Terms;
|
||||
import org.elasticsearch.search.aggregations.metrics.ParsedAvg;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 20-2-19 下午9:17
|
||||
* @CreateDate : 20-2-13 下午4:16
|
||||
* @Modify:
|
||||
**/
|
||||
@Service
|
||||
public class SysLogElasticSearchService implements ISysLogService {
|
||||
|
||||
public static final Logger LOGGER = LoggerFactory.getLogger(SysLogElasticSearchService.class);
|
||||
|
||||
@Autowired
|
||||
private ImppLog imppLog;
|
||||
|
||||
@Override
|
||||
public ListPager<SysLogException> querySysLogExceptionByPager(SysLogException sysLogException, Pager pager) {
|
||||
return null;
|
||||
public ListPager<SysLogException> queryLogExceptionPager(SysLogException log, Pager pager) {
|
||||
return ElasticSearchTool.searchPager(NoSqlPack.packEsSysLogException(log),pager,SysLogException.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public long deleteSysLogExceptionByDateTimeAfter(String dateTime) {
|
||||
return 0;
|
||||
public List<SysLogException> findLogExceptionList(SysLogException log, Pager pager) {
|
||||
return ElasticSearchTool.searchList(NoSqlPack.packEsSysLogException(log),pager,SysLogException.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SysLogOperate insertSysLogOperate(SysLogOperate logOperate) {
|
||||
imppLog.insertSysLogOperate(logOperate);
|
||||
return logOperate;
|
||||
public List<SysLogException> findLogExceptionList(SysLogException log) {
|
||||
return ElasticSearchTool.searchList(NoSqlPack.packEsSysLogException(log),SysLogException.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteSysLogOperateById(Long id) {
|
||||
// ElasticSearchTool.deletePrimaryKey();
|
||||
public SysLogException insertLogException(SysLogException log) {
|
||||
imppLog.insertSysLogException(log);
|
||||
return log;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List listSysLogOperate() {
|
||||
return null;
|
||||
public SysLogException getLogException(SysLogException log) {
|
||||
return ElasticSearchTool.getPrimaryKey(log.getId(),SysLogException.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteSysLogOperateByIds(Long[] ids) {
|
||||
|
||||
public void deleteLogException(SysLogException log) {
|
||||
ElasticSearchTool.deleteQuery(NoSqlPack.packEsSysLogException(log));
|
||||
}
|
||||
|
||||
@Override
|
||||
public SysLogOperate getSysLogOperateById(Long id) {
|
||||
// return ElasticSearchTool.getPrimaryKey();
|
||||
return null;
|
||||
public ListPager<SysLogOperate> queryLogOperatePager(SysLogOperate log, Pager pager) {
|
||||
return ElasticSearchTool.searchPager(NoSqlPack.packEsSysLogOperate(log),pager,SysLogOperate.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SysLogOperate> listSysLogOperateByOperateUserName(String operateUserName) {
|
||||
return null;
|
||||
public List<SysLogOperate> findLogOperateList(SysLogOperate log, Pager pager) {
|
||||
return ElasticSearchTool.searchList(NoSqlPack.packEsSysLogOperate(log),pager,SysLogOperate.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public long countAllSysLogOperate() {
|
||||
return 0;
|
||||
public List<SysLogOperate> findLogOperateList(SysLogOperate log) {
|
||||
return ElasticSearchTool.searchList(NoSqlPack.packEsSysLogOperate(log),SysLogOperate.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ListPager<SysLogOperate> querySysLogOperateByPager(SysLogOperate logOperate, Pager pager) {
|
||||
return null;
|
||||
public SysLogOperate insertLogOperate(SysLogOperate log) {
|
||||
imppLog.insertSysLogOperate(log);
|
||||
return log;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SysLogOperate> findNewSysLogOperate(Integer num) {
|
||||
return null;
|
||||
public SysLogOperate getLogOperate(SysLogOperate log) {
|
||||
return ElasticSearchTool.getPrimaryKey(log.getId(),SysLogOperate.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public long deleteSysLogOperateByDateTimeAfter(String dateTime) {
|
||||
return 0;
|
||||
public void deleteLogOperate(SysLogOperate log) {
|
||||
ElasticSearchTool.deleteQuery(NoSqlPack.packEsSysLogOperate(log));
|
||||
}
|
||||
|
||||
@Override
|
||||
public long countSysLogOperate() {
|
||||
return 0;
|
||||
public ListPager<SysLogSystem> queryLogSystemPager(SysLogSystem log, Pager pager) {
|
||||
return ElasticSearchTool.searchPager(NoSqlPack.packEsSysLogSystem(log),pager,SysLogSystem.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void insertSysLogSystem(SysLogSystem logSystem) {
|
||||
|
||||
public List<SysLogSystem> findLogSystemList(SysLogSystem log, Pager pager) {
|
||||
return ElasticSearchTool.searchList(NoSqlPack.packEsSysLogSystem(log),pager,SysLogSystem.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void insertSysLogBatch(int num, int waitTime) {
|
||||
|
||||
public List<SysLogSystem> findLogSystemList(SysLogSystem log) {
|
||||
return ElasticSearchTool.searchList(NoSqlPack.packEsSysLogSystem(log), SysLogSystem.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public long deleteSysLogSystemById(Long id) {
|
||||
return 0;
|
||||
public SysLogSystem insertLogSystem(SysLogSystem log) {
|
||||
imppLog.insertSysLogSystem(log);
|
||||
return log;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SysLogSystem> listSysLogSystem() {
|
||||
return null;
|
||||
public SysLogSystem getLogSystem(SysLogSystem log) {
|
||||
return ElasticSearchTool.getPrimaryKey(log.getId(),SysLogSystem.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SysLogSystem getSysLogSystemById(long id) {
|
||||
return null;
|
||||
public void deleteLogSystem(SysLogSystem log) {
|
||||
ElasticSearchTool.deleteQuery(NoSqlPack.packEsSysLogSystem(log));
|
||||
}
|
||||
|
||||
@Override
|
||||
public ListPager querySysLogSystemByPager(SysLogSystem logSystem, Pager pager) {
|
||||
return null;
|
||||
public ListPager<SysLogTaskTime> queryLogTaskTimePager(SysLogTaskTime log, Pager pager) {
|
||||
return ElasticSearchTool.searchPager(NoSqlPack.packEsSysLogTaskTime(log),pager,SysLogTaskTime.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public long deleteSysLogSystemByIds(Long[] ids) {
|
||||
return 0;
|
||||
public List<SysLogTaskTime> findLogTaskTimeList(SysLogTaskTime log, Pager pager) {
|
||||
return ElasticSearchTool.searchList(NoSqlPack.packEsSysLogTaskTime(log),pager,SysLogTaskTime.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SysLogSystem> findSysLogSystemByIdInterval(long min, long max) {
|
||||
return null;
|
||||
public List<SysLogTaskTime> findLogTaskTimeList(SysLogTaskTime log) {
|
||||
return ElasticSearchTool.searchList(NoSqlPack.packEsSysLogTaskTime(log),SysLogTaskTime.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public long deleteSysLogSystemByDateTimeAfter(String dateTime) {
|
||||
return 0;
|
||||
public SysLogTaskTime insertLogTaskTime(SysLogTaskTime log) {
|
||||
imppLog.insertSysLogTaskTime(log);
|
||||
return log;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void insertSysLogTaskTime(SysLogTaskTime sysLogTaskTime) {
|
||||
|
||||
public SysLogTaskTime getLogTaskTime(SysLogTaskTime log) {
|
||||
return ElasticSearchTool.getPrimaryKey(log.getId(),SysLogTaskTime.class);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteSysLogTaskTimeById(Long id) {
|
||||
|
||||
public void deleteLogTaskTime(SysLogTaskTime log) {
|
||||
ElasticSearchTool.deleteQuery(NoSqlPack.packEsSysLogTaskTime(log));
|
||||
}
|
||||
|
||||
@Override
|
||||
public SysLogTaskTime getSysLogTaskTimeById(Long id) {
|
||||
return null;
|
||||
}
|
||||
/******************************************************* 定时任务日志 End *********************************************************/
|
||||
|
||||
@Override
|
||||
public ListPager querySysLogTaskTimeByPager(SysLogTaskTime sysLogTaskTime, Pager pager) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long deleteSysLogTaskTimeByDateTimeAfter(String dateTime) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> querySysLogSystemAvgExecuteTime(String startTime, String endTime) {
|
||||
return null;
|
||||
Map resultData = new LinkedHashMap();
|
||||
ElasticSearchPack pack = ElasticSearchPack.imppBuild(SysLogSystem.class);
|
||||
pack.pager(CommonConstWords.getDefaultPager());
|
||||
pack.andStringDateTimeBetween("createDatetime",startTime,endTime);
|
||||
pack.group("createDatetime").avg("executeTime").buildAggregation();
|
||||
Map<String, Aggregation> aggregationMap = ElasticSearchTool.searchAggregationMap(pack);
|
||||
|
||||
ParsedTerms parsedTerms = (ParsedTerms)aggregationMap.get("group_createDatetime");
|
||||
if(Objects.nonNull(parsedTerms)){
|
||||
for (Terms.Bucket bucket : parsedTerms.getBuckets()) {
|
||||
try {
|
||||
String key = bucket.getKeyAsString();
|
||||
Double value = ((ParsedAvg) bucket.getAggregations().get("avg_executeTime")).getValue();
|
||||
resultData.put(key,value.intValue());
|
||||
}catch (Exception e){
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return resultData;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> querySysLogSystemByLevel(String startTime, String endTime) {
|
||||
return null;
|
||||
Map resultData = new LinkedHashMap();
|
||||
ElasticSearchPack pack = ElasticSearchPack.imppBuild(SysLogSystem.class);
|
||||
pack.pager(CommonConstWords.getDefaultPager());
|
||||
pack.andStringDateTimeBetween("createDatetime",startTime,endTime);
|
||||
pack.group("logLevel").count("id").buildAggregation();
|
||||
Map<String, Aggregation> aggregationMap = ElasticSearchTool.searchAggregationMap(pack);
|
||||
|
||||
|
||||
ParsedTerms parsedTerms = (ParsedTerms)aggregationMap.get("group_logLevel");
|
||||
if(Objects.nonNull(parsedTerms)){
|
||||
for (Terms.Bucket bucket : parsedTerms.getBuckets()) {
|
||||
try {
|
||||
String key = bucket.getKeyAsString();
|
||||
resultData.put(ImppEnumUtil.LOG_LEVEL.valueOfName(Integer.parseInt(key)),bucket.getDocCount());
|
||||
}catch (Exception e){
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return resultData;
|
||||
}
|
||||
|
||||
/******************************************************* 系统异常日志 End *********************************************************/
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -0,0 +1,218 @@
|
||||
package cn.estsh.i3plus.core.apiservice.serviceimpl.base;
|
||||
|
||||
import cn.estsh.i3plus.core.api.iservice.base.ISysLogService;
|
||||
import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
|
||||
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
|
||||
import cn.estsh.i3plus.pojo.platform.platbean.SysLogException;
|
||||
import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate;
|
||||
import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem;
|
||||
import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
|
||||
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
|
||||
import cn.estsh.impp.framework.boot.util.ImppLog;
|
||||
import cn.estsh.impp.framework.boot.util.ImppSwitchUtil;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.context.annotation.Primary;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 20-2-13 下午4:16
|
||||
* @Modify:
|
||||
**/
|
||||
@Service
|
||||
@Primary
|
||||
public class SysLogFactory implements ISysLogService {
|
||||
|
||||
public static final Logger LOGGER = LoggerFactory.getLogger(SysLogFactory.class);
|
||||
|
||||
@Autowired
|
||||
private SysLogElasticSearchService elasticSearchService;
|
||||
|
||||
@Autowired
|
||||
private SysLogMongoService mongoService;
|
||||
|
||||
@Autowired
|
||||
private ImppLog imppLog;
|
||||
|
||||
private ISysLogService getSysLogService(){
|
||||
ImppEnumUtil.LOG_STORAGE storage = imppLog.getLogStorageCase();
|
||||
|
||||
if(ImppEnumUtil.LOG_STORAGE.MONGO.equals(storage)){
|
||||
if(ImppSwitchUtil.isSwitchMongo() && mongoService != null){
|
||||
return mongoService;
|
||||
}else{
|
||||
throw ImppExceptionBuilder.newInstance()
|
||||
.setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
|
||||
.setErrorCode(ImppExceptionEnum.LOG_SAVE_STORAGE_ERROR.getCode())
|
||||
.setErrorDetail("没有开启Mongo储存技术,请联系管理员")
|
||||
.setErrorSolution("请检查配置文件")
|
||||
.build();
|
||||
}
|
||||
}else if(ImppEnumUtil.LOG_STORAGE.ELASTICSEARCH.equals(storage)){
|
||||
if(ImppSwitchUtil.isElasticSearchSwitch() && elasticSearchService != null){
|
||||
return elasticSearchService;
|
||||
}else{
|
||||
throw ImppExceptionBuilder.newInstance()
|
||||
.setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
|
||||
.setErrorCode(ImppExceptionEnum.LOG_SAVE_STORAGE_ERROR.getCode())
|
||||
.setErrorDetail("没有开启Elasticsearch储存技术,请联系管理员")
|
||||
.setErrorSolution("请检查配置文件")
|
||||
.build();
|
||||
}
|
||||
}
|
||||
|
||||
throw ImppExceptionBuilder.newInstance()
|
||||
.setSystemID(CommonEnumUtil.SOFT_TYPE.IMPP.getCode())
|
||||
.setErrorCode(ImppExceptionEnum.LOG_SAVE_STORAGE_ERROR.getCode())
|
||||
.setErrorDetail("没有开启日志储存技术,请联系管理员")
|
||||
.setErrorSolution("请检查日志配置,或者配置文件")
|
||||
.build();
|
||||
}
|
||||
|
||||
@Override
|
||||
public ListPager<SysLogException> queryLogExceptionPager(SysLogException log, Pager pager) {
|
||||
return getSysLogService().queryLogExceptionPager(log,pager);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SysLogException> findLogExceptionList(SysLogException log, Pager pager) {
|
||||
return getSysLogService().findLogExceptionList(log,pager);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SysLogException> findLogExceptionList(SysLogException log) {
|
||||
return getSysLogService().findLogExceptionList(log);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SysLogException insertLogException(SysLogException log) {
|
||||
return getSysLogService().insertLogException(log);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SysLogException getLogException(SysLogException log) {
|
||||
return getSysLogService().getLogException(log);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteLogException(SysLogException log) {
|
||||
getSysLogService().deleteLogException(log);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ListPager<SysLogOperate> queryLogOperatePager(SysLogOperate log, Pager pager) {
|
||||
return getSysLogService().queryLogOperatePager(log,pager);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SysLogOperate> findLogOperateList(SysLogOperate log, Pager pager) {
|
||||
return getSysLogService().findLogOperateList(log,pager);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SysLogOperate> findLogOperateList(SysLogOperate log) {
|
||||
return getSysLogService().findLogOperateList(log);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SysLogOperate insertLogOperate(SysLogOperate log) {
|
||||
return getSysLogService().insertLogOperate(log);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SysLogOperate getLogOperate(SysLogOperate log) {
|
||||
return getSysLogService().getLogOperate(log);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteLogOperate(SysLogOperate log) {
|
||||
getSysLogService().deleteLogOperate(log);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ListPager<SysLogSystem> queryLogSystemPager(SysLogSystem log, Pager pager) {
|
||||
return getSysLogService().queryLogSystemPager(log,pager);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SysLogSystem> findLogSystemList(SysLogSystem log, Pager pager) {
|
||||
return getSysLogService().findLogSystemList(log,pager);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SysLogSystem> findLogSystemList(SysLogSystem log) {
|
||||
return getSysLogService().findLogSystemList(log);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SysLogSystem insertLogSystem(SysLogSystem log) {
|
||||
return getSysLogService().insertLogSystem(log);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SysLogSystem getLogSystem(SysLogSystem log) {
|
||||
return getSysLogService().getLogSystem(log);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteLogSystem(SysLogSystem log) {
|
||||
getSysLogService().deleteLogSystem(log);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ListPager<SysLogTaskTime> queryLogTaskTimePager(SysLogTaskTime log, Pager pager) {
|
||||
return getSysLogService().queryLogTaskTimePager(log,pager);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SysLogTaskTime> findLogTaskTimeList(SysLogTaskTime log, Pager pager) {
|
||||
return getSysLogService().findLogTaskTimeList(log,pager);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SysLogTaskTime> findLogTaskTimeList(SysLogTaskTime log) {
|
||||
return getSysLogService().findLogTaskTimeList(log);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SysLogTaskTime insertLogTaskTime(SysLogTaskTime log) {
|
||||
return getSysLogService().insertLogTaskTime(log);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SysLogTaskTime getLogTaskTime(SysLogTaskTime log) {
|
||||
return getSysLogService().getLogTaskTime(log);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteLogTaskTime(SysLogTaskTime log) {
|
||||
getSysLogService().deleteLogTaskTime(log);
|
||||
}
|
||||
|
||||
/******************************************************* 定时任务日志 End *********************************************************/
|
||||
|
||||
|
||||
@Override
|
||||
public Map<String, Object> querySysLogSystemAvgExecuteTime(String startTime, String endTime) {
|
||||
return getSysLogService().querySysLogSystemAvgExecuteTime(startTime, endTime);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> querySysLogSystemByLevel(String startTime, String endTime) {
|
||||
return getSysLogService().querySysLogSystemByLevel(startTime, endTime);
|
||||
}
|
||||
|
||||
/******************************************************* 系统异常日志 End *********************************************************/
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,60 @@
|
||||
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
|
||||
|
||||
import cn.estsh.i3plus.core.api.iservice.busi.ILicenseClickService;
|
||||
import cn.estsh.i3plus.platform.common.util.CommonConstWords;
|
||||
import cn.estsh.i3plus.platform.plugin.license.ImppLicenseTool;
|
||||
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
|
||||
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
|
||||
import cn.estsh.i3plus.pojo.platform.repository.SysOrganizeRepository;
|
||||
import cn.estsh.i3plus.pojo.platform.repository.SysUserInfoRepository;
|
||||
import org.apache.shiro.web.session.mgt.DefaultWebSessionManager;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 20-3-23 下午5:16
|
||||
* @Modify:
|
||||
**/
|
||||
@Service
|
||||
public class LicenseClickService implements ILicenseClickService {
|
||||
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(LicenseClickService.class);
|
||||
|
||||
@Autowired
|
||||
private SysUserInfoRepository userInfoRDao;
|
||||
|
||||
@Autowired
|
||||
private SysOrganizeRepository organizeRDao;
|
||||
|
||||
@Resource(name = CommonConstWords.IMPP_BEAN_SESSION_MANAGER)
|
||||
private DefaultWebSessionManager webSessionManager;
|
||||
|
||||
@Override
|
||||
public void checkLicenseNumberUser() {
|
||||
int count = userInfoRDao.findByHqlWhereCount(DdlPackBean.getDdlPackBean());
|
||||
ImppLicenseTool.checkUser(count);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void checkLicenseNumberOrganize() {
|
||||
DdlPackBean bean = DdlPackBean.getDdlPackBean();
|
||||
DdlPreparedPack.getNumEqualPack(ImppEnumUtil.ORGANIZE_YTPE.TYPE_FACTORY.getValue(),"organizeType",bean);
|
||||
|
||||
ImppLicenseTool.checkOrganize(organizeRDao.findByHqlWhereCount(bean));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void checkLicenseNumberLogin() {
|
||||
int count = webSessionManager.getSessionDAO().getActiveSessions().size();
|
||||
ImppLicenseTool.checkUserSession(count);
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,171 @@
|
||||
package cn.estsh.i3plus.core.apiservice.util;
|
||||
|
||||
import cn.estsh.i3plus.platform.common.tool.TimeTool;
|
||||
import cn.estsh.i3plus.platform.plugin.elasticsearch.ElasticSearchPack;
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
import cn.estsh.i3plus.pojo.base.tool.BsonPackTool;
|
||||
import cn.estsh.i3plus.pojo.platform.platbean.SysLogException;
|
||||
import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate;
|
||||
import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem;
|
||||
import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
|
||||
import com.mongodb.BasicDBObject;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.bson.conversions.Bson;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 20-3-10 下午4:12
|
||||
* @Modify:
|
||||
**/
|
||||
public class NoSqlPack {
|
||||
/**
|
||||
* Es 查询构建基类
|
||||
* @param bean
|
||||
* @return
|
||||
*/
|
||||
public static ElasticSearchPack packElasticSearchPack(BaseBean bean){
|
||||
ElasticSearchPack result = null;
|
||||
if(StringUtils.isNotBlank(bean.getCreateDatetime())){
|
||||
result = ElasticSearchPack.imppBuild(TimeTool.parseDate(bean.getCreateDatetime()),bean.getClass());
|
||||
}else{
|
||||
result = ElasticSearchPack.imppBuild(bean.getClass());
|
||||
}
|
||||
|
||||
if(StringUtils.isNotBlank(bean.getOrderByParam())){
|
||||
if(CommonEnumUtil.ASC_OR_DESC.ASC.getValue() == bean.getAscOrDesc()){
|
||||
result.asc(bean.getOrderByParam());
|
||||
}else {
|
||||
result.desc(bean.getOrderByParam());
|
||||
}
|
||||
}else{
|
||||
result.orderKeywordDesc("createDatetime");
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 系统异常日志复杂查询
|
||||
*
|
||||
* @param sysLogException
|
||||
* @return
|
||||
*/
|
||||
public static Bson packMongoBySysLogException(SysLogException sysLogException) {
|
||||
Bson bson = new BasicDBObject();
|
||||
|
||||
bson = BsonPackTool.getNumEqualPack(sysLogException.getExcModule(), "excModule", bson);
|
||||
bson = BsonPackTool.getStringLikerPack(sysLogException.getExcMessage(), "excMessage", bson);
|
||||
bson = BsonPackTool.timeBuilder("createDatetime", bson, sysLogException.getCreateDateTimeStart(),sysLogException.getCreateDateTimeEnd());
|
||||
|
||||
return bson;
|
||||
}
|
||||
|
||||
public static ElasticSearchPack packEsSysLogException(SysLogException bean) {
|
||||
ElasticSearchPack result = packElasticSearchPack(bean);
|
||||
|
||||
result.andTextEquals("excModule",bean.getExcModule());
|
||||
result.andKeywordLike("excMessage",bean.getExcMessage());
|
||||
result.andKeywordDateTimeBetween("createDatetime",bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd());
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 系统操作日志
|
||||
*
|
||||
* @param logOperate
|
||||
* @return
|
||||
*/
|
||||
public static Bson packMongoByLogOperate(SysLogOperate logOperate) {
|
||||
Bson bson = new BasicDBObject();
|
||||
|
||||
bson = BsonPackTool.getNumEqualPack(logOperate.getId(), "id", bson);
|
||||
bson = BsonPackTool.getNumEqualPack(logOperate.getOperateType(), "operateType", bson);
|
||||
bson = BsonPackTool.getNumEqualPack(logOperate.getOperateModule(), "operateModule", bson);
|
||||
bson = BsonPackTool.timeBuilder("createDatetime", bson, logOperate.getCreateDateTimeStart(),logOperate.getCreateDateTimeEnd());
|
||||
bson = BsonPackTool.getStringLikerPack(logOperate.getRemoteIp(), "remoteIp", bson);
|
||||
bson = BsonPackTool.getStringLikerPack(logOperate.getOperateMessage(), "operateMessage", bson);
|
||||
bson = BsonPackTool.getStringLikerPack(logOperate.getCreateUser(), "createUser", bson);
|
||||
|
||||
return bson;
|
||||
}
|
||||
|
||||
public static ElasticSearchPack packEsSysLogOperate(SysLogOperate bean) {
|
||||
ElasticSearchPack result = packElasticSearchPack(bean);
|
||||
|
||||
result.andKeywordEquals("id",bean.getId());
|
||||
result.andKeywordEquals("operateType",bean.getOperateType());
|
||||
result.andKeywordEquals("operateModule",bean.getOperateModule());
|
||||
result.andStringEquals("remoteIp",bean.getRemoteIp());
|
||||
result.andStringEquals("createUser",bean.getCreateUser());
|
||||
result.andStringLike("operateMessage",bean.getOperateMessage());
|
||||
result.andStringDateTimeBetween("createDatetime",bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd());
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 日志复杂查询
|
||||
*
|
||||
* @param logSystem
|
||||
* @return
|
||||
*/
|
||||
public static Bson packMongoByLogSystem(SysLogSystem logSystem) {
|
||||
Bson bson = new BasicDBObject();
|
||||
|
||||
bson = BsonPackTool.getNumEqualPack(logSystem.getId(), "id", bson);
|
||||
bson = BsonPackTool.getNumEqualPack(logSystem.getLogLevel(), "logLevel", bson);
|
||||
bson = BsonPackTool.getNumEqualPack(logSystem.getLogModuleId(), "logModuleId", bson);
|
||||
bson = BsonPackTool.timeBuilder("createDatetime", bson, logSystem.getCreateDateTimeStart(),logSystem.getCreateDateTimeEnd());
|
||||
bson = BsonPackTool.getStringLikerPack(logSystem.getRemoteIp(), "remoteIp", bson);
|
||||
bson = BsonPackTool.getStringLikerPack(logSystem.getRequestUrl(), "requestUrl", bson);
|
||||
bson = BsonPackTool.getStringLikerPack(logSystem.getLogMethod(), "logMethod", bson);
|
||||
|
||||
return bson;
|
||||
}
|
||||
|
||||
public static ElasticSearchPack packEsSysLogSystem(SysLogSystem bean) {
|
||||
ElasticSearchPack result = packElasticSearchPack(bean);
|
||||
|
||||
result.andTextEquals("id",bean.getId());
|
||||
result.andTextEquals("logLevel",bean.getLogLevel());
|
||||
result.andTextEquals("logModuleId",bean.getLogModuleId());
|
||||
result.andStringEquals("remoteIp",bean.getRemoteIp());
|
||||
result.andTextLike("requestUrl",bean.getRequestUrl());
|
||||
result.andKeywordDateTimeBetween("createDatetime",bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd());
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 定时任务日志复杂查询
|
||||
*
|
||||
* @param sysLogTaskTime
|
||||
* @return
|
||||
*/
|
||||
public static Bson packMongoByLogTaskTime(SysLogTaskTime sysLogTaskTime) {
|
||||
Bson bson = new BasicDBObject();
|
||||
|
||||
bson = BsonPackTool.getNumEqualPack(sysLogTaskTime.getId(), "id", bson);
|
||||
bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getName(), "name", bson);
|
||||
bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getGroupName(), "groupName", bson);
|
||||
bson = BsonPackTool.timeBuilder("createDatetime", bson, sysLogTaskTime.getCreateDateTimeStart(),sysLogTaskTime.getCreateDateTimeEnd());
|
||||
|
||||
return bson;
|
||||
}
|
||||
|
||||
public static ElasticSearchPack packEsSysLogTaskTime(SysLogTaskTime bean) {
|
||||
ElasticSearchPack result = packElasticSearchPack(bean);
|
||||
|
||||
result.andKeywordEquals("id",bean.getId());
|
||||
result.andTextLike("name",bean.getName());
|
||||
result.andStringEquals("groupName",bean.getGroupName());
|
||||
result.andStringEquals("schedulerServerIp",bean.getSchedulerServerIp());
|
||||
result.andKeywordDateTimeBetween("createDatetime",bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd());
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue