diff --git a/.gitignore b/.gitignore index 838e520..f56704b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ # IntelliJ project files .gitignore .idea +idea/*.xml *.iml out gen diff --git a/modules/i3plus-core-api/pom.xml b/modules/i3plus-core-api/pom.xml index 155a733..cbfbca2 100644 --- a/modules/i3plus-core-api/pom.xml +++ b/modules/i3plus-core-api/pom.xml @@ -5,7 +5,7 @@ i3plus-core i3plus.core - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java index 00bb5a7..83f4827 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserInfoService.java @@ -2,9 +2,7 @@ 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.SessionUser; -import cn.estsh.i3plus.pojo.platform.bean.SysUser; -import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo; +import cn.estsh.i3plus.pojo.platform.bean.*; import io.swagger.annotations.ApiOperation; import java.util.List; @@ -97,4 +95,36 @@ public interface ISysUserInfoService { @ApiOperation(value = "查询用户信息",notes = "根据复杂查询条件查询用户信息(分页信息)") ListPager querySysUserInfo(SysUserInfo userInfo, Pager pager); + /** + * 用户唯一校验 + * @param userInfo + */ + @ApiOperation(value = "用户唯一校验",notes = "校验用户信息唯一性") + void checkSysUserInfoOnly(SysUserInfo userInfo); + + /** + * 查询用户部门关系 + * @param userId + * @return + */ + @ApiOperation(value = "关系查询-用户部门",notes = "查询用户部门关系") + List findRefUserDepartmentByUserId(Long userId); + + /** + * 查询用户岗位关系 + * @param userId + * @return + */ + @ApiOperation(value = "关系查询-用户岗位",notes = "查询用户岗位关系") + List findSysRefUserPositionByUserId(Long userId); + + /** + * 用户唯一校验 用户工号 + * @param no + * @param id + * @return + */ + @ApiOperation(value = "用户唯一校验 用户工号",notes = "用户唯一校验 用户工号") + boolean checkUserInfoByUserEmpNo(String no,long id); + } diff --git a/modules/i3plus-core-apiservice/pom.xml b/modules/i3plus-core-apiservice/pom.xml index b25c5d2..50107af 100644 --- a/modules/i3plus-core-apiservice/pom.xml +++ b/modules/i3plus-core-apiservice/pom.xml @@ -5,7 +5,7 @@ i3plus-core i3plus.core - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.java index 2608546..30c3295 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoAuthController.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller; import cn.estsh.i3plus.core.api.iservice.base.ISystemLoginService; import cn.estsh.i3plus.platform.common.tool.EncryptTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; @@ -32,7 +33,7 @@ import java.util.Map; **/ @RestController @Api(description="登陆授权demo") -@RequestMapping(CoreBaseController.BASE_URL + "/demo") +@RequestMapping(PlatformConstWords.BASE_URL + "/demo") public class DemoAuthController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(DemoAuthController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java index d051389..3b776f9 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.controller; import cn.estsh.i3plus.core.api.iservice.busi.ISysLogOperateService; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SysLogOperate; @@ -26,7 +27,7 @@ import java.util.List; **/ @RestController @Api(description="系统服务demo") -@RequestMapping(CoreBaseController.BASE_URL + "/demo-mongo-service") +@RequestMapping(PlatformConstWords.BASE_URL + "/demo-mongo-service") public class DemoMongoController extends CoreBaseController{ private static final Logger LOGGER = LoggerFactory.getLogger(DemoMongoController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRedisMqController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRedisMqController.java index e16f953..66c918e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRedisMqController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRedisMqController.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.controller; import cn.estsh.i3plus.core.apiservice.mq.I3CoreQueueConfig; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.util.ResultBean; @@ -34,7 +35,7 @@ import java.util.concurrent.TimeoutException; **/ @RestController @Api(description="复杂对象服务demo") -@RequestMapping(CoreBaseController.BASE_URL + "/demo") +@RequestMapping(PlatformConstWords.BASE_URL + "/demo") public class DemoRedisMqController extends CoreBaseController{ private static final Logger LOGGER = LoggerFactory.getLogger(DemoRedisMqController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java index 321419a..db7542c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService; import cn.estsh.i3plus.core.api.iservice.busi.ISystemResourceService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.base.bean.ListPager; @@ -39,7 +40,7 @@ import java.util.Locale; **/ @RestController @Api(description="系统服务demo") -@RequestMapping(CoreBaseController.BASE_URL + "/demo-system-service") +@RequestMapping(PlatformConstWords.BASE_URL + "/demo-system-service") public class DemoResourceController extends CoreBaseController { private static final Logger LOGGER = LoggerFactory.getLogger(DemoResourceController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoScheduleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoScheduleController.java index 8cda612..4ed2ae2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoScheduleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoScheduleController.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.core.apiservice.controller; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.quartz.ScheduleTool; @@ -24,7 +25,7 @@ import java.util.List; **/ @RestController @Api(description="定时任务demo") -@RequestMapping(CoreBaseController.BASE_URL + "/schedule") +@RequestMapping(PlatformConstWords.BASE_URL + "/schedule") public class DemoScheduleController extends CoreBaseController{ private static final Logger LOGGER = LoggerFactory.getLogger(DemoScheduleController.class); 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 3f8b9f4..b4328fa 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.controller; import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SysDepartment; @@ -32,7 +33,7 @@ import java.net.URLConnection; **/ @RestController @Api(description="树和异常demo") -@RequestMapping(CoreBaseController.BASE_URL + "/demo") +@RequestMapping(PlatformConstWords.BASE_URL + "/demo") public class DemoTreeAndExceptionController extends CoreBaseController{ private static final Logger LOGGER = LoggerFactory.getLogger(DemoTreeAndExceptionController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUploadController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUploadController.java index 57161c3..2152b77 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUploadController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUploadController.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.core.apiservice.controller; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.exception.ImppBusiException; @@ -25,7 +26,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; **/ @RestController @Api(description="复杂对象服务demo") -@RequestMapping(CoreBaseController.BASE_URL + "/demo-upload") +@RequestMapping(PlatformConstWords.BASE_URL + "/demo-upload") public class DemoUploadController extends CoreBaseController{ private static final Logger LOGGER = LoggerFactory.getLogger(DemoUploadController.class); 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 5aab9ca..4c88219 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 @@ -6,6 +6,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService; import cn.estsh.i3plus.core.apiservice.controller.DemoAuthController; import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.SysLocaleLanguageService; import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage; @@ -40,7 +41,7 @@ import java.util.List; **/ @RestController @Api(description="用户所有权限操作服务") -@RequestMapping(CoreBaseController.BASE_URL + "/auth") +@RequestMapping(PlatformConstWords.BASE_URL + "/auth") public class AuthController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(DemoAuthController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SimpleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SimpleController.java index 8b95721..4c62aaa 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SimpleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SimpleController.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.controller.base; import cn.estsh.i3plus.core.api.iservice.base.IDataSimpleService; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.i3plus.pojo.mes.MachineFactory; @@ -22,7 +23,7 @@ import java.util.List; **/ @RestController @Api(tags="SimpleController",description="简单服务demo") -@RequestMapping(CoreBaseController.BASE_URL +"/simple-service") +@RequestMapping(PlatformConstWords.BASE_URL +"/simple-service") public class SimpleController extends CoreBaseController{ private Logger LOGGER = LoggerFactory.getLogger(this.getClass()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java index e74a533..81f4510 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java @@ -22,7 +22,7 @@ // **/ //@RestController //@Api(description="复杂对象服务demo") -//@RequestMapping(CoreBaseController.BASE_URL +"/factory-store") +//@RequestMapping(PlatformConstWords.BASE_URL +"/factory-store") //public class FactoryStoreController extends CoreBaseController { // private Logger LOGGER = LoggerFactory.getLogger(this.getClass()); // diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java index f0ce24b..150bf5f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysConfigController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService; import cn.estsh.i3plus.core.apiservice.util.MailUtil; import cn.estsh.i3plus.platform.common.convert.ConvertBean; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; @@ -33,7 +34,7 @@ import java.util.List; **/ @RestController @Api(description = "系统参数管理服务") -@RequestMapping(CoreBaseController.BASE_URL +"/sys-config") +@RequestMapping(PlatformConstWords.BASE_URL +"/sys-config") public class SysConfigController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysConfigController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java index fbde097..cf5a56f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysDepartmentService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -34,7 +35,7 @@ import java.util.List; **/ @RestController @Api(description = "部门管理服务") -@RequestMapping(CoreBaseController.BASE_URL +"/department") +@RequestMapping(PlatformConstWords.BASE_URL +"/department") public class SysDepartmentController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysDepartmentController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java index efd4fc1..c4d7c13 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysDictionaryService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -34,7 +35,7 @@ import java.util.List; **/ @RestController @Api(description = "字典管理服务") -@RequestMapping(CoreBaseController.BASE_URL +"/sys-dictionary") +@RequestMapping(PlatformConstWords.BASE_URL +"/sys-dictionary") public class SysDictionaryController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysConfigController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java index 349dfa6..bb06701 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import cn.estsh.impp.framework.base.controller.CoreBaseController; @@ -23,7 +24,7 @@ import java.util.List; **/ @RestController @Api(description = "系统枚举服务") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-enum") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-enum") public class SysEnumController extends CoreBaseController{ @GetMapping("/method-level") diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java index 61cc61c..8f6243a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysDictionaryService; import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService; import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -50,7 +51,7 @@ import java.util.List; **/ @RestController @Api(description = "文件资源服务") -@RequestMapping(CoreBaseController.BASE_URL +"/sys-file") +@RequestMapping(PlatformConstWords.BASE_URL +"/sys-file") public class SysFileController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysFileController.class); 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 66c03ab..57fb717 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 @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleLanguageService; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -31,7 +32,7 @@ import java.util.List; **/ @RestController @Api(description = "系统语言服务") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-locale-language") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-locale-language") public class SysLocaleLanguageController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysFileController.class); 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 b79e05e..cb6f9d6 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 @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleResourceService; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -34,7 +35,7 @@ import java.util.List; **/ @RestController @Api(description = "系统语言资源服务") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-locale-resource") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-locale-resource") public class SysLocaleResourceController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysFileController.class); 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 index 7f866e1..1b53673 100644 --- 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysLogExceptionService; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; @@ -27,7 +28,7 @@ import org.springframework.web.bind.annotation.RestController; **/ @RestController @Api(description = "系统异常日志服务") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-log-exception") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-log-exception") public class SysLogExceptionController { public static final Logger LOGGER = LoggerFactory.getLogger(SysLogExceptionController.class); 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 d16a574..0b70c9c 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,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysLogOperateService; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; @@ -29,7 +30,7 @@ import java.util.List; **/ @RestController @Api(description = "操作日志") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-log-operate") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-log-operate") public class SysLogOperateController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysLogOperateController.class); 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 2941e13..4af9408 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,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysLogSystemService; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; @@ -28,7 +29,7 @@ import java.util.List; **/ @RestController @Api(description = "系统日志服务") -@RequestMapping(CoreBaseController.BASE_URL +"/sys-log-system") +@RequestMapping(PlatformConstWords.BASE_URL +"/sys-log-system") public class SysLogSystemController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysLogSystemController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java index a926a31..54bdf84 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java @@ -3,6 +3,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; + import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -32,7 +33,7 @@ **/ @RestController @Api(description = "系统功能服务") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-menu") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-menu") public class SysMenuController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysMenuController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java index 1b350ed..3d24a1c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -37,7 +38,7 @@ import java.util.List; * @Modify : **/ @RestController -@RequestMapping(CoreBaseController.BASE_URL) +@RequestMapping(PlatformConstWords.BASE_URL) @Api(description = "消息管理服务") public class SysMessageController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysMessageController.class); 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 index 35b170b..2f9ccf8 100644 --- 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 @@ -47,7 +47,7 @@ import java.util.List; **/ @RestController @Api(description = "系统单号规则管理服务") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-order-no-rule") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-order-no-rule") public class SysOrderNoRuleController extends CoreBaseController { @Autowired @@ -65,14 +65,8 @@ public class SysOrderNoRuleController extends CoreBaseController { @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()); + // 添加校验 + validatorSysOrderNoRule(sysOrderNoRule); sysOrderNoRule.setOrderNoRuleStatus(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); sysOrderNoRule.setSerialNo(CommonEnumUtil.PARENT.DEFAULT.getValue()); @@ -276,12 +270,20 @@ public class SysOrderNoRuleController extends CoreBaseController { } } - @GetMapping(value = "/import") + @PostMapping(value = "/import") @ApiOperation(value = "导入单号规则") public ResultBean importSysOrderNoRule(@RequestParam("file") MultipartFile file){ try { - List sysOrderNoRuleList = ExcelUtil.importData(file.getName(),file.getInputStream(),SysOrderNoRule.class); - sysOrderNoRuleService.insertSysOrderNoRuleList(sysOrderNoRuleList); + List sysOrderNoRuleList = ExcelUtil.importData(file.getOriginalFilename(),file.getInputStream(),SysOrderNoRule.class); + for (SysOrderNoRule item : sysOrderNoRuleList) { + //校验及初始化数据 + validatorSysOrderNoRule(item); + item.setOrderNoRuleStatus(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); + item.setSerialNo(CommonEnumUtil.PARENT.DEFAULT.getValue()); + + sysOrderNoRuleService.insertSysOrderNoRule(item); + } + return ResultBean.success("导出成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); @@ -290,17 +292,44 @@ public class SysOrderNoRuleController extends CoreBaseController { } } - @GetMapping(value = "/import-template") + @GetMapping(value = "/down-template") @ApiOperation(value = "下载导入模板") - public ResultBean importSysOrderNoRuleTemplate(HttpServletResponse response, String[] colName){ + public ResultBean downSysOrderNoRuleTemplate(){ try { - response.setContentType("application/force-download");// 设置强制下载不打开 - response.addHeader("Content-Disposition", "attachment;fileName=" + SysOrderNoRule.class.getSimpleName() + "Template.xls");// 设置文件名 - response.addHeader("Content-type", "application/octet-stream");// 设置文件名 - -// ExcelUtil.importTemplate(response.getOutputStream(),SysOrderNoRule.class, colName); + FastDFSFile fastDFSFile = new FastDFSFile(SysOrderNoRule.class.getSimpleName() + "ImportTemplate.xls", + ExcelUtil.importTemplate(SysOrderNoRule.class),"xls"); + + String[] fileAbsolutePath = dfsClient.upload(fastDFSFile); + + // 保证系统文件表中 + String filePath = dfsClient.getHostUi() + "/" + fileAbsolutePath[0] + "/" + fileAbsolutePath[1]; + SysDictionary dictionary = sysDictionaryService.getSysDictionaryByParentCodeAndCode( + CommonConstWords.DICTIONARY_FILE_TYPE,fastDFSFile.getExt()); + + SysFile sysFile = new SysFile(); + sysFile.setDfsGroupName(fileAbsolutePath[0]); + sysFile.setDfsFileName(fileAbsolutePath[1]); + sysFile.setFileSize(fastDFSFile.getContent().length); + sysFile.setFilePath(filePath); + sysFile.setFileOriginalName(fastDFSFile.getName()); + sysFile.setFileTypeId(dictionary.getId()); + sysFile.setFileTypeName(dictionary.getName()); + sysFile.setDownloadNum(0); + sysFileService.insertSysFile(sysFile); + + return ResultBean.success("导出成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(sysFile); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } - return ResultBean.success("导出成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + @GetMapping("/get-col") + @ApiOperation(value = "获取单号规则字段") + public ResultBean getSysOrderNoRuleColName(){ + try { + return ResultBean.success("导出成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultMap(ExcelUtil.getColName(SysOrderNoRule.class)); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -308,4 +337,19 @@ public class SysOrderNoRuleController extends CoreBaseController { } } + /** + * 对象添加校验 + * @param sysOrderNoRule 校验对象 + * @throws NoSuchFieldException + */ + private void validatorSysOrderNoRule(SysOrderNoRule sysOrderNoRule) throws NoSuchFieldException { + 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()); + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java index 4720e11..7669312 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysOrganizeService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -33,7 +34,7 @@ import java.util.List; **/ @RestController @Api(description = "组织") -@RequestMapping(CoreBaseController.BASE_URL +"/organize") +@RequestMapping(PlatformConstWords.BASE_URL +"/organize") public class SysOrganizeController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysOrganizeController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java index 7db1cf4..5c4ebd5 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysPositionService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -34,7 +35,7 @@ import java.util.List; **/ @RestController @Api(description = "岗位管理服务") -@RequestMapping(CoreBaseController.BASE_URL +"/position") +@RequestMapping(PlatformConstWords.BASE_URL +"/position") public class SysPositionController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysPositionController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java index d14399b..7a242f2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysRoleService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -34,7 +35,7 @@ import java.util.List; **/ @RestController @Api(description = "系统角色服务") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-role") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-role") public class SysRoleController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysRoleController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskTimeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskTimeController.java index df606a9..947ffc7 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskTimeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskTimeController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskTimeExpressionService; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskTimeService; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -34,7 +35,7 @@ import java.util.List; **/ @RestController @Api(description = "定时任务服务") -@RequestMapping(CoreBaseController.BASE_URL +"/task-time") +@RequestMapping(PlatformConstWords.BASE_URL +"/task-time") public class SysTaskTimeController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysTaskTimeController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskTimeExpressionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskTimeExpressionController.java index 808c256..20161d4 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskTimeExpressionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskTimeExpressionController.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskTimeExpressionService; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -31,7 +32,7 @@ import java.util.List; **/ @RestController @Api(description = "系统时间表达式") -@RequestMapping(CoreBaseController.BASE_URL +"/task-time-expression") +@RequestMapping(PlatformConstWords.BASE_URL +"/task-time-expression") public class SysTaskTimeExpressionController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysTaskTimeExpressionController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java index b51cb03..ff28147 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysToolService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -41,7 +42,7 @@ import java.util.List; **/ @RestController @Api(description = "硬件服务") -@RequestMapping(CoreBaseController.BASE_URL +"/tool") +@RequestMapping(PlatformConstWords.BASE_URL +"/tool") public class SysToolController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysToolController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java index 93e00c3..859f9e0 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysToolTypeService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -34,7 +35,7 @@ import java.util.List; **/ @RestController @Api(description = "硬件类型服务") -@RequestMapping(CoreBaseController.BASE_URL +"/tool-type") +@RequestMapping(PlatformConstWords.BASE_URL +"/tool-type") public class SysToolTypeController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysToolTypeController.class); 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 de029c9..eee7d02 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 @@ -2,6 +2,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.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.model.platform.CommonTreeModel; import cn.estsh.i3plus.pojo.platform.bean.SysDepartment; @@ -33,7 +34,7 @@ import java.util.List; **/ @RestController @Api(description = "树服务") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-tree") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-tree") public class SysTreeController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysLogSystemController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java index 4b9dae6..abe288a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java @@ -7,6 +7,7 @@ import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.EncryptTool; import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -42,7 +43,7 @@ import java.util.List; **/ @RestController @Api(description = "系统用户服务") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-user") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-user") public class SysUserController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysUserController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java index 23895c4..1482bfa 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserInfoController.java @@ -2,17 +2,17 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysDepartmentService; import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService; +import cn.estsh.i3plus.core.api.iservice.busi.ISysPositionService; import cn.estsh.i3plus.core.api.iservice.busi.ISysUserInfoService; import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.SysOrganizeService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; -import cn.estsh.i3plus.pojo.platform.bean.SessionUser; -import cn.estsh.i3plus.pojo.platform.bean.SysDepartment; -import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo; +import cn.estsh.i3plus.pojo.platform.bean.*; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; @@ -39,7 +39,7 @@ import java.util.List; **/ @RestController @Api(description = "系统用户服务") -@RequestMapping(CoreBaseController.BASE_URL + "/sys-user-info") +@RequestMapping(PlatformConstWords.BASE_URL + "/sys-user-info") public class SysUserInfoController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysUserInfoController.class); @@ -56,6 +56,9 @@ public class SysUserInfoController extends CoreBaseController{ @Autowired private ISysFileService sysFileService; + @Autowired + private ISysPositionService sysPositionService; + @PostMapping(value="/insert") @ApiOperation(value="添加用户信息",notes="返回内容添加用户信息") public ResultBean insertSysUserInfo(SysUserInfo userInfo){ @@ -63,33 +66,24 @@ public class SysUserInfoController extends CoreBaseController{ //登陆用户 SessionUser user = AuthUtil.getSessionUser(); - //条件验证 - ValidatorBean.beginValid(userInfo) - .notNull("name",userInfo.getName()) - .notNull("userEmpNo",userInfo.getUserEmpNo()) - .checkNotZero("departmentId",userInfo.getDepartmentId()) - .checkNotZero("departmentIdList",userInfo.getDepartmentIdList()) - .checkNotZero("positionId",userInfo.getPositionId()); + checkSysUserInfo(userInfo,false); ConvertBean.modelInitialize(userInfo,user); userInfo.setUserInfoStatus(CommonEnumUtil.USER_STATUS.ENABLE.getValue()); - SysUserInfo pos = sysUserInfoService.insertSysUserInfo(userInfo); - sysUserInfoService.refreshRefUserDepartment(pos.getId(), + SysUserInfo info = sysUserInfoService.insertSysUserInfo(userInfo); + + sysUserInfoService.refreshRefUserDepartment(info.getId(), StringTool.getArrayLong(userInfo.getDepartmentIdList()), user.getUserName()); - sysUserInfoService.refreshRefUserPosition(pos.getId(), - new Long[]{userInfo.getPositionId()}, + sysUserInfoService.refreshRefUserPosition(info.getId(), + StringTool.getArrayLong(userInfo.getPositionIdList()), user.getUserName()); - SysDepartment department = departmentService.getSysDepartmentById(userInfo.getDepartmentId()); - if(department != null){ - sysUserInfoService.refreshRefUserOrganize(pos.getId(), - department.getOrganizeId(),user.getUserName()); - } + sysUserInfoService.refreshRefUserOrganize(info.getId(), userInfo.getDepartment().getOrganizeId(),user.getUserName()); - return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(pos); + return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(info); } catch (ImppBusiException busExcep) { LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); return ResultBean.fail(busExcep); @@ -106,13 +100,7 @@ public class SysUserInfoController extends CoreBaseController{ //登陆用户 SessionUser user = AuthUtil.getSessionUser(); - //条件验证 - ValidatorBean.beginValid(userInfo) - .notNull("id",userInfo.getId()) - .notNull("name",userInfo.getName()) - .notNull("userEmpNo",userInfo.getUserEmpNo()) - .checkNotZero("departmentId",userInfo.getDepartmentId()) - .checkNotZero("positionId",userInfo.getPositionId()); + checkSysUserInfo(userInfo,true); //修改初始化 ConvertBean.modelUpdate(userInfo,user); @@ -120,16 +108,14 @@ public class SysUserInfoController extends CoreBaseController{ sysUserInfoService.updateSysUserInfo(userInfo); sysUserInfoService.refreshRefUserDepartment(userInfo.getId(), - StringTool.getArrayLong(userInfo.getDepartmentIdList()), user.getUserName()); + StringTool.getArrayLong(userInfo.getDepartmentIdList()), + user.getUserName()); sysUserInfoService.refreshRefUserPosition(userInfo.getId(), - new Long[]{userInfo.getPositionId()}, user.getUserName()); + StringTool.getArrayLong(userInfo.getPositionIdList()), + user.getUserName()); - SysDepartment department = departmentService.getSysDepartmentById(userInfo.getDepartmentId()); - if(department != null){ - sysUserInfoService.refreshRefUserOrganize(userInfo.getId(), - department.getOrganizeId(),user.getUserName()); - } + sysUserInfoService.refreshRefUserOrganize(userInfo.getId(), userInfo.getDepartment().getOrganizeId(),user.getUserName()); return ResultBean.success("修改成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { @@ -237,4 +223,90 @@ public class SysUserInfoController extends CoreBaseController{ } } + @GetMapping(value = "/find-ref-department/{userId}") + @ApiOperation(value = "查询角色的所有角色权限关系", notes = "查询角色的所有角色权限关系") + public ResultBean findRefDepartment(@PathVariable("userId") String userId) { + try { + ValidatorBean.checkNotNull(userId, "用户 id 不能为空"); + List list = sysUserInfoService.findRefUserDepartmentByUserId(Long.parseLong(userId)); + return ResultBean.success("操作成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultList(list); + } catch (ImppBusiException busExcep) { + LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); + return ResultBean.fail(busExcep); + } catch (Exception e) { + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } + + @GetMapping(value = "/find-ref-position/{userId}") + @ApiOperation(value = "查询角色的所有角色权限关系", notes = "查询角色的所有角色权限关系") + public ResultBean findRefPosition(@PathVariable("userId") String userId) { + try { + ValidatorBean.checkNotNull(userId, "用户 id 不能为空"); + List list = sysUserInfoService.findSysRefUserPositionByUserId(Long.parseLong(userId)); + return ResultBean.success("操作成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultList(list); + } catch (ImppBusiException busExcep) { + LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); + return ResultBean.fail(busExcep); + } catch (Exception e) { + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); + return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + } + } + + /** + * 用户唯一信息校验 + * @param userInfo + * @param isId 是否检查ID 存在 + */ + private void checkSysUserInfo(SysUserInfo userInfo,boolean isId){ + + try{ + //条件验证 + ValidatorBean.beginValid(userInfo) + .notNull("name",userInfo.getName()) + .notNull("userEmpNo",userInfo.getUserEmpNo()) + .checkNotZero("departmentId",userInfo.getDepartmentId()) + .checkNotZero("departmentIdList",userInfo.getDepartmentIdList()) + .checkNotZero("positionId",userInfo.getPositionId()); + if(isId){ + ValidatorBean.beginValid(userInfo) + .notNull("id",userInfo.getId()); + } + + SysDepartment department = departmentService.getSysDepartmentById(userInfo.getDepartmentId()); + if(department == null){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("主部门信息不存在。") + .build(); + } + + SysPosition position = sysPositionService.getSysPositionById(userInfo.getPositionId()); + if(position == null){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("主岗位信息不存在。") + .build(); + } + + sysUserInfoService.checkSysUserInfoOnly(userInfo); + + userInfo.setDepartmentNameRdd(department.getName()); + userInfo.setPositionNameRdd(position.getName()); + userInfo.setDepartment(department); + userInfo.setPosition(position); + }catch(ImppBusiException busExcep){ + LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); + }catch(Exception e){ + LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); + } + } } 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 256cb42..f39319d 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 @@ -13,6 +13,7 @@ import cn.estsh.i3plus.pojo.platform.repository.*; 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 io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -103,7 +104,7 @@ public class SysUserInfoService implements ISysUserInfoService { nameList.add(department.getName()); } - userInfo.setDepartmentNameRdd(String.join(",",nameList)); + userInfo.setDepartmentNamesRdd(String.join(",",nameList)); refUserDepartmentRDao.saveAll(list); sysUserInfoRDao.save(userInfo); @@ -151,7 +152,7 @@ public class SysUserInfoService implements ISysUserInfoService { nameList.add(position.getName()); } - userInfo.setPositionNameRdd(String.join(",",nameList)); + userInfo.setPositionNamesRdd(String.join(",",nameList)); refUserPositionRDao.saveAll(list); sysUserInfoRDao.save(userInfo); @@ -227,4 +228,47 @@ public class SysUserInfoService implements ISysUserInfoService { return new ListPager(sysUserInfoRDao.findByHqlWherePage(hqlPack + userInfo.orderBy(),pager),pager); } } + + @Override + @ApiOperation(value = "关系查询-用户部门",notes = "查询用户部门关系") + public List findRefUserDepartmentByUserId(Long userId) { + return refUserDepartmentRDao.findByProperty("userId",userId); + } + + @Override + @ApiOperation(value = "关系查询-用户岗位",notes = "查询用户岗位关系") + public List findSysRefUserPositionByUserId(Long userId) { + return refUserPositionRDao.findByProperty("userId",userId); + } + + @Override + @ApiOperation(value = "用户唯一校验",notes = "校验用户信息唯一性") + public void checkSysUserInfoOnly(SysUserInfo userInfo) { + if(userInfo != null){ + // 登录名唯一教研 + if(!checkUserInfoByUserEmpNo(userInfo.getUserEmpNo(), userInfo.getId() == null ? 0 : userInfo.getId())){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) + .setErrorDetail("工号已存在") + .setErrorSolution("请重新输入工号") + .build(); + } + } + } + + @Override + @ApiOperation(value = "用户唯一校验 用户工号",notes = "用户唯一校验 用户工号") + public boolean checkUserInfoByUserEmpNo(String no, long id) { + int count; + if(id > 0){ + StringBuffer sw = new StringBuffer(); + HqlPack.getStringEqualPack(no,"userEmpNo",sw); + HqlPack.getNumNOEqualPack(id,"id",sw); + count = sysUserInfoRDao.findByHqlWhereCount(sw.toString()); + }else{ + count = sysUserInfoRDao.findByPropertyCount("userEmpNo",no); + } + return count <= 0 ; + } } 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 7bb481e..9b3a663 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 @@ -9,6 +9,7 @@ import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.PagerHelper; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import cn.estsh.i3plus.pojo.base.shirotoken.UserToken; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.platform.bean.*; @@ -18,6 +19,7 @@ import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.CredentialsException; import org.apache.shiro.authc.UnknownAccountException; @@ -430,7 +432,7 @@ public class SysUserService implements ISysUserService { packSysUserDepartment(sessionUser,userInfo); //封装用户部门信息 packSysUserPosition(sessionUser,userInfo); //封装用户岗位信息 - packSysUserOrganize(sessionUser,userInfo); //封装用户组织信息 + packSysUserOrganize(userInfo); //封装用户组织信息 userInfo.setUser(user); sessionUser.setUserName(userInfo.getName()); @@ -522,11 +524,10 @@ public class SysUserService implements ISysUserService { /** * 封装用户 组织信息封装 - * @param sessionUser * @param userInfo * @return */ - public void packSysUserOrganize(SessionUser sessionUser, SysUserInfo userInfo){ + public void packSysUserOrganize(SysUserInfo userInfo){ try { LOGGER.debug("平台用户 SYS_USER user id :{}", userInfo.getId()); userInfo.setOrganize(organizeRDao.getById(userInfo.getOrganizeId())); @@ -538,8 +539,8 @@ public class SysUserService implements ISysUserService { ids[i] = departmentList.get(i).getOrganizeId(); } - String hqlWhere = CoreHqlPack.packHqlIds("id", ids); - List organizeList = organizeRDao.findByHqlWhere(hqlWhere); + String strWhere = CoreHqlPack.packHqlSysOrganize(ids, ImppEnumUtil.ORGANIZE_YTPE.TYPE_FACTORY.getValue()); + List organizeList = organizeRDao.findByHqlWhere(strWhere); userInfo.setOrganizeList(organizeList); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/ExcelUtil.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/ExcelUtil.java index b8fd500..532433f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/ExcelUtil.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/ExcelUtil.java @@ -63,8 +63,7 @@ public class ExcelUtil { HSSFWorkbook workbook = new HSSFWorkbook(); try { //创建临时文件 - System.out.println(exportClass.getSimpleName() + TimeTool.getNowTime(true)); - excelFile = File.createTempFile(exportClass.getSimpleName() + new Date().getTime(),".xls"); + excelFile = File.createTempFile(exportClass.getSimpleName() + new Date().getTime(), ".xls"); LOGGER.info("临时文件所在的本地路径：" + excelFile.getCanonicalPath()); fos = new FileOutputStream(excelFile); @@ -192,11 +191,14 @@ public class ExcelUtil { Row row; Object obj; Object cellValue = null; - for (int i = 0; i < sheet.getLastRowNum(); i++) { + for (int i = 1; i <= sheet.getLastRowNum(); i++) { row = sheet.getRow(i); obj = importClass.newInstance(); for (int j = 0; j < fields.length; j++) { - if (fields[j].getType() == String.class) { + row.getCell(j).setCellType(CellType.STRING); + if("".equals(row.getCell(j).getStringCellValue())){ + cellValue = null; + }else if (fields[j].getType() == String.class) { cellValue = row.getCell(j).getStringCellValue(); } else if (fields[j].getType() == Integer.class) { cellValue = Integer.parseInt(row.getCell(j).getStringCellValue()); @@ -204,7 +206,7 @@ public class ExcelUtil { cellValue = Long.parseLong(row.getCell(j).getStringCellValue()); } - importClass.getDeclaredMethod("set" + StringTool.toUpperCaseFirstOne(fields[i].getName()), fields[i].getType()) + importClass.getDeclaredMethod("set" + StringTool.toUpperCaseFirstOne(fields[j].getName()), fields[j].getType()) .invoke(obj, cellValue); } dataList.add(obj); @@ -252,13 +254,19 @@ public class ExcelUtil { * 导入模板 * * @param exportClass - * @param exportCol */ - public static byte[] importTemplate(Class exportClass, String[] exportCol) { + public static byte[] importTemplate(Class exportClass) { + File excelFile = null; + FileOutputStream fos = null; //创建HSSFWorkbook对象(excel的文档对象) HSSFWorkbook workbook = new HSSFWorkbook(); try { + //创建临时文件 + excelFile = File.createTempFile(exportClass.getSimpleName() + new Date().getTime(), "Tp.xls"); + LOGGER.info("临时文件所在的本地路径：" + excelFile.getCanonicalPath()); + fos = new FileOutputStream(excelFile); + //建立新的sheet对象（excel的表单） HSSFSheet sheet = workbook.createSheet(exportClass.getSimpleName()); @@ -268,27 +276,23 @@ public class ExcelUtil { // 类数据 Field[] declaredFields = exportClass.getDeclaredFields(); - Field[] fields = new Field[exportCol.length]; ApiParam fieldAnno; + int col = 0; - for (int i = 0; i < exportCol.length; i++) { - for (Field field : declaredFields) { - if (field.getName().equals(exportCol[i])) { - fields[i] = field; - - if (field.isAnnotationPresent(ApiParam.class)) { - fieldAnno = field.getAnnotation(ApiParam.class); - tableHeader.createCell(i, CellType.STRING).setCellValue(fieldAnno.value()); + for (int i = 0; i < declaredFields.length; i++) { + if (declaredFields[i].isAnnotationPresent(ApiParam.class)) { + fieldAnno = declaredFields[i].getAnnotation(ApiParam.class); + if (!fieldAnno.hidden()) { + tableHeader.createCell(col, CellType.STRING).setCellValue(fieldAnno.value()); - tableData.createCell(i, CellType.STRING).setCellValue(fieldAnno.example()); - } + tableData.createCell(col, CellType.STRING).setCellValue(fieldAnno.example()); + col++; } } } - ByteArrayOutputStream os = new ByteArrayOutputStream(); - workbook.write(os); - return os.toString("utf-8").getBytes(); + workbook.write(fos); + return file2Byte(excelFile); } catch (IOException e) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) @@ -298,12 +302,36 @@ public class ExcelUtil { } finally { try { workbook.close(); + fos.close(); + excelFile.deleteOnExit(); } catch (IOException e) { LOGGER.error("IOException!", e); } } } + /** + * 获取实体列集合 + * + * @param pojoClass + * @return + */ + public static Map getColName(Class pojoClass) { + Map colName = new LinkedHashMap(); + Field[] field = pojoClass.getDeclaredFields(); + ApiParam fieldAnno; + + for (int i = 0; i < field.length; i++) { + if (field[i].isAnnotationPresent(ApiParam.class)) { + fieldAnno = field[i].getAnnotation(ApiParam.class); + if (!fieldAnno.hidden()) { + colName.put(field[i].getAnnotation(ApiParam.class).value(), field[i].getName()); + } + } + } + + return colName; + } public static void main(String[] args) { List sysTools = new ArrayList<>(); @@ -327,30 +355,22 @@ public class ExcelUtil { } - - public static byte[] file2Byte(File file) - { + public static byte[] file2Byte(File file) { byte[] buffer = null; - try - { + try { FileInputStream fis = new FileInputStream(file); ByteArrayOutputStream bos = new ByteArrayOutputStream(); byte[] b = new byte[1024]; int n; - while ((n = fis.read(b)) != -1) - { + while ((n = fis.read(b)) != -1) { bos.write(b, 0, n); } fis.close(); bos.close(); buffer = bos.toByteArray(); - } - catch (FileNotFoundException e) - { + } catch (FileNotFoundException e) { e.printStackTrace(); - } - catch (IOException e) - { + } catch (IOException e) { e.printStackTrace(); } return buffer; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/MessageWebSocket.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/MessageWebSocket.java index 61ab42d..77ff2a2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/MessageWebSocket.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/websocket/MessageWebSocket.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.core.apiservice.websocket; +import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.impp.framework.base.controller.CoreBaseController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -19,7 +21,7 @@ import java.util.concurrent.ConcurrentMap; * @CreateDate : 2018-11-24 16:57 * @Modify: **/ -@ServerEndpoint(value= CoreBaseController.BASE_URL + "/message-websocket/{userId}") +@ServerEndpoint(value= PlatformConstWords.BASE_URL + "/message-websocket/{userId}") @Component public class MessageWebSocket { diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties index 3e86b51..e5a0fcd 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties @@ -84,7 +84,7 @@ spring.zipkin.base-url=${impp.console.ip} spring.sleuth.sampler.probability=1.0 ################ 日志据源 ################ -spring.data.mongodb.database=mongoDBSource +spring.data.mongodb.database=testMongoDBSource spring.data.mongodb.uri=192.168.1.55:27017 spring.data.mongodb.username=sa spring.data.mongodb.password=i3plus @@ -170,4 +170,4 @@ spring.datasource.validationQuery=SELECT 1 #表关系create,create-drop,update,validate spring.jpa.properties.hibernate.hbm2ddl.auto=update #是否显示sql -spring.jpa.show-sql=true \ No newline at end of file +spring.jpa.show-sql=true diff --git a/modules/i3plus-core-apiservice/src/main/resources/application.properties b/modules/i3plus-core-apiservice/src/main/resources/application.properties index 2fdf9a3..58de670 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application.properties @@ -2,7 +2,7 @@ spring.application.name=${project.name} #使用配置 -spring.profiles.active=test +spring.profiles.active=dev ######### 自定义参数 ######### #项目描述信息（swagger中显式），中文使用uncode转码 diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestDepartmentService.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestDepartmentService.java index 3c5aa24..c330bce 100644 --- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestDepartmentService.java +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestDepartmentService.java @@ -34,7 +34,7 @@ // for(int i = 0 ; i < 50 ; i++ ){ // Department obj = new Department(); // obj.setName("Junit Test " + i); -// obj.setDepartmentCode("TEST_JUNIT " + i); +// obj.setDepartmentCode("DEV_JUNIT " + i); // obj.setParentId(1057165194242953216L); // obj.setOrganizeId(1057163974900060160L); // obj = departmentService.insertDepartment(obj); diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestOrganizeService.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestOrganizeService.java index 11f7e07..af77e5d 100644 --- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestOrganizeService.java +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestOrganizeService.java @@ -35,7 +35,7 @@ // for(int i = 0 ; i < 50 ; i++ ){ // Organize obj = new Organize(); // obj.setName("Junit Test " + i); -// obj.setOrganizeCode("TEST_JUNIT " + i); +// obj.setOrganizeCode("DEV_JUNIT " + i); // obj.setParentId(-1L); // obj = organizeService.insertOrganize(obj); // System.out.println(JSON.toJSONString(obj)); diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestPositionService.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestPositionService.java index 8626b4f..3e53b3b 100644 --- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestPositionService.java +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestPositionService.java @@ -35,7 +35,7 @@ // for(int i = 0 ; i < 50 ; i++ ){ // Position position = new Position(); // position.setName("Junit Test " + i); -// position.setPositionCode("TEST_JUNIT " + i); +// position.setPositionCode("DEV_JUNIT " + i); // position = positionService.insertPosition(position); // System.out.println(JSON.toJSONString(position)); // } diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysDictionaryService.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysDictionaryService.java index 1ec458c..8922e68 100644 --- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysDictionaryService.java +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysDictionaryService.java @@ -53,7 +53,7 @@ // SysDictionary sysDictionary = new SysDictionary(); // sysDictionary.setName("字典测试"); // sysDictionary.setDictionaryCode("dic_test"); -// sysDictionary.setDictionaryValue("TEST"); +// sysDictionary.setDictionaryValue("DEV"); // sysDictionary.setDictionaryDescription("字典测试"); // // sysDictionaryService.insertSysDictionary(sysDictionary); diff --git a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysMenuService.java b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysMenuService.java index e056eac..ce918a3 100644 --- a/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysMenuService.java +++ b/modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysMenuService.java @@ -68,7 +68,7 @@ // for(int i = 0 ; i < 50 ; i++ ){ // SysMenu obj = new SysMenu(); // obj.setName("Junit Test " + i); -// obj.setMenuCode("TEST_JUNIT " + i); +// obj.setMenuCode("DEV_JUNIT " + i); // obj.setParentId(-1L); // obj = sysMenuService.insertSysMenu(obj); // System.out.println(JSON.toJSONString(obj)); diff --git a/pom.xml b/pom.xml index b2b1556..0a79893 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ i3plus.core i3plus-core pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-core-api modules/i3plus-core-apiservice