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

Merge remote-tracking branch 'origin/master'

Browse Source
yun-zuoyi
alwaysfrin 7 years ago
parent d1ff081470 129de18e45
commit 151717db13
3 changed files with 22 additions and 34 deletions
Show Stats Download Patch File Download Diff File

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

@ -178,6 +178,13 @@ public class SysLocaleResourceController extends CoreBaseController {
}
sysLocaleResourceService.insertSysLocaleResourceList(sysLocaleResourcesList);
HashMap<String,String> resource;
for (SysLocaleResource item:sysLocaleResourcesList) {
resource = new HashMap();
resource.put(item.getLanguageCode(),item.getResourceValue());
redisRes.putHashMap(item.getResourceKey(),resource,0);
}
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);

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

@ -58,17 +58,14 @@ public class SysToolController extends CoreBaseController{
.notNull("toolPort",tool.getToolPort());
// 添加初始化
ConvertBean.modelInitialize(tool,user);
tool.setToolStatus(CommonEnumUtil.DATA_STATUS.ENABLE.getValue());
toolService.insertSysTool(tool);
return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -94,11 +91,9 @@ public class SysToolController extends CoreBaseController{
toolService.updateSysTool(tool);
return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -111,11 +106,9 @@ public class SysToolController extends CoreBaseController{
toolService.deleteSysToolById(Long.parseLong(id));
return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -126,12 +119,10 @@ public class SysToolController extends CoreBaseController{
List<SysTool> toolList = toolService.listSysTool();
return ResultBean.success("操作成功").setResultList(toolList)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}catch(Exception e){
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -151,12 +142,10 @@ public class SysToolController extends CoreBaseController{
return ResultBean.fail("硬件不存在")
.setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
}
}catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
}catch(ImppBusiException busExcep){
return ResultBean.fail(busExcep);
} catch (Exception e) {
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}catch(Exception e){
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -169,11 +158,9 @@ public class SysToolController extends CoreBaseController{
.setListPager(sysSysToolListPager)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -184,11 +171,9 @@ public class SysToolController extends CoreBaseController{
toolService.updateSysToolStatusById(Long.parseLong(id),status);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -206,11 +191,9 @@ public class SysToolController extends CoreBaseController{
toolService.deleteSysToolByIds(StringTool.getArrayLong(ids));
return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
@ -228,11 +211,9 @@ public class SysToolController extends CoreBaseController{
toolService.updateSysToolStatusByIds(StringTool.getArrayLong(ids),status);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep);
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
}
}
}

4
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolService.java
Unescape Escape View File

@ -96,7 +96,7 @@ public class SysToolService implements ISysToolService {
@Override
public void updateSysToolStatusById(Long id, Integer status) {
LOGGER.info("硬件 TOOL id:{}，status：{}",id,status);
toolRDao.updateByProperties("id",id,"toolStatusId", status);
toolRDao.updateByProperties("id",id,"toolStatus", status);
}
@Override
@ -111,6 +111,6 @@ public class SysToolService implements ISysToolService {
StringBuffer where = new StringBuffer();
HqlPack.getInPack(StringUtils.join( ids,","), "id", where);
toolRDao.updateByHqlWhere(where.toString(), "toolStatusId", status);
toolRDao.updateByHqlWhere(where.toString(), "toolStatus", status);
}
}

Write Preview
Loading…
Cancel
Save