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
汪云昊 4 years ago
parent 1cdf68663d 11e6487225
commit dc821d31c6
4 changed files with 127 additions and 99 deletions
Show Stats Download Patch File Download Diff File

201
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.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static cn.estsh.i3plus.platform.common.util.CommonConstWords.DEFAULT_LANGUAGE;
/** /**
* @Description : * @Description :
* @Reference : * @Reference :
@ -106,7 +108,7 @@ public class WhiteController extends CoreBaseController {
@Autowired @Autowired
private ILicenseClickService licenseClickService; private ILicenseClickService licenseClickService;
@Resource(name= CommonConstWords.IMPP_REDIS_SESSION) @Resource(name = CommonConstWords.IMPP_REDIS_SESSION)
private ImppRedis redisSession; private ImppRedis redisSession;
@Autowired @Autowired
@ -114,73 +116,77 @@ public class WhiteController extends CoreBaseController {
@GetMapping(value = "/sys-locale-language/list") @GetMapping(value = "/sys-locale-language/list")
@ApiOperation(value = "查询可用语言",notes = "查询可用语言") @ApiOperation(value = "查询可用语言", notes = "查询可用语言")
public ResultBean listSysLocaleLanguage(){ public ResultBean listSysLocaleLanguage() {
try { try {
List sysLocaleLanguageList = sysLocaleLanguageService.findSysLocaleLanguageByStatus(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); List sysLocaleLanguageList = sysLocaleLanguageService.findSysLocaleLanguageByStatus(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(sysLocaleLanguageList); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(sysLocaleLanguageList);
}catch(ImppBusiException busExcep){ } catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
}catch(Exception e){ } catch (Exception e) {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
} }
} }
@GetMapping(value = "/system-info") @GetMapping(value = "/system-info")
@ApiOperation(value = "查询可用语言",notes = "查询可用语言") @ApiOperation(value = "查询可用语言", notes = "查询可用语言")
public ResultBean getSystemInfo(){ public ResultBean getSystemInfo() {
try { try {
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(configService.findSystemInfoConfig()); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(configService.findSystemInfoConfig());
}catch(ImppBusiException busExcep){ } catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
}catch(Exception e){ } catch (Exception e) {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
} }
} }
/** /**
*
* @return * @return
*/ */
@GetMapping(value="/auth/logout") @GetMapping(value = "/auth/logout")
@ApiOperation(value="登出",notes="登出") @ApiOperation(value = "登出", notes = "登出")
public ResultBean logout(){ public ResultBean logout() {
LOGGER.info("用户退出..."); LOGGER.info("用户退出...");
try { try {
AuthUtil.logout(); AuthUtil.logout();
return new ResultBean(true,"您已安全退出。").build(); return new ResultBean(true, "您已安全退出。").build();
} catch (ImppBusiException e) { } catch (ImppBusiException e) {
return new ResultBean(false,e.getErrorDetail() + "-[解决]" + e.getErrorSolution()); return new ResultBean(false, e.getErrorDetail() + "-[解决]" + e.getErrorSolution());
} }
} }
@GetMapping(value="/auth/login") @GetMapping(value = "/auth/login")
@ApiOperation(value="登陆",notes="登陆") @ApiOperation(value = "登陆", notes = "登陆")
public ResultBean login(HttpServletRequest request, String loginName, String loginPwd, public ResultBean login(HttpServletRequest request, String loginName, String loginPwd,
@RequestParam(required = false) String languageCode, @RequestParam(required = false) String languageCode,
@RequestParam(required = false) String deviceId){ @RequestParam(required = false) String deviceId) {
Long startTime = System.currentTimeMillis(); Long startTime = System.currentTimeMillis();
startMultiService(); startMultiService();
licenseClickService.checkLicenseNumberLogin(); licenseClickService.checkLicenseNumberLogin();
LOGGER.info("用户登陆 loginName:{} loginPwd:{} languageCode:{}",loginName,loginPwd,languageCode); LOGGER.info("用户登陆 loginName:{} loginPwd:{} languageCode:{}", loginName, loginPwd, languageCode);
ResultBean result = null; ResultBean result = null;
CommonEnumUtil.USER_LOGIN_STATUS userLoginStatus = CommonEnumUtil.USER_LOGIN_STATUS.LOGIN_SUCCESS; CommonEnumUtil.USER_LOGIN_STATUS userLoginStatus = CommonEnumUtil.USER_LOGIN_STATUS.LOGIN_SUCCESS;
try { try {
ValidatorBean.checkNotNull(languageCode,"语言不能为空"); ValidatorBean.checkNotNull(languageCode, "语言不能为空");
// TODO 后期移除，暂时用于避免自动登录后前台没有正确的传输组织代码信息
if ("null".equals(languageCode)) {
languageCode = DEFAULT_LANGUAGE;
}
// 设置语言代码 // 设置语言代码
BaseThreadLocal.setData(BaseThreadLocal.LANGUAGE_CODE, languageCode); BaseThreadLocal.setData(BaseThreadLocal.LANGUAGE_CODE, languageCode);
ValidatorBean.checkNotNull(loginName,"用户名不能为空"); ValidatorBean.checkNotNull(loginName, "用户名不能为空");
ValidatorBean.checkNotNull(loginPwd,"密码不能为空"); ValidatorBean.checkNotNull(loginPwd, "密码不能为空");
int sessionMode = RedisCacheTool.getSysConfigIntVal(CommonConstWords.CONFIG_SESSION_MODE, CommonConstWords.CONFIG_SESSION_MODE_DEFAULT); int sessionMode = RedisCacheTool.getSysConfigIntVal(CommonConstWords.CONFIG_SESSION_MODE, CommonConstWords.CONFIG_SESSION_MODE_DEFAULT);
if (sessionMode != CommonEnumUtil.SESSION_MODE.SEIZE.getValue()) { if (sessionMode != CommonEnumUtil.SESSION_MODE.SEIZE.getValue()) {
logout(); logout();
} }
SessionUser user = userService.queryUserLogin(loginName.trim(), loginPwd.trim(), languageCode, getLoginPlatform().getValue(),deviceId); SessionUser user = userService.queryUserLogin(loginName.trim(), loginPwd.trim(), languageCode, getLoginPlatform().getValue(), deviceId);
String redisKey = CommonConstWords.USER_LOGIN_ERROR + "_" + user.getUser().getId(); String redisKey = CommonConstWords.USER_LOGIN_ERROR + "_" + user.getUser().getId();
redisCore.deleteKey(redisKey); redisCore.deleteKey(redisKey);
@ -191,11 +197,11 @@ public class WhiteController extends CoreBaseController {
result.setUrl("/"); result.setUrl("/");
// 记录登录记录 // 记录登录记录
recordSysUserLog(user.getUser().getUserInfoId(), loginName,CommonEnumUtil.USER_LOGIN_STATUS.LOGIN_SUCCESS.getValue()); recordSysUserLog(user.getUser().getUserInfoId(), loginName, CommonEnumUtil.USER_LOGIN_STATUS.LOGIN_SUCCESS.getValue());
AuthUtil.setOrganize(user.getUser().getOrganize()); AuthUtil.setOrganize(user.getUser().getOrganize());
} catch (IncorrectCredentialsException e) { } catch (IncorrectCredentialsException e) {
result = ResultBean.fail(ImppExceptionEnum.LOGIN_EXCEPTION_USER_PASSWORD); result = ResultBean.fail(ImppExceptionEnum.LOGIN_EXCEPTION_USER_PASSWORD);
userPasswordUtil.checkLoginErrorNumber(loginName,result,e); userPasswordUtil.checkLoginErrorNumber(loginName, result, e);
userLoginStatus = CommonEnumUtil.USER_LOGIN_STATUS.WRONG_PASSWORD; userLoginStatus = CommonEnumUtil.USER_LOGIN_STATUS.WRONG_PASSWORD;
} catch (CredentialsException e) { } catch (CredentialsException e) {
@ -234,16 +240,16 @@ public class WhiteController extends CoreBaseController {
// 记录登录记录 // 记录登录记录
userLoginStatus = CommonEnumUtil.USER_LOGIN_STATUS.SYSTEM_ERROR; userLoginStatus = CommonEnumUtil.USER_LOGIN_STATUS.SYSTEM_ERROR;
}finally { } finally {
// 记录登录记录 // 记录登录记录
recordSysUserLog(null, loginName,userLoginStatus.getValue()); recordSysUserLog(null, loginName, userLoginStatus.getValue());
} }
LOGGER.info("会员{}登陆登录完成 ,语言：{} , 登录耗时:{}",loginName,BaseThreadLocal.getThreadLanguageCode(),(System.currentTimeMillis() - startTime)); LOGGER.info("会员{}登陆登录完成 ,语言：{} , 登录耗时:{}", loginName, BaseThreadLocal.getThreadLanguageCode(), (System.currentTimeMillis() - startTime));
return result; return result;
} }
private void recordSysUserLog(Long userId, String username,Integer userLoginStatus){ private void recordSysUserLog(Long userId, String username, Integer userLoginStatus) {
SysLogUserLogin log = new SysLogUserLogin(); SysLogUserLogin log = new SysLogUserLogin();
log.setUserId(userId); log.setUserId(userId);
@ -259,11 +265,11 @@ public class WhiteController extends CoreBaseController {
@GetMapping(value = "/find-language-code") @GetMapping(value = "/find-language-code")
@ApiOperation(value = "根据语言代码查询资源") @ApiOperation(value = "根据语言代码查询资源")
public ResultBean findSysLocaleResourceByLanguageCode(String languageCode){ public ResultBean findSysLocaleResourceByLanguageCode(String languageCode) {
try { try {
startMultiService(); startMultiService();
ValidatorBean.checkNotNull(languageCode,"语言代码不能为空"); ValidatorBean.checkNotNull(languageCode, "语言代码不能为空");
if (sysLocaleLanguageService.getSysLocaleLanguageByCode(languageCode) == null) { if (sysLocaleLanguageService.getSysLocaleLanguageByCode(languageCode) == null) {
throw ImppExceptionBuilder.newInstance() throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
@ -274,23 +280,23 @@ public class WhiteController extends CoreBaseController {
// 从缓存获取语言信息 // 从缓存获取语言信息
Map<Object, Object> resourceMap = Map<Object, Object> resourceMap =
redisRes.getHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE_WEB+ ":" + languageCode); redisRes.getHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE_WEB + ":" + languageCode);
if (resourceMap == null || resourceMap.size() == 0) { if (resourceMap == null || resourceMap.size() == 0) {
systemInitService.putAndLoadSysLocaleLanguage(); systemInitService.putAndLoadSysLocaleLanguage();
resourceMap = redisRes.getHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE_WEB + ":" + languageCode); resourceMap = redisRes.getHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE_WEB + ":" + languageCode);
} }
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultMap(resourceMap); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultMap(resourceMap);
}catch(ImppBusiException busExcep){ } catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
}catch(Exception e){ } catch (Exception e) {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
} }
} }
@PostMapping(value = "/sys-locale-resource/query") @PostMapping(value = "/sys-locale-resource/query")
@ApiOperation(value = "按条件查询资源") @ApiOperation(value = "按条件查询资源")
public ResultBean findSysLocaleResource(@RequestBody CloudPagerModel<SysLocaleResource> pagerModel){ public ResultBean findSysLocaleResource(@RequestBody CloudPagerModel<SysLocaleResource> pagerModel) {
try { try {
ListPager<SysLocaleResource> resourceList = sysLocaleResourceService.querySysLocaleResourceByPager( ListPager<SysLocaleResource> resourceList = sysLocaleResourceService.querySysLocaleResourceByPager(
pagerModel.getObj(), pagerModel.getPager() pagerModel.getObj(), pagerModel.getPager()
@ -298,40 +304,39 @@ public class WhiteController extends CoreBaseController {
return ResultBean.success("操作成功") return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setListPager(resourceList); .setListPager(resourceList);
}catch(ImppBusiException busExcep){ } catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
}catch(Exception e){ } catch (Exception e) {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
} }
} }
@PostMapping(value = "/find-resource") @PostMapping(value = "/find-resource")
@ApiOperation(value = "按条件查询资源") @ApiOperation(value = "按条件查询资源")
public ResultBean<SysLocaleResource> findSysLocaleResource(@RequestBody SysLocaleResource resource){ public ResultBean<SysLocaleResource> findSysLocaleResource(@RequestBody SysLocaleResource resource) {
try { try {
startMultiService(); startMultiService();
List<SysLocaleResource> resourceList = sysLocaleResourceService.findSysLocaleResource(resource); List<SysLocaleResource> resourceList = sysLocaleResourceService.findSysLocaleResource(resource);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(resourceList); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(resourceList);
}catch(ImppBusiException busExcep){ } catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
}catch(Exception e){ } catch (Exception e) {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
} }
} }
@GetMapping(value = "/find-language-code-soft-type") @GetMapping(value = "/find-language-code-soft-type")
@ApiOperation(value = "根据语言代码查询资源") @ApiOperation(value = "根据语言代码查询资源")
public ResultBean findSysLocaleResourceByLanguageCode(String languageCode,Integer softType, public ResultBean findSysLocaleResourceByLanguageCode(String languageCode, Integer softType,
@RequestParam(defaultValue = "2") Integer needPlatformRes){ @RequestParam(defaultValue = "2") Integer needPlatformRes) {
try { try {
startMultiService(); startMultiService();
ValidatorBean.checkNotNull(languageCode,"语言代码不能为空"); ValidatorBean.checkNotNull(languageCode, "语言代码不能为空");
ValidatorBean.checkNotNull(softType,"软件类型不能为空"); ValidatorBean.checkNotNull(softType, "软件类型不能为空");
if (sysLocaleLanguageService.getSysLocaleLanguageByCode(languageCode) == null) { if (sysLocaleLanguageService.getSysLocaleLanguageByCode(languageCode) == null) {
throw ImppExceptionBuilder.newInstance() throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
@ -348,16 +353,17 @@ public class WhiteController extends CoreBaseController {
resourceMap = redisRes.getHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE_WEB + ":" + languageCode + ":" + softType); resourceMap = redisRes.getHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE_WEB + ":" + languageCode + ":" + softType);
} }
if(needPlatformRes.intValue() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()){ if (needPlatformRes.intValue() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()) {
Map<Object, Object> platformResMap = 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); resourceMap.putAll(platformResMap);
} }
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultMap(resourceMap); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultMap(resourceMap);
}catch(ImppBusiException busExcep){ } catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
}catch(Exception e){ } catch (Exception e) {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
} }
} }
@ -365,7 +371,7 @@ public class WhiteController extends CoreBaseController {
@PostMapping(value = "/sys-file/insert") @PostMapping(value = "/sys-file/insert")
@ApiOperation(value = "新增文件资源", notes = "新增文件资源") @ApiOperation(value = "新增文件资源", notes = "新增文件资源")
public ResultBean insertSysFile(@RequestBody SysFile sysFile){ public ResultBean insertSysFile(@RequestBody SysFile sysFile) {
try { try {
startMultiService(); startMultiService();
@ -379,11 +385,11 @@ public class WhiteController extends CoreBaseController {
// 文件类型验证 // 文件类型验证
SysDictionary dictionary = dictionaryService.getSysDictionaryByParentCodeAndValue(BaseConstWords.DICTIONARY_FILE_TYPE, SysDictionary dictionary = dictionaryService.getSysDictionaryByParentCodeAndValue(BaseConstWords.DICTIONARY_FILE_TYPE,
StringTool.getStringFileSuffix(sysFile.getFileOriginalName(), true)); StringTool.getStringFileSuffix(sysFile.getFileOriginalName(), true));
if(dictionary == null){ if (dictionary == null) {
throw ImppExceptionBuilder.newInstance() throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_FORMAT.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_FORMAT.getCode())
.setErrorDetail("文件格式不支持 %s",sysFile.getFileOriginalName()) .setErrorDetail("文件格式不支持 %s", sysFile.getFileOriginalName())
.setErrorSolution("请到字典管理中添加文件类型") .setErrorSolution("请到字典管理中添加文件类型")
.build(); .build();
} }
@ -392,19 +398,20 @@ public class WhiteController extends CoreBaseController {
sysFile.setFileTypeId(dictionary.getId()); sysFile.setFileTypeId(dictionary.getId());
sysFile.setFileTypeName(dictionary.getName()); sysFile.setFileTypeName(dictionary.getName());
ConvertBean.serviceModelInitialize(sysFile,"白名单"); ConvertBean.serviceModelInitialize(sysFile, "白名单");
sysFile = sysFileService.insertSysFile(sysFile); sysFile = sysFileService.insertSysFile(sysFile);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(sysFile); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(sysFile);
}catch(ImppBusiException busExcep){ } catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
}catch(Exception e){ } catch (Exception e) {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
} }
} }
/** /**
* 根据文件代码查询文件信息 * 根据文件代码查询文件信息
*
* @param fileCode 文件代码 * @param fileCode 文件代码
* @return 处理结果 * @return 处理结果
*/ */
@ -416,10 +423,10 @@ public class WhiteController extends CoreBaseController {
ValidatorBean.checkNotNull(fileCode, "文件代码不能为空"); ValidatorBean.checkNotNull(fileCode, "文件代码不能为空");
SysFile sysFile = sysFileService.getSysFileByFileCode(fileCode); SysFile sysFile = sysFileService.getSysFileByFileCode(fileCode);
return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(sysFile); return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(sysFile);
}catch(ImppBusiException busExcep){ } catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
}catch(Exception e){ } catch (Exception e) {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
} }
} }
@ -464,14 +471,14 @@ public class WhiteController extends CoreBaseController {
} }
@PostMapping(value = "/sys-find-user/list") @PostMapping(value = "/sys-find-user/list")
@ApiOperation(value = "查询用户列表信息",notes = "查询用户列表信息") @ApiOperation(value = "查询用户列表信息", notes = "查询用户列表信息")
public ResultBean findSysUserInfoList(UserDetailModel model){ public ResultBean findSysUserInfoList(UserDetailModel model) {
try { try {
List<SysUser> userList = personnelService.querySysUserByUserDetailModelOrIds(model, new ArrayList<>()); List<SysUser> userList = personnelService.querySysUserByUserDetailModelOrIds(model, new ArrayList<>());
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(userList); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(userList);
}catch(ImppBusiException busExcep){ } catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
}catch(Exception e){ } catch (Exception e) {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
} }
} }
@ -491,14 +498,14 @@ public class WhiteController extends CoreBaseController {
* *
* @return * @return
*/ */
private CommonEnumUtil.LOG_LOGIN_PLATFORM getLoginPlatform(){ private CommonEnumUtil.LOG_LOGIN_PLATFORM getLoginPlatform() {
String value = CookieTool.getCookieValue(request, CommonConstWords.SESSION_LOGIN_PLATFORM); String value = CookieTool.getCookieValue(request, CommonConstWords.SESSION_LOGIN_PLATFORM);
if(StringUtils.isBlank(value)){ if (StringUtils.isBlank(value)) {
value = CommonEnumUtil.LOG_LOGIN_PLATFORM.PC_IMPP_CORE.getValue() + ""; value = CommonEnumUtil.LOG_LOGIN_PLATFORM.PC_IMPP_CORE.getValue() + "";
}else{ } else {
try { try {
Integer.parseInt(value); Integer.parseInt(value);
}catch (Exception e){ } catch (Exception e) {
throw ImppExceptionBuilder.newInstance() throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_FORMAT.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_FORMAT.getCode())
@ -513,55 +520,58 @@ public class WhiteController extends CoreBaseController {
@GetMapping("/sys-organize/list") @GetMapping("/sys-organize/list")
@ApiOperation(value = "获取全部组织", notes = "获取全部组织") @ApiOperation(value = "获取全部组织", notes = "获取全部组织")
public ResultBean<SysOrganize> findSysOrganizeList(){ public ResultBean<SysOrganize> findSysOrganizeList() {
try { try {
List<SysOrganize> sysOrganizeList = sysOrganizeService.findAll(); List<SysOrganize> sysOrganizeList = sysOrganizeService.findAll();
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(sysOrganizeList); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(sysOrganizeList);
}catch(ImppBusiException busExcep){ } catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
}catch(Exception e){ } catch (Exception e) {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
} }
} }
/** /**
* 查询全部打印模板 * 查询全部打印模板
*
* @return 处理结果 * @return 处理结果
*/ */
@PostMapping(value = "/sys-label-template/list") @PostMapping(value = "/sys-label-template/list")
@ApiOperation(value = "查询全部打印模板",notes = "查询全部打印模板") @ApiOperation(value = "查询全部打印模板", notes = "查询全部打印模板")
public ResultBean<SysLabelTemplate> findSysConfigAll(@RequestBody SysLabelTemplate template){ public ResultBean<SysLabelTemplate> findSysConfigAll(@RequestBody SysLabelTemplate template) {
try { try {
List<SysLabelTemplate> sysLabelTemplateList = sysLabelTemplateService.listSysLabelTemplateDetail(template);; List<SysLabelTemplate> sysLabelTemplateList = sysLabelTemplateService.listSysLabelTemplateDetail(template);
return ResultBean.success("操作成功") ;
return ResultBean.success("操作成功")
.setResultList(sysLabelTemplateList) .setResultList(sysLabelTemplateList)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){ } catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
}catch(Exception e){ } catch (Exception e) {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
} }
} }
/** /**
* 查询未翻译的资源 * 查询未翻译的资源
*
* @return 处理结果 * @return 处理结果
*/ */
@PostMapping(value = "/locale-resource/no-resource") @PostMapping(value = "/locale-resource/no-resource")
@ApiOperation(value = "查询未翻译的资源",notes = "查询未翻译的资源") @ApiOperation(value = "查询未翻译的资源", notes = "查询未翻译的资源")
public ResultBean<SysLabelTemplate> findSysConfigAll(){ public ResultBean<SysLabelTemplate> findSysConfigAll() {
try { try {
Set<String> keys = redisRes.getKeysSet(CommonConstWords.REDIS_PREFIX_CACHE_NO_RES+"*"); Set<String> keys = redisRes.getKeysSet(CommonConstWords.REDIS_PREFIX_CACHE_NO_RES + "*");
List<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
for (String key : keys) { for (String key : keys) {
list.add(redisRes.getObject(key).toString()); list.add(redisRes.getObject(key).toString());
} }
return ResultBean.success("操作成功") return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
.setResultList(list); .setResultList(list);
}catch(ImppBusiException busExcep){ } catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
}catch(Exception e){ } catch (Exception e) {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
} }
} }
@ -587,6 +597,7 @@ public class WhiteController extends CoreBaseController {
/** /**
* 缺失资源 * 缺失资源
*
* @param key * @param key
* @param menuCode * @param menuCode
* @return * @return
@ -594,10 +605,10 @@ public class WhiteController extends CoreBaseController {
@AnnoIgnoreLog @AnnoIgnoreLog
@PostMapping(value = "/miss-resource/get") @PostMapping(value = "/miss-resource/get")
@ApiOperation(value = "缺失资源", notes = "缺失资源") @ApiOperation(value = "缺失资源", notes = "缺失资源")
public ResultBean getMissResourceByKey(String key,String menuCode){ public ResultBean getMissResourceByKey(String key, String menuCode) {
try { try {
Map<String,String> missResource = new HashMap<>(); Map<String, String> missResource = new HashMap<>();
missResource.put(key,menuCode); missResource.put(key, menuCode);
rabbitTemplate.convertAndSend(PlatformConstWords.QUEUE_IMPP_RESOURCE, JsonUtilTool.encode(missResource)); rabbitTemplate.convertAndSend(PlatformConstWords.QUEUE_IMPP_RESOURCE, JsonUtilTool.encode(missResource));
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) { } catch (ImppBusiException busExcep) {
@ -615,7 +626,7 @@ public class WhiteController extends CoreBaseController {
@AnnoIgnoreLog @AnnoIgnoreLog
@GetMapping(value = "/miss-resource/web-listener-switch") @GetMapping(value = "/miss-resource/web-listener-switch")
@ApiOperation(value = "缺失资源开关", notes = "缺失资源开关") @ApiOperation(value = "缺失资源开关", notes = "缺失资源开关")
public ResultBean getWebMissResourceSwitch(){ public ResultBean getWebMissResourceSwitch() {
try { try {
int webListener = RedisCacheTool.getSysConfigIntVal(PlatformConstWords.WEB_MISS_RESOURCE_LISTENER_SWITCH, int webListener = RedisCacheTool.getSysConfigIntVal(PlatformConstWords.WEB_MISS_RESOURCE_LISTENER_SWITCH,
CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
@ -630,12 +641,12 @@ public class WhiteController extends CoreBaseController {
@PostMapping(value = "/license") @PostMapping(value = "/license")
@ApiOperation(value = "更新授权", notes = "更新授权") @ApiOperation(value = "更新授权", notes = "更新授权")
public ResultBean updateLicense(String content){ public ResultBean updateLicense(String content) {
try { try {
ImppLicense license = ImppLicenseDecoder.getLicenseDecoder(content); ImppLicense license = ImppLicenseDecoder.getLicenseDecoder(content);
if(Objects.nonNull(license)){ if (Objects.nonNull(license)) {
ImppLicenseTool.updateImppLicense(license); ImppLicenseTool.updateImppLicense(license);
}else{ } else {
return ResultBean.fail("错误的授权信息"); return ResultBean.fail("错误的授权信息");
} }
return ResultBean.success("操作成功"); return ResultBean.success("操作成功");
@ -648,10 +659,10 @@ public class WhiteController extends CoreBaseController {
@GetMapping(value = "/forced-offline/{loginName}") @GetMapping(value = "/forced-offline/{loginName}")
@ApiOperation(value = "强制下线", notes = "强制下线") @ApiOperation(value = "强制下线", notes = "强制下线")
public ResultBean forcedOffline(@PathVariable("loginName") String loginName){ public ResultBean forcedOffline(@PathVariable("loginName") String loginName) {
try { try {
SysUser sysUser = userService.getSysUserByLoginName(loginName); SysUser sysUser = userService.getSysUserByLoginName(loginName);
ValidatorBean.checkNotNull(sysUser,"用户不存在，请检查【登录名】"); ValidatorBean.checkNotNull(sysUser, "用户不存在，请检查【登录名】");
redisSession.deleteBatchKey(CommonConstWords.SESSION_USER + ":*_" + sysUser.getId()); redisSession.deleteBatchKey(CommonConstWords.SESSION_USER + ":*_" + sysUser.getId());
return ResultBean.success("操作成功"); return ResultBean.success("操作成功");
} catch (ImppBusiException busExcep) { } catch (ImppBusiException busExcep) {
@ -670,6 +681,7 @@ public class WhiteController extends CoreBaseController {
/********************************************SWEB所需接口*******************************************/ /********************************************SWEB所需接口*******************************************/
/** /**
* 添加用户信息 * 添加用户信息
*
* @param model 用户信息 * @param model 用户信息
* @return 处理结果 * @return 处理结果
*/ */
@ -681,6 +693,7 @@ public class WhiteController extends CoreBaseController {
/** /**
* 修改用户信息 * 修改用户信息
*
* @param model 用户信息 * @param model 用户信息
* @return 处理结果 * @return 处理结果
*/ */
@ -692,6 +705,7 @@ public class WhiteController extends CoreBaseController {
/** /**
* 删除用户信息 * 删除用户信息
*
* @param id 用户id * @param id 用户id
* @return 处理结果 * @return 处理结果
*/ */
@ -703,11 +717,12 @@ public class WhiteController extends CoreBaseController {
/** /**
* 查询用户信息 * 查询用户信息
*
* @param cloudPagerModel 查询条件 * @param cloudPagerModel 查询条件
* @return 处理结果 * @return 处理结果
*/ */
@PostMapping(value="/user/query") @PostMapping(value = "/user/query")
@ApiOperation(value="查询用户信息",notes="复杂查询用户信息带分页") @ApiOperation(value = "查询用户信息", notes = "复杂查询用户信息带分页")
public ResultBean querySysUserInfo(@RequestBody CloudPagerModel<SysUserInfo> cloudPagerModel) { public ResultBean querySysUserInfo(@RequestBody CloudPagerModel<SysUserInfo> cloudPagerModel) {
return sysUserInfoController.querySysUserInfo(cloudPagerModel.getObj(), cloudPagerModel.getPager()); return sysUserInfoController.querySysUserInfo(cloudPagerModel.getObj(), cloudPagerModel.getPager());
} }

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()); .checkNotZero("isCycle", sysOrderNoRule.getIsCycle());
sysOrderNoRuleService.updateSysOrderNoRule(sysOrderNoRule); sysOrderNoRuleService.updateSysOrderNoRule(sysOrderNoRule);
// 清理缓存
redisRes.deleteKey(REDIS_PREFIX_LOCK_GET_ORDER_NO + ":" + sysOrderNoRule.getOrderNoRuleCode());
return ResultBean.success("操作成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("操作成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) { } catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
@ -157,11 +161,11 @@ public class SysOrderNoRuleController extends CoreBaseController {
SysOrderNoRule sysOrderNoRule = sysOrderNoRuleService.getSysOrderNoRuleById(Long.parseLong(idStr)); SysOrderNoRule sysOrderNoRule = sysOrderNoRuleService.getSysOrderNoRuleById(Long.parseLong(idStr));
ValidatorBean.checkNotNull(sysOrderNoRule,"单号规则不存在"); ValidatorBean.checkNotNull(sysOrderNoRule,"单号规则不存在");
// 清理缓存
redisRes.deleteKey(REDIS_PREFIX_LOCK_GET_ORDER_NO + ":" + sysOrderNoRule.getOrderNoRuleCode());
// 删除 // 删除
sysOrderNoRuleService.deleteSysOrderNoRuleById(sysOrderNoRule.getId()); sysOrderNoRuleService.deleteSysOrderNoRuleById(sysOrderNoRule.getId());
// 清理缓存
redisRes.deleteKey(REDIS_PREFIX_LOCK_GET_ORDER_NO + ":" + sysOrderNoRule.getOrderNoRuleCode());
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) { } catch (ImppBusiException busExcep) {
return ResultBean.fail(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); sysOrderNoRuleService.detachSysOrderNoRule(codeRole);
Long incr = codeRole.getSerialNoIncrement() * num; long orginSerialNo = codeRole.getSerialNo() < 0 ? 0 : codeRole.getSerialNo();
long incr = codeRole.getSerialNoIncrement() * num;
//缓存增加 //缓存增加
//先判断redis是否存在，如果不存在，则用默认初始值+步长*数量，如果存在，则添加步长 * 数量 //先判断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); 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) { if (orderNoRule.getSerialNo() > 0 && orderNo.indexOf(PlatformConstWords.SERIAL_NO) != -1) {
String newNo = orderNo.substring(0,orderNo.indexOf(PlatformConstWords.SERIAL_NO)); String newNo = orderNo.substring(0,orderNo.indexOf(PlatformConstWords.SERIAL_NO));
String oldNo = orderNoRule.getOrderNo().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()){ if(!newNo.equals(oldNo) && orderNoRule.getIsCycle() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()){
orderNoRule.setSerialNo(orderNoRule.getSerialNoSeed()); orderNoRule.setSerialNo(orderNoRule.getSerialNoSeed());
} else { } 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 { } else {
orderNoRule.setSerialNo(orderNoRule.getSerialNoSeed() * orderNoRule.getSerialNoIncrement()); orderNoRule.setSerialNo(orderNoRule.getSerialNoSeed() * orderNoRule.getSerialNoIncrement());

Write Preview
Loading…
Cancel
Save