Merge remote-tracking branch 'remotes/origin/dev' into test
# Conflicts: # modules/i3plus-core-api/pom.xml # modules/i3plus-core-apiservice/pom.xml # modules/i3plus-core-apiservice/src/main/resources/application.properties # pom.xmlyun-zuoyi
汪云昊
5 years ago
commit
b43b2e9f19
@ -0,0 +1,178 @@
|
||||
package cn.estsh.i3plus.core.apiservice.serviceimpl.base;
|
||||
|
||||
import cn.estsh.i3plus.core.api.iservice.base.ISysLogService;
|
||||
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.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.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 20-2-19 下午9:17
|
||||
* @Modify:
|
||||
**/
|
||||
@Service
|
||||
public class SysLogElasticSearchService implements ISysLogService {
|
||||
|
||||
@Autowired
|
||||
private ImppLog imppLog;
|
||||
|
||||
@Override
|
||||
public ListPager<SysLogException> querySysLogExceptionByPager(SysLogException sysLogException, Pager pager) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long deleteSysLogExceptionByDateTimeAfter(String dateTime) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public SysLogOperate insertSysLogOperate(SysLogOperate logOperate) {
|
||||
imppLog.insertSysLogOperate(logOperate);
|
||||
return logOperate;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteSysLogOperateById(Long id) {
|
||||
// ElasticSearchTool.deletePrimaryKey();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List listSysLogOperate() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteSysLogOperateByIds(Long[] ids) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public SysLogOperate getSysLogOperateById(Long id) {
|
||||
// return ElasticSearchTool.getPrimaryKey();
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SysLogOperate> listSysLogOperateByOperateUserName(String operateUserName) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long countAllSysLogOperate() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ListPager<SysLogOperate> querySysLogOperateByPager(SysLogOperate logOperate, Pager pager) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SysLogOperate> findNewSysLogOperate(Integer num) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long deleteSysLogOperateByDateTimeAfter(String dateTime) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long countSysLogOperate() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void insertSysLogSystem(SysLogSystem logSystem) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void insertSysLogBatch(int num, int waitTime) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public long deleteSysLogSystemById(Long id) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SysLogSystem> listSysLogSystem() {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public SysLogSystem getSysLogSystemById(long id) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ListPager querySysLogSystemByPager(SysLogSystem logSystem, Pager pager) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long deleteSysLogSystemByIds(Long[] ids) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<SysLogSystem> findSysLogSystemByIdInterval(long min, long max) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long deleteSysLogSystemByDateTimeAfter(String dateTime) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void insertSysLogTaskTime(SysLogTaskTime sysLogTaskTime) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void deleteSysLogTaskTimeById(Long id) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public SysLogTaskTime getSysLogTaskTimeById(Long id) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@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;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Object> querySysLogSystemByLevel(String startTime, String endTime) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@ -1,66 +1,64 @@
|
||||
package test.cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
|
||||
|
||||
import cn.estsh.i3plus.core.api.iservice.busi.ISysLogExceptionService;
|
||||
import cn.estsh.i3plus.core.api.iservice.busi.ISysLogSystemService;
|
||||
import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase;
|
||||
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
import cn.estsh.i3plus.pojo.platform.platbean.SysLogException;
|
||||
import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem;
|
||||
import com.alibaba.fastjson.JSON;
|
||||
import org.junit.Test;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
|
||||
import javax.transaction.Transactional;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : alwaysfrin
|
||||
* @CreateDate : 2019-04-09 14:38
|
||||
* @Modify:
|
||||
**/
|
||||
public class TestMongoDb extends TestBase {
|
||||
|
||||
|
||||
@Autowired
|
||||
private ISysLogExceptionService sysLogExceptionService;
|
||||
|
||||
@Autowired
|
||||
private ISysLogSystemService syslogSystemService;
|
||||
|
||||
/**
|
||||
* 测试 查询所有系统参数
|
||||
*/
|
||||
@Test
|
||||
@Transactional
|
||||
public void testListSysConfig() {
|
||||
Pager pager = new Pager();
|
||||
pager.setStartRow(0);
|
||||
pager.setPageSize(10);
|
||||
|
||||
SysLogException sysLogException = new SysLogException();
|
||||
|
||||
ListPager logExceptionList = sysLogExceptionService.querySysLogExceptionByPager(sysLogException, pager);
|
||||
System.out.println(logExceptionList);
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
@Transactional
|
||||
public void testListSysLogSystem() {
|
||||
Pager pager = new Pager();
|
||||
pager.setStartRow(0);
|
||||
pager.setPageSize(10);
|
||||
|
||||
SysLogSystem logSystem = new SysLogSystem();
|
||||
logSystem.setLogLevel(1);
|
||||
logSystem.setLogModuleId(1);
|
||||
|
||||
System.out.println("2===============");
|
||||
ListPager logSystemList = syslogSystemService.querySysLogSystemByPager(logSystem,pager);
|
||||
System.out.println(logSystemList.getObjectList().size());
|
||||
System.out.println("===============pager:" + pager);
|
||||
}
|
||||
}
|
||||
//package test.cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
|
||||
//
|
||||
//import cn.estsh.i3plus.core.api.iservice.busi.ISysLogExceptionService;
|
||||
//import cn.estsh.i3plus.core.api.iservice.busi.ISysLogSystemService;
|
||||
//import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase;
|
||||
//import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||
//import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
//import cn.estsh.i3plus.pojo.platform.platbean.SysLogException;
|
||||
//import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem;
|
||||
//import org.junit.Test;
|
||||
//import org.springframework.beans.factory.annotation.Autowired;
|
||||
//
|
||||
//import javax.transaction.Transactional;
|
||||
//
|
||||
///**
|
||||
// * @Description :
|
||||
// * @Reference :
|
||||
// * @Author : alwaysfrin
|
||||
// * @CreateDate : 2019-04-09 14:38
|
||||
// * @Modify:
|
||||
// **/
|
||||
//public class TestMongoDb extends TestBase {
|
||||
//
|
||||
//
|
||||
// @Autowired
|
||||
// private ISysLogExceptionService sysLogExceptionService;
|
||||
//
|
||||
// @Autowired
|
||||
// private ISysLogSystemService syslogSystemService;
|
||||
//
|
||||
// /**
|
||||
// * 测试 查询所有系统参数
|
||||
// */
|
||||
// @Test
|
||||
// @Transactional
|
||||
// public void testListSysConfig() {
|
||||
// Pager pager = new Pager();
|
||||
// pager.setStartRow(0);
|
||||
// pager.setPageSize(10);
|
||||
//
|
||||
// SysLogException sysLogException = new SysLogException();
|
||||
//
|
||||
// ListPager logExceptionList = sysLogExceptionService.querySysLogExceptionByPager(sysLogException, pager);
|
||||
// System.out.println(logExceptionList);
|
||||
// }
|
||||
//
|
||||
//
|
||||
// @Test
|
||||
// @Transactional
|
||||
// public void testListSysLogSystem() {
|
||||
// Pager pager = new Pager();
|
||||
// pager.setStartRow(0);
|
||||
// pager.setPageSize(10);
|
||||
//
|
||||
// SysLogSystem logSystem = new SysLogSystem();
|
||||
// logSystem.setLogLevel(1);
|
||||
// logSystem.setLogModuleId(1);
|
||||
//
|
||||
// System.out.println("2===============");
|
||||
// ListPager logSystemList = syslogSystemService.querySysLogSystemByPager(logSystem,pager);
|
||||
// System.out.println(logSystemList.getObjectList().size());
|
||||
// System.out.println("===============pager:" + pager);
|
||||
// }
|
||||
//}
|
||||
|
||||
@ -0,0 +1,17 @@
|
||||
|
||||
# must be unique in a given SonarQube instance
|
||||
sonar.projectKey=i3plus.core:i3plus-core
|
||||
|
||||
# --- optional properties ---
|
||||
|
||||
# defaults to project key
|
||||
sonar.projectName=i3plus-core
|
||||
# defaults to 'not provided'
|
||||
sonar.projectVersion=1.0-DEV-SNAPSHOT
|
||||
|
||||
# Path is relative to the sonar-project.properties file. Defaults to .
|
||||
#sonar.sources=./
|
||||
#sonar.java.binaries=target
|
||||
|
||||
# Encoding of the source code. Default is default system encoding
|
||||
sonar.sourceEncoding=UTF-8
|
||||
Loading…
Reference in New Issue