diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDictionaryService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDictionaryService.java new file mode 100644 index 0000000..9d14a29 --- /dev/null +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDictionaryService.java @@ -0,0 +1,53 @@ +package cn.estsh.i3plus.core.api.iservice.busi; + +import cn.estsh.i3plus.pojo.platform.bean.SysDictionary; + +import java.util.List; + +/** + * @Description : 字典服务接口 + * @Reference : + * @Author : yunhao + * @Date : 2018-10-28 23:41 + * @Modify : + **/ +public interface ISysDictionaryService { + + /** + * 添加字典 + * @param sysDictionary + */ + void insertSysDictionary(SysDictionary sysDictionary); + + /** + * 根据id删除字典 + * @param id + */ + void deleteSysDictionaryById(String id); + + /** + * 修改字典 + * @param sysDictionary + */ + void updateSysDictionary(SysDictionary sysDictionary); + + /** + * 查询所有字典信息 + * @return + */ + List listSysDictionary(); + + /** + * 根据id查询字典信息 + * @param id + * @return + */ + SysDictionary getSysDictionaryById(String id); + + /** + * 根据父级id查询字典信息 + * @param parentId + * @return + */ + List findSysDictionaryByCode(String parentId); +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java new file mode 100644 index 0000000..314ef01 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java @@ -0,0 +1,166 @@ +package cn.estsh.i3plus.core.apiservice.controller.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysDictionaryService; +import cn.estsh.i3plus.platform.common.convert.ConvertBean; +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.ImppExceptionEnum; +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.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @Description : 字典管理服务 + * @Reference : + * @Author : yunhao + * @Date : 2018-10-28 23:54 + * @Modify : + **/ +@RestController +@RequestMapping("/sys-dictionary") +@Api(description = "字典管理服务") +public class SysDictionaryController { + public static final Logger LOGGER = LoggerFactory.getLogger(SysConfigController.class); + + @Autowired + public ISysDictionaryService sysDictionaryService; + + @PostMapping("/insert") + @ApiOperation(value = "添加字典",notes = "添加字典") + public ResultBean insertSysDictionary(SysDictionary sysDictionary) { + try { + // 登录用户 + SessionUser user = AuthUtil.getSessionUser(); + + // 条件验证 + ValidatorBean.beginValid(sysDictionary) + .notNull("name",sysDictionary.getName()) + .notNull("dictionaryCode",sysDictionary.getDictionaryCode()) + .notNull("dictionaryValue",sysDictionary.getDictionaryValue()) + .notNull("dictionarySort",sysDictionary.getDictionarySort()); + + //修改初始化 + ConvertBean.modelInitialize(sysDictionary,user); + + sysDictionaryService.insertSysDictionary(sysDictionary); + 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("/update") + @ApiOperation(value = "修改字典",notes = "修改字典") + public ResultBean updateSysDictionary(SysDictionary sysDictionary) { + try { + // 登录用户 + SessionUser user = AuthUtil.getSessionUser(); + + // 条件验证 + ValidatorBean.beginValid(sysDictionary) + .notNull("name",sysDictionary.getName()) + .notNull("dictionaryCode",sysDictionary.getDictionaryCode()) + .notNull("dictionaryValue",sysDictionary.getDictionaryValue()) + .notNull("dictionarySort",sysDictionary.getDictionarySort()); + + //修改初始化 + ConvertBean.modelUpdate(sysDictionary,user); + + sysDictionaryService.updateSysDictionary(sysDictionary); + 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()); + } + } + + @DeleteMapping("/delete/{id}") + @ApiOperation(value = "根据id删除字典",notes = "根据id删除字典") + public ResultBean updateSysDictionary(@PathVariable("id") String id) { + try { + // 条件验证 + ValidatorBean.checkNotNull(id,"id不能为空"); + + sysDictionaryService.deleteSysDictionaryById(id); + 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()); + } + } + + @GetMapping(value = "/list") + @ApiOperation(value = "查询所有字典", notes = "查询所有字典") + public ResultBean findSysDictionaryAll() { + try { + List sysDictionaryList = sysDictionaryService.listSysDictionary(); + return ResultBean.success("查询成功").setResultList(sysDictionaryList) + .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()); + } + } + + @GetMapping(value = "/get/{id}") + @ApiOperation(value = "根据id查询字典", notes = "根据id查询字典") + public ResultBean getSysDictionaryById(@PathVariable("id") String id) { + try { + // 条件判断 + ValidatorBean.checkNotNull(id,"id不能为空"); + + SysDictionary sysDictionary = sysDictionaryService.getSysDictionaryById(id); + if (sysDictionary != null) { + return ResultBean.success("查询成功").setResultObject(sysDictionary) + .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()); + } catch (Exception e) { + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } + + @GetMapping(value = "/find/{code}") + @ApiOperation(value = "根据code查询字典项", notes = "根据code查询字典项") + public ResultBean findSysDictionaryByCode(@PathVariable("code") String code) { + try { + List sysDictionaryList = sysDictionaryService.findSysDictionaryByCode(code); + return ResultBean.success("查询成功").setResultList(sysDictionaryList) + .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()); + } + } +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java index cb81865..b6b9717 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java @@ -81,6 +81,21 @@ public class SysFileController { } } + @DeleteMapping(value = "/delete/{id}") + @ApiOperation(value = "根据id删除文件资源",notes = "根据id删除文件资源") + public ResultBean deleteSysFileById(@PathVariable("id") String id){ + try { + sysFileService.deleteSysFileById(id); + 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()); + } + } + @GetMapping(value = "/list") @ApiOperation(value = "查询全部文件资源",notes = "查询全部文件资源") public ResultBean findSysFileAll(SysFile sysFile){ @@ -98,9 +113,9 @@ public class SysFileController { } } - @GetMapping(value = "/get-by-id") + @GetMapping(value = "/get/{id}") @ApiOperation(value = "根据id查询文件资源",notes = "根据id查询文件资源") - public ResultBean getSysFileById(String id){ + public ResultBean getSysFileById(@PathVariable("id") String id){ try { SysFile sysFile = sysFileService.getSysFileById(id); return ResultBean.success("查询成功") diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryServiceImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryServiceImpl.java new file mode 100644 index 0000000..02e10d2 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryServiceImpl.java @@ -0,0 +1,82 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysDictionaryService; +import cn.estsh.i3plus.pojo.platform.bean.Position; +import cn.estsh.i3plus.pojo.platform.bean.SysDictionary; +import cn.estsh.i3plus.pojo.platform.repository.SysDictionaryRepository; +import cn.estsh.impp.framework.boot.util.ValidatorBean; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Description : 字典服务接口实现 + * @Reference : + * @Author : yunhao + * @Date : 2018-10-28 23:44 + * @Modify : + **/ +@Service +public class SysDictionaryServiceImpl implements ISysDictionaryService { + public static final Logger LOGGER = LoggerFactory.getLogger(SysDictionaryServiceImpl.class); + + @Autowired + private SysDictionaryRepository sysDictionaryRDao; + + @Override + public void insertSysDictionary(SysDictionary sysDictionary) { + // 查询父级字典名称 + if (sysDictionary.getParentId() != null && sysDictionary.getParentId() > 0) { + LOGGER.info("字典 SYS_DICTIONARY parentId:{}", sysDictionary.getParentId()); + SysDictionary parentSysDictionary = sysDictionaryRDao.getById(sysDictionary.getParentId()); + ValidatorBean.checkNotNull(parentSysDictionary); + + sysDictionary.setRedParentName(parentSysDictionary.getName()); + } + + LOGGER.info("字典 SYS_DICTIONARY sysDictionary:{}",sysDictionary); + sysDictionaryRDao.insert(sysDictionary); + } + + @Override + public void deleteSysDictionaryById(String id) { + LOGGER.info("字典 SYS_DICTIONARY id:{}",id); + sysDictionaryRDao.deleteById(Long.parseLong(id)); + } + + @Override + public void updateSysDictionary(SysDictionary sysDictionary) { + // 查询父级字典名称 + if (sysDictionary.getParentId() != null && sysDictionary.getParentId() > 0) { + LOGGER.info("字典 SYS_DICTIONARY parentId:{}", sysDictionary.getParentId()); + SysDictionary parentSysDictionary = sysDictionaryRDao.getById(sysDictionary.getParentId()); + ValidatorBean.checkNotNull(parentSysDictionary); + + sysDictionary.setRedParentName(parentSysDictionary.getName()); + } + + LOGGER.info("字典 SYS_DICTIONARY sysDictionary:{}",sysDictionary); + sysDictionaryRDao.update(sysDictionary); + } + + @Override + public List listSysDictionary() { + LOGGER.info("字典 SYS_DICTIONARY list"); + return sysDictionaryRDao.list(); + } + + @Override + public SysDictionary getSysDictionaryById(String id) { + LOGGER.info("字典 SYS_DICTIONARY id:{}",id); + return sysDictionaryRDao.getById(Long.parseLong(id)); + } + + @Override + public List findSysDictionaryByCode(String code) { + LOGGER.info("字典 SYS_DICTIONARY code:{}",code); + return sysDictionaryRDao.findByHql("select child from SysDictionary dic,SysDictionary child where dic.id = child.parentId and dic.dictionaryCode = '" + code + "'"); + } +}