Merge remote-tracking branch 'remotes/origin/dev' into test
wei.peng
6 years ago
commit
7697d78c25
@ -1,42 +1,42 @@
|
|||||||
package cn.estsh.i3plus.core.api.iservice.busi;
|
//package cn.estsh.i3plus.core.api.iservice.busi;
|
||||||
|
//
|
||||||
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
|
//import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
|
||||||
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
//import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||||
import cn.estsh.i3plus.pojo.base.common.Pager;
|
//import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||||
import cn.estsh.i3plus.pojo.platform.bean.SysUser;
|
//import cn.estsh.i3plus.pojo.platform.bean.SysUser;
|
||||||
import io.swagger.annotations.ApiOperation;
|
//import io.swagger.annotations.ApiOperation;
|
||||||
|
//
|
||||||
import javax.transaction.Transactional;
|
//import javax.transaction.Transactional;
|
||||||
import java.util.List;
|
//import java.util.List;
|
||||||
|
//
|
||||||
/**
|
///**
|
||||||
* @Description :
|
// * @Description :
|
||||||
* @Reference :
|
// * @Reference :
|
||||||
* @Author : yunhao
|
// * @Author : yunhao
|
||||||
* @CreateDate : 2019-02-20 21:23
|
// * @CreateDate : 2019-02-20 21:23
|
||||||
* @Modify:
|
// * @Modify:
|
||||||
**/
|
// **/
|
||||||
public interface ITestService {
|
//public interface ITestService {
|
||||||
|
//
|
||||||
@ApiOperation(value = "多表查询")
|
// @ApiOperation(value = "多表查询")
|
||||||
List<Object> queryToolAndToolType(Pager pager);
|
// List<Object> queryToolAndToolType(Pager pager);
|
||||||
|
//
|
||||||
@ApiOperation(value = "条件查询")
|
// @ApiOperation(value = "条件查询")
|
||||||
public ListPager<SysUser> querySysUserByPager(SysUser user, Pager pager);
|
// public ListPager<SysUser> querySysUserByPager(SysUser user, Pager pager);
|
||||||
|
//
|
||||||
@ApiOperation(value = "in条件封装查询")
|
// @ApiOperation(value = "in条件封装查询")
|
||||||
List<SysUser> querySysUserByPack(DdlPackBean packBean);
|
// List<SysUser> querySysUserByPack(DdlPackBean packBean);
|
||||||
|
//
|
||||||
@ApiOperation(value = "添加用户")
|
// @ApiOperation(value = "添加用户")
|
||||||
void insertSysUser(SysUser sysUser);
|
// void insertSysUser(SysUser sysUser);
|
||||||
|
//
|
||||||
@ApiOperation(value = "修改用户")
|
// @ApiOperation(value = "修改用户")
|
||||||
void updateSysUser(SysUser sysUser);
|
// void updateSysUser(SysUser sysUser);
|
||||||
|
//
|
||||||
@ApiOperation(value = "查询用户")
|
// @ApiOperation(value = "查询用户")
|
||||||
List<SysUser> listSysUser();
|
// List<SysUser> listSysUser();
|
||||||
|
//
|
||||||
@ApiOperation(value = "读写分离测试写")
|
// @ApiOperation(value = "读写分离测试写")
|
||||||
@Transactional
|
// @Transactional
|
||||||
void write();
|
// void write();
|
||||||
}
|
//}
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -1,123 +1,123 @@
|
|||||||
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
|
//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
|
||||||
|
//
|
||||||
import cn.estsh.i3plus.core.api.iservice.busi.ITestService;
|
//import cn.estsh.i3plus.core.api.iservice.busi.ITestService;
|
||||||
import cn.estsh.i3plus.core.apiservice.dao.ITestDao;
|
//import cn.estsh.i3plus.core.apiservice.dao.ITestDao;
|
||||||
import cn.estsh.i3plus.platform.common.tool.StringTool;
|
//import cn.estsh.i3plus.platform.common.tool.StringTool;
|
||||||
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
|
//import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
|
||||||
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
//import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||||
import cn.estsh.i3plus.pojo.base.common.Pager;
|
//import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||||
import cn.estsh.i3plus.pojo.base.common.PagerHelper;
|
//import cn.estsh.i3plus.pojo.base.common.PagerHelper;
|
||||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
//import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||||
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
|
//import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
|
||||||
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
|
//import cn.estsh.i3plus.pojo.base.tool.HqlPack;
|
||||||
import cn.estsh.i3plus.pojo.platform.bean.SysDepartment;
|
//import cn.estsh.i3plus.pojo.platform.bean.SysDepartment;
|
||||||
import cn.estsh.i3plus.pojo.platform.bean.SysOrganize;
|
//import cn.estsh.i3plus.pojo.platform.bean.SysOrganize;
|
||||||
import cn.estsh.i3plus.pojo.platform.bean.SysUser;
|
//import cn.estsh.i3plus.pojo.platform.bean.SysUser;
|
||||||
import cn.estsh.i3plus.pojo.platform.bean.TestTransUser;
|
//import cn.estsh.i3plus.pojo.platform.bean.TestTransUser;
|
||||||
import cn.estsh.i3plus.pojo.platform.repository.SysUserRepository;
|
//import cn.estsh.i3plus.pojo.platform.repository.SysUserRepository;
|
||||||
import cn.estsh.i3plus.pojo.platform.repository.TestTransUserRepository;
|
//import cn.estsh.i3plus.pojo.platform.repository.TestTransUserRepository;
|
||||||
import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
|
//import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
|
||||||
import io.swagger.annotations.ApiOperation;
|
//import io.swagger.annotations.ApiOperation;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
//import org.apache.commons.lang3.StringUtils;
|
||||||
import org.slf4j.Logger;
|
//import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
//import org.slf4j.LoggerFactory;
|
||||||
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.util.ArrayList;
|
//import java.util.ArrayList;
|
||||||
import java.util.List;
|
//import java.util.List;
|
||||||
import java.util.Random;
|
//import java.util.Random;
|
||||||
|
//
|
||||||
/**
|
///**
|
||||||
* @Description :
|
// * @Description :
|
||||||
* @Reference :
|
// * @Reference :
|
||||||
* @Author : yunhao
|
// * @Author : yunhao
|
||||||
* @CreateDate : 2019-02-20 21:24
|
// * @CreateDate : 2019-02-20 21:24
|
||||||
* @Modify:
|
// * @Modify:
|
||||||
**/
|
// **/
|
||||||
@Service
|
//@Service
|
||||||
public class TestService implements ITestService {
|
//public class TestService implements ITestService {
|
||||||
|
//
|
||||||
public static final Logger LOGGER = LoggerFactory.getLogger(TestService.class);
|
// public static final Logger LOGGER = LoggerFactory.getLogger(TestService.class);
|
||||||
|
//
|
||||||
@Autowired
|
// @Autowired
|
||||||
ITestDao testDao;
|
// ITestDao testDao;
|
||||||
|
//
|
||||||
@Autowired
|
// @Autowired
|
||||||
private SysUserRepository sysUserRDao;
|
// private SysUserRepository sysUserRDao;
|
||||||
|
//
|
||||||
@Autowired
|
// @Autowired
|
||||||
private TestTransUserRepository testTransUserRepository;
|
// private TestTransUserRepository testTransUserRepository;
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
@ApiOperation(value = "多表查询")
|
// @ApiOperation(value = "多表查询")
|
||||||
public List<Object> queryToolAndToolType(Pager pager) {
|
// public List<Object> queryToolAndToolType(Pager pager) {
|
||||||
return testDao.queryToolAndToolType(pager);
|
// return testDao.queryToolAndToolType(pager);
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
@ApiOperation(value = "账号分页查询", notes = "组合查询")
|
// @ApiOperation(value = "账号分页查询", notes = "组合查询")
|
||||||
public ListPager<SysUser> querySysUserByPager(SysUser user, Pager pager) {
|
// public ListPager<SysUser> querySysUserByPager(SysUser user, Pager pager) {
|
||||||
LOGGER.debug("系统用户 SysUser find user :{} page :{}", user, pager);
|
// LOGGER.debug("系统用户 SysUser find user :{} page :{}", user, pager);
|
||||||
|
//
|
||||||
//生成hql查询语句
|
// //生成hql查询语句
|
||||||
String hqlPack = CoreHqlPack.packHqlSysUser(user);
|
// String hqlPack = CoreHqlPack.packHqlSysUser(user);
|
||||||
pager = PagerHelper.getPager(pager, sysUserRDao.findByHqlWhereCount(hqlPack));
|
// pager = PagerHelper.getPager(pager, sysUserRDao.findByHqlWhereCount(hqlPack));
|
||||||
ListPager<SysUser> list = new ListPager(sysUserRDao.findByHqlWherePage(hqlPack + user.orderBy(), pager), pager);
|
// ListPager<SysUser> list = new ListPager(sysUserRDao.findByHqlWherePage(hqlPack + user.orderBy(), pager), pager);
|
||||||
LOGGER.info("size:{},pager:{}",list.getObjectList().size(),list.getObjectPager());
|
// LOGGER.info("size:{},pager:{}",list.getObjectList().size(),list.getObjectPager());
|
||||||
|
//
|
||||||
// DdlPackBean packBean = new DdlPackBean();
|
//// DdlPackBean packBean = new DdlPackBean();
|
||||||
// DdlPreparedPack.getNumEqualPackOverZero(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",packBean);
|
//// DdlPreparedPack.getNumEqualPackOverZero(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",packBean);
|
||||||
// DdlPreparedPack.getNumEqualPackOverZero(user.getDepartmentId(),"departmentId",packBean);
|
//// DdlPreparedPack.getNumEqualPackOverZero(user.getDepartmentId(),"departmentId",packBean);
|
||||||
// DdlPreparedPack.getNumEqualPackOverZero(user.getUserStatus(),"userStatus",packBean);
|
//// DdlPreparedPack.getNumEqualPackOverZero(user.getUserStatus(),"userStatus",packBean);
|
||||||
// DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",packBean);
|
//// DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",packBean);
|
||||||
// DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",packBean);
|
//// DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",packBean);
|
||||||
// DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",packBean);
|
//// DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",packBean);
|
||||||
// DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",packBean);
|
//// DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",packBean);
|
||||||
|
//
|
||||||
DdlPackBean packBean = CoreHqlPack.packDdlSysUser(user);
|
// DdlPackBean packBean = CoreHqlPack.packDdlSysUser(user);
|
||||||
System.out.println("getPackedHql=="+packBean.getPackedHql());
|
// System.out.println("getPackedHql=="+packBean.getPackedHql());
|
||||||
System.out.println("getPackedHqlAll=="+packBean.getPackedHqlAll());
|
// System.out.println("getPackedHqlAll=="+packBean.getPackedHqlAll());
|
||||||
System.out.println("getHqlAppend=="+packBean.getHqlAppend());
|
// System.out.println("getHqlAppend=="+packBean.getHqlAppend());
|
||||||
System.out.println("getWhereAppend=="+packBean.getWhereAppend());
|
// System.out.println("getWhereAppend=="+packBean.getWhereAppend());
|
||||||
System.out.println("getOrderByStr=="+packBean.getOrderByStr());
|
// System.out.println("getOrderByStr=="+packBean.getOrderByStr());
|
||||||
|
//
|
||||||
pager = PagerHelper.getPager(pager, sysUserRDao.findByHqlWhereCount(packBean));
|
// pager = PagerHelper.getPager(pager, sysUserRDao.findByHqlWhereCount(packBean));
|
||||||
list = new ListPager(sysUserRDao.findByHqlWherePage(packBean, pager), pager);
|
// list = new ListPager(sysUserRDao.findByHqlWherePage(packBean, pager), pager);
|
||||||
LOGGER.info("size:{},pager:{}",list.getObjectList().size(),list.getObjectPager());
|
// LOGGER.info("size:{},pager:{}",list.getObjectList().size(),list.getObjectPager());
|
||||||
|
//
|
||||||
return list;
|
// return list;
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public List<SysUser> querySysUserByPack(DdlPackBean packBean) {
|
// public List<SysUser> querySysUserByPack(DdlPackBean packBean) {
|
||||||
return sysUserRDao.findByHqlWhere(packBean);
|
// return sysUserRDao.findByHqlWhere(packBean);
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public void write() {
|
// public void write() {
|
||||||
Random ran = new Random(10000);
|
// Random ran = new Random(10000);
|
||||||
TestTransUser u = new TestTransUser();
|
// TestTransUser u = new TestTransUser();
|
||||||
u.setName("na2me" + ran.nextInt(100));
|
// u.setName("na2me" + ran.nextInt(100));
|
||||||
u.setSalary(ran.nextDouble());
|
// u.setSalary(ran.nextDouble());
|
||||||
System.out.println("插入对象：" + u);
|
// System.out.println("插入对象：" + u);
|
||||||
|
//
|
||||||
u = testTransUserRepository.insert(u);
|
// u = testTransUserRepository.insert(u);
|
||||||
System.out.println("插入对象：" + u);
|
// System.out.println("插入对象：" + u);
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public void insertSysUser(SysUser sysUser) {
|
// public void insertSysUser(SysUser sysUser) {
|
||||||
sysUserRDao.insert(sysUser);
|
// sysUserRDao.insert(sysUser);
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public void updateSysUser(SysUser sysUser) {
|
// public void updateSysUser(SysUser sysUser) {
|
||||||
sysUserRDao.update(sysUser);
|
// sysUserRDao.update(sysUser);
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
@Override
|
// @Override
|
||||||
public List<SysUser> listSysUser() {
|
// public List<SysUser> listSysUser() {
|
||||||
return sysUserRDao.list();
|
// return sysUserRDao.list();
|
||||||
}
|
// }
|
||||||
}
|
//}
|
||||||
|
|||||||
@ -1,55 +0,0 @@
|
|||||||
package cn.estsh.i3plus.core.apiservice.websocket;
|
|
||||||
|
|
||||||
import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker;
|
|
||||||
import org.apache.commons.lang.StringEscapeUtils;
|
|
||||||
import org.apache.commons.lang3.RandomStringUtils;
|
|
||||||
|
|
||||||
import java.util.Random;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @Description :
|
|
||||||
* @Reference :
|
|
||||||
* @Author : Adair Peng
|
|
||||||
* @CreateDate : 2018-11-22 15:02
|
|
||||||
* @Modify:
|
|
||||||
**/
|
|
||||||
public class TestMain {
|
|
||||||
|
|
||||||
public static void main(String[] args) {
|
|
||||||
System.out.println(RandomStringUtils.random(15, true, false));
|
|
||||||
|
|
||||||
// StringEscapeUtils.escapeHtml();
|
|
||||||
/*long workerIdBits = 5L;
|
|
||||||
long maxWorkerId = -1L ^ (-1L << workerIdBits);
|
|
||||||
System.out.println("5 --> "+maxWorkerId);
|
|
||||||
|
|
||||||
workerIdBits = 6L;
|
|
||||||
maxWorkerId = -1L ^ (-1L << workerIdBits);
|
|
||||||
System.out.println("6 --> "+maxWorkerId);
|
|
||||||
|
|
||||||
workerIdBits = 8L;
|
|
||||||
maxWorkerId = -1L ^ (-1L << workerIdBits);
|
|
||||||
System.out.println("8 --> " + maxWorkerId);*/
|
|
||||||
|
|
||||||
int wId = new Random().nextInt(29) + 1;
|
|
||||||
System.out.println("random id -> "+wId);
|
|
||||||
SnowflakeIdMaker m = new SnowflakeIdMaker(wId,3);
|
|
||||||
|
|
||||||
int i = 0;
|
|
||||||
long id;
|
|
||||||
int c = 0;
|
|
||||||
|
|
||||||
long l1 = System.currentTimeMillis();
|
|
||||||
while(i < 1000){
|
|
||||||
if(m.nextId() < 0) {
|
|
||||||
System.out.println("======="+m.nextId());
|
|
||||||
c++;
|
|
||||||
}else{
|
|
||||||
//System.out.println(m.nextId());
|
|
||||||
}
|
|
||||||
i++;
|
|
||||||
}
|
|
||||||
System.out.println("耗时：" + (System.currentTimeMillis()-l1));
|
|
||||||
System.out.println("====end====error:" + c);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue