Merge remote-tracking branch 'origin/master'
# Conflicts: # modules/i3plus-core-apiservice/src/main/resources/application-dev.propertiesyun-zuoyi
frin.fei
7 years ago
commit
fbc33e3d0c
@ -0,0 +1,34 @@
|
|||||||
|
package cn.estsh.i3plus.core.api.iservice.busi;
|
||||||
|
|
||||||
|
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||||
|
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||||
|
import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule;
|
||||||
|
import io.swagger.annotations.ApiOperation;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description : 单号生成规则服务器
|
||||||
|
* @Reference :
|
||||||
|
* @Author : yunhao
|
||||||
|
* @CreateDate : 2018-11-21 19:57
|
||||||
|
* @Modify:
|
||||||
|
**/
|
||||||
|
public interface ISysOrderNoRuleService {
|
||||||
|
|
||||||
|
@ApiOperation(value = "添加单号规则")
|
||||||
|
SysOrderNoRule insertSysOrderNoRule(SysOrderNoRule sysOrderNoRule);
|
||||||
|
|
||||||
|
@ApiOperation(value = "修改单号规则")
|
||||||
|
void updateSysOrderNoRule(SysOrderNoRule sysOrderNoRule);
|
||||||
|
|
||||||
|
@ApiOperation(value = "根据id删除单号规则")
|
||||||
|
void deleteSysOrderNoRuleById(Long id);
|
||||||
|
|
||||||
|
@ApiOperation(value = "根据id查询单号规则")
|
||||||
|
SysOrderNoRule getSysOrderNoRuleById(Long id);
|
||||||
|
|
||||||
|
@ApiOperation(value = "单号规则复杂查询，分页，排序")
|
||||||
|
ListPager querySysOrderNoRuleByPager(SysOrderNoRule sysOrderNoRule, Pager pager);
|
||||||
|
|
||||||
|
@ApiOperation(value = "根据code查询单号规则")
|
||||||
|
SysOrderNoRule getSysOrderNoRuleCode(String code);
|
||||||
|
}
|
||||||
@ -0,0 +1,49 @@
|
|||||||
|
package cn.estsh.i3plus.core.apiservice.controller.busi;
|
||||||
|
|
||||||
|
import cn.estsh.i3plus.core.api.iservice.busi.ISysLogExceptionService;
|
||||||
|
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||||
|
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||||
|
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
|
||||||
|
import cn.estsh.i3plus.pojo.platform.bean.SysLogException;
|
||||||
|
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 io.swagger.annotations.Api;
|
||||||
|
import io.swagger.annotations.ApiOperation;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
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;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description : 系统异常日志服务
|
||||||
|
* @Reference :
|
||||||
|
* @Author : yunhao
|
||||||
|
* @CreateDate : 2018-11-19 18:42
|
||||||
|
* @Modify:
|
||||||
|
**/
|
||||||
|
@RestController
|
||||||
|
@Api(description = "系统异常日志服务")
|
||||||
|
@RequestMapping(CoreBaseController.BASE_URL + "/sys-log-exception")
|
||||||
|
public class SysLogExceptionController {
|
||||||
|
public static final Logger LOGGER = LoggerFactory.getLogger(SysLogExceptionController.class);
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private ISysLogExceptionService sysLogExceptionService;
|
||||||
|
|
||||||
|
@GetMapping(value = "/query")
|
||||||
|
@ApiOperation(value = "异常日志复杂查询，分页，排序",notes = "异常日志复杂查询，分页，排序")
|
||||||
|
public ResultBean querySysLogOperateByPager(SysLogException sysLogException, Pager pager){
|
||||||
|
try {
|
||||||
|
ListPager logExceptionList = sysLogExceptionService.querySysLogExceptionByPager(sysLogException, pager);
|
||||||
|
return ResultBean.success("查询成功").setListPager(logExceptionList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
|
||||||
|
}catch(ImppBusiException busExcep){
|
||||||
|
return ResultBean.fail(busExcep.getErrorShow());
|
||||||
|
}catch(Exception e){
|
||||||
|
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,132 @@
|
|||||||
|
package cn.estsh.i3plus.core.apiservice.controller.busi;
|
||||||
|
|
||||||
|
import cn.estsh.i3plus.core.api.iservice.busi.ISysOrderNoRuleService;
|
||||||
|
import cn.estsh.i3plus.core.apiservice.util.OrderNoMakeUtil;
|
||||||
|
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
|
||||||
|
import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule;
|
||||||
|
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 cn.estsh.impp.framework.boot.util.ValidatorBean;
|
||||||
|
import io.swagger.annotations.Api;
|
||||||
|
import io.swagger.annotations.ApiOperation;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description :系统单号规则管理服务
|
||||||
|
* @Reference :
|
||||||
|
* @Author : yunhao
|
||||||
|
* @CreateDate : 2018-11-21 18:20
|
||||||
|
* @Modify:
|
||||||
|
**/
|
||||||
|
@RestController
|
||||||
|
@Api(description = "系统单号规则管理服务")
|
||||||
|
@RequestMapping(CoreBaseController.BASE_URL + "/sys-order-no-rule")
|
||||||
|
public class SysOrderNoRuleController {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
ISysOrderNoRuleService sysOrderNoRuleService;
|
||||||
|
|
||||||
|
@PostMapping(value = "/insert")
|
||||||
|
@ApiOperation(value = "新增单号规则")
|
||||||
|
public ResultBean insertSysOrderNoRule(SysOrderNoRule sysOrderNoRule){
|
||||||
|
try {
|
||||||
|
ValidatorBean.beginValid(sysOrderNoRule)
|
||||||
|
.notNull("name",sysOrderNoRule.getName())
|
||||||
|
.notNull("orderNoRuleCode",sysOrderNoRule.getOrderNoRuleCode())
|
||||||
|
.notNull("orderNoRule",sysOrderNoRule.getOrderNoRule())
|
||||||
|
.checkNotZero("serialNoSeed",sysOrderNoRule.getSerialNoSeed())
|
||||||
|
.checkNotZero("serialNoIncrement",sysOrderNoRule.getSerialNoIncrement())
|
||||||
|
.checkNotZero("serialNoLength",sysOrderNoRule.getSerialNoLength())
|
||||||
|
.checkNotZero("isCycle",sysOrderNoRule.getIsCycle());
|
||||||
|
|
||||||
|
sysOrderNoRuleService.insertSysOrderNoRule(sysOrderNoRule);
|
||||||
|
return ResultBean.success("操作成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
|
||||||
|
}catch(ImppBusiException busExcep){
|
||||||
|
return ResultBean.fail(busExcep.getErrorShow());
|
||||||
|
}catch(Exception e){
|
||||||
|
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@PutMapping(value = "/update")
|
||||||
|
@ApiOperation(value = "修改单号规则")
|
||||||
|
public ResultBean updateSysOrderNoRule(SysOrderNoRule sysOrderNoRule){
|
||||||
|
try {
|
||||||
|
ValidatorBean.beginValid(sysOrderNoRule)
|
||||||
|
.notNull("id",sysOrderNoRule.getId())
|
||||||
|
.notNull("name",sysOrderNoRule.getName())
|
||||||
|
.notNull("orderNoRuleCode",sysOrderNoRule.getOrderNoRuleCode())
|
||||||
|
.notNull("orderNoRule",sysOrderNoRule.getOrderNoRule())
|
||||||
|
.checkNotZero("serialNoSeed",sysOrderNoRule.getSerialNoSeed())
|
||||||
|
.checkNotZero("serialNoIncrement",sysOrderNoRule.getSerialNoIncrement())
|
||||||
|
.checkNotZero("serialNoLength",sysOrderNoRule.getSerialNoLength())
|
||||||
|
.checkNotZero("isCycle",sysOrderNoRule.getIsCycle());
|
||||||
|
|
||||||
|
sysOrderNoRuleService.updateSysOrderNoRule(sysOrderNoRule);
|
||||||
|
return ResultBean.success("操作成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
|
||||||
|
}catch(ImppBusiException busExcep){
|
||||||
|
return ResultBean.fail(busExcep.getErrorShow());
|
||||||
|
}catch(Exception e){
|
||||||
|
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping(value = "/get/{id}")
|
||||||
|
@ApiOperation(value = "根据id获取编号规则")
|
||||||
|
public ResultBean getSysOrderNoRuleById(@PathVariable("id") String idStr){
|
||||||
|
try {
|
||||||
|
ValidatorBean.checkNotNull(idStr,"id不能为空");
|
||||||
|
|
||||||
|
SysOrderNoRule sysOrderNoRule = sysOrderNoRuleService.getSysOrderNoRuleById(Long.parseLong(idStr));
|
||||||
|
if (sysOrderNoRule != null) {
|
||||||
|
return ResultBean.success("查询成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
|
||||||
|
}else {
|
||||||
|
return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
|
||||||
|
}
|
||||||
|
}catch(ImppBusiException busExcep){
|
||||||
|
return ResultBean.fail(busExcep.getErrorShow());
|
||||||
|
}catch(Exception e){
|
||||||
|
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@DeleteMapping(value = "/delete/{id}")
|
||||||
|
@ApiOperation(value = "根据id删除单号规则")
|
||||||
|
public ResultBean deleteSysOrderNoRuleById(@PathVariable("id") String idStr){
|
||||||
|
try {
|
||||||
|
ValidatorBean.checkNotNull(idStr,"id不能为空");
|
||||||
|
|
||||||
|
sysOrderNoRuleService.deleteSysOrderNoRuleById(Long.parseLong(idStr));
|
||||||
|
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
|
||||||
|
}catch(ImppBusiException busExcep){
|
||||||
|
return ResultBean.fail(busExcep.getErrorShow());
|
||||||
|
}catch(Exception e){
|
||||||
|
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@GetMapping(value = "/get-order-no/{code}")
|
||||||
|
@ApiOperation(value = "根据单号规则代码，获取单号")
|
||||||
|
public ResultBean getOrderNo(@PathVariable("code") String code){
|
||||||
|
try {
|
||||||
|
ValidatorBean.checkNotNull(code,"code不能为空");
|
||||||
|
|
||||||
|
SysOrderNoRule sysOrderNoRule = sysOrderNoRuleService.getSysOrderNoRuleCode(code);
|
||||||
|
if (sysOrderNoRule == null) {
|
||||||
|
return ResultBean.fail("单号规则不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
|
||||||
|
}else {
|
||||||
|
sysOrderNoRule = OrderNoMakeUtil.next(sysOrderNoRule);
|
||||||
|
sysOrderNoRuleService.updateSysOrderNoRule(sysOrderNoRule);
|
||||||
|
}
|
||||||
|
return ResultBean.success("查询成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
|
||||||
|
}catch(ImppBusiException busExcep){
|
||||||
|
return ResultBean.fail(busExcep.getErrorShow());
|
||||||
|
}catch(Exception e){
|
||||||
|
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,45 @@
|
|||||||
|
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
|
||||||
|
|
||||||
|
import cn.estsh.i3plus.core.api.iservice.busi.ISysLogExceptionService;
|
||||||
|
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||||
|
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||||
|
import cn.estsh.i3plus.pojo.base.common.PagerHelper;
|
||||||
|
import cn.estsh.i3plus.pojo.platform.bean.SysLogException;
|
||||||
|
import cn.estsh.i3plus.pojo.platform.repositorymongo.SysLogExceptionRepository;
|
||||||
|
import cn.estsh.i3plus.pojo.platform.sqlpack.CoreBsonPack;
|
||||||
|
import io.swagger.annotations.ApiOperation;
|
||||||
|
import org.bson.conversions.Bson;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description :异常日志服务接口实现
|
||||||
|
* @Reference :
|
||||||
|
* @Author : yunhao
|
||||||
|
* @CreateDate : 2018-11-19 17:30
|
||||||
|
* @Modify:
|
||||||
|
**/
|
||||||
|
@Service
|
||||||
|
public class SysLogExceptionService implements ISysLogExceptionService {
|
||||||
|
public static final Logger LOGGER = LoggerFactory.getLogger(SysLogExceptionService.class);
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private SysLogExceptionRepository sysLogExceptionRDao;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@ApiOperation(value = "系统异常日志复杂查询，分页，排序")
|
||||||
|
public ListPager<SysLogException> querySysLogExceptionByPager(SysLogException sysLogException, Pager pager) {
|
||||||
|
if(sysLogException == null) {
|
||||||
|
pager = PagerHelper.getPager(pager, (int) sysLogExceptionRDao.count());
|
||||||
|
return new ListPager(sysLogExceptionRDao.findAll(),pager);
|
||||||
|
}else{
|
||||||
|
Bson bson = CoreBsonPack.packBsonBySysLogException(sysLogException);
|
||||||
|
pager = PagerHelper.getPager(pager,sysLogExceptionRDao.findByBsonCount(bson));
|
||||||
|
//分页，排序
|
||||||
|
return new ListPager(sysLogExceptionRDao.findByBsonPager(bson,pager,sysLogException.getOrderByParam()
|
||||||
|
,sysLogException.getAscOrDesc()),pager);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,90 @@
|
|||||||
|
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
|
||||||
|
|
||||||
|
import cn.estsh.i3plus.core.api.iservice.busi.ISysOrderNoRuleService;
|
||||||
|
import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||||
|
import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||||
|
import cn.estsh.i3plus.pojo.base.common.PagerHelper;
|
||||||
|
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||||
|
import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule;
|
||||||
|
import cn.estsh.i3plus.pojo.platform.repository.SysOrderNoRuleRepository;
|
||||||
|
import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
|
||||||
|
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
|
||||||
|
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description : 系统单号生成规则接口实现
|
||||||
|
* @Reference :
|
||||||
|
* @Author : yunhao
|
||||||
|
* @CreateDate : 2018-11-21 20:04
|
||||||
|
* @Modify:
|
||||||
|
**/
|
||||||
|
@Service
|
||||||
|
public class SysOrderNoRuleService implements ISysOrderNoRuleService {
|
||||||
|
|
||||||
|
public static final Logger LOGGER = LoggerFactory.getLogger(SysOrderNoRuleService.class);
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private SysOrderNoRuleRepository sysOrderNoRuleRDao;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public SysOrderNoRule insertSysOrderNoRule(SysOrderNoRule sysOrderNoRule) {
|
||||||
|
if(sysOrderNoRuleRDao.isExitByProperty("orderNoRuleCode",sysOrderNoRule.getOrderNoRuleCode())){
|
||||||
|
throw ImppExceptionBuilder.newInstance()
|
||||||
|
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
|
||||||
|
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
|
||||||
|
.setErrorDetail("规则代码已存在")
|
||||||
|
.setErrorSolution("请重新输入规则代码")
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
return sysOrderNoRuleRDao.insert(sysOrderNoRule);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateSysOrderNoRule(SysOrderNoRule sysOrderNoRule) {
|
||||||
|
// 校验唯一
|
||||||
|
String hqlPack = CoreHqlPack.packHqlSysOrderNoRuleCode(sysOrderNoRule);
|
||||||
|
long repeatCount = sysOrderNoRuleRDao.findByHqlWhereCount(hqlPack);
|
||||||
|
if (repeatCount > 0){
|
||||||
|
throw ImppExceptionBuilder.newInstance()
|
||||||
|
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
|
||||||
|
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
|
||||||
|
.setErrorDetail("规则代码已存在")
|
||||||
|
.setErrorSolution("请重新输入规则代码")
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
sysOrderNoRuleRDao.update(sysOrderNoRule);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void deleteSysOrderNoRuleById(Long id) {
|
||||||
|
sysOrderNoRuleRDao.deleteById(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public SysOrderNoRule getSysOrderNoRuleById(Long id) {
|
||||||
|
return sysOrderNoRuleRDao.getById(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ListPager querySysOrderNoRuleByPager(SysOrderNoRule sysOrderNoRule, Pager pager) {
|
||||||
|
if(sysOrderNoRule == null) {
|
||||||
|
pager = PagerHelper.getPager(pager, sysOrderNoRuleRDao.listCount());
|
||||||
|
return new ListPager(sysOrderNoRuleRDao.listPager(pager),pager);
|
||||||
|
}else {
|
||||||
|
String hqlPack = CoreHqlPack.packHqlSysOrderNoRule(sysOrderNoRule);
|
||||||
|
pager = PagerHelper.getPager(pager, sysOrderNoRuleRDao.findByHqlWhereCount(hqlPack));
|
||||||
|
return new ListPager(sysOrderNoRuleRDao.findByHqlWherePage(hqlPack + sysOrderNoRule.orderBy(),pager),pager);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public SysOrderNoRule getSysOrderNoRuleCode(String code) {
|
||||||
|
return sysOrderNoRuleRDao.getByProperty("code",code);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
@ -0,0 +1,59 @@
|
|||||||
|
package cn.estsh.i3plus.core.apiservice.util;
|
||||||
|
|
||||||
|
import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
|
||||||
|
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||||
|
import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule;
|
||||||
|
|
||||||
|
import java.text.MessageFormat;
|
||||||
|
import java.text.SimpleDateFormat;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description : 单号生成工具类
|
||||||
|
* @Reference :
|
||||||
|
* @Author : yunhao
|
||||||
|
* @CreateDate : 2018-11-21 13:26
|
||||||
|
* @Modify:
|
||||||
|
**/
|
||||||
|
public class OrderNoMakeUtil {
|
||||||
|
|
||||||
|
public static SysOrderNoRule next(SysOrderNoRule orderNoRule) {
|
||||||
|
StringBuilder orderNo = new StringBuilder(orderNoRule.getOrderNoRule());
|
||||||
|
|
||||||
|
String[] dateTime = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss").format(System.currentTimeMillis()).split("-");
|
||||||
|
replace(orderNo, PlatformConstWords.YEAR, dateTime[0]);
|
||||||
|
replace(orderNo, PlatformConstWords.MONTH, dateTime[1]);
|
||||||
|
replace(orderNo, PlatformConstWords.DAY, dateTime[2]);
|
||||||
|
replace(orderNo, PlatformConstWords.HOUR, dateTime[3]);
|
||||||
|
replace(orderNo, PlatformConstWords.MINUTE, dateTime[4]);
|
||||||
|
replace(orderNo, PlatformConstWords.SECOND, dateTime[5]);
|
||||||
|
|
||||||
|
// 流水号长度补全
|
||||||
|
String serialNumberFormatStr = MessageFormat.format(PlatformConstWords.SERIAL_NO_FORMAT, orderNoRule.getSerialNoLength());
|
||||||
|
|
||||||
|
if (orderNoRule.getLastMakeSerialNo() > 0) {
|
||||||
|
int serialNo = orderNoRule.getLastMakeSerialNo() + orderNoRule.getSerialNoIncrement();
|
||||||
|
// 达到最大值后循环或继续
|
||||||
|
if(orderNoRule.getSerialNoLength().intValue() < String.valueOf(serialNo).length()
|
||||||
|
&& orderNoRule.getIsCycle() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()){
|
||||||
|
orderNoRule.setLastMakeSerialNo(orderNoRule.getSerialNoSeed());
|
||||||
|
} else {
|
||||||
|
orderNoRule.setLastMakeSerialNo(orderNoRule.getLastMakeSerialNo() + orderNoRule.getSerialNoIncrement());
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
orderNoRule.setLastMakeSerialNo(orderNoRule.getSerialNoSeed());
|
||||||
|
}
|
||||||
|
replace(orderNo, PlatformConstWords.SERIAL_NO, String.format(serialNumberFormatStr, orderNoRule.getLastMakeSerialNo()));
|
||||||
|
|
||||||
|
orderNoRule.setLastMakeOrderNo(orderNo.toString());
|
||||||
|
return orderNoRule;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static StringBuilder replace(StringBuilder no, String constant, String param) {
|
||||||
|
int day = no.indexOf(constant);
|
||||||
|
if (day != -1) {
|
||||||
|
no.replace(day, day + constant.length(), param);
|
||||||
|
}
|
||||||
|
return no;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Binary file not shown.
Binary file not shown.
@ -1,111 +0,0 @@
|
|||||||
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
|
|
||||||
|
|
||||||
import cn.estsh.i3plus.core.api.iservice.busi.*;
|
|
||||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
|
||||||
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
|
|
||||||
import cn.estsh.i3plus.pojo.platform.bean.*;
|
|
||||||
import com.alibaba.fastjson.JSON;
|
|
||||||
import org.junit.Test;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
|
||||||
|
|
||||||
import javax.transaction.Transactional;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 系统数据初始化
|
|
||||||
*/
|
|
||||||
public class TestInitData extends TestBase {
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private IOrganizeService organizeService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private IPositionService positionService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private IDepartmentService departmentService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ISysMenuService sysMenuService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ISysRoleService sysRoleService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ISysUserService sysUserService;
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
private ISysUserInfoService sysUserInfoService;
|
|
||||||
|
|
||||||
@Test
|
|
||||||
@Transactional
|
|
||||||
public void testInitPosition(){
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
@Transactional
|
|
||||||
public void testInitOrganize(){
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
@Transactional
|
|
||||||
public void testInitDepartment(){
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
@Transactional
|
|
||||||
public void testInitSysRole(){
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
@Transactional
|
|
||||||
public void testInitSysUser()throws Exception{
|
|
||||||
Organize organize = new Organize();
|
|
||||||
organize.setName("Junit 组织");
|
|
||||||
organize.setOrganizeTypeId(ImppEnumUtil.ORGANIZE_YTPE.TYPE_COMPANY.getValue());
|
|
||||||
organize.setOrganizeCode("junit 001");
|
|
||||||
Organize insertOrganize = organizeService.insertOrganize(organize);
|
|
||||||
System.out.println(JSON.toJSON(insertOrganize));
|
|
||||||
|
|
||||||
Department department = new Department();
|
|
||||||
department.setName("Junit 部门");
|
|
||||||
department.setDepartmentCode("junit 001");
|
|
||||||
department.setOrganizeId(insertOrganize.getId());
|
|
||||||
Department insertDepartment = departmentService.insertDepartment(department);
|
|
||||||
System.out.println(JSON.toJSON(insertDepartment));
|
|
||||||
|
|
||||||
Position position = new Position();
|
|
||||||
position.setName("Junit 岗位");
|
|
||||||
position.setPositionCode("junit 001");
|
|
||||||
Position insertPosition = positionService.insertPosition(position);
|
|
||||||
System.out.println(JSON.toJSON(insertPosition));
|
|
||||||
|
|
||||||
SysUserInfo info = new SysUserInfo();
|
|
||||||
info.setName("Junit 用户");
|
|
||||||
info.setOrganizeId(insertOrganize.getId());
|
|
||||||
info.setDepartmentId(insertDepartment.getId());
|
|
||||||
info.setPositionId(insertPosition.getId());
|
|
||||||
|
|
||||||
SysUserInfo insertSysUserInfo = sysUserInfoService.insertSysUserInfo(info);
|
|
||||||
|
|
||||||
SysRole role = new SysRole();
|
|
||||||
role.setName("Junit 角色");
|
|
||||||
SysRole insertSysRole = sysRoleService.insertSysRole(role);
|
|
||||||
System.out.println(JSON.toJSON(insertSysRole));
|
|
||||||
|
|
||||||
|
|
||||||
SysUser user = new SysUser();
|
|
||||||
user.setUserLoginName("root");
|
|
||||||
user.setUserLoginPassword("root");
|
|
||||||
user.setUserInfoId(insertSysUserInfo.getId());
|
|
||||||
user.setRoleId(insertSysRole.getId());
|
|
||||||
|
|
||||||
SysUser sysUser = sysUserService.insertSysUser(user);
|
|
||||||
System.out.println(JSON.toJSON(sysUser));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
@ -1,102 +1,102 @@
|
|||||||
//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
|
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
|
||||||
//
|
|
||||||
//import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService;
|
import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService;
|
||||||
//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.SysConfig;
|
import cn.estsh.i3plus.pojo.platform.bean.SysConfig;
|
||||||
//import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
//import org.junit.Test;
|
import org.junit.Test;
|
||||||
//import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
//import org.springframework.test.annotation.Rollback;
|
import org.springframework.test.annotation.Rollback;
|
||||||
//
|
|
||||||
//import javax.transaction.Transactional;
|
import javax.transaction.Transactional;
|
||||||
//import java.util.List;
|
import java.util.List;
|
||||||
//
|
|
||||||
///**
|
/**
|
||||||
// * @Description : 系统参数服务测试
|
* @Description : 系统参数服务测试
|
||||||
// * @Reference :
|
* @Reference :
|
||||||
// * @Author : yunhao
|
* @Author : yunhao
|
||||||
// * @Date : 2018-10-30 10:49
|
* @Date : 2018-10-30 10:49
|
||||||
// * @Modify :
|
* @Modify :
|
||||||
// **/
|
**/
|
||||||
//public class TestSysConfigService extends TestBase {
|
public class TestSysConfigService extends TestBase {
|
||||||
//
|
|
||||||
// @Autowired
|
@Autowired
|
||||||
// private ISysConfigService sysConfigService;
|
private ISysConfigService sysConfigService;
|
||||||
//
|
|
||||||
// /**
|
/**
|
||||||
// * 测试 查询所有系统参数
|
* 测试 查询所有系统参数
|
||||||
// */
|
*/
|
||||||
// @Test
|
@Test
|
||||||
// @Transactional
|
@Transactional
|
||||||
// public void testListSysConfig() {
|
public void testListSysConfig() {
|
||||||
// List list = sysConfigService.ListSysConfig();
|
List list = sysConfigService.ListSysConfig();
|
||||||
// System.out.println(JSON.toJSONString(list));
|
System.out.println(JSON.toJSONString(list));
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// /**
|
/**
|
||||||
// * 测试 根据id查询系统参数
|
* 测试 根据id查询系统参数
|
||||||
// */
|
*/
|
||||||
// @Test
|
@Test
|
||||||
// @Transactional
|
@Transactional
|
||||||
// public void testGetSysConfigById() {
|
public void testGetSysConfigById() {
|
||||||
// SysConfig sysConfig = sysConfigService.getSysConfigById("1057110061127700480");
|
SysConfig sysConfig = sysConfigService.getSysConfigById(1057110061127700480L);
|
||||||
// System.out.println(JSON.toJSONString(sysConfig));
|
System.out.println(JSON.toJSONString(sysConfig));
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// /**
|
/**
|
||||||
// * 测试 添加系统参数
|
* 测试 添加系统参数
|
||||||
// */
|
*/
|
||||||
// @Test
|
@Test
|
||||||
// @Transactional
|
@Transactional
|
||||||
// @Rollback(false)
|
@Rollback(false)
|
||||||
// public void testInsertSysConfig() {
|
public void testInsertSysConfig() {
|
||||||
// SysConfig sysConfig = new SysConfig();
|
SysConfig sysConfig = new SysConfig();
|
||||||
// sysConfig.setName("系统名称");
|
sysConfig.setName("系统名称");
|
||||||
// sysConfig.setConfigCode("sys_name");
|
sysConfig.setConfigCode("sys_name");
|
||||||
// sysConfig.setConfigTypeId(1);
|
sysConfig.setConfigType(1);
|
||||||
// sysConfig.setConfigValue("IMPP");
|
sysConfig.setConfigValue("IMPP");
|
||||||
// sysConfig.setConfigDescription("系统名称");
|
sysConfig.setConfigDescription("系统名称");
|
||||||
//
|
|
||||||
// sysConfigService.insertSysConfig(sysConfig);
|
sysConfigService.insertSysConfig(sysConfig);
|
||||||
// System.out.println(JSON.toJSONString(sysConfig));
|
System.out.println(JSON.toJSONString(sysConfig));
|
||||||
//
|
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// /**
|
/**
|
||||||
// * 测试 修改系统参数
|
* 测试 修改系统参数
|
||||||
// */
|
*/
|
||||||
// @Test
|
@Test
|
||||||
// @Transactional
|
@Transactional
|
||||||
// public void testUpdateSysConfig(){
|
public void testUpdateSysConfig(){
|
||||||
// SysConfig sysConfig = sysConfigService.getSysConfigById("1057110613261684736");
|
SysConfig sysConfig = sysConfigService.getSysConfigById(1057110613261684736L);
|
||||||
// sysConfig.setConfigDescription("测试修改");
|
sysConfig.setConfigDescription("测试修改");
|
||||||
//
|
|
||||||
// sysConfigService.updateSysConfig(sysConfig);
|
sysConfigService.updateSysConfig(sysConfig);
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// /**
|
/**
|
||||||
// * 测试 根据id删除系统参数
|
* 测试 根据id删除系统参数
|
||||||
// */
|
*/
|
||||||
// @Test
|
@Test
|
||||||
// @Transactional
|
@Transactional
|
||||||
// public void testDeleteSysConfigById(){
|
public void testDeleteSysConfigById(){
|
||||||
// sysConfigService.deleteSysConfigById("1057111616417566720");
|
sysConfigService.deleteSysConfigById(1057111616417566720L);
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// /**
|
/**
|
||||||
// * 测试 复制查询
|
* 测试 复制查询
|
||||||
// */
|
*/
|
||||||
// @Test
|
@Test
|
||||||
// @Transactional
|
@Transactional
|
||||||
// public void testQuerySysConfigByPager(){
|
public void testQuerySysConfigByPager(){
|
||||||
// SysConfig sysConfig = new SysConfig();
|
SysConfig sysConfig = new SysConfig();
|
||||||
//
|
|
||||||
// Pager pager = new Pager();
|
Pager pager = new Pager();
|
||||||
// pager.setPageSize(10);
|
pager.setPageSize(10);
|
||||||
// pager.setCurrentPage(1);
|
pager.setCurrentPage(1);
|
||||||
//
|
|
||||||
// ListPager list = sysConfigService.querySysConfigByPager(sysConfig,pager);
|
ListPager list = sysConfigService.querySysConfigByPager(sysConfig,pager);
|
||||||
// System.out.println(list);
|
System.out.println(list);
|
||||||
// }
|
}
|
||||||
//}
|
}
|
||||||
|
|||||||
@ -0,0 +1,29 @@
|
|||||||
|
package cn.estsh.i3plus.core.apiservice.util;
|
||||||
|
|
||||||
|
import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase;
|
||||||
|
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description :
|
||||||
|
* @Reference :
|
||||||
|
* @Author : yunhao
|
||||||
|
* @CreateDate : 2018-11-21 19:44
|
||||||
|
* @Modify:
|
||||||
|
**/
|
||||||
|
public class TestMailUtil extends TestBase {
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
MailUtil mailUtil;
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void TestSendMail(){
|
||||||
|
mailUtil.setTo("yunhao.wang@estsh.com");
|
||||||
|
mailUtil.setSubject("中文");
|
||||||
|
mailUtil.setContentType(ImppEnumUtil.MESSAGE_CONTENT_TYPE.HTML.getDescription());
|
||||||
|
mailUtil.setBody("内容");
|
||||||
|
mailUtil.send();
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -0,0 +1,33 @@
|
|||||||
|
package cn.estsh.i3plus.core.apiservice.util;
|
||||||
|
|
||||||
|
import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase;
|
||||||
|
import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @Description :
|
||||||
|
* @Reference :
|
||||||
|
* @Author : yunhao
|
||||||
|
* @CreateDate : 2018-11-21 19:45
|
||||||
|
* @Modify:
|
||||||
|
**/
|
||||||
|
public class TestOrderNoMakeUtil extends TestBase {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void TestMakeOrderNO() {
|
||||||
|
SysOrderNoRule sysOrderNoRule = new SysOrderNoRule();
|
||||||
|
sysOrderNoRule.setName("一号单据");
|
||||||
|
sysOrderNoRule.setOrderNoRule("GG-{yyyy}{MM}{dd}{serialNo}");
|
||||||
|
sysOrderNoRule.setSerialNoSeed(1);
|
||||||
|
sysOrderNoRule.setSerialNoIncrement(1);
|
||||||
|
sysOrderNoRule.setSerialNoLength(4);
|
||||||
|
sysOrderNoRule.setLastMakeSerialNo(9999);
|
||||||
|
sysOrderNoRule.setIsCycle(1);
|
||||||
|
|
||||||
|
System.out.println(OrderNoMakeUtil.next(sysOrderNoRule));
|
||||||
|
|
||||||
|
// String d= MessageFormat.format("%0{0}d", 3);
|
||||||
|
// System.out.println(d);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue