字典管理 批量删除

系统信息管理 get结果判断
硬件管理     批量修改状态
yun-zuoyi
yunhao.wang 7 years ago
parent 19714088d2
commit c39dff1266

@ -55,11 +55,18 @@ public interface ISysDictionaryService {
/**
*
*
*/
ListPager querySysDictionaryByPager(SysDictionary sysDictionary, Pager pager);
/**
*
*
*/
List<SysDictionary> findSysDictionaryByTop();
/**
*
* @param ids
*/
void deleteSysDictionaryByIds(String[] ids);
}

@ -67,7 +67,6 @@ public interface ISysMessageService {
*/
void deleteSysMessageByIds(String[] ids);
/**
*
* @param ids

@ -20,7 +20,7 @@ public interface IToolService {
*
* @param tool
*/
void insertTool(Tool tool);
Tool insertTool(Tool tool);
/**
*
@ -56,14 +56,23 @@ public interface IToolService {
ListPager queryToolByPager(Tool tool, Pager pager);
/**
* id
* id
* @param id
* @param status
*/
void updateStatusEnable(String id);
void updateToolStatusById(String id,Integer status);
/**
* id
* @param id
*
* @param ids
*/
void deleteToolByIds(String[] ids);
/**
*
* @param ids
* @param status
*/
void updateStatusDisable(String id);
void updateToolStatusByIds(String[] ids,Integer status);
}

@ -4,11 +4,13 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysDictionaryService;
import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ResultBean;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
@ -116,8 +118,7 @@ public class SysDictionaryController {
public ResultBean findSysDictionaryAll() {
try {
List<SysDictionary> sysDictionaryList = sysDictionaryService.listSysDictionary();
return ResultBean.success("查询成功")
.setResultList(sysDictionaryList)
return ResultBean.success("查询成功").setResultList(sysDictionaryList)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) {
LOGGER.error(busExcep.getErrorMsg() + "{}", busExcep.getErrorDetail(), busExcep);
@ -137,8 +138,7 @@ public class SysDictionaryController {
SysDictionary sysDictionary = sysDictionaryService.getSysDictionaryById(id);
if (sysDictionary != null) {
return ResultBean.success("查询成功").setResultObject(sysDictionary)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
return ResultBean.success("查询成功").setResultObject(sysDictionary).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}else {
return ResultBean.fail("字典不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
}
@ -174,9 +174,7 @@ public class SysDictionaryController {
public ResultBean querySysDictionaryByPager(SysDictionary sysDictionary, Pager pager) {
try {
ListPager sysDictionaryListPager = sysDictionaryService.querySysDictionaryByPager(sysDictionary,pager);
return ResultBean.success("查询成功")
.setListPager(sysDictionaryListPager)
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
return ResultBean.success("查询成功").setListPager(sysDictionaryListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());
@ -202,4 +200,26 @@ public class SysDictionaryController {
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
@DeleteMapping("/batch-delete")
@ApiOperation(value = "批量删除消息",notes = "批量删除消息")
public ResultBean deleteSysDictionaryByIds(String[] ids){
try{
if(ids.length == 0){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("请选择需要删除的资源。")
.build();
}
sysDictionaryService.deleteSysDictionaryByIds(ids);
return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
}

@ -56,8 +56,8 @@ public class SysMessageController {
// 添加初始化
ConvertBean.modelInitialize(sysMessage,user);
sysMessage.setMessageSendId(user.getUser().getId());
sysMessage.setRedSendName(user.getUser().getName());
// sysMessage.setMessageSendId(user.getUser().getId());
// sysMessage.setRedSendName(user.getUser().getName());
sysMessage.setMessageStatusId(ImppEnumUtil.USER_MESSAGE_STATUS.UNREAD.getValue());
sysMessageService.insertSysMessage(sysMessage);
@ -133,11 +133,15 @@ public class SysMessageController {
}
@GetMapping(value = "/get/{id}")
@ApiOperation(value = "根据id查询系统参数",notes = "根据id查询系统参数")
@ApiOperation(value = "根据id查询消息",notes = "根据id查询消息")
public ResultBean getSysConfigById(String id){
try {
SysMessage sysMessageList = sysMessageService.getSysMessageById(id);
if (sysMessageList != null) {
return ResultBean.success("查询成功").setResultObject(sysMessageList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}else {
return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode());
}
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());
@ -202,9 +206,9 @@ public class SysMessageController {
}
}
@DeleteMapping("/batch-status")
@PutMapping("/batch-status")
@ApiOperation(value = "批量切换消息状态",notes = "批量切换消息状态")
public ResultBean deleteSysMessageByIds(String[] ids,Integer status){
public ResultBean updateSysMessageStatusByIds(String[] ids,Integer status){
try{
if(ids.length == 0){
throw ImppExceptionBuilder.newInstance()

@ -13,6 +13,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.Tool;
import cn.estsh.impp.framework.boot.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ResultBean;
import cn.estsh.impp.framework.boot.util.ValidatorBean;
@ -179,12 +180,11 @@ public class ToolController {
}
@PutMapping(value = "/status")
@ApiOperation(value = "硬件类型启用",notes = "硬件类型禁用")
@ApiOperation(value = "硬件状态",notes = "硬件类型禁用")
public ResultBean updateStatusEnable(String id,Integer status){
try {
toolService.updateStatusEnable(id);
return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
toolService.updateToolStatusById(id,status);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());
@ -194,13 +194,41 @@ public class ToolController {
}
}
@PutMapping(value = "/update/status/disable")
@ApiOperation(value = "硬件类型启用",notes = "硬件类型禁用")
public ResultBean updateStatusDisable(String id){
@DeleteMapping("/batch-delete")
@ApiOperation(value = "批量删除硬件",notes = "批量删除硬件")
public ResultBean deleteToolByIds(String[] ids){
try{
toolService.updateStatusDisable(id);
return ResultBean.success("操作成功")
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
if(ids.length == 0){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("请选择需要删除的资源。")
.build();
}
toolService.deleteToolByIds(ids);
return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());
}catch(Exception e){
LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "{}",e.getMessage(),e);
return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode());
}
}
@PutMapping("/batch-status")
@ApiOperation(value = "批量切换硬件状态",notes = "批量切换硬件状态")
public ResultBean updateToolStatusByIds(String[] ids,Integer status){
try{
if(ids.length == 0){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
.setErrorDetail("请选择需要操作的资源。")
.build();
}
toolService.updateToolStatusByIds(ids,status);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){
LOGGER.error(busExcep.getErrorMsg() + "{}",busExcep.getErrorDetail(),busExcep);
return ResultBean.fail(busExcep.getErrorShow());

@ -5,9 +5,12 @@ 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.base.enumutil.ImppEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
import cn.estsh.i3plus.pojo.platform.repository.SysDictionaryRepository;
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 cn.estsh.impp.framework.boot.util.ValidatorBean;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -32,6 +35,16 @@ public class SysDictionaryService implements ISysDictionaryService {
@Override
public void insertSysDictionary(SysDictionary sysDictionary) {
long repeatCount = sysDictionaryRDao.findByPropertyCount("dictionaryCode",sysDictionary.getDictionaryCode());
if (repeatCount > 0){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode())
.setErrorDetail("字典代码已存在")
.setErrorSolution("请重新输入字典代码")
.build();
}
// 查询父级字典名称
if (sysDictionary.getParentId() != null && sysDictionary.getParentId() > 0) {
LOGGER.info("字典 SYS_DICTIONARY parentId:{}", sysDictionary.getParentId());
@ -41,7 +54,7 @@ public class SysDictionaryService implements ISysDictionaryService {
sysDictionary.setRedParentName(parentSysDictionary.getName());
sysDictionary.setRedParentCode(parentSysDictionary.getDictionaryCode());
} else {
sysDictionary.setParentId(-1L);
sysDictionary.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue());
}
LOGGER.info("字典 SYS_DICTIONARY sysDictionary:{}",sysDictionary);
@ -56,6 +69,18 @@ public class SysDictionaryService implements ISysDictionaryService {
@Override
public void updateSysDictionary(SysDictionary sysDictionary) {
// 校验唯一
String hqlPack = CoreHqlPack.packHqlSysDictionaryCode(sysDictionary);
long repeatCount = sysDictionaryRDao.findByHqlWhereCount(hqlPack);
if (repeatCount > 0){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode())
.setErrorDetail("字典代码已存在")
.setErrorSolution("请重新输入字典代码")
.build();
}
// 查询父级字典名称
if (sysDictionary.getParentId() != null && sysDictionary.getParentId() > 0) {
LOGGER.info("字典 SYS_DICTIONARY parentId:{}", sysDictionary.getParentId());
@ -64,8 +89,6 @@ public class SysDictionaryService implements ISysDictionaryService {
sysDictionary.setRedParentName(parentSysDictionary.getName());
sysDictionary.setRedParentCode(parentSysDictionary.getDictionaryCode());
} else {
sysDictionary.setParentId(-1L);
}
LOGGER.info("字典 SYS_DICTIONARY sysDictionary:{}",sysDictionary);
@ -81,9 +104,7 @@ public class SysDictionaryService implements ISysDictionaryService {
@Override
public SysDictionary getSysDictionaryById(String id) {
LOGGER.info("字典 SYS_DICTIONARY id:{}",id);
SysDictionary ds = sysDictionaryRDao.getById(Long.parseLong(id));
System.out.println(ds);
return ds;
return sysDictionaryRDao.getById(Long.parseLong(id));
}
@Override
@ -95,19 +116,27 @@ public class SysDictionaryService implements ISysDictionaryService {
@Override
public ListPager querySysDictionaryByPager(SysDictionary sysDictionary, Pager pager) {
LOGGER.info("字典 SYS_DICTIONARY SysDictionary:{}Pager:{}",sysDictionary,pager);
if(sysDictionary == null) {
pager = PagerHelper.getPager(pager, sysDictionaryRDao.listCount());
return new ListPager(sysDictionaryRDao.listPager(pager),pager);
}else {
sysDictionary = sysDictionary == null ? new SysDictionary():sysDictionary;
String hqlPack = CoreHqlPack.packHqlSysDictionary(sysDictionary);
pager = PagerHelper.getPager(pager, sysDictionaryRDao.findByHqlWhereCount(hqlPack));
return new ListPager(sysDictionaryRDao.findByHqlWherePage(hqlPack + sysDictionary.orderBy(),pager),pager);
}
}
@Override
public List<SysDictionary> findSysDictionaryByTop() {
LOGGER.info("字典 SYS_DICTIONARY parentId:{}", CommonEnumUtil.PARENT.DEFAULT.getValue());
return sysDictionaryRDao.findByProperty("parentId",(long)CommonEnumUtil.PARENT.DEFAULT.getValue());
}
@Override
public void deleteSysDictionaryByIds(String[] ids) {
LOGGER.info("字典 SYS_DICTIONARY ids:{}", ids.toString());
Long[] array = new Long[ids.length];
for (int i = 0; i < ids.length; i++) {
array[i] = Long.parseLong(ids[i]);
}
sysDictionaryRDao.deleteByIds(array);
}
}

@ -5,6 +5,7 @@ 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.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
import cn.estsh.i3plus.pojo.platform.bean.SysUser;
import cn.estsh.i3plus.pojo.platform.repository.SysMessageRepository;
@ -102,15 +103,12 @@ public class SysMessageService implements ISysMessageService {
@Override
public void updateSysMessageStatusById(String id, Integer status) {
LOGGER.info("消息 SYS_MESSAGE id:{}status:{}",id,status);
SysMessage sysMessage = sysMessageRDao.getById(Long.parseLong(id));
sysMessage.setMessageStatusId(status);
sysMessageRDao.update(sysMessage);
sysMessageRDao.updateByProperties("id",Long.parseLong(id),"messageStatusId", status);
}
@Override
public void deleteSysMessageByIds(String[] ids) {
LOGGER.info("硬件类型 TOOL_TYPE ids:{}", ids.toString());
LOGGER.info("消息 SYS_MESSAGE ids:{}", ids.toString());
Long[] array = new Long[ids.length];
for (int i = 0; i < ids.length; i++) {
array[i] = Long.parseLong(ids[i]);
@ -121,12 +119,10 @@ public class SysMessageService implements ISysMessageService {
@Override
public void updateSysMessageStatusByIds(String[] ids,Integer status) {
LOGGER.info("硬件类型 TOOL_TYPE ids:{}", ids.toString());
long[] array = new long[ids.length];
for (int i = 0; i < ids.length; i++) {
array[i] = Long.parseLong(ids[i]);
}
// TODO 批量修改消息状态
// sysMessageRDao.
LOGGER.info("消息 SYS_MESSAGE ids{}status{}",ids,status);
StringBuffer where = new StringBuffer();
HqlPack.getInPack(String.join(",", ids), "id", where);
sysMessageRDao.updateByHqlWhere(where.toString(), "messageStatusId", status);
}
}

@ -5,6 +5,7 @@ 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.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.platform.bean.Tool;
import cn.estsh.i3plus.pojo.platform.bean.ToolType;
import cn.estsh.i3plus.pojo.platform.repository.ToolRepository;
@ -36,7 +37,7 @@ public class ToolService implements IToolService {
private ToolTypeRepository toolTypeRDao;
@Override
public void insertTool(Tool tool) {
public Tool insertTool(Tool tool) {
// 查询硬件类型名称
LOGGER.info("硬件类型 TOOL_TYPE :{}", tool.getToolTypeId());
ToolType toolType = toolTypeRDao.getById(tool.getToolTypeId());
@ -45,7 +46,7 @@ public class ToolService implements IToolService {
tool.setRedToolTypeName(toolType.getName());
LOGGER.info("硬件 TOOL tool:{}",tool);
toolRDao.insert(tool);
return toolRDao.insert(tool);
}
@Override
@ -93,16 +94,28 @@ public class ToolService implements IToolService {
}
@Override
public void updateStatusEnable(String id) {
LOGGER.info("硬件 TOOL id:{}",id);
toolRDao.updateByProperties("id",Long.parseLong(id),
"toolStatusId", CommonEnumUtil.DATA_STATUS.ENABLE.getValue());
public void updateToolStatusById(String id, Integer status) {
LOGGER.info("硬件 TOOL id:{}status{}",id,status);
toolRDao.updateByProperties("id",Long.parseLong(id),"toolStatusId", status);
}
@Override
public void updateStatusDisable(String id) {
LOGGER.info("硬件 TOOL id:{}",id);
toolRDao.updateByProperties("id",Long.parseLong(id),
"toolStatusId", CommonEnumUtil.DATA_STATUS.DISABLE.getValue());
public void deleteToolByIds(String[] ids) {
LOGGER.info("消息 SYS_MESSAGE ids:{}", ids.toString());
Long[] array = new Long[ids.length];
for (int i = 0; i < ids.length; i++) {
array[i] = Long.parseLong(ids[i]);
}
toolRDao.deleteByIds(array);
}
@Override
public void updateToolStatusByIds(String[] ids, Integer status) {
LOGGER.info("硬件 TOOL ids{}status{}",ids,status);
StringBuffer where = new StringBuffer();
HqlPack.getInPack(String.join(",", ids), "id", where);
toolRDao.updateByHqlWhere(where.toString(), "toolStatusId", status);
}
}

@ -43,7 +43,7 @@ public class ToolTypeService implements IToolTypeService {
@Override
public void deleteToolTypeById(String id) {
LOGGER.info("硬件类型 TOOL_TYPE id:{}",id);
long count = toolRDao.findByPropertyCount("toolTypeId",id);
long count = toolRDao.findByPropertyCount("toolTypeId",Long.parseLong(id));
if(count >= 1){
throw ImppExceptionBuilder.newInstance()
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())

Loading…
Cancel
Save