diff --git a/modules/i3plus-core-api/pom.xml b/modules/i3plus-core-api/pom.xml index bc1be0a..6e2cbcd 100644 --- a/modules/i3plus-core-api/pom.xml +++ b/modules/i3plus-core-api/pom.xml @@ -21,6 +21,10 @@ i3plus.pojo i3plus-pojo-mes + + i3plus.pojo + i3plus-pojo-model + diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreTreeService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreTreeService.java index 50a49e9..85c0d43 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreTreeService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ICoreTreeService.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.core.api.iservice.busi; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.model.platform.CommonTreeModel; import cn.estsh.i3plus.pojo.platform.bean.SysDepartment; import cn.estsh.i3plus.pojo.platform.bean.SysMenu; import cn.estsh.i3plus.pojo.platform.bean.SysOrganize; @@ -28,7 +30,7 @@ public interface ICoreTreeService { * @param id * @return */ - SysPosition getSysPositionTreeByParentId(long id); + SysPosition getSysPositionTreeById(long id); /** * 生成子集树递归方法 @@ -55,7 +57,7 @@ public interface ICoreTreeService { * @param id * @return */ - SysDepartment getSysDepartmentTreeByParentId(long id); + SysDepartment getSysDepartmentTreeById(long id); /** * 生成子集树递归方法 @@ -82,7 +84,7 @@ public interface ICoreTreeService { * @param id * @return */ - SysOrganize getSysOrganizeTreeByParentId(long id); + SysOrganize getSysOrganizeTreeById(long id); /** * 生成子集树递归方法 @@ -109,7 +111,7 @@ public interface ICoreTreeService { * @param id * @return */ - SysMenu getSysMenuTreeByParentId(long id); + SysMenu getSysMenuTreeById(long id); /** * 生成子集树递归方法 @@ -124,4 +126,25 @@ public interface ICoreTreeService { */ void doValidatorSysMenuParentId(SysMenu menu) ; + /** + * 获取组织树 + * @param parentId + * @return + */ + List findOrganizeDepartment(long parentId); + + /** + * 获取组织树 + * @param id + * @return + */ + CommonTreeModel getOrganizeById(long id); + + /** + * 生成子集树递归方法 + * @param parent 父类对象 + * @param step 层级 + */ + void findOrganizeTreePack(CommonTreeModel parent, int step); + } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysConfigService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysConfigService.java index 69d2a6d..e4a2a68 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysConfigService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysConfigService.java @@ -51,4 +51,17 @@ public interface ISysConfigService { * @return */ ListPager querySysConfigByPager(SysConfig sysConfig, Pager pager); + + /** + * 根据code查询系统配置 + * @param code + * @return + */ + SysConfig getSysConfigByCode(String code); + + /** + * 查询系统邮件配置 + * @return + */ + List findMailConfig(); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleLanguageService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleLanguageService.java index 4a3cd26..64efd55 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleLanguageService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleLanguageService.java @@ -39,4 +39,9 @@ public interface ISysLocaleLanguageService { @ApiOperation(value = "根据code查询语言") SysLocaleLanguage getSysLocaleLanguageByCode(String code); + + @ApiOperation(value = "根据语言id修改语言状态") + void updateSysLocaleLanguageStatusById(Long id,Integer status); + + void updateSysLocaleLanguageStatusByIds(Long[] ids,Integer status); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleResourceService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleResourceService.java index 3059734..2a5b5ea 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleResourceService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLocaleResourceService.java @@ -33,4 +33,7 @@ public interface ISysLocaleResourceService { @ApiOperation(value = "根据id批量删除",notes = "根据id批量删除") void deleteSysLocaleResourceByIds(Long[] ids); + + @ApiOperation(value = "批量添加") + void insertSysLocaleResourceList(List sysLocaleResources); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogExceptionService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogExceptionService.java new file mode 100644 index 0000000..e159a8c --- /dev/null +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogExceptionService.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.core.api.iservice.busi; + +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.platform.bean.SysLogException; +import io.swagger.annotations.ApiOperation; + +/** + * @Description : 异常日志服务接口 + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-11-19 17:28 + * @Modify: + **/ +public interface ISysLogExceptionService { + + /** + * 系统异常日志复杂查询，分页，排序 + * @param sysLogException + * @param pager + * @return + */ + @ApiOperation(value = "系统异常日志复杂查询，分页，排序") + ListPager querySysLogExceptionByPager(SysLogException sysLogException, Pager pager); +} diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogOperateService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogOperateService.java index 3658f4a..94054fc 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogOperateService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysLogOperateService.java @@ -62,6 +62,7 @@ public interface ISysLogOperateService { List listSysLogOperateByOperateUserName(String operateUserName); //查询所有日志数量 + @ApiOperation(value = "查询所有日志数量") long countAllSysLogOperate(); /** diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysOrderNoRuleService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysOrderNoRuleService.java new file mode 100644 index 0000000..8bc6802 --- /dev/null +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysOrderNoRuleService.java @@ -0,0 +1,34 @@ +package cn.estsh.i3plus.core.api.iservice.busi; + +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule; +import io.swagger.annotations.ApiOperation; + +/** + * @Description : 单号生成规则服务器 + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-11-21 19:57 + * @Modify: + **/ +public interface ISysOrderNoRuleService { + + @ApiOperation(value = "添加单号规则") + SysOrderNoRule insertSysOrderNoRule(SysOrderNoRule sysOrderNoRule); + + @ApiOperation(value = "修改单号规则") + void updateSysOrderNoRule(SysOrderNoRule sysOrderNoRule); + + @ApiOperation(value = "根据id删除单号规则") + void deleteSysOrderNoRuleById(Long id); + + @ApiOperation(value = "根据id查询单号规则") + SysOrderNoRule getSysOrderNoRuleById(Long id); + + @ApiOperation(value = "单号规则复杂查询，分页，排序") + ListPager querySysOrderNoRuleByPager(SysOrderNoRule sysOrderNoRule, Pager pager); + + @ApiOperation(value = "根据code查询单号规则") + SysOrderNoRule getSysOrderNoRuleCode(String code); +} diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml index ba0e1d3..da61650 100644 --- a/modules/i3plus-core-apiservice/pom.xml +++ b/modules/i3plus-core-apiservice/pom.xml @@ -128,6 +128,27 @@ javax.mail mail + + + org.jdom + jdom2 + 2.0.6 + + + jaxen + jaxen + 1.1.6 + + + + org.apache.poi + poi + + + org.apache.poi + poi-ooxml + + @@ -164,8 +185,19 @@ src/main/resources true + + **/*.xlsx + + + + src/main/resources + false + + **/*.xlsx + + \ No newline at end of file diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTreeAndExceptionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTreeAndExceptionController.java index 1b35020..1304de9 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTreeAndExceptionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTreeAndExceptionController.java @@ -43,7 +43,7 @@ public class DemoTreeAndExceptionController extends CoreBaseController{ @ApiOperation(value="查询部门树",notes="通过部门主键获取部门树，-1为根节点") public ResultBean listDepartmentTree(long depParentId) { try { - SysDepartment department = coreTreeService.getSysDepartmentTreeByParentId(depParentId); + SysDepartment department = coreTreeService.getSysDepartmentTreeById(depParentId); return ResultBean.success("查询部门树成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java index b58748d..f0d91d0 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java @@ -103,7 +103,24 @@ public class AuthController extends CoreBaseController { try { SessionUser sUser = AuthUtil.getSessionUser(); LOGGER.info("用户：{}",sUser); - return new ResultBean(true,"",sUser); + return new ResultBean(true,"",sUser.getUserInfo()); + } catch (ImppBusiException e) { + return new ResultBean(false,e.getErrorDetail() + ",so:" + e.getErrorSolution()); + } + } + + /** + * + * @return + */ + @GetMapping(value="/get-user") + @ApiOperation(value="获取登录用户信息",notes="获取当前登录用户账号详细信息") + public ResultBean getUser(){ + LOGGER.info("获取用户信息...lang:{}",AuthUtil.getSessionAttribute("languageCode")); + try { + SessionUser sUser = AuthUtil.getSessionUser(); + LOGGER.info("用户：{}",sUser); + return new ResultBean(true,"",sUser.getUser()); } catch (ImppBusiException e) { return new ResultBean(false,e.getErrorDetail() + ",so:" + e.getErrorSolution()); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java index 4e9f941..d3e5206 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleLanguageService; -import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; @@ -49,8 +48,8 @@ public class SysLocaleLanguageController extends CoreBaseController { .notNull("languageCode", sysLocaleLanguage.getLanguageCode()); //新增初始化 -// ConvertBean.modelInitialize(sysLocaleLanguage, sessionUser); sysLocaleLanguage.setIsDefault(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + sysLocaleLanguage.setLanguageStatus(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); sysLocaleLanguageService.insertSysLocaleLanguage(sysLocaleLanguage); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); @@ -71,9 +70,6 @@ public class SysLocaleLanguageController extends CoreBaseController { .notNull("languageName", sysLocaleLanguage.getLanguageName()) .notNull("languageCode", sysLocaleLanguage.getLanguageCode()); - //修改初始化 -// ConvertBean.modelUpdate(sysLocaleLanguage, sessionUser); - sysLocaleLanguageService.updateSysLocaleLanguage(sysLocaleLanguage); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ @@ -161,4 +157,43 @@ public class SysLocaleLanguageController extends CoreBaseController { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } + + @PostMapping(value = "/status/{id}/{status}") + @ApiOperation(value = "根据id修改语言状态") + public ResultBean updateSysLocaleLanguageStatusById(@PathVariable("id") String idStr,@PathVariable("status") Integer status){ + try { + //条件校验 + ValidatorBean.checkNotNull(idStr,"id不能为空"); + ValidatorBean.checkIsNumber(status,"状态不能为空"); + + sysLocaleLanguageService.updateSysLocaleLanguageStatusById(Long.parseLong(idStr),status); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @PostMapping(value = "/batch-status") + @ApiOperation(value = "根据批量修改语言状态") + public ResultBean updateSysLocaleLanguageStatusByIds(String[] idsStr,Integer status){ + try { + if(idsStr.length == 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("请选择需要删除的资源。") + .build(); + } + ValidatorBean.checkNotZero(status,"状态不能为0"); + + sysLocaleLanguageService.updateSysLocaleLanguageStatusByIds(StringTool.getArrayLong(idsStr),status); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java index 62b2c28..1f7978a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleResourceService; -import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; @@ -165,4 +164,25 @@ public class SysLocaleResourceController extends CoreBaseController { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } + + @PutMapping(value = "batch-insert") + @ApiOperation(value = "批量添加系统资源") + public ResultBean insertSysLocaleResourceList(@RequestBody List sysLocaleResourcesList){ + try { + if(sysLocaleResourcesList.size() == 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("请选择需要删除的资源。") + .build(); + } + + sysLocaleResourceService.insertSysLocaleResourceList(sysLocaleResourcesList); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java new file mode 100644 index 0000000..b8722ba --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.core.apiservice.controller.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysLogExceptionService; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.i3plus.pojo.platform.bean.SysLogException; +import cn.estsh.impp.framework.base.controller.CoreBaseController; +import cn.estsh.impp.framework.boot.exception.ImppBusiException; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.util.ResultBean; +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.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @Description : 系统异常日志服务 + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-11-19 18:42 + * @Modify: + **/ +@RestController +@Api(description = "系统异常日志服务") +@RequestMapping(CoreBaseController.BASE_URL + "/sys-log-exception") +public class SysLogExceptionController { + public static final Logger LOGGER = LoggerFactory.getLogger(SysLogExceptionController.class); + + @Autowired + private ISysLogExceptionService sysLogExceptionService; + + @GetMapping(value = "/query") + @ApiOperation(value = "异常日志复杂查询，分页，排序",notes = "异常日志复杂查询，分页，排序") + public ResultBean querySysLogOperateByPager(SysLogException sysLogException, Pager pager){ + try { + ListPager logExceptionList = sysLogExceptionService.querySysLogExceptionByPager(sysLogException, pager); + return ResultBean.success("查询成功").setListPager(logExceptionList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java index 20f575a..9caf6cc 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java @@ -1,16 +1,13 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysLogOperateService; -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.ResourceEnumUtil; -import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysLogOperate; import cn.estsh.impp.framework.base.controller.CoreBaseController; -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.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; import io.swagger.annotations.Api; @@ -24,7 +21,7 @@ import javax.websocket.server.PathParam; import java.util.List; /** - * @Description : 操作日志 + * @Description : 操作日志服务 * @Reference : * @Author : yunhao * @Date : 2018-10-25 14:08 @@ -32,7 +29,7 @@ import java.util.List; **/ @RestController @Api(description = "操作日志") -@RequestMapping(CoreBaseController.BASE_URL + "/log-operate") +@RequestMapping(CoreBaseController.BASE_URL + "/sys-log-operate") public class SysLogOperateController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysLogOperateController.class); @@ -43,20 +40,12 @@ public class SysLogOperateController extends CoreBaseController { @ApiOperation(value = "添加操作日志",notes = "添加操作日志") public ResultBean insertSysLogOperateController(SysLogOperate logOperate){ try { - // 登录用户 - SessionUser user = AuthUtil.getSessionUser(); - - // 新增初始化 - ConvertBean.modelInitialize(logOperate,user); - logOperateService.insertSysLogOperate(logOperate); 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()); + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @@ -70,11 +59,9 @@ public class SysLogOperateController extends CoreBaseController { logOperateService.deleteSysLogOperateById(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.getErrorShow()); }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); } } @@ -85,11 +72,9 @@ public class SysLogOperateController extends CoreBaseController { List logOperateList = logOperateService.listSysLogOperate(); return ResultBean.success("查询成功").setResultList(logOperateList).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()); + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @@ -108,11 +93,9 @@ public class SysLogOperateController extends CoreBaseController { .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()); + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @@ -123,11 +106,9 @@ public class SysLogOperateController extends CoreBaseController { ListPager logSystemList = logOperateService.querySysLogOperateByPager(logOperate, pager); return ResultBean.success("查询成功").setListPager(logSystemList).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()); + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java index 43bb9b7..953468f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java @@ -1,16 +1,13 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysLogSystemService; -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.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SysLogSystem; -import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.impp.framework.base.controller.CoreBaseController; -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.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; import io.swagger.annotations.Api; @@ -31,7 +28,7 @@ import java.util.List; **/ @RestController @Api(description = "系统日志服务") -@RequestMapping(CoreBaseController.BASE_URL +"/log-system") +@RequestMapping(CoreBaseController.BASE_URL +"/sys-log-system") public class SysLogSystemController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysLogSystemController.class); @@ -43,20 +40,12 @@ public class SysLogSystemController extends CoreBaseController{ @ApiOperation(value="新增系统日志",notes = "新增系统日志") public ResultBean insertSysLogSystem(SysLogSystem logSystem) { try { - // 登录用户 - SessionUser user = AuthUtil.getSessionUser(); - - // 新增初始化 - ConvertBean.modelInitialize(logSystem,user); - logSystemService.insertSysLogSystem(logSystem); 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()); + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @@ -70,11 +59,9 @@ public class SysLogSystemController extends CoreBaseController{ logSystemService.deleteSysLogSystemById(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.getErrorShow()); }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); } } @@ -83,15 +70,11 @@ public class SysLogSystemController extends CoreBaseController{ public ResultBean findSysLogSystemAll(){ try { List logSystemList = logSystemService.listSysLogSystem(); - return ResultBean.success("查询成功") - .setResultList(logSystemList) - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("查询成功").setResultList(logSystemList).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()); + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @@ -102,11 +85,9 @@ public class SysLogSystemController extends CoreBaseController{ SysLogSystem logSystem = logSystemService.getSysLogSystemById(Long.parseLong(id)); return ResultBean.success("查询成功").setResultObject(logSystem).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()); + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @@ -123,11 +104,9 @@ public class SysLogSystemController extends CoreBaseController{ ListPager logSystemList = logSystemService.querySysLogSystemByPager(logSystem, pager); return ResultBean.success("查询成功").setListPager(logSystemList).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()); + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java new file mode 100644 index 0000000..31764fb --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java @@ -0,0 +1,132 @@ +package cn.estsh.i3plus.core.apiservice.controller.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysOrderNoRuleService; +import cn.estsh.i3plus.core.apiservice.util.OrderNoMakeUtil; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule; +import cn.estsh.impp.framework.base.controller.CoreBaseController; +import cn.estsh.impp.framework.boot.exception.ImppBusiException; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +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.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +/** + * @Description :系统单号规则管理服务 + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-11-21 18:20 + * @Modify: + **/ +@RestController +@Api(description = "系统单号规则管理服务") +@RequestMapping(CoreBaseController.BASE_URL + "/sys-order-no-rule") +public class SysOrderNoRuleController { + + @Autowired + ISysOrderNoRuleService sysOrderNoRuleService; + + @PostMapping(value = "/insert") + @ApiOperation(value = "新增单号规则") + public ResultBean insertSysOrderNoRule(SysOrderNoRule sysOrderNoRule){ + try { + ValidatorBean.beginValid(sysOrderNoRule) + .notNull("name",sysOrderNoRule.getName()) + .notNull("orderNoRuleCode",sysOrderNoRule.getOrderNoRuleCode()) + .notNull("orderNoRule",sysOrderNoRule.getOrderNoRule()) + .checkNotZero("serialNoSeed",sysOrderNoRule.getSerialNoSeed()) + .checkNotZero("serialNoIncrement",sysOrderNoRule.getSerialNoIncrement()) + .checkNotZero("serialNoLength",sysOrderNoRule.getSerialNoLength()) + .checkNotZero("isCycle",sysOrderNoRule.getIsCycle()); + + sysOrderNoRuleService.insertSysOrderNoRule(sysOrderNoRule); + return ResultBean.success("操作成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @PutMapping(value = "/update") + @ApiOperation(value = "修改单号规则") + public ResultBean updateSysOrderNoRule(SysOrderNoRule sysOrderNoRule){ + try { + ValidatorBean.beginValid(sysOrderNoRule) + .notNull("id",sysOrderNoRule.getId()) + .notNull("name",sysOrderNoRule.getName()) + .notNull("orderNoRuleCode",sysOrderNoRule.getOrderNoRuleCode()) + .notNull("orderNoRule",sysOrderNoRule.getOrderNoRule()) + .checkNotZero("serialNoSeed",sysOrderNoRule.getSerialNoSeed()) + .checkNotZero("serialNoIncrement",sysOrderNoRule.getSerialNoIncrement()) + .checkNotZero("serialNoLength",sysOrderNoRule.getSerialNoLength()) + .checkNotZero("isCycle",sysOrderNoRule.getIsCycle()); + + sysOrderNoRuleService.updateSysOrderNoRule(sysOrderNoRule); + return ResultBean.success("操作成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping(value = "/get/{id}") + @ApiOperation(value = "根据id获取编号规则") + public ResultBean getSysOrderNoRuleById(@PathVariable("id") String idStr){ + try { + ValidatorBean.checkNotNull(idStr,"id不能为空"); + + SysOrderNoRule sysOrderNoRule = sysOrderNoRuleService.getSysOrderNoRuleById(Long.parseLong(idStr)); + if (sysOrderNoRule != null) { + return ResultBean.success("查询成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }else { + return ResultBean.fail("数据不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); + } + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @DeleteMapping(value = "/delete/{id}") + @ApiOperation(value = "根据id删除单号规则") + public ResultBean deleteSysOrderNoRuleById(@PathVariable("id") String idStr){ + try { + ValidatorBean.checkNotNull(idStr,"id不能为空"); + + sysOrderNoRuleService.deleteSysOrderNoRuleById(Long.parseLong(idStr)); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + + @GetMapping(value = "/get-order-no/{code}") + @ApiOperation(value = "根据单号规则代码，获取单号") + public ResultBean getOrderNo(@PathVariable("code") String code){ + try { + ValidatorBean.checkNotNull(code,"code不能为空"); + + SysOrderNoRule sysOrderNoRule = sysOrderNoRuleService.getSysOrderNoRuleCode(code); + if (sysOrderNoRule == null) { + return ResultBean.fail("单号规则不存在").setCode(ResourceEnumUtil.MESSAGE.EMPTY.getCode()); + }else { + sysOrderNoRule = OrderNoMakeUtil.next(sysOrderNoRule); + sysOrderNoRuleService.updateSysOrderNoRule(sysOrderNoRule); + } + return ResultBean.success("查询成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep.getErrorShow()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java index 4369e7b..6e092c7 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService; import cn.estsh.i3plus.core.api.iservice.busi.ISysOrganizeService; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.i3plus.pojo.model.platform.CommonTreeModel; import cn.estsh.i3plus.pojo.platform.bean.SysDepartment; import cn.estsh.i3plus.pojo.platform.bean.SysMenu; import cn.estsh.i3plus.pojo.platform.bean.SysOrganize; @@ -47,7 +48,7 @@ public class SysTreeController extends CoreBaseController { @ApiOperation(value="查询岗位树",notes="通过部门主键获取岗位树，-1为根节点") public ResultBean listSysPositionTree(@PathVariable("id") long id) { try { - SysPosition position = coreTreeService.getSysPositionTreeByParentId(id); + SysPosition position = coreTreeService.getSysPositionTreeById(id); return ResultBean.success("查询部门树成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) @@ -84,7 +85,7 @@ public class SysTreeController extends CoreBaseController { @ApiOperation(value="查询组织树",notes="通过部门主键获取组织树，-1为根节点") public ResultBean listOrganizeTree(@PathVariable("id") long id) { try { - SysOrganize obj = coreTreeService.getSysOrganizeTreeByParentId(id); + SysOrganize obj = coreTreeService.getSysOrganizeTreeById(id); return ResultBean.success("查询部门树成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) @@ -120,7 +121,7 @@ public class SysTreeController extends CoreBaseController { @ApiOperation(value="部门树",notes="通过部门主键获取部门树，-1为根节点") public ResultBean listDepartmentTree(@PathVariable("id") long id) { try { - SysDepartment obj = coreTreeService.getSysDepartmentTreeByParentId(id); + SysDepartment obj = coreTreeService.getSysDepartmentTreeById(id); return ResultBean.success("查询部门树成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) @@ -157,7 +158,7 @@ public class SysTreeController extends CoreBaseController { @ApiOperation(value="部门树",notes="通过部门主键获取部门树，-1为根节点") public ResultBean listSysMenuTree(@PathVariable("id") long id) { try { - SysMenu obj = coreTreeService.getSysMenuTreeByParentId(id); + SysMenu obj = coreTreeService.getSysMenuTreeById(id); return ResultBean.success("查询部门树成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) @@ -189,4 +190,21 @@ public class SysTreeController extends CoreBaseController { } } + @GetMapping(value="/organize-department/list/{parentId}") + @ApiOperation(value="查询组织-部门树",notes="通过部门主键获取组组织-部门，-1为根节点") + public ResultBean listOrganizeDepartmentListTree(@PathVariable("parentId") long parentId) { + try { + List resultList = coreTreeService.findOrganizeDepartment(parentId); + + return ResultBean.success("查询组织-部门树成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultList(resultList); + }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/mq/MailQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MailQueueReceiver.java index fef02f1..f36e509 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MailQueueReceiver.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MailQueueReceiver.java @@ -2,8 +2,6 @@ package cn.estsh.i3plus.core.apiservice.mq; import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService; import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService; -import cn.estsh.i3plus.core.apiservice.util.MailUtil; -import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SysMessage; import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage; import cn.estsh.i3plus.pojo.platform.bean.SysUser; @@ -51,12 +49,12 @@ public class MailQueueReceiver { SysMessage sysMessage = sysMessageService.getSysMessageById(msg.getMessageId()); SysUser sysUser = sysUserService.getSysUserById(msg.getReceiverId()); - MailUtil mailUtil = new MailUtil(); - mailUtil.setSubject(sysMessage.getMessageTitle()); - mailUtil.setContentType(ImppEnumUtil.MESSAGE_CONTENT_TYPE.valueOfDescription(sysMessage.getMessageContentType())); - mailUtil.setBody(sysMessage.getMessageContent()); - mailUtil.setTo(sysUser.getUserEmail()); - mailUtil.send(); +// MailUtil mailUtil = new MailUtil(); +// mailUtil.setSubject(sysMessage.getMessageTitle()); +// mailUtil.setContentType(ImppEnumUtil.MESSAGE_CONTENT_TYPE.valueOfDescription(sysMessage.getMessageContentType())); +// mailUtil.setBody(sysMessage.getMessageContent()); +// mailUtil.setTo(sysUser.getUserEmail()); +// mailUtil.send(); //信息已处理 channel.basicAck(message.getMessageProperties().getDeliveryTag(),false); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java index 1e49117..0b37e2e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java @@ -1,7 +1,10 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.ModelEnumUtil; +import cn.estsh.i3plus.pojo.model.platform.CommonTreeModel; import cn.estsh.i3plus.pojo.platform.bean.SysDepartment; import cn.estsh.i3plus.pojo.platform.bean.SysMenu; import cn.estsh.i3plus.pojo.platform.bean.SysOrganize; @@ -18,6 +21,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -59,7 +63,7 @@ public class CoreTreeService implements ICoreTreeService { } @Override - public SysPosition getSysPositionTreeByParentId(long id) { + public SysPosition getSysPositionTreeById(long id) { // 查找数据 SysPosition position = positionRDao.getById(id); // 数据是否真实存在 @@ -107,7 +111,7 @@ public class CoreTreeService implements ICoreTreeService { } @Override - public SysDepartment getSysDepartmentTreeByParentId(long id) { + public SysDepartment getSysDepartmentTreeById(long id) { // 查找数据 SysDepartment department = departmentRDao.getById(id); // 数据是否真实存在 @@ -155,7 +159,7 @@ public class CoreTreeService implements ICoreTreeService { } @Override - public SysOrganize getSysOrganizeTreeByParentId(long id) { + public SysOrganize getSysOrganizeTreeById(long id) { // 查找数据 SysOrganize organize = organizeRDao.getById(id); // 数据是否真实存在 @@ -202,7 +206,7 @@ public class CoreTreeService implements ICoreTreeService { } @Override - public SysMenu getSysMenuTreeByParentId(long id) { + public SysMenu getSysMenuTreeById(long id) { // 查找数据 SysMenu menu = menuRDao.getById(id); // 数据是否真实存在 @@ -305,4 +309,98 @@ public class CoreTreeService implements ICoreTreeService { } } } + + @Override + public List findOrganizeDepartment(long parentId) { + List result = new ArrayList<>(); + List list = organizeRDao.findByProperty("parentId", parentId); + + // 循环设置子集 + if(list != null && list.size() > 0){ + for (SysOrganize organize : list) { + CommonTreeModel treeModel = new CommonTreeModel(); + treeModel.setBean(organize); + treeModel.setBeanType(ModelEnumUtil.COMMON_TREE_TYPE.TYPE_ORGANIZE.getValue()); + + findOrganizeTreePack(treeModel,0); + + result.add(treeModel); + } + } + + + return result; + } + + @Override + public CommonTreeModel getOrganizeById(long id) { + // 查找数据 + SysOrganize organize = organizeRDao.getById(id); + // 数据是否真实存在 + ValidatorBean.checkNotNull(organize,"不存在的组织信息"); + + CommonTreeModel treeModel = new CommonTreeModel(); + treeModel.setBean(organize); + treeModel.setBeanType(ModelEnumUtil.COMMON_TREE_TYPE.TYPE_ORGANIZE.getValue()); + + // 递归查询子集 + findOrganizeTreePack(treeModel, 0); + return treeModel; + } + + @Override + public void findOrganizeTreePack(CommonTreeModel parent, int step) { + if(null != parent){ + BaseBean bean = parent.getBean(); + List childList = new ArrayList<>(); + CommonTreeModel treeModel = null; + if(bean instanceof SysOrganize){ + SysOrganize organize = (SysOrganize) bean; + + List organizeList = organizeRDao.findByProperty("parentId", organize.getId()); + if(organizeList != null && organizeList.size() > 0){ + for (SysOrganize org : organizeList) { + treeModel = new CommonTreeModel(); + treeModel.setBean(org); + treeModel.setBeanType(ModelEnumUtil.COMMON_TREE_TYPE.TYPE_ORGANIZE.getValue()); + + findOrganizeTreePack(treeModel,step); + + childList.add(treeModel); + } + } + + List departmentList = departmentRDao.findByProperty("organizeId", organize.getId()); + if(departmentList != null && departmentList.size() > 0){ + for (SysDepartment department : departmentList) { + if(department.getParentId() != null && department.getParentId() < 0){ + treeModel = new CommonTreeModel(); + treeModel.setBean(department); + treeModel.setBeanType(ModelEnumUtil.COMMON_TREE_TYPE.TYPE_DEPARTMENT.getValue()); + + findOrganizeTreePack(treeModel,step); + + childList.add(treeModel); + } + } + } + LOGGER.info("【{}】包含子集：{},步长：{}", parent.getBean().getClass().getName(), parent.getChildList().size(), step); + }else if(bean instanceof SysDepartment){ + SysDepartment department = (SysDepartment) bean; + List departmentList = departmentRDao.findByProperty("parentId", department.getId()); + if(departmentList != null && departmentList.size() > 0){ + for (SysDepartment dep : departmentList) { + treeModel = new CommonTreeModel(); + treeModel.setBean(dep); + treeModel.setBeanType(ModelEnumUtil.COMMON_TREE_TYPE.TYPE_DEPARTMENT.getValue()); + + findOrganizeTreePack(treeModel,step); + + childList.add(treeModel); + } + } + } + parent.setChildList(childList); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysConfigService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysConfigService.java index d6c7b4d..d75988d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysConfigService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysConfigService.java @@ -12,6 +12,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -71,4 +72,21 @@ public class SysConfigService implements ISysConfigService { } } + @Override + public SysConfig getSysConfigByCode(String code) { + return SysConfigRDao.getByProperty("configCode",code); + } + + @Override + public List findMailConfig() { + List mailConfig = new ArrayList(); +// mailConfig.add(SysConfigRDao.getByProperty("configCode", PlatformConstWords.MAIL_HOST)); +// mailConfig.add(SysConfigRDao.getByProperty("configCode", PlatformConstWords.MAIL_PORT)); +// mailConfig.add(SysConfigRDao.getByProperty("configCode", PlatformConstWords.MAIL_USER)); +// mailConfig.add(SysConfigRDao.getByProperty("configCode", PlatformConstWords.MAIL_PASSWORD)); +// mailConfig.add(SysConfigRDao.getByProperty("configCode", PlatformConstWords.MAIL_NICK)); + + return mailConfig; + } + } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java index 212ac28..dc9f430 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java @@ -117,7 +117,6 @@ public class SysDictionaryService implements ISysDictionaryService { @Override public ListPager querySysDictionaryByPager(SysDictionary sysDictionary, Pager pager) { - LOGGER.info("字典 SYS_DICTIONARY SysDictionary:{}，Pager:{}",sysDictionary,pager); sysDictionary = sysDictionary == null ? new SysDictionary():sysDictionary; String hqlPack = CoreHqlPack.packHqlSysDictionary(sysDictionary); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleLanguageService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleLanguageService.java index 89f8afb..6b85de1 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleLanguageService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleLanguageService.java @@ -9,7 +9,6 @@ import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage; import cn.estsh.i3plus.pojo.platform.repository.SysLocaleLanguageRepository; import cn.estsh.i3plus.pojo.platform.repository.SysLocaleResourceRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; -import cn.estsh.impp.framework.base.service.IBaseService; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ValidatorBean; @@ -103,7 +102,6 @@ public class SysLocaleLanguageService implements ISysLocaleLanguageService { @Override public ListPager querySysLocaleLanguageByPager(SysLocaleLanguage sysLocaleLanguage, Pager pager) { - LOGGER.info("系统语言 SYS_LOCALE_LANGUAGE sysLocaleLanguage:{},Pager:{}",sysLocaleLanguage,pager); if(sysLocaleLanguage == null) { pager = PagerHelper.getPager(pager, sysLocaleLanguageRDao.listCount()); return new ListPager(sysLocaleLanguageRDao.listPager(pager),pager); @@ -116,13 +114,19 @@ public class SysLocaleLanguageService implements ISysLocaleLanguageService { @Override public void deleteSysLocaleLanguageByIds(Long[] ids) { - LOGGER.info("系统语言 SYS_LOCALE_LANGUAGE ids:{}",ids); + if(sysLocaleResourceRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("id",ids)) > 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) + .setErrorDetail("存在关联资源无法删除") + .build(); + } + sysLocaleLanguageRDao.deleteByIds(ids); } @Override public void updateSysLocaleLanguageDefaultById(Long ids) { - LOGGER.info("系统语言 SYS_LOCALE_LANGUAGE ids:{}",ids); sysLocaleLanguageRDao.updateByHqlWhere("and 1=1","isDefault",CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); sysLocaleLanguageRDao.updateByProperties("id",ids, @@ -133,4 +137,14 @@ public class SysLocaleLanguageService implements ISysLocaleLanguageService { public SysLocaleLanguage getSysLocaleLanguageByCode(String code) { return sysLocaleLanguageRDao.getByProperty("languageCode",code); } + + @Override + public void updateSysLocaleLanguageStatusById(Long id, Integer status) { + sysLocaleLanguageRDao.updateByProperties("id",id,"languageStatus",status); + } + + @Override + public void updateSysLocaleLanguageStatusByIds(Long[] ids, Integer status) { + sysLocaleLanguageRDao.updateByHqlWhere(CoreHqlPack.packHqlIds("id",ids),"languageStatus",status); + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java index 25fac4b..ae7f1d8 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLocaleResourceService.java @@ -115,4 +115,9 @@ public class SysLocaleResourceService implements ISysLocaleResourceService { LOGGER.info("系统资源 SYS_LOCALE_RESOURCE ids：{}",ids); sysLocaleResourceRDao.deleteByIds(ids); } + + @Override + public void insertSysLocaleResourceList(List sysLocaleResourcesList) { + sysLocaleResourceRDao.saveAll(sysLocaleResourcesList); + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogExceptionService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogExceptionService.java new file mode 100644 index 0000000..c2c890d --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogExceptionService.java @@ -0,0 +1,45 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysLogExceptionService; +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.platform.bean.SysLogException; +import cn.estsh.i3plus.pojo.platform.repositorymongo.SysLogExceptionRepository; +import cn.estsh.i3plus.pojo.platform.sqlpack.CoreBsonPack; +import io.swagger.annotations.ApiOperation; +import org.bson.conversions.Bson; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @Description :异常日志服务接口实现 + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-11-19 17:30 + * @Modify: + **/ +@Service +public class SysLogExceptionService implements ISysLogExceptionService { + public static final Logger LOGGER = LoggerFactory.getLogger(SysLogExceptionService.class); + + @Autowired + private SysLogExceptionRepository sysLogExceptionRDao; + + @Override + @ApiOperation(value = "系统异常日志复杂查询，分页，排序") + public ListPager querySysLogExceptionByPager(SysLogException sysLogException, Pager pager) { + if(sysLogException == null) { + pager = PagerHelper.getPager(pager, (int) sysLogExceptionRDao.count()); + return new ListPager(sysLogExceptionRDao.findAll(),pager); + }else{ + Bson bson = CoreBsonPack.packBsonBySysLogException(sysLogException); + pager = PagerHelper.getPager(pager,sysLogExceptionRDao.findByBsonCount(bson)); + //分页，排序 + return new ListPager(sysLogExceptionRDao.findByBsonPager(bson,pager,sysLogException.getOrderByParam() + ,sysLogException.getAscOrDesc()),pager); + } + } +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogOperateService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogOperateService.java index 00c518c..4822f16 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogOperateService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogOperateService.java @@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.base.common.PagerHelper; import cn.estsh.i3plus.pojo.platform.bean.SysLogOperate; import cn.estsh.i3plus.pojo.platform.repositorymongo.SysLogOperateRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreBsonPack; +import io.swagger.annotations.ApiOperation; import org.bson.conversions.Bson; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -24,23 +25,26 @@ import java.util.List; **/ @Service public class SysLogOperateService implements ISysLogOperateService { - + public static final Logger LOGGER = LoggerFactory.getLogger(SysLogOperateService.class); @Autowired public SysLogOperateRepository logOperateRDao; @Override + @ApiOperation(value = "添加操作日志",notes = "添加操作日志") public SysLogOperate insertSysLogOperate(SysLogOperate logOperate) { return logOperateRDao.insert(logOperate); } @Override + @ApiOperation(value = "根据id删除日志",notes = "根据id删除日志") public void deleteSysLogOperateById(Long id) { logOperateRDao.deleteById(id); } @Override + @ApiOperation(value = "查询全部操作日志",notes = "查询全部操作日志") public List listSysLogOperate() { return logOperateRDao.listPager(null); } @@ -53,28 +57,32 @@ public class SysLogOperateService implements ISysLogOperateService { } @Override + @ApiOperation(value = "根据id查询操作日志",notes = "根据id查询操作日志") public SysLogOperate getSysLogOperateById(Long id) { return logOperateRDao.getById(id); } @Override + @ApiOperation(value = "根据操作人姓名模糊查询日志",notes = "根据操作人姓名模糊查询日志") public List listSysLogOperateByOperateUserName(String operateUserName) { return logOperateRDao.findByProperty("operateUserName",operateUserName); } @Override + @ApiOperation(value = "查询所有日志数量") public long countAllSysLogOperate() { return logOperateRDao.listCount(); } @Override + @ApiOperation(value = "操作日志复杂查询，分页，排序",notes = "操作日志复杂查询，分页，排序") public ListPager querySysLogOperateByPager(SysLogOperate logOperate, Pager pager) { if(logOperate == null) { pager = PagerHelper.getPager(pager, (int) logOperateRDao.count()); return new ListPager(logOperateRDao.findAll(),pager); }else{ Bson bson = CoreBsonPack.packBsonByLogOperate(logOperate); - pager = PagerHelper.getPager(pager,(int)logOperateRDao.findByBsonCount(bson)); + pager = PagerHelper.getPager(pager,logOperateRDao.findByBsonCount(bson)); //分页，排序 return new ListPager(logOperateRDao.findByBsonPager(bson,pager,logOperate.getOrderByParam(),logOperate.getAscOrDesc()),pager); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogSystemService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogSystemService.java index f7e9ac8..9cc58b8 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogSystemService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLogSystemService.java @@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.base.common.PagerHelper; import cn.estsh.i3plus.pojo.platform.bean.SysLogSystem; import cn.estsh.i3plus.pojo.platform.repositorymongo.SysLogSystemRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreBsonPack; +import io.swagger.annotations.ApiOperation; import org.bson.conversions.Bson; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,38 +33,38 @@ public class SysLogSystemService implements ISysLogSystemService { private SysLogSystemRepository logSystemRDao; @Override + @ApiOperation(value = "添加系统日志",notes = "添加系统日志") public void insertSysLogSystem(SysLogSystem logSystem) { - LOGGER.info("系统日志 SYS_SYSTEM {}",logSystem); logSystemRDao.insert(logSystem); } @Override + @ApiOperation(value = "删除日志",notes = "删除日志") public void deleteSysLogSystemById(Long id) { - LOGGER.info("系统日志 SYS_SYSTEM id:{}",id); logSystemRDao.deleteById(id); } @Override + @ApiOperation(value = "查询全部日志",notes = "查询全部日志") public List listSysLogSystem() { - LOGGER.info("系统日志 LOG_SYSTEM list"); return logSystemRDao.findAll(); } @Override + @ApiOperation(value = "根据id查询系统日志",notes = "根据id查询系统日志") public SysLogSystem getSysLogSystemById(long id) { - LOGGER.info("系统日志 LOG_SYSTEM id:{}",id); return logSystemRDao.getById(id); } @Override + @ApiOperation(value = "系统日志分页复杂查询",notes = "系统日志分页复杂查询") public ListPager querySysLogSystemByPager(SysLogSystem logSystem, Pager pager) { - LOGGER.info("系统日志 LOG_SYSTEM logSystem:{}，Pager:{}",logSystem,pager); if (logSystem == null) { - pager = PagerHelper.getPager(pager,(int) logSystemRDao.listCount()); + pager = PagerHelper.getPager(pager,logSystemRDao.listCount()); return new ListPager(logSystemRDao.listPager(pager),pager); } else { Bson bson = CoreBsonPack.packBsonByLogSystem(logSystem); - pager = PagerHelper.getPager(pager, (int) logSystemRDao.findByBsonCount(bson)); + pager = PagerHelper.getPager(pager,logSystemRDao.findByBsonCount(bson)); return new ListPager(logSystemRDao.findByBsonPager(bson,pager,logSystem.getOrderByParam() ,logSystem.getAscOrDesc()),pager); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrderNoRuleService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrderNoRuleService.java new file mode 100644 index 0000000..1d7c5ec --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrderNoRuleService.java @@ -0,0 +1,90 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysOrderNoRuleService; +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.platform.bean.SysOrderNoRule; +import cn.estsh.i3plus.pojo.platform.repository.SysOrderNoRuleRepository; +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 org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @Description : 系统单号生成规则接口实现 + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-11-21 20:04 + * @Modify: + **/ +@Service +public class SysOrderNoRuleService implements ISysOrderNoRuleService { + + public static final Logger LOGGER = LoggerFactory.getLogger(SysOrderNoRuleService.class); + + @Autowired + private SysOrderNoRuleRepository sysOrderNoRuleRDao; + + @Override + public SysOrderNoRule insertSysOrderNoRule(SysOrderNoRule sysOrderNoRule) { + if(sysOrderNoRuleRDao.isExitByProperty("orderNoRuleCode",sysOrderNoRule.getOrderNoRuleCode())){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) + .setErrorDetail("规则代码已存在") + .setErrorSolution("请重新输入规则代码") + .build(); + } + return sysOrderNoRuleRDao.insert(sysOrderNoRule); + } + + @Override + public void updateSysOrderNoRule(SysOrderNoRule sysOrderNoRule) { + // 校验唯一 + String hqlPack = CoreHqlPack.packHqlSysOrderNoRuleCode(sysOrderNoRule); + long repeatCount = sysOrderNoRuleRDao.findByHqlWhereCount(hqlPack); + if (repeatCount > 0){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) + .setErrorDetail("规则代码已存在") + .setErrorSolution("请重新输入规则代码") + .build(); + } + sysOrderNoRuleRDao.update(sysOrderNoRule); + } + + @Override + public void deleteSysOrderNoRuleById(Long id) { + sysOrderNoRuleRDao.deleteById(id); + } + + @Override + public SysOrderNoRule getSysOrderNoRuleById(Long id) { + return sysOrderNoRuleRDao.getById(id); + } + + @Override + public ListPager querySysOrderNoRuleByPager(SysOrderNoRule sysOrderNoRule, Pager pager) { + if(sysOrderNoRule == null) { + pager = PagerHelper.getPager(pager, sysOrderNoRuleRDao.listCount()); + return new ListPager(sysOrderNoRuleRDao.listPager(pager),pager); + }else { + String hqlPack = CoreHqlPack.packHqlSysOrderNoRule(sysOrderNoRule); + pager = PagerHelper.getPager(pager, sysOrderNoRuleRDao.findByHqlWhereCount(hqlPack)); + return new ListPager(sysOrderNoRuleRDao.findByHqlWherePage(hqlPack + sysOrderNoRule.orderBy(),pager),pager); + } + } + + @Override + public SysOrderNoRule getSysOrderNoRuleCode(String code) { + return sysOrderNoRuleRDao.getByProperty("code",code); + } + + +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java index 7e7a087..256cb42 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserInfoService.java @@ -35,10 +35,10 @@ public class SysUserInfoService implements ISysUserInfoService { public static final Logger LOGGER = LoggerFactory.getLogger(SysUserInfoService.class); @Autowired - private SysUserInfoRepository userInfoRDao; + private SysUserInfoRepository sysUserInfoRDao; @Autowired - private SysUserRepository userRDao; + private SysUserRepository sysUserRepository; @Autowired private SysDepartmentRepository departmentRDao; @@ -63,20 +63,20 @@ public class SysUserInfoService implements ISysUserInfoService { public SysUserInfo insertSysUserInfo(SysUserInfo userInfo) { LOGGER.info("用户信息 SysUserInfo userInfo:{}",userInfo); - return userInfoRDao.insert(userInfo); + return sysUserInfoRDao.insert(userInfo); } @Override public void updateSysUserInfo(SysUserInfo userInfo) { LOGGER.info("用户信息 SysUserInfo userInfo:{}",userInfo); - userInfoRDao.update(userInfo); + sysUserInfoRDao.update(userInfo); } @Override public void refreshRefUserDepartment(Long userInfoId, Long[] departmentIds, String userName) { LOGGER.info("用户信息 SysUserInfo userInfoId:{} departmentIds:{} userName:{}",userInfoId,departmentIds,userName); - SysUserInfo userInfo = userInfoRDao.getById(userInfoId); + SysUserInfo userInfo = sysUserInfoRDao.getById(userInfoId); if(userInfo != null ){ // 查询部门信息 StringBuffer where = new StringBuffer(); @@ -106,7 +106,7 @@ public class SysUserInfoService implements ISysUserInfoService { userInfo.setDepartmentNameRdd(String.join(",",nameList)); refUserDepartmentRDao.saveAll(list); - userInfoRDao.save(userInfo); + sysUserInfoRDao.save(userInfo); LOGGER.info("用户信息 SysUserInfo RefUserDepartmentRDao Insert Size :{}",list.size()); } @@ -124,7 +124,7 @@ public class SysUserInfoService implements ISysUserInfoService { public void refreshRefUserPosition(Long userInfoId, Long[] positionIds , String userName) { LOGGER.info("用户信息 SysUserInfo userInfoId:{} positionIds:{} userName:{}",userInfoId,positionIds,userName); - SysUserInfo userInfo = userInfoRDao.getById(userInfoId); + SysUserInfo userInfo = sysUserInfoRDao.getById(userInfoId); if(userInfo != null ){ // 查询部门信息 StringBuffer where = new StringBuffer(); @@ -154,7 +154,7 @@ public class SysUserInfoService implements ISysUserInfoService { userInfo.setPositionNameRdd(String.join(",",nameList)); refUserPositionRDao.saveAll(list); - userInfoRDao.save(userInfo); + sysUserInfoRDao.save(userInfo); LOGGER.info("用户信息 SysUserInfo RefUserPositionRDao Insert Size :{}",list.size()); } @@ -171,7 +171,7 @@ public class SysUserInfoService implements ISysUserInfoService { @Override public void refreshRefUserOrganize(Long userInfoId, Long organizeId, String userName) { LOGGER.info("用户信息 SysUserInfo userInfoId:{} organizeId:{} userName:{}",userInfoId,organizeId,userName); - SysUserInfo userInfo = userInfoRDao.getById(userInfoId); + SysUserInfo userInfo = sysUserInfoRDao.getById(userInfoId); if(userInfo != null ){ SysOrganize organize = organizeRDao.getById(organizeId); if(organize != null ){ @@ -181,7 +181,7 @@ public class SysUserInfoService implements ISysUserInfoService { userInfo.setModifyUser(userName); userInfo.setModifyDatetime(TimeTool.getNowTime(true)); - userInfoRDao.update(organize); + sysUserInfoRDao.update(organize); } }else { throw ImppExceptionBuilder.newInstance() @@ -196,35 +196,35 @@ public class SysUserInfoService implements ISysUserInfoService { @Override public void deleteSysUserInfoById(Long id) { LOGGER.info("用户信息 SysUserInfo id:{}",id); - userInfoRDao.deleteById(id); + sysUserInfoRDao.deleteById(id); } @Override public void deleteSysUserInfoByIds(Long[] ids) { LOGGER.info("用户信息 SysUserInfo ids:{}",ids); - userInfoRDao.deleteByIds(ids); + sysUserInfoRDao.deleteByIds(ids); } @Override public SysUserInfo getSysUserInfoById(Long id) { - return userInfoRDao.getById(id); + return sysUserInfoRDao.getById(id); } @Override public List listSysUserInfo() { - return userInfoRDao.findAll(); + return sysUserInfoRDao.findAll(); } @Override public ListPager querySysUserInfo(SysUserInfo userInfo, Pager pager) { LOGGER.info("定时任务 TASK_TIME TaskTime:{}，Pager:{}",userInfo,pager); if(userInfo == null) { - pager = PagerHelper.getPager(pager, userInfoRDao.listCount()); - return new ListPager(userInfoRDao.listPager(pager),pager); + pager = PagerHelper.getPager(pager, sysUserInfoRDao.listCount()); + return new ListPager(sysUserInfoRDao.listPager(pager),pager); }else { String hqlPack = CoreHqlPack.packHqlSysUserInfo(userInfo); - pager = PagerHelper.getPager(pager, userInfoRDao.findByHqlWhereCount(hqlPack)); - return new ListPager(userInfoRDao.findByHqlWherePage(hqlPack + userInfo.orderBy(),pager),pager); + pager = PagerHelper.getPager(pager, sysUserInfoRDao.findByHqlWhereCount(hqlPack)); + return new ListPager(sysUserInfoRDao.findByHqlWherePage(hqlPack + userInfo.orderBy(),pager),pager); } } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java index e8124dc..1e63db5 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java @@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.HashSet; import java.util.List; /** @@ -65,6 +66,12 @@ public class SysUserService implements ISysUserService { @Autowired private SysFileRepository sysFileRDao; + @Autowired + private SysDepartmentRepository sysDepartmentRDao; + + @Autowired + private SysPositionRepository sysPositionRDao; + @Override public SessionUser queryUserLogin(String loginName, String password, String languageCode) throws AuthenticationException { LOGGER.debug("平台用户 SYS_USER loginName:{} \t password:{} \t languageCode:{}", loginName, password, languageCode); @@ -388,17 +395,14 @@ public class SysUserService implements ISysUserService { * @return */ public void packSysUserDepartment(SessionUser sessionUser, SysUserInfo userInfo){ - List list = null; try { LOGGER.debug("平台用户 SYS_USER user id :{}", userInfo.getId()); - - list = userPermissionDao.findDepartmentByUser(userInfo); + userInfo.setDepartmentList(userPermissionDao.findDepartmentByUser(userInfo)); + userInfo.setDepartment(sysDepartmentRDao.getById(userInfo.getDepartmentId())); }catch (Exception e){ LOGGER.error(" SysUser Peck Department information Error userId : {} Exception Message : {} " ,userInfo.getId(),e.getMessage()); e.printStackTrace(); } - userInfo.setDepartmentList(list); - sessionUser.setUserInfo(userInfo); } /** @@ -408,17 +412,14 @@ public class SysUserService implements ISysUserService { * @return */ public void packSysUserPosition(SessionUser sessionUser, SysUserInfo userInfo){ - List list = null; try { LOGGER.debug("平台用户 SYS_USER user id :{}", userInfo.getId()); - - list = userPermissionDao.findPositionByUser(userInfo); + userInfo.setPositionList(userPermissionDao.findPositionByUser(userInfo)); + userInfo.setPosition(sysPositionRDao.getById(userInfo.getPositionId())); }catch (Exception e){ LOGGER.error(" SysUser Peck Position information Error userId : {} Exception Message : {} " ,userInfo.getId(),e.getMessage()); e.printStackTrace(); } - userInfo.setPositionList(list); - sessionUser.setUserInfo(userInfo); } /** @@ -428,17 +429,25 @@ public class SysUserService implements ISysUserService { * @return */ public void packSysUserOrganize(SessionUser sessionUser, SysUserInfo userInfo){ - SysOrganize organize = null; try { LOGGER.debug("平台用户 SYS_USER user id :{}", userInfo.getId()); + userInfo.setOrganize(organizeRDao.getById(userInfo.getOrganizeId())); + + List departmentList = userInfo.getDepartmentList(); + if(departmentList != null && departmentList.size() > 0){ + Long[] ids = new Long[departmentList.size()]; + for (int i = 0; i < departmentList.size(); i++) { + ids[i] = departmentList.get(i).getOrganizeId(); + } + + String hqlWhere = CoreHqlPack.packHqlIds("id", ids); + List organizeList = organizeRDao.findByHqlWhere(hqlWhere); - organize = organizeRDao.getById(userInfo.getOrganizeId()); + userInfo.setOrganizeList(organizeList); + } }catch (Exception e){ LOGGER.error(" SysUser Peck Organize information Error userId : {} Exception Message : {} " ,userInfo.getId(),e.getMessage()); - e.printStackTrace(); } - userInfo.setOrganize(organize); - sessionUser.setUserInfo(userInfo); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/MailUtil.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/MailUtil.java index d780b0b..8051c06 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/MailUtil.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/MailUtil.java @@ -1,16 +1,18 @@ package cn.estsh.i3plus.core.apiservice.util; +import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.core.io.support.PropertiesLoaderUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; import javax.mail.*; import javax.mail.internet.AddressException; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeUtility; -import java.io.IOException; import java.io.UnsupportedEncodingException; import java.util.Properties; @@ -21,6 +23,7 @@ import java.util.Properties; * @CreateDate : 2018-11-14 19:24 * @Modify: **/ +@Component public class MailUtil { public static final Logger LOGGER = LoggerFactory.getLogger(MailUtil.class); @@ -39,21 +42,20 @@ public class MailUtil { private String smtpPassword = ""; private boolean isAuthenticationSMTP = false; + @Autowired + private ISysConfigService sysConfigService; //初始化服务器邮箱参数 - public MailUtil() { - try { - Properties mailInfo = PropertiesLoaderUtils.loadAllProperties("mail.properties"); - this.smtpHost = mailInfo.get("mail.host").toString(); - this.smtpPort = Integer.parseInt(mailInfo.get("mail.port").toString()); - this.from = mailInfo.get("mail.user") + ""; - this.nick = mailInfo.get("mail.nick") + ""; - this.smtpUser = mailInfo.get("mail.user") + ""; - this.smtpPassword = mailInfo.get("mail.password") + ""; - this.isAuthenticationSMTP = true; - } catch (IOException e) { - e.printStackTrace(); - } + public MailUtil init() { + this.smtpHost = sysConfigService.getSysConfigByCode(PlatformConstWords.MAIL_HOST).getConfigValue(); + this.smtpPort = Integer.parseInt(sysConfigService.getSysConfigByCode(PlatformConstWords.MAIL_PORT).getConfigValue()); + this.from = sysConfigService.getSysConfigByCode(PlatformConstWords.MAIL_USER).getConfigValue(); + this.nick = sysConfigService.getSysConfigByCode(PlatformConstWords.MAIL_NICK).getConfigValue(); + this.smtpUser = sysConfigService.getSysConfigByCode(PlatformConstWords.MAIL_USER).getConfigValue(); + this.smtpPassword = sysConfigService.getSysConfigByCode(PlatformConstWords.MAIL_PASSWORD).getConfigValue(); + this.isAuthenticationSMTP = true; + + return this; } /** diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/OrderNoMakeUtil.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/OrderNoMakeUtil.java new file mode 100644 index 0000000..ebda193 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/OrderNoMakeUtil.java @@ -0,0 +1,59 @@ +package cn.estsh.i3plus.core.apiservice.util; + +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule; + +import java.text.MessageFormat; +import java.text.SimpleDateFormat; + +/** + * @Description : 单号生成工具类 + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-11-21 13:26 + * @Modify: + **/ +public class OrderNoMakeUtil { + + public static SysOrderNoRule next(SysOrderNoRule orderNoRule) { + StringBuilder orderNo = new StringBuilder(orderNoRule.getOrderNoRule()); + + String[] dateTime = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss").format(System.currentTimeMillis()).split("-"); + replace(orderNo, PlatformConstWords.YEAR, dateTime[0]); + replace(orderNo, PlatformConstWords.MONTH, dateTime[1]); + replace(orderNo, PlatformConstWords.DAY, dateTime[2]); + replace(orderNo, PlatformConstWords.HOUR, dateTime[3]); + replace(orderNo, PlatformConstWords.MINUTE, dateTime[4]); + replace(orderNo, PlatformConstWords.SECOND, dateTime[5]); + + // 流水号长度补全 + String serialNumberFormatStr = MessageFormat.format(PlatformConstWords.SERIAL_NO_FORMAT, orderNoRule.getSerialNoLength()); + + if (orderNoRule.getLastMakeSerialNo() > 0) { + int serialNo = orderNoRule.getLastMakeSerialNo() + orderNoRule.getSerialNoIncrement(); + // 达到最大值后循环或继续 + if(orderNoRule.getSerialNoLength().intValue() < String.valueOf(serialNo).length() + && orderNoRule.getIsCycle() == CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()){ + orderNoRule.setLastMakeSerialNo(orderNoRule.getSerialNoSeed()); + } else { + orderNoRule.setLastMakeSerialNo(orderNoRule.getLastMakeSerialNo() + orderNoRule.getSerialNoIncrement()); + } + } else { + orderNoRule.setLastMakeSerialNo(orderNoRule.getSerialNoSeed()); + } + replace(orderNo, PlatformConstWords.SERIAL_NO, String.format(serialNumberFormatStr, orderNoRule.getLastMakeSerialNo())); + + orderNoRule.setLastMakeOrderNo(orderNo.toString()); + return orderNoRule; + } + + private static StringBuilder replace(StringBuilder no, String constant, String param) { + int day = no.indexOf(constant); + if (day != -1) { + no.replace(day, day + constant.length(), param); + } + return no; + } + +} diff --git a/modules/i3plus-core-apiservice/src/main/resources/init/permission-test.xlsx b/modules/i3plus-core-apiservice/src/main/resources/init/permission-test.xlsx new file mode 100644 index 0000000..7e9ae4d Binary files /dev/null and b/modules/i3plus-core-apiservice/src/main/resources/init/permission-test.xlsx differ diff --git a/modules/i3plus-core-apiservice/src/main/resources/init/permission.xlsx b/modules/i3plus-core-apiservice/src/main/resources/init/permission.xlsx new file mode 100644 index 0000000..fc80651 Binary files /dev/null and b/modules/i3plus-core-apiservice/src/main/resources/init/permission.xlsx differ diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/mq/MailUtil.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/mq/TestMQ.java similarity index 90% rename from modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/mq/MailUtil.java rename to modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/mq/TestMQ.java index 6a5d078..d1176f5 100644 --- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/mq/MailUtil.java +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/mq/TestMQ.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.mq; import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase; +import cn.estsh.i3plus.core.apiservice.util.MailUtil; import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SysMessage; import org.junit.Test; @@ -14,7 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; * @CreateDate : 2018-11-15 13:22 * @Modify: **/ -public class MailUtil extends TestBase { +public class TestMQ extends TestBase { /** * rabbitMQ队列 @@ -22,6 +23,9 @@ public class MailUtil extends TestBase { @Autowired private RabbitTemplate rabbitTemplate; + @Autowired + private MailUtil mailUtil; + @Test public void sendMail() throws InterruptedException { @@ -42,4 +46,5 @@ public class MailUtil extends TestBase { } } + } diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java index 521a0bb..379178e 100644 --- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; +import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService; import cn.estsh.impp.framework.boot.init.ApplicationProperties; import org.junit.After; import org.junit.Before; @@ -27,6 +28,9 @@ public class TestBase { @Autowired private ApplicationProperties app; + @Autowired + private ISysConfigService sysConfigService; + @Before public void init() { System.out.println("-----------------开始测试-----------------"); diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelPermission.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelPermission.java new file mode 100644 index 0000000..04f6020 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelPermission.java @@ -0,0 +1,261 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.platform.common.tool.EncryptTool; +import cn.estsh.i3plus.pojo.platform.bean.*; +import cn.estsh.i3plus.pojo.platform.repository.*; +import com.alibaba.fastjson.JSON; +import io.swagger.models.auth.In; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.usermodel.WorkbookFactory; +import org.apache.poi.xssf.usermodel.XSSFSheet; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.jdom2.Document; +import org.jdom2.JDOMException; +import org.jdom2.input.SAXBuilder; +import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; + +/** + * 系统数据初始化 + */ +public class TestExcelPermission extends TestBase { +//public class TestExcelPermission { + + public static final Logger LOGGER = LoggerFactory.getLogger(TestExcelPermission.class); + + // 文件路径 + public static final String PATH_NAME = "init/permission.xlsx"; + // 权限Sheet 名称 + public static final String SHEET_NAME_MENU = "menu"; + public static final String SHEET_NAME_ROLE = "role"; + public static final String SHEET_NAME_USER_INFO = "user-info"; + public static final String SHEET_NAME_USER = "user"; + + @Autowired + private SysUserRepository sysUserRdao; + + @Autowired + private SysUserInfoRepository userInfoRDao; + + @Autowired + private SysMenuRepository menuRdao; + + @Autowired + private SysRoleRepository roleRDao; + + @Autowired + private SysRefRoleMenuRepository refRoleMenuRDao; + + + + @Test + public void testInit() throws Exception { + XSSFWorkbook workbook = getWorkbook(PATH_NAME); + if(workbook != null){ + XSSFSheet sheetMenu = workbook.getSheet(SHEET_NAME_MENU); + XSSFSheet sheetRole = workbook.getSheet(SHEET_NAME_ROLE); + XSSFSheet sheetUserInfo = workbook.getSheet(SHEET_NAME_USER_INFO); + XSSFSheet sheetUser = workbook.getSheet(SHEET_NAME_USER); + + List menus = getSysMenu(sheetMenu); + List roles = getSysRole(sheetRole); + List userInfos = getSysUserInfo(sheetUserInfo); + List users = getSysUser(sheetUser); + + List refRoleMenu = getRefRoleMenu(menus, roles); + + LOGGER.info("System Init SysMenu Size:{}",menus.size()); + LOGGER.info("System Init SysRole Size:{}",roles.size()); + LOGGER.info("System Init SysUserInfo Size:{}",userInfos.size()); + LOGGER.info("System Init SysUser Size:{}",users.size()); + LOGGER.info("System Init SysRefRoleMenu Size:{}",refRoleMenu.size()); + + sysUserRdao.saveAll(users); + userInfoRDao.saveAll(userInfos); + menuRdao.saveAll(menus); + roleRDao.saveAll(roles); + refRoleMenuRDao.saveAll(refRoleMenu); + } + } + + + + + public List getRefUserRole(List users,List roles){ + List result = new ArrayList<>(); + if(users != null && roles != null){ + SysRefUserRole ref = null; + for (SysUser user : users) { + for (SysRole role : roles) { + ref = new SysRefUserRole(); + ref.setRoleId(role.getId()); + ref.setRoleNameRdd(role.getName()); + ref.setUserId(user.getId()); + ref.setUserNameRdd(user.getUserName()); + result.add(ref); + } + } + } + return result; + } + + public List getRefRoleMenu(List menus,List roles){ + List result = new ArrayList<>(); + if(menus != null && roles != null){ + SysRefRoleMenu ref = null; + for (SysMenu menu : menus) { + for (SysRole role : roles) { + ref = new SysRefRoleMenu(); + ref.setRoleId(role.getId()); + ref.setRoleNameRdd(role.getName()); + ref.setMenuId(menu.getId()); + ref.setMenuNameRdd(menu.getName()); + ref.setMenuTypeRdd(menu.getMenuType()); + result.add(ref); + } + } + } + return result; + } + + public List getSysUser(XSSFSheet sheet){ + List result = new ArrayList<>(); + if(sheet != null){ + if(sheet.getLastRowNum() >= 1){ + SysUser obj = null; + for (int i = 1; i <= sheet.getLastRowNum(); i++) { + try { + Row row = sheet.getRow(i);//获取索引为i的行，以0开始 + if(row.getCell(0).toString().trim().length() > 0){ + obj = new SysUser(); + String md5 = EncryptTool.hexMD5(row.getCell(2).toString()); + obj.setId(Long.parseLong(row.getCell(0).getStringCellValue())); + obj.setUserLoginName(row.getCell(1).getStringCellValue()); + obj.setUserLoginPassword(md5); + obj.setUserEmail(row.getCell(3).getStringCellValue()); + obj.setUserPhone(row.getCell(4).getStringCellValue()); + obj.setUserInfoId(Long.parseLong(row.getCell(5).getStringCellValue())); + obj.setUserName(row.getCell(6).getStringCellValue()); + obj.setIsValid(1); + obj.setUserType(1); + obj.setUserLoginNum(0); + + result.add(obj); + } + }catch (Exception e){ + LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i); + } + } + } + } + return result; + } + + public List getSysUserInfo(XSSFSheet sheet){ + List result = new ArrayList<>(); + if(sheet != null){ + if(sheet.getLastRowNum() >= 1){ + SysUserInfo obj = null; + for (int i = 1; i <= sheet.getLastRowNum(); i++) { + try { + Row row = sheet.getRow(i);//获取索引为i的行，以0开始 + if(row.getCell(0).toString().trim().length() > 0){ + obj = new SysUserInfo(); + obj.setId(Long.parseLong(row.getCell(0).getStringCellValue())); + obj.setName(row.getCell(1).getStringCellValue()); + obj.setUserEmpNo(row.getCell(2).getStringCellValue()); + obj.setUserLoginNum(0); + obj.setIsValid(1); + + result.add(obj); + } + }catch (Exception e){ + LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i); + } + } + } + } + return result; + } + + public List getSysRole(XSSFSheet sheet){ + List result = new ArrayList<>(); + if(sheet != null){ + if(sheet.getLastRowNum() >= 1){ + SysRole role = null; + for (int i = 1; i <= sheet.getLastRowNum(); i++) { + try { + Row row = sheet.getRow(i);//获取索引为i的行，以0开始 + if(row.getCell(0).toString().trim().length() > 0){ + role = new SysRole(); + role.setId(Long.parseLong(row.getCell(0).getStringCellValue())); + role.setName(row.getCell(1).getStringCellValue()); + role.setRoleDescription(row.getCell(2).getStringCellValue()); + + result.add(role); + } + }catch (Exception e){ + LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i); + } + } + } + } + return result; + } + + public List getSysMenu(XSSFSheet sheet){ + List result = new ArrayList<>(); + if(sheet != null){ + if(sheet.getLastRowNum() >= 1){ + SysMenu menu = null; + for (int i = 1; i <= sheet.getLastRowNum(); i++) { + try { + Row row = sheet.getRow(i);//获取索引为i的行，以0开始 + if(row.getCell(0).toString().trim().length() > 0){ + menu = new SysMenu(); + menu.setId(Long.parseLong(row.getCell(0).getStringCellValue())); + menu.setMenuType(Integer.parseInt(row.getCell(1).getStringCellValue())); + menu.setMenuCode(row.getCell(2).getStringCellValue()); + menu.setName(row.getCell(3).getStringCellValue()); + menu.setParentId(Long.parseLong(row.getCell(4).getStringCellValue())); + menu.setParentNameRdd(row.getCell(5).getStringCellValue()); + menu.setMenuDescription(row.getCell(6).getStringCellValue()); + menu.setMenuStatus(Integer.parseInt(row.getCell(7).getStringCellValue())); + menu.setCreateUser("System Init"); + menu.setMenuUrl(row.getCell(9).getStringCellValue()); + menu.setMenuCss(row.getCell(10).getStringCellValue()); + menu.setMenuIcon(row.getCell(11).getStringCellValue()); + + result.add(menu); + } + }catch (Exception e){ + LOGGER.error("Excel Sheet Name :{} Index:{} DataType Error", sheet.getSheetName(), i); + } + } + } + } + return result; + } + + public XSSFWorkbook getWorkbook(String pathName){ + try { + InputStream in = TestExcelPermission.class.getClassLoader().getResourceAsStream(pathName); + XSSFWorkbook workbook = new XSSFWorkbook(in); + return workbook; + }catch (Exception e){ + LOGGER.error(" System Init Sys Data Excel Error file path {} error message :{}",pathName,e.getMessage()); + e.getMessage(); + return null; + } + } + +} diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestInitData.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestInitData.java deleted file mode 100644 index 4ce05a6..0000000 --- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestInitData.java +++ /dev/null @@ -1,111 +0,0 @@ -package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; - -import cn.estsh.i3plus.core.api.iservice.busi.*; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; -import cn.estsh.i3plus.pojo.platform.bean.*; -import com.alibaba.fastjson.JSON; -import org.junit.Test; -import org.springframework.beans.factory.annotation.Autowired; - -import javax.transaction.Transactional; - -/** - * 系统数据初始化 - */ -public class TestInitData extends TestBase { - - @Autowired - private IOrganizeService organizeService; - - @Autowired - private IPositionService positionService; - - @Autowired - private IDepartmentService departmentService; - - @Autowired - private ISysMenuService sysMenuService; - - @Autowired - private ISysRoleService sysRoleService; - - @Autowired - private ISysUserService sysUserService; - - @Autowired - private ISysUserInfoService sysUserInfoService; - - @Test - @Transactional - public void testInitPosition(){ - - } - - @Test - @Transactional - public void testInitOrganize(){ - - } - - @Test - @Transactional - public void testInitDepartment(){ - - } - - @Test - @Transactional - public void testInitSysRole(){ - - } - - @Test - @Transactional - public void testInitSysUser()throws Exception{ - Organize organize = new Organize(); - organize.setName("Junit 组织"); - organize.setOrganizeTypeId(ImppEnumUtil.ORGANIZE_YTPE.TYPE_COMPANY.getValue()); - organize.setOrganizeCode("junit 001"); - Organize insertOrganize = organizeService.insertOrganize(organize); - System.out.println(JSON.toJSON(insertOrganize)); - - Department department = new Department(); - department.setName("Junit 部门"); - department.setDepartmentCode("junit 001"); - department.setOrganizeId(insertOrganize.getId()); - Department insertDepartment = departmentService.insertDepartment(department); - System.out.println(JSON.toJSON(insertDepartment)); - - Position position = new Position(); - position.setName("Junit 岗位"); - position.setPositionCode("junit 001"); - Position insertPosition = positionService.insertPosition(position); - System.out.println(JSON.toJSON(insertPosition)); - - SysUserInfo info = new SysUserInfo(); - info.setName("Junit 用户"); - info.setOrganizeId(insertOrganize.getId()); - info.setDepartmentId(insertDepartment.getId()); - info.setPositionId(insertPosition.getId()); - - SysUserInfo insertSysUserInfo = sysUserInfoService.insertSysUserInfo(info); - - SysRole role = new SysRole(); - role.setName("Junit 角色"); - SysRole insertSysRole = sysRoleService.insertSysRole(role); - System.out.println(JSON.toJSON(insertSysRole)); - - - SysUser user = new SysUser(); - user.setUserLoginName("root"); - user.setUserLoginPassword("root"); - user.setUserInfoId(insertSysUserInfo.getId()); - user.setRoleId(insertSysRole.getId()); - - SysUser sysUser = sysUserService.insertSysUser(user); - System.out.println(JSON.toJSON(sysUser)); - } - - -} diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysConfigService.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysConfigService.java index c4ce0e7..1ca0c30 100644 --- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysConfigService.java +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysConfigService.java @@ -1,102 +1,102 @@ -//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; -// -//import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService; -//import cn.estsh.i3plus.pojo.base.bean.ListPager; -//import cn.estsh.i3plus.pojo.base.common.Pager; -//import cn.estsh.i3plus.pojo.platform.bean.SysConfig; -//import com.alibaba.fastjson.JSON; -//import org.junit.Test; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.test.annotation.Rollback; -// -//import javax.transaction.Transactional; -//import java.util.List; -// -///** -// * @Description : 系统参数服务测试 -// * @Reference : -// * @Author : yunhao -// * @Date : 2018-10-30 10:49 -// * @Modify : -// **/ -//public class TestSysConfigService extends TestBase { -// -// @Autowired -// private ISysConfigService sysConfigService; -// -// /** -// * 测试 查询所有系统参数 -// */ -// @Test -// @Transactional -// public void testListSysConfig() { -// List list = sysConfigService.ListSysConfig(); -// System.out.println(JSON.toJSONString(list)); -// } -// -// /** -// * 测试 根据id查询系统参数 -// */ -// @Test -// @Transactional -// public void testGetSysConfigById() { -// SysConfig sysConfig = sysConfigService.getSysConfigById("1057110061127700480"); -// System.out.println(JSON.toJSONString(sysConfig)); -// } -// -// /** -// * 测试 添加系统参数 -// */ -// @Test -// @Transactional -// @Rollback(false) -// public void testInsertSysConfig() { -// SysConfig sysConfig = new SysConfig(); -// sysConfig.setName("系统名称"); -// sysConfig.setConfigCode("sys_name"); -// sysConfig.setConfigTypeId(1); -// sysConfig.setConfigValue("IMPP"); -// sysConfig.setConfigDescription("系统名称"); -// -// sysConfigService.insertSysConfig(sysConfig); -// System.out.println(JSON.toJSONString(sysConfig)); -// -// } -// -// /** -// * 测试 修改系统参数 -// */ -// @Test -// @Transactional -// public void testUpdateSysConfig(){ -// SysConfig sysConfig = sysConfigService.getSysConfigById("1057110613261684736"); -// sysConfig.setConfigDescription("测试修改"); -// -// sysConfigService.updateSysConfig(sysConfig); -// } -// -// /** -// * 测试 根据id删除系统参数 -// */ -// @Test -// @Transactional -// public void testDeleteSysConfigById(){ -// sysConfigService.deleteSysConfigById("1057111616417566720"); -// } -// -// /** -// * 测试 复制查询 -// */ -// @Test -// @Transactional -// public void testQuerySysConfigByPager(){ -// SysConfig sysConfig = new SysConfig(); -// -// Pager pager = new Pager(); -// pager.setPageSize(10); -// pager.setCurrentPage(1); -// -// ListPager list = sysConfigService.querySysConfigByPager(sysConfig,pager); -// System.out.println(list); -// } -//} +package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; + +import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.platform.bean.SysConfig; +import com.alibaba.fastjson.JSON; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.annotation.Rollback; + +import javax.transaction.Transactional; +import java.util.List; + +/** + * @Description : 系统参数服务测试 + * @Reference : + * @Author : yunhao + * @Date : 2018-10-30 10:49 + * @Modify : + **/ +public class TestSysConfigService extends TestBase { + + @Autowired + private ISysConfigService sysConfigService; + + /** + * 测试 查询所有系统参数 + */ + @Test + @Transactional + public void testListSysConfig() { + List list = sysConfigService.ListSysConfig(); + System.out.println(JSON.toJSONString(list)); + } + + /** + * 测试 根据id查询系统参数 + */ + @Test + @Transactional + public void testGetSysConfigById() { + SysConfig sysConfig = sysConfigService.getSysConfigById(1057110061127700480L); + System.out.println(JSON.toJSONString(sysConfig)); + } + + /** + * 测试 添加系统参数 + */ + @Test + @Transactional + @Rollback(false) + public void testInsertSysConfig() { + SysConfig sysConfig = new SysConfig(); + sysConfig.setName("系统名称"); + sysConfig.setConfigCode("sys_name"); + sysConfig.setConfigType(1); + sysConfig.setConfigValue("IMPP"); + sysConfig.setConfigDescription("系统名称"); + + sysConfigService.insertSysConfig(sysConfig); + System.out.println(JSON.toJSONString(sysConfig)); + + } + + /** + * 测试 修改系统参数 + */ + @Test + @Transactional + public void testUpdateSysConfig(){ + SysConfig sysConfig = sysConfigService.getSysConfigById(1057110613261684736L); + sysConfig.setConfigDescription("测试修改"); + + sysConfigService.updateSysConfig(sysConfig); + } + + /** + * 测试 根据id删除系统参数 + */ + @Test + @Transactional + public void testDeleteSysConfigById(){ + sysConfigService.deleteSysConfigById(1057111616417566720L); + } + + /** + * 测试 复制查询 + */ + @Test + @Transactional + public void testQuerySysConfigByPager(){ + SysConfig sysConfig = new SysConfig(); + + Pager pager = new Pager(); + pager.setPageSize(10); + pager.setCurrentPage(1); + + ListPager list = sysConfigService.querySysConfigByPager(sysConfig,pager); + System.out.println(list); + } +} diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/util/TestMailUtil.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/util/TestMailUtil.java new file mode 100644 index 0000000..0de9cef --- /dev/null +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/util/TestMailUtil.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.core.apiservice.util; + +import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; +import org.junit.Test; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-11-21 19:44 + * @Modify: + **/ +public class TestMailUtil extends TestBase { + + @Autowired + MailUtil mailUtil; + + @Test + public void TestSendMail(){ + mailUtil.setTo("yunhao.wang@estsh.com"); + mailUtil.setSubject("中文"); + mailUtil.setContentType(ImppEnumUtil.MESSAGE_CONTENT_TYPE.HTML.getDescription()); + mailUtil.setBody("内容"); + mailUtil.send(); + + } +} diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/util/TestOrderNoMakeUtil.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/util/TestOrderNoMakeUtil.java new file mode 100644 index 0000000..2195fc7 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/util/TestOrderNoMakeUtil.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.core.apiservice.util; + +import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase; +import cn.estsh.i3plus.pojo.platform.bean.SysOrderNoRule; +import org.junit.Test; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-11-21 19:45 + * @Modify: + **/ +public class TestOrderNoMakeUtil extends TestBase { + + @Test + public void TestMakeOrderNO() { + SysOrderNoRule sysOrderNoRule = new SysOrderNoRule(); + sysOrderNoRule.setName("一号单据"); + sysOrderNoRule.setOrderNoRule("GG-{yyyy}{MM}{dd}{serialNo}"); + sysOrderNoRule.setSerialNoSeed(1); + sysOrderNoRule.setSerialNoIncrement(1); + sysOrderNoRule.setSerialNoLength(4); + sysOrderNoRule.setLastMakeSerialNo(9999); + sysOrderNoRule.setIsCycle(1); + + System.out.println(OrderNoMakeUtil.next(sysOrderNoRule)); + +// String d= MessageFormat.format("%0{0}d", 3); +// System.out.println(d); + } + +} diff --git a/pom.xml b/pom.xml index 652cd8b..f9d07bc 100644 --- a/pom.xml +++ b/pom.xml @@ -182,6 +182,17 @@ mail 1.4.7 + + + org.apache.poi + poi + RELEASE + + + org.apache.poi + poi-ooxml + RELEASE +