diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISystemLoginService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISystemLoginService.java index f79a54c..68bc0ca 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISystemLoginService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISystemLoginService.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.shirotoken.AdminToken; import cn.estsh.i3plus.pojo.base.shirotoken.SaAdminToken; import cn.estsh.i3plus.pojo.base.shirotoken.UserToken; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; +import cn.estsh.i3plus.pojo.platform.bean.SysUser; import java.util.List; @@ -25,4 +26,6 @@ public interface ISystemLoginService { SessionUser queryCheckAdminLogin(AdminToken authenticationToken); SessionUser queryCheckSaAdminLogin(SaAdminToken authenticationToken); + + Integer doLoginPasswordError(SysUser user); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDictionaryService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDictionaryService.java index 6cdbe5e..c2169df 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDictionaryService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDictionaryService.java @@ -3,6 +3,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.SysDictionary; +import io.swagger.annotations.ApiOperation; import java.util.List; @@ -19,24 +20,28 @@ public interface ISysDictionaryService { * 添加字典 * @param sysDictionary */ + @ApiOperation(value = "添加字典") void insertSysDictionary(SysDictionary sysDictionary); /** * 根据id删除字典 * @param id */ + @ApiOperation(value = "根据id删除字典") void deleteSysDictionaryById(Long id); /** * 修改字典 * @param sysDictionary */ + @ApiOperation(value = "修改字典") void updateSysDictionary(SysDictionary sysDictionary); /** * 查询所有字典信息 * @return */ + @ApiOperation(value = "查询所有字典信息") List listSysDictionary(); /** @@ -44,6 +49,7 @@ public interface ISysDictionaryService { * @param id * @return */ + @ApiOperation(value = "根据id查询字典信息") SysDictionary getSysDictionaryById(Long id); /** @@ -51,23 +57,27 @@ public interface ISysDictionaryService { * @param parentCode * @return */ + @ApiOperation(value = "根据父级代码查询字典项信息") List findSysDictionaryByParentCode(String parentCode); /** * 字典复杂查询，分页，排序 * 默认查询非顶级字典 */ + @ApiOperation(value = "字典复杂查询，分页，排序",notes = "默认查询非顶级字典") ListPager querySysDictionaryByPager(SysDictionary sysDictionary, Pager pager); /** * 查询顶级字典 */ + @ApiOperation(value = "查询顶级字典") List findSysDictionaryByTop(); /** * 批量删除字典 * @param ids */ + @ApiOperation(value = "批量删除字典") void deleteSysDictionaryByIds(Long[] ids); /** @@ -75,13 +85,15 @@ public interface ISysDictionaryService { * @param fileName * @return */ + @ApiOperation(value = "检出文件名称是否符合系统规范") boolean checkFileName(String fileName); /** - * 根据父节点 已经当前节点CODE 获取字典信息 + * 根据父节点 以及当前节点CODE 获取字典信息 * @param parentCode * @param code * @return */ + @ApiOperation(value = "根据父节点 以及当前节点CODE 获取字典信息") SysDictionary getSysDictionaryByParentCodeAndCode(String parentCode,String code); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskTimeExpressionService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskTimeExpressionService.java index 430e22e..7955212 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskTimeExpressionService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskTimeExpressionService.java @@ -2,10 +2,8 @@ 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.SysFile; -import cn.estsh.i3plus.pojo.platform.bean.SysRole; import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeExpression; +import io.swagger.annotations.ApiOperation; import java.util.List; @@ -22,12 +20,14 @@ public interface ISysTaskTimeExpressionService { * 修改数据 * @param taskTimeExpression */ + @ApiOperation(value = "修改数据") void updateSysTaskTimeExpression(SysTaskTimeExpression taskTimeExpression); /** - * 根据Key 删除数据 + * 根据id删除数据 * @param id */ + @ApiOperation(value = "根据id删除数据") void deleteSysTaskTimeExpressionById(Long id); /** @@ -35,12 +35,14 @@ public interface ISysTaskTimeExpressionService { * @param taskTimeExpression * @return */ + @ApiOperation(value = "新增数据") SysTaskTimeExpression insertSysTaskTimeExpression(SysTaskTimeExpression taskTimeExpression); /** * 查询所有数据 * @return */ + @ApiOperation(value = "查询所有数据") List listSysTaskTimeExpression(); /** @@ -48,6 +50,7 @@ public interface ISysTaskTimeExpressionService { * @param id * @return */ + @ApiOperation(value = "根据ID 查询任务表达式") SysTaskTimeExpression getSysTaskTimeExpressionById(Long id); /** @@ -56,11 +59,13 @@ public interface ISysTaskTimeExpressionService { * @param pager * @return */ + @ApiOperation(value = "任务表达式查询，分页，排序") ListPager querySysTaskTimeExpressionByPager(SysTaskTimeExpression taskTimeExpression, Pager pager); /** * 任务表达式批量删除 * @param ids */ + @ApiOperation(value = "任务表达式批量删除") void deleteSysTaskTimeExpressionByIds(Long[] ids); } diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskTimeService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskTimeService.java index 703116e..4f856c5 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskTimeService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskTimeService.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysTaskTime; import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeExpression; +import io.swagger.annotations.ApiOperation; import java.util.List; @@ -18,16 +19,18 @@ import java.util.List; public interface ISysTaskTimeService { /** - * 新增数据 + * 新增定时任务 * @param taskTime * @return */ + @ApiOperation(value = "新增定时任务") SysTaskTime insertSysTaskTime(SysTaskTime taskTime, SysTaskTimeExpression taskTimeExpression); /** - * 修改数据 + * 修改定时任务 * @param taskTime */ + @ApiOperation(value = "修改定时任务") void updateSysTaskTime(SysTaskTime taskTime, SysTaskTimeExpression taskTimeExpression); /** @@ -36,18 +39,21 @@ public interface ISysTaskTimeService { * @param status 任务状态 * @param user 当前会话用户 */ + @ApiOperation(value = "修改任务状态") void updateSysTaskTimeStatus(Long id, int status, SessionUser user); /** - * 根据Key 删除数据 + * 根据根据id删除数据 * @param id */ + @ApiOperation(value = "根据根据id删除数据") void deleteSysTaskTimeById(Long id); /** * 查询所有数据 * @return */ + @ApiOperation(value = "查询所有数据") List listSysTaskTime(); /** @@ -55,6 +61,7 @@ public interface ISysTaskTimeService { * @param id * @return */ + @ApiOperation(value = "根据id 数据") SysTaskTime getSysTaskTimeById(Long id); /** @@ -63,12 +70,14 @@ public interface ISysTaskTimeService { * @param pager * @return */ + @ApiOperation(value = "定时任务复制查询，分页，排序") ListPager querySysTaskTimeByPager(SysTaskTime taskTime, Pager pager); /** * 根据id批量删除定时任务 * @param ids */ + @ApiOperation(value = "根据id批量删除定时任务") void deleteSysTaskTimeByIds(Long[] ids); /** @@ -76,6 +85,7 @@ public interface ISysTaskTimeService { * @param ids * */ + @ApiOperation(value = "批量修改定时任务状态") void updateSysTaskTimeStatusByIds(Long[] ids, Integer status); /** @@ -84,11 +94,13 @@ public interface ISysTaskTimeService { * @param name * @param groupName */ + @ApiOperation(value = "修改最后时间") void doSysTaskTimeLastDateByNameAndGroupName(String lastDate,String name,String groupName); /** * 立即执行 * @param id */ + @ApiOperation(value = "立即执行") void executeSysTaskTimeById(Long id); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java index fee0cc9..f1909a8 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java @@ -1,127 +1,127 @@ -package cn.estsh.i3plus.core.apiservice.controller; - -import cn.estsh.i3plus.icloud.core.sdk.ICoreDemoCloud; -import cn.estsh.i3plus.icloud.wms.sdk.IWmsDemoCloud; -import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.base.bean.BaseModelBean; -import cn.estsh.i3plus.pojo.base.bean.BaseResultBean; -import cn.estsh.i3plus.pojo.base.common.Pager; -import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; -import cn.estsh.i3plus.pojo.platform.bean.SysRole; -import cn.estsh.i3plus.pojo.platform.bean.SysUser; -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.beans.factory.annotation.Value; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - -@RestController -@RequestMapping("/impp/cloud") -@Api(description="分布式服务测试") -public class DemoCloudController { - - private static final Logger LOGGER = LoggerFactory.getLogger(DemoCloudController.class); - - @Value("${server.port}") - private String serverPort; - - @Value("${eureka.instance.ip-address}") - private String ipAddress; - - @Autowired - ICoreDemoCloud iCoreDemoCloud; - - @Autowired - IWmsDemoCloud iWmsDemoCloud; - - @GetMapping(value="/test") - @ApiOperation(value="core测试",notes = "core测试") - public ResultBean testCore(String test) { - LOGGER.info("{}：{}，【impp-core接受数据】{}",ipAddress,serverPort,test); - return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } - - @GetMapping(value="/test-wms") - @ApiOperation(value="wms测试",notes = "wms测试") - public ResultBean testWms(String test) { - LOGGER.info("【{}：{}，impp-core接受数据 -> wms】{}",ipAddress,serverPort,test); - - BaseResultBean result = iWmsDemoCloud.testWms(test); - if(result.isSuccess()){ - return ResultBean.success("wms返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }else{ - LOGGER.error("无法调用wms服务：{}",result.getErrorMsg()); - return ResultBean.fail("调用wms服务出错：" + result.getErrorMsg()); - } - } - - @GetMapping(value="/test-get") - @ApiOperation(value="测试get",notes = "测试get") - public ResultBean testFeignGet(String test) { - LOGGER.info("【impp-core-get接受数据】{}" ,test); - return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } - - @PostMapping(value="/test-post") - @ApiOperation(value="测试post",notes = "测试post") - public ResultBean testFeignPost(String test) { - LOGGER.info("【impp-core-post接受数据】{}" ,test); - return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } - - @PutMapping(value="/test-put") - @ApiOperation(value="put接受数据",notes = "put接受数据") - public ResultBean testPut(String test,String name) { - LOGGER.info("【impp-core-put接受数据】param1:{},param2:{}", test,name); - return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } - - @DeleteMapping(value="/test-delete") - @ApiOperation(value="delete接受数据",notes = "delete接受数据") - public ResultBean testDelete( - @RequestBody Pager pager, - @RequestParam("test") String test) { - LOGGER.info("【impp-core-delete接受数据】pager:{},test:{}",pager,test); - return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } - - @PutMapping(value="/test-cloud-put") - @ApiOperation(value="测试cloudput",notes = "测试cloudput") - public ResultBean putTestCloud(String test,String name) { - LOGGER.info("【impp-core-put接受数据】test:{},name:{}",test,name); - return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } - - @PostMapping(value="/test-object") - @ApiOperation(value="测试单对象") - public ResultBean testObject(@RequestBody Pager pager) { - LOGGER.info("【impp-core-object接受数据】{}" ,pager); - return ResultBean.success("返回：" + pager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } - - @PostMapping(value="/test-map") - @ApiOperation(value="测试get",notes = "测试get") - public ResultBean testFeignMap(@RequestBody Map map) { - LOGGER.info("【impp-core-map接受数据】{}" ,map); - return ResultBean.success("返回：" + map).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } - - @PostMapping(value="/test-arr") - @ApiOperation(value="测试arr",notes = "测试arr") - public ResultBean testFeignArr(@RequestBody String[] arr) { - LOGGER.info("【impp-core-arr接受数据】{}" ,arr); - return ResultBean.success("返回：" + arr).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } - - @PostMapping(value="/test-more-object") - @ApiOperation(value="测试多对象模型",notes = "测试多对象模型") - public ResultBean testFeignMoreObj(@RequestBody BaseModelBean roleBean) { - LOGGER.info("【impp-core-more-obj接受多对象模型】objBean:{},pager:{}" ,roleBean.getObj(),roleBean.getPager()); - return ResultBean.success("返回：" + roleBean).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } -} +//package cn.estsh.i3plus.core.apiservice.controller; +// +//import cn.estsh.i3plus.icloud.core.sdk.ICoreDemoCloud; +//import cn.estsh.i3plus.icloud.wms.sdk.IWmsDemoCloud; +//import cn.estsh.i3plus.pojo.base.bean.BaseBean; +//import cn.estsh.i3plus.pojo.base.bean.BaseModelBean; +//import cn.estsh.i3plus.pojo.base.bean.BaseResultBean; +//import cn.estsh.i3plus.pojo.base.common.Pager; +//import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +//import cn.estsh.i3plus.pojo.platform.bean.SysRole; +//import cn.estsh.i3plus.pojo.platform.bean.SysUser; +//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.beans.factory.annotation.Value; +//import org.springframework.web.bind.annotation.*; +// +//import java.util.Map; +// +//@RestController +//@RequestMapping("/impp/cloud") +//@Api(description="分布式服务测试") +//public class DemoCloudController { +// +// private static final Logger LOGGER = LoggerFactory.getLogger(DemoCloudController.class); +// +// @Value("${server.port}") +// private String serverPort; +// +// @Value("${eureka.instance.ip-address}") +// private String ipAddress; +// +// @Autowired +// ICoreDemoCloud iCoreDemoCloud; +// +// @Autowired +// IWmsDemoCloud iWmsDemoCloud; +// +// @GetMapping(value="/test") +// @ApiOperation(value="core测试",notes = "core测试") +// public ResultBean testCore(String test) { +// LOGGER.info("{}：{}，【impp-core接受数据】{}",ipAddress,serverPort,test); +// return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); +// } +// +// @GetMapping(value="/test-wms") +// @ApiOperation(value="wms测试",notes = "wms测试") +// public ResultBean testWms(String test) { +// LOGGER.info("【{}：{}，impp-core接受数据 -> wms】{}",ipAddress,serverPort,test); +// +// BaseResultBean result = iWmsDemoCloud.testWms(test); +// if(result.isSuccess()){ +// return ResultBean.success("wms返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); +// }else{ +// LOGGER.error("无法调用wms服务：{}",result.getErrorMsg()); +// return ResultBean.fail("调用wms服务出错：" + result.getErrorMsg()); +// } +// } +// +// @GetMapping(value="/test-get") +// @ApiOperation(value="测试get",notes = "测试get") +// public ResultBean testFeignGet(String test) { +// LOGGER.info("【impp-core-get接受数据】{}" ,test); +// return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); +// } +// +// @PostMapping(value="/test-post") +// @ApiOperation(value="测试post",notes = "测试post") +// public ResultBean testFeignPost(String test) { +// LOGGER.info("【impp-core-post接受数据】{}" ,test); +// return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); +// } +// +// @PutMapping(value="/test-put") +// @ApiOperation(value="put接受数据",notes = "put接受数据") +// public ResultBean testPut(String test,String name) { +// LOGGER.info("【impp-core-put接受数据】param1:{},param2:{}", test,name); +// return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); +// } +// +// @DeleteMapping(value="/test-delete") +// @ApiOperation(value="delete接受数据",notes = "delete接受数据") +// public ResultBean testDelete( +// @RequestBody Pager pager, +// @RequestParam("test") String test) { +// LOGGER.info("【impp-core-delete接受数据】pager:{},test:{}",pager,test); +// return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); +// } +// +// @PutMapping(value="/test-cloud-put") +// @ApiOperation(value="测试cloudput",notes = "测试cloudput") +// public ResultBean putTestCloud(String test,String name) { +// LOGGER.info("【impp-core-put接受数据】test:{},name:{}",test,name); +// return ResultBean.success("返回：" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); +// } +// +// @PostMapping(value="/test-object") +// @ApiOperation(value="测试单对象") +// public ResultBean testObject(@RequestBody Pager pager) { +// LOGGER.info("【impp-core-object接受数据】{}" ,pager); +// return ResultBean.success("返回：" + pager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); +// } +// +// @PostMapping(value="/test-map") +// @ApiOperation(value="测试get",notes = "测试get") +// public ResultBean testFeignMap(@RequestBody Map map) { +// LOGGER.info("【impp-core-map接受数据】{}" ,map); +// return ResultBean.success("返回：" + map).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); +// } +// +// @PostMapping(value="/test-arr") +// @ApiOperation(value="测试arr",notes = "测试arr") +// public ResultBean testFeignArr(@RequestBody String[] arr) { +// LOGGER.info("【impp-core-arr接受数据】{}" ,arr); +// return ResultBean.success("返回：" + arr).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); +// } +// +// @PostMapping(value="/test-more-object") +// @ApiOperation(value="测试多对象模型",notes = "测试多对象模型") +// public ResultBean testFeignMoreObj(@RequestBody BaseModelBean roleBean) { +// LOGGER.info("【impp-core-more-obj接受多对象模型】objBean:{},pager:{}" ,roleBean.getObj(),roleBean.getPager()); +// return ResultBean.success("返回：" + roleBean).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 311f2c4..6e37732 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 @@ -71,8 +71,15 @@ public class AuthController extends CoreBaseController { result.setUrl("/"); return result; }catch (AuthenticationException e) { - ResultBean result = ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); - result.setErrorMsg(e.getMessage()); + ResultBean result = ResultBean.fail(); + Throwable cause = e.getCause(); + if(cause instanceof ImppBusiException ){ + ImppBusiException exception = (ImppBusiException) cause; + result.setErrorMsg(exception.getMessage() + exception.getErrorSolution()); + }else { + result = ResultBean.fail(e.getMessage()).setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + result.setErrorMsg(e.getMessage()); + } return result; }catch (ImppBusiException e) { return ResultBean.fail(e); 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 7adb54f..df606a9 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 @@ -2,14 +2,13 @@ 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.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; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; -import cn.estsh.i3plus.pojo.platform.bean.*; +import cn.estsh.i3plus.pojo.platform.bean.SysTaskTime; +import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeExpression; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; @@ -75,12 +74,10 @@ public class SysTaskTimeController extends CoreBaseController{ taskTimeService.executeSysTaskTimeById(taskTime.getId()); } return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(taskTime); - } catch (ImppBusiException busExcep) { - LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); + }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); - } catch (Exception e) { - LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); - return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @@ -113,12 +110,10 @@ public class SysTaskTimeController extends CoreBaseController{ taskTimeService.executeSysTaskTimeById(taskTime.getId()); } return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(taskTime); - } catch (ImppBusiException busExcep) { - LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); + }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); - } catch (Exception e) { - LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); - return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @@ -131,12 +126,10 @@ public class SysTaskTimeController extends CoreBaseController{ taskTimeService.deleteSysTaskTimeById(Long.parseLong(id)); return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); + }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); - } catch (Exception e) { - LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); - return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @@ -148,12 +141,10 @@ public class SysTaskTimeController extends CoreBaseController{ return ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) .setResultList(list); - } catch (ImppBusiException busExcep) { - LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); + }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); - } catch (Exception e) { - LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); - return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @@ -169,31 +160,27 @@ public class SysTaskTimeController extends CoreBaseController{ return ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) .setResultObject(taskTime); - } catch (ImppBusiException busExcep) { - LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); + }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); - } catch (Exception e) { - LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); - return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } - @PutMapping(value = "/status") + @PutMapping(value = "/status/{id}/{status}") @ApiOperation(value = "修改定时任务状态", notes = "根据ID修改定时任务状态") - public ResultBean updateQuartzStatus(String id,int status) { + public ResultBean updateQuartzStatus(@PathVariable("id") String idStr,@PathVariable("status") Integer status) { try { // 数据校验 - ValidatorBean.checkNotNull(id, "功能id 不能为空"); - ValidatorBean.checkNotZero(status, "功能状态不能为空"); + ValidatorBean.checkNotNull(idStr, "id 不能为空"); + ValidatorBean.checkNotZero(status, "状态不能为空"); - taskTimeService.updateSysTaskTimeStatus(Long.parseLong(id),status,AuthUtil.getSessionUser()); + taskTimeService.updateSysTaskTimeStatus(Long.parseLong(idStr),status,AuthUtil.getSessionUser()); return new ResultBean(true); - } catch(ImppBusiException busExcep){ - LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); + }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ - LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}",e.getMessage(),e); - return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode()); + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @@ -204,11 +191,9 @@ public class SysTaskTimeController extends CoreBaseController{ ListPager taskTimeListPager = taskTimeService.querySysTaskTimeByPager(taskTime,pager); return ResultBean.success("查询成功").setListPager(taskTimeListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ - LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); return ResultBean.fail(busExcep); }catch(Exception e){ - LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); - return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @@ -227,11 +212,9 @@ public class SysTaskTimeController extends CoreBaseController{ taskTimeService.deleteSysTaskTimeByIds(StringTool.getArrayLong(ids)); return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ - LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); return ResultBean.fail(busExcep); }catch(Exception e){ - LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); - return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @@ -251,12 +234,10 @@ public class SysTaskTimeController extends CoreBaseController{ taskTimeService.updateSysTaskTimeStatusByIds(StringTool.getArrayLong(ids),status); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch(ImppBusiException busExcep){ - LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); + }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ - LOGGER.error(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getDescription() + "：{}",e.getMessage(),e); - return ResultBean.fail().setCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode()); + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @@ -269,12 +250,10 @@ public class SysTaskTimeController extends CoreBaseController{ taskTimeService.executeSysTaskTimeById(Long.parseLong(id)); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); + }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); - } catch (Exception e) { - LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); - return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } } \ No newline at end of file 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 5049f3a..808c256 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 @@ -50,14 +50,11 @@ public class SysTaskTimeExpressionController extends CoreBaseController{ .notNull("expressionStartDatetime",timeExpression.getExpressionStartDatetime()); taskTimeExpressionService.insertSysTaskTimeExpression(timeExpression); - return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); + }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); - } catch (Exception e) { - LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); - return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @@ -74,12 +71,10 @@ public class SysTaskTimeExpressionController extends CoreBaseController{ taskTimeExpressionService.updateSysTaskTimeExpression(timeExpression); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); + }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); - } catch (Exception e) { - LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); - return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @@ -92,12 +87,10 @@ public class SysTaskTimeExpressionController extends CoreBaseController{ taskTimeExpressionService.deleteSysTaskTimeExpressionById(Long.parseLong(id)); return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } catch (ImppBusiException busExcep) { - LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); + }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); - } catch (Exception e) { - LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); - return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @@ -106,15 +99,11 @@ public class SysTaskTimeExpressionController extends CoreBaseController{ public ResultBean findSysTaskTimeExpressionAll() { try { List list = taskTimeExpressionService.listSysTaskTimeExpression(); - return ResultBean.success("操作成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) - .setResultList(list); - } catch (ImppBusiException busExcep) { - LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(list); + }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); - } catch (Exception e) { - LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); - return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @@ -127,15 +116,11 @@ public class SysTaskTimeExpressionController extends CoreBaseController{ SysTaskTimeExpression taskTimeExpression = taskTimeExpressionService.getSysTaskTimeExpressionById(Long.parseLong(id)); - return ResultBean.success("操作成功") - .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) - .setResultObject(taskTimeExpression); - } catch (ImppBusiException busExcep) { - LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(taskTimeExpression); + }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); - } catch (Exception e) { - LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}", e.getMessage(), e); - return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @@ -146,19 +131,17 @@ public class SysTaskTimeExpressionController extends CoreBaseController{ ListPager taskTimeExpressionListPager = taskTimeExpressionService.querySysTaskTimeExpressionByPager(taskTimeExpression,pager); return ResultBean.success("查询成功").setListPager(taskTimeExpressionListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ - LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); return ResultBean.fail(busExcep); }catch(Exception e){ - LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); - return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @DeleteMapping("/batch-delete") @ApiOperation(value = "根据id批量删除时间表达式",notes = "根据id批量删除时间表达式") - public ResultBean deleteSysTaskTimeExpressionByIds(String[] ids){ + public ResultBean deleteSysTaskTimeExpressionByIds(String[] idsStr){ try{ - if(ids.length == 0){ + if(idsStr.length == 0){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) @@ -166,14 +149,12 @@ public class SysTaskTimeExpressionController extends CoreBaseController{ .build(); } - taskTimeExpressionService.deleteSysTaskTimeExpressionByIds(StringTool.getArrayLong(ids)); + taskTimeExpressionService.deleteSysTaskTimeExpressionByIds(StringTool.getArrayLong(idsStr)); return ResultBean.success("删除成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ - LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); return ResultBean.fail(busExcep); }catch(Exception e){ - LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); - return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } } 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 d5f2815..aff3dd1 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 @@ -47,9 +47,6 @@ public class SysUserController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysUserController.class); - @Resource(name="redisCore") - private ImppRedis redisCore; - @Autowired private ISysUserService sysUserService; @@ -93,7 +90,7 @@ public class SysUserController extends CoreBaseController{ //新增初始化 sysUser.setUserName(userInfo.getName()); - sysUser.setUserStatus(CommonEnumUtil.USER_STATUS.NORMAL.getValue()); + sysUser.setUserStatus(CommonEnumUtil.USER_STATUS.ENABLE.getValue()); sysUser.setDepartmentId(userInfo.getDepartmentId()); sysUser.setDepartmentNameRdd(userInfo.getDepartmentNameRdd()); sysUser.setIsValid(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); @@ -449,17 +446,17 @@ public class SysUserController extends CoreBaseController{ sysUserService.updateSysUser(user); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else { - return ResultBean.success("操作失败") + return ResultBean.fail("操作失败") .setCode(ResourceEnumUtil.MESSAGE.FAIL.getCode()) .setErrorMsg("请勿修改邮箱信息"); } }else { - return ResultBean.success("操作失败") + return ResultBean.fail("操作失败") .setCode(ResourceEnumUtil.MESSAGE.FAIL.getCode()) .setErrorMsg("验证码错误请重新输入"); } }else { - return ResultBean.success("操作失败") + return ResultBean.fail("操作失败") .setCode(ResourceEnumUtil.MESSAGE.FAIL.getCode()) .setErrorMsg("验证码已过期"); } 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 c886886..23895c4 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 @@ -72,7 +72,7 @@ public class SysUserInfoController extends CoreBaseController{ .checkNotZero("positionId",userInfo.getPositionId()); ConvertBean.modelInitialize(userInfo,user); - userInfo.setUserInfoStatus(CommonEnumUtil.USER_STATUS.NORMAL.getValue()); + userInfo.setUserInfoStatus(CommonEnumUtil.USER_STATUS.ENABLE.getValue()); SysUserInfo pos = sysUserInfoService.insertSysUserInfo(userInfo); sysUserInfoService.refreshRefUserDepartment(pos.getId(), diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/LetterQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/LetterQueueReceiver.java index 199039a..8f19e23 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/LetterQueueReceiver.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/LetterQueueReceiver.java @@ -14,7 +14,6 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.amqp.core.Message; -import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -82,7 +81,7 @@ public class LetterQueueReceiver { ); } - msg.setMessageSenderNameRdd(StringUtils.join(receiverName, ",")); + msg.setMessageReceiversNameRdd(StringUtils.join(receiverName, ",")); sysMessageService.updateSysMessage(msg); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java index bd6f2d0..7e523bb 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.base; import cn.estsh.i3plus.core.api.iservice.base.ISystemLoginService; import cn.estsh.i3plus.platform.common.tool.EncryptTool; +import cn.estsh.i3plus.platform.common.util.CommonConstWords; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.shirotoken.AdminToken; import cn.estsh.i3plus.pojo.base.shirotoken.SaAdminToken; @@ -12,12 +13,17 @@ import cn.estsh.i3plus.pojo.platform.repository.SysUserRepository; 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 cn.estsh.impp.framework.boot.util.ImppRedis; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authc.AuthenticationException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; /** * @Description : 用户登陆方法 @@ -33,6 +39,12 @@ public class SystemLoginService implements ISystemLoginService { @Autowired private SysUserRepository sysUserRDao; + /** + * 核心的缓存 + */ + @Resource(name="redisCore") + protected ImppRedis redisCore; + @Override public SessionUser queryUserLogin(String loginName, String loginPwd, String languageCode) { //生成令牌 @@ -79,6 +91,26 @@ public class SystemLoginService implements ISystemLoginService { return packSessionUser(user,CommonEnumUtil.USER_TYPE.SA.getCode(),saAdminToken.getLanguageCode()); } + @Override +// @Transactional(propagation = Propagation.NOT_SUPPORTED) + public Integer doLoginPasswordError(SysUser user) { + String redisKey = CommonConstWords.USER_LOGIN_ERROR + "_" + user.getId(); +// Object redisValue = redisCore.getObject(redisKey); + Object redisValue = AuthUtil.getSessionAttribute(redisKey); + Integer num = redisValue == null ? 1 : Integer.parseInt(redisValue.toString()) + 1; + + + if(num >= CommonConstWords.USER_LOGIN_ERROR_MAX_NUM){ +// user.setUserStatus(CommonEnumUtil.USER_STATUS.LOCKING.getValue()); + redisCore.putObject(redisKey,num,0); // 账号锁定后移除锁 + sysUserRDao.update(user); + } + + redisCore.putObject(redisKey,num,24 * 60 * 60); + AuthUtil.setSessionObject(redisKey,num); + return num; + } + /** * 根据用户名密码查询用户 * @param loginName @@ -90,15 +122,29 @@ public class SystemLoginService implements ISystemLoginService { if(user == null){ //用户不存在 throw new AuthenticationException("用户不存在"); }else { - try { // 密码加密 + if(user.getUserStatus() != CommonEnumUtil.USER_STATUS.ENABLE.getValue()){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.LOGIN_USER_NAME_EXCEPTION.getCode()) + .setErrorDetail("账号状态:"+CommonEnumUtil.USER_STATUS.valueOf(user.getUserStatus())) + .setErrorSolution("请联系管理员") + .build(); + } + try { + // 密码加密 pwd = EncryptTool.hexMD5(pwd); } catch (Exception e) { LOGGER.error("登录密码加密出错。"); throw new AuthenticationException("登陆密码错误"); +// doLoginPasswordError( user); +// throw new AuthenticationException("密码输入错误。如果输错次数超过"+CommonConstWords.USER_LOGIN_ERROR_MAX_NUM+"次，用户将被锁定。"); } if (!StringUtils.equals(user.getUserLoginPassword(), pwd)) { //密码不符 throw new AuthenticationException("登陆密码错误"); +// doLoginPasswordError( user); +// throw new AuthenticationException("密码输入错误。如果输错次数超过"+CommonConstWords.USER_LOGIN_ERROR_MAX_NUM+"次，用户将被锁定。"); } + return user; } } @@ -120,4 +166,6 @@ public class SystemLoginService implements ISystemLoginService { return sessionUser; } + + } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java index d9757fe..c925343 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java @@ -151,9 +151,10 @@ public class SysDepartmentService implements ISysDepartmentService { LOGGER.info("部门信息 DEPARTMENT department:{}",department); departmentRDao.update(department); // 修改冗余信息 - // 修改冗余信息 departmentRDao.updateByProperties("parentId",department.getId(), - "parentNameRdd",department.getName()); + new String[]{"parentNameRdd", "organizeId", "organizeNameRdd"}, + new Object[]{department.getName(), department.getOrganizeId(), department.getOrganizeNameRdd()}); + } @Override 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 dc9f430..aa8469b 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 @@ -14,6 +14,7 @@ import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ValidatorBean; +import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -36,9 +37,11 @@ public class SysDictionaryService implements ISysDictionaryService { private SysDictionaryRepository sysDictionaryRDao; @Override + @ApiOperation(value = "添加字典") public void insertSysDictionary(SysDictionary sysDictionary) { - long repeatCount = sysDictionaryRDao.findByPropertyCount("dictionaryCode",sysDictionary.getDictionaryCode()); - if (repeatCount > 0){ + long repeatCodeCount = sysDictionaryRDao.findByPropertyCount("dictionaryCode",sysDictionary.getDictionaryCode()); + long repeatValueCount = sysDictionaryRDao.findByPropertyCount("dictionaryValue",sysDictionary.getDictionaryValue()); + if (repeatCodeCount > 0 || repeatValueCount > 0){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.IO_EXCEPTION.getCode()) @@ -64,17 +67,21 @@ public class SysDictionaryService implements ISysDictionaryService { } @Override + @ApiOperation(value = "根据id删除字典") public void deleteSysDictionaryById(Long id) { LOGGER.info("字典 SYS_DICTIONARY id:{}",id); sysDictionaryRDao.deleteById(id); } @Override + @ApiOperation(value = "修改字典") public void updateSysDictionary(SysDictionary sysDictionary) { // 校验唯一 String hqlPack = CoreHqlPack.packHqlSysDictionaryCode(sysDictionary); - long repeatCount = sysDictionaryRDao.findByHqlWhereCount(hqlPack); - if (repeatCount > 0){ + long repeatCodeCount = sysDictionaryRDao.findByHqlWhereCount(hqlPack); + hqlPack = CoreHqlPack.packHqlSysDictionaryValue(sysDictionary); + long repeatValueCount = sysDictionaryRDao.findByHqlWhereCount(hqlPack); + if (repeatCodeCount > 0 || repeatValueCount > 0){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) @@ -98,24 +105,28 @@ public class SysDictionaryService implements ISysDictionaryService { } @Override + @ApiOperation(value = "查询所有字典信息") public List listSysDictionary() { LOGGER.info("字典 SYS_DICTIONARY list"); return sysDictionaryRDao.list(); } @Override + @ApiOperation(value = "根据id查询字典信息") public SysDictionary getSysDictionaryById(Long id) { LOGGER.info("字典 SYS_DICTIONARY id:{}",id); return sysDictionaryRDao.getById(id); } @Override + @ApiOperation(value = "根据父级代码查询字典项信息") public List findSysDictionaryByParentCode(String parentCode) { LOGGER.info("字典 SYS_DICTIONARY parentCode:{}",parentCode); return sysDictionaryRDao.findByProperty("parentCodeRdd",parentCode); } @Override + @ApiOperation(value = "字典复杂查询，分页，排序",notes = "默认查询非顶级字典") public ListPager querySysDictionaryByPager(SysDictionary sysDictionary, Pager pager) { sysDictionary = sysDictionary == null ? new SysDictionary():sysDictionary; @@ -125,18 +136,21 @@ public class SysDictionaryService implements ISysDictionaryService { } @Override + @ApiOperation(value = "查询顶级字典") public List findSysDictionaryByTop() { LOGGER.info("字典 SYS_DICTIONARY parentId:{}", CommonEnumUtil.PARENT.DEFAULT.getValue()); return sysDictionaryRDao.findByProperty("parentId",(long)CommonEnumUtil.PARENT.DEFAULT.getValue()); } @Override + @ApiOperation(value = "批量删除字典") public void deleteSysDictionaryByIds(Long[] ids) { LOGGER.info("字典 SYS_DICTIONARY ids:{}", ids.toString()); sysDictionaryRDao.deleteByIds(ids); } @Override + @ApiOperation(value = "检出文件名称是否符合系统规范") public boolean checkFileName(String fileName) { List list = findSysDictionaryByParentCode(CommonConstWords.DICTIONARY_FILE_TYPE); @@ -153,6 +167,7 @@ public class SysDictionaryService implements ISysDictionaryService { } @Override + @ApiOperation(value = "根据父节点 以及当前节点CODE 获取字典信息") public SysDictionary getSysDictionaryByParentCodeAndCode(String parentCode, String code) { List list = sysDictionaryRDao.findByProperty(new String[]{"parentCodeRdd","dictionaryCode"}, new Object[]{parentCode,code}); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java index 1db47e2..be17ad7 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java @@ -68,7 +68,7 @@ public class SysRoleService implements ISysRoleService { StringBuffer where = new StringBuffer(); HqlPack.getInPack(StringUtils.join( ids,","), "id", where); - sysRoleRDao.updateByHqlWhere(where.toString(), "roleStatusId", status); + sysRoleRDao.updateByHqlWhere(where.toString(), "roleStatus", status); } @Override diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskTimeExpressionService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskTimeExpressionService.java index 02e610e..69b25df 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskTimeExpressionService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskTimeExpressionService.java @@ -11,6 +11,7 @@ import cn.estsh.i3plus.pojo.platform.repository.SysTaskTimeRepository; 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.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -37,36 +38,42 @@ public class SysTaskTimeExpressionService implements ISysTaskTimeExpressionServi private SysTaskTimeRepository taskTimeRDao; @Override + @ApiOperation(value = "修改数据") public void updateSysTaskTimeExpression(SysTaskTimeExpression taskTimeExpression) { LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION :{}", taskTimeExpression); taskTimeExpressionRDao.update(taskTimeExpression); } @Override + @ApiOperation(value = "根据id删除数据") public void deleteSysTaskTimeExpressionById(Long id) { LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION :{}", id); taskTimeExpressionRDao.deleteById(id); } @Override + @ApiOperation(value = "新增数据") public SysTaskTimeExpression insertSysTaskTimeExpression(SysTaskTimeExpression taskTimeExpression) { LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION :{}", taskTimeExpression); return taskTimeExpressionRDao.insert(taskTimeExpression); } @Override + @ApiOperation(value = "查询所有数据") public List listSysTaskTimeExpression() { LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION list"); return taskTimeExpressionRDao.list(); } @Override + @ApiOperation(value = "根据ID 查询任务表达式") public SysTaskTimeExpression getSysTaskTimeExpressionById(Long id) { LOGGER.info("定时任务时间表达式 TASK_TIME_EXPRESSION :{}" ,id); return taskTimeExpressionRDao.getById(id); } @Override + @ApiOperation(value = "任务表达式查询，分页，排序") public ListPager querySysTaskTimeExpressionByPager(SysTaskTimeExpression taskTimeExpression, Pager pager) { LOGGER.info("文件表达式 TASK_TIME_EXPRESSION taskTimeExpression:{}，Pager:{}",taskTimeExpression,pager); if(taskTimeExpression == null) { @@ -80,9 +87,10 @@ public class SysTaskTimeExpressionService implements ISysTaskTimeExpressionServi } @Override + @ApiOperation(value = "任务表达式批量删除") public void deleteSysTaskTimeExpressionByIds(Long[] ids) { LOGGER.info("文件表达式 SYS_MENU ids:{}", ids); - long count = taskTimeRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("timeId",ids)); + long count = taskTimeRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("timeExpressionId",ids)); if(count >= 1){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskTimeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskTimeService.java index ce61014..81e3580 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskTimeService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskTimeService.java @@ -16,6 +16,7 @@ import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ValidatorBean; +import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.quartz.*; import org.slf4j.Logger; @@ -36,7 +37,7 @@ import java.util.List; * @Modify : **/ @Service -public class SysTaskTimeService implements ISysTaskTimeService { +public class SysTaskTimeService implements ISysTaskTimeService{ public static final Logger LOGGER = LoggerFactory.getLogger(SysTaskTimeService.class); @@ -50,16 +51,16 @@ public class SysTaskTimeService implements ISysTaskTimeService { private Scheduler scheduler; @Override + @ApiOperation(value = "修改定时任务") public void updateSysTaskTime(SysTaskTime taskTime, SysTaskTimeExpression taskTimeExpression) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SysTaskTime oldSysTaskTime = taskTimeRDao.getById(taskTime.getId()); // 更新关系表 - refExpressionTriggerRDao.updateByProperties( - "expressionId",oldSysTaskTime.getTimeExpressionId(), - new String[]{"name","groupName"}, - new String[]{oldSysTaskTime.getName(),taskTime.getGroupName()} + refExpressionTriggerRDao.updateByProperties(new String[]{"triggerName","triggerGroupName"}, + new String[]{oldSysTaskTime.getName(),taskTime.getGroupName()}, + "expressionId",oldSysTaskTime.getTimeExpressionId() ); taskTimeRDao.update(taskTime); @@ -106,6 +107,7 @@ public class SysTaskTimeService implements ISysTaskTimeService { } @Override + @ApiOperation(value = "修改任务状态") public void updateSysTaskTimeStatus(Long id, int status, SessionUser user) { LOGGER.info("定时任务 SYS_MENU id:{} status:{} user:{}", id,status,user); SysTaskTime taskTime = taskTimeRDao.getById(id); @@ -130,6 +132,7 @@ public class SysTaskTimeService implements ISysTaskTimeService { } @Override + @ApiOperation(value = "根据根据id删除数据") public void deleteSysTaskTimeById(Long id) { try { SysTaskTime taskTime = taskTimeRDao.getById(id); @@ -160,6 +163,7 @@ public class SysTaskTimeService implements ISysTaskTimeService { } @Override + @ApiOperation(value = "新增定时任务") public SysTaskTime insertSysTaskTime(SysTaskTime taskTime, SysTaskTimeExpression taskTimeExpression) { try { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -226,18 +230,21 @@ public class SysTaskTimeService implements ISysTaskTimeService { } @Override + @ApiOperation(value = "查询所有数据") public List listSysTaskTime() { LOGGER.info("定时任务 TASK_TIME find All"); return taskTimeRDao.findAll(); } @Override + @ApiOperation(value = "根据id 数据") public SysTaskTime getSysTaskTimeById(Long id) { LOGGER.info("定时任务 TASK_TIME find id:{}", id); return taskTimeRDao.getOne(id); } @Override + @ApiOperation(value = "定时任务复制查询，分页，排序") public ListPager querySysTaskTimeByPager(SysTaskTime taskTime, Pager pager) { LOGGER.info("定时任务 TASK_TIME SysTaskTime:{}，Pager:{}",taskTime,pager); if(taskTime == null) { @@ -251,12 +258,14 @@ public class SysTaskTimeService implements ISysTaskTimeService { } @Override + @ApiOperation(value = "根据id批量删除定时任务") public void deleteSysTaskTimeByIds(Long[] ids) { LOGGER.info("定时任务 TASK_TIME ids:{}", ids.toString()); taskTimeRDao.deleteByIds(ids); } @Override + @ApiOperation(value = "批量修改定时任务状态") public void updateSysTaskTimeStatusByIds(Long[] ids, Integer status) { LOGGER.info("定时任务 TASK_TIME ids：{}，status：{}",ids,status); StringBuffer where = new StringBuffer(); @@ -266,6 +275,7 @@ public class SysTaskTimeService implements ISysTaskTimeService { } @Override + @ApiOperation(value = "修改最后时间") public void doSysTaskTimeLastDateByNameAndGroupName(String lastDate, String name, String groupName) { taskTimeRDao.updateByProperties( new String[]{"name","groupName"},new String[]{name,groupName}, @@ -273,6 +283,7 @@ public class SysTaskTimeService implements ISysTaskTimeService { } @Override + @ApiOperation(value = "立即执行") public void executeSysTaskTimeById(Long id) { SysTaskTime taskTime = taskTimeRDao.getById(id); JobKey jobKey = JobKey.jobKey(taskTime.getName(),taskTime.getGroupName()); 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 7fb2785..81506f5 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 @@ -90,6 +90,7 @@ public class SysUserService implements ISysUserService { .build(); } + packSessionUser(sessionUser, user, user.getUserType(), languageCode); AuthUtil.setSessionUser(sessionUser); refreshUserLoginInformation(user.getId()); @@ -332,7 +333,7 @@ public class SysUserService implements ISysUserService { int count; if(id > 0){ StringBuffer sw = new StringBuffer(); - HqlPack.getStringEqualPackOr(userLoginName,"userLoginName",sw); + HqlPack.getStringEqualPack(userLoginName,"userLoginName",sw); HqlPack.getNumNOEqualPack(id,"id",sw); count = sysUserRDao.findByHqlWhereCount(sw.toString()); @@ -348,7 +349,7 @@ public class SysUserService implements ISysUserService { int count; if(id > 0){ StringBuffer sw = new StringBuffer(); - HqlPack.getStringEqualPackOr(email,"userEmail",sw); + HqlPack.getStringEqualPack(email,"userEmail",sw); HqlPack.getNumNOEqualPack(id,"id",sw); count = sysUserRDao.findByHqlWhereCount(sw.toString()); @@ -364,7 +365,7 @@ public class SysUserService implements ISysUserService { int count; if(id > 0){ StringBuffer sw = new StringBuffer(); - HqlPack.getStringEqualPackOr(phone,"userPhone",sw); + HqlPack.getStringEqualPack(phone,"userPhone",sw); HqlPack.getNumNOEqualPack(id,"id",sw); count = sysUserRDao.findByHqlWhereCount(sw.toString()); @@ -379,7 +380,7 @@ public class SysUserService implements ISysUserService { public void checkSysUserOnly(SysUser user) { if(user != null){ // 登录名唯一教研 - if(checkSysUserLoginName(user.getUserLoginName(),user.getId())){ + if(!checkSysUserLoginName(user.getUserLoginName(), user.getId() == null ? 0 : user.getId())){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) @@ -389,7 +390,7 @@ public class SysUserService implements ISysUserService { } // 登录名唯一教研 - if(checkSysUserEmail(user.getUserEmail(),user.getId())){ + if(!checkSysUserEmail(user.getUserEmail(),user.getId() == null ? 0 : user.getId())){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) @@ -399,7 +400,7 @@ public class SysUserService implements ISysUserService { } // 登录名唯一教研 - if(checkSysUserPhone(user.getUserPhone(),user.getId())){ + if(!checkSysUserPhone(user.getUserPhone(),user.getId() == null ? 0 : user.getId())){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) diff --git a/modules/i3plus-core-apiservice/src/main/resources/init/permission.xlsx b/modules/i3plus-core-apiservice/src/main/resources/init/permission.xlsx index 19fd927..08ac3c0 100644 Binary files a/modules/i3plus-core-apiservice/src/main/resources/init/permission.xlsx and b/modules/i3plus-core-apiservice/src/main/resources/init/permission.xlsx differ