I3_YF_SEAT
/
impp-core
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into test

Browse Source
yun-zuoyi
汪云昊 5 years ago
parent 1cdf68663d 11e6487225
commit dc821d31c6
4 changed files with 127 additions and 99 deletions
Show Stats Download Patch File Download Diff File

23
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java
Unescape Escape View File

@ -44,6 +44,8 @@ import javax.servlet.http.HttpServletRequest;
import java.util.*;
import java.util.stream.Collectors;
import static cn.estsh.i3plus.platform.common.util.CommonConstWords.DEFAULT_LANGUAGE;
/**
* @Description :
* @Reference :
@ -139,7 +141,6 @@ public class WhiteController extends CoreBaseController {
}
/**
*
* @return
*/
@GetMapping(value = "/auth/logout")
@ -169,6 +170,11 @@ public class WhiteController extends CoreBaseController {
try {
ValidatorBean.checkNotNull(languageCode, "语言不能为空");
// TODO 后期移除，暂时用于避免自动登录后前台没有正确的传输组织代码信息
if ("null".equals(languageCode)) {
languageCode = DEFAULT_LANGUAGE;
}
// 设置语言代码
BaseThreadLocal.setData(BaseThreadLocal.LANGUAGE_CODE, languageCode);
@ -322,7 +328,6 @@ public class WhiteController extends CoreBaseController {
}
@GetMapping(value = "/find-language-code-soft-type")
@ApiOperation(value = "根据语言代码查询资源")
public ResultBean findSysLocaleResourceByLanguageCode(String languageCode, Integer softType,
@ -350,7 +355,8 @@ public class WhiteController extends CoreBaseController {
if (needPlatformRes.intValue() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) {
Map<Object, Object> platformResMap =
redisRes.getHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE_WEB + ":" + languageCode + ":" + CommonEnumUtil.SOFT_TYPE.IMPP.getValue());;
redisRes.getHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE_WEB + ":" + languageCode + ":" + CommonEnumUtil.SOFT_TYPE.IMPP.getValue());
;
resourceMap.putAll(platformResMap);
}
@ -405,6 +411,7 @@ public class WhiteController extends CoreBaseController {
/**
* 根据文件代码查询文件信息
*
* @param fileCode 文件代码
* @return 处理结果
*/
@ -526,13 +533,15 @@ public class WhiteController extends CoreBaseController {
/**
* 查询全部打印模板
*
* @return 处理结果
*/
@PostMapping(value = "/sys-label-template/list")
@ApiOperation(value = "查询全部打印模板", notes = "查询全部打印模板")
public ResultBean<SysLabelTemplate> findSysConfigAll(@RequestBody SysLabelTemplate template) {
try {
List<SysLabelTemplate> sysLabelTemplateList = sysLabelTemplateService.listSysLabelTemplateDetail(template);;
List<SysLabelTemplate> sysLabelTemplateList = sysLabelTemplateService.listSysLabelTemplateDetail(template);
;
return ResultBean.success("操作成功")
.setResultList(sysLabelTemplateList)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
@ -545,6 +554,7 @@ public class WhiteController extends CoreBaseController {
/**
* 查询未翻译的资源
*
* @return 处理结果
*/
@PostMapping(value = "/locale-resource/no-resource")
@ -587,6 +597,7 @@ public class WhiteController extends CoreBaseController {
/**
* 缺失资源
*
* @param key
* @param menuCode
* @return
@ -670,6 +681,7 @@ public class WhiteController extends CoreBaseController {
/********************************************SWEB所需接口*******************************************/
/**
* 添加用户信息
*
* @param model 用户信息
* @return 处理结果
*/
@ -681,6 +693,7 @@ public class WhiteController extends CoreBaseController {
/**
* 修改用户信息
*
* @param model 用户信息
* @return 处理结果
*/
@ -692,6 +705,7 @@ public class WhiteController extends CoreBaseController {
/**
* 删除用户信息
*
* @param id 用户id
* @return 处理结果
*/
@ -703,6 +717,7 @@ public class WhiteController extends CoreBaseController {
/**
* 查询用户信息
*
* @param cloudPagerModel 查询条件
* @return 处理结果
*/

10
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java
Unescape Escape View File

@ -122,6 +122,10 @@ public class SysOrderNoRuleController extends CoreBaseController {
.checkNotZero("isCycle", sysOrderNoRule.getIsCycle());
sysOrderNoRuleService.updateSysOrderNoRule(sysOrderNoRule);
// 清理缓存
redisRes.deleteKey(REDIS_PREFIX_LOCK_GET_ORDER_NO + ":" + sysOrderNoRule.getOrderNoRuleCode());
return ResultBean.success("操作成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);
@ -157,11 +161,11 @@ public class SysOrderNoRuleController extends CoreBaseController {
SysOrderNoRule sysOrderNoRule = sysOrderNoRuleService.getSysOrderNoRuleById(Long.parseLong(idStr));
ValidatorBean.checkNotNull(sysOrderNoRule,"单号规则不存在");
// 清理缓存
redisRes.deleteKey(REDIS_PREFIX_LOCK_GET_ORDER_NO + ":" + sysOrderNoRule.getOrderNoRuleCode());
// 删除
sysOrderNoRuleService.deleteSysOrderNoRuleById(sysOrderNoRule.getId());
// 清理缓存
redisRes.deleteKey(REDIS_PREFIX_LOCK_GET_ORDER_NO + ":" + sysOrderNoRule.getOrderNoRuleCode());
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep);

5
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SynchronizedService.java
Unescape Escape View File

@ -87,10 +87,11 @@ public class SynchronizedService implements ISynchronizedService {
sysOrderNoRuleService.detachSysOrderNoRule(codeRole);
Long incr = codeRole.getSerialNoIncrement() * num;
long orginSerialNo = codeRole.getSerialNo() < 0 ? 0 : codeRole.getSerialNo();
long incr = codeRole.getSerialNoIncrement() * num;
//缓存增加
//先判断redis是否存在，如果不存在，则用默认初始值+步长*数量，如果存在，则添加步长 * 数量
codeRole.setSerialNo(redisRes.putObjAdditational(redisKey, codeRole.getSerialNo(), incr)-incr);
codeRole.setSerialNo(redisRes.putObjAdditional(redisKey, orginSerialNo, incr) - incr);
// 生成单号更缓存
List<SysOrderNoRule> orderNoRuleList = sysOrderNoRuleService.doGetSysOrderNoRuleByNum(codeRole, num);

10
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/OrderNoMakeUtil.java
Unescape Escape View File

@ -50,11 +50,19 @@ public class OrderNoMakeUtil {
if (orderNoRule.getSerialNo() > 0 && orderNo.indexOf(PlatformConstWords.SERIAL_NO) != -1) {
String newNo = orderNo.substring(0,orderNo.indexOf(PlatformConstWords.SERIAL_NO));
String oldNo = orderNoRule.getOrderNo().substring(0,orderNo.indexOf(PlatformConstWords.SERIAL_NO));
long serialNo = orderNoRule.getSerialNo() + orderNoRule.getSerialNoIncrement();
// 前缀（日期）不同后是否重置流水号
if(!newNo.equals(oldNo) && orderNoRule.getIsCycle() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()){
orderNoRule.setSerialNo(orderNoRule.getSerialNoSeed());
} else {
orderNoRule.setSerialNo(orderNoRule.getSerialNo() + orderNoRule.getSerialNoIncrement());
orderNoRule.setSerialNo(serialNo);
}
if (CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(orderNoRule.getIsFixedLength())
&& String.valueOf(serialNo).length() > orderNoRule.getSerialNoLength()) {
orderNoRule.setSerialNo(orderNoRule.getSerialNoSeed());
}
} else {
orderNoRule.setSerialNo(orderNoRule.getSerialNoSeed() * orderNoRule.getSerialNoIncrement());

Write Preview
Loading…
Cancel
Save