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 e865e49..2608546 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 @@ -14,6 +14,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; @@ -31,6 +32,7 @@ import java.util.Map; **/ @RestController @Api(description="登陆授权demo") +@RequestMapping(CoreBaseController.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/DemoCloudController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java index 7417df5..7fee8f1 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,87 +1,87 @@ -package cn.estsh.i3plus.core.apiservice.controller; - -import cn.estsh.i3plus.icloud.core.controller.DemoCloudInterface; -import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; -import cn.estsh.impp.framework.boot.util.ResultBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -@RestController -@RequestMapping("/cloud") -@Api(description="分布式服务测试") -public class DemoCloudController { - - private static final Logger LOGGER = LoggerFactory.getLogger(DemoCloudController.class); - - @Autowired - DemoCloudInterface demoCloudInterface; - - @GetMapping(value="/test") - @ApiOperation(value="测试",notes = "测试") - public ResultBean simpleTest(String test) { - LOGGER.info("【接受数据】{}",test); - - try { - demoCloudInterface.testGet("get = " + test); - }catch (Exception e){ - LOGGER.error("XXXX --> get调用出错:" + e.getMessage(),e); - } - try { - demoCloudInterface.testPost("post = " + test); - }catch (Exception e){ - LOGGER.error("XXXX --> post调用出错:" + e.getMessage(),e); - } - try { - demoCloudInterface.testPut("testPut = " + test); - }catch (Exception e){ - LOGGER.error("XXXX --> testPut调用出错:" + e.getMessage(),e); - } - try { - demoCloudInterface.testDelete("delete = " + test); - }catch (Exception e){ - LOGGER.error("XXXX --> delete调用出错:" + e.getMessage(),e); - } - - test += "cloud return = "; - return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } - - @GetMapping(value="/test-get") - @ApiOperation(value="测试get",notes = "测试get") - public ResultBean testFeignGet(String test) { - LOGGER.info("【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("【post接受数据】{}" ,test); - return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } - - @PostMapping(value="/test-put") - @ApiOperation(value="put接受数据",notes = "put接受数据") - public ResultBean testPut(String test) { - LOGGER.info("【put接受数据】{}", test); - return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } - - @DeleteMapping(value="/test-delete") - @ApiOperation(value="delete接受数据",notes = "delete接受数据") - public ResultBean testDelete(String test) { - LOGGER.info("【delete接受数据】{}",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) { - LOGGER.info("【put--->{}",test); - return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - } -} +//package cn.estsh.i3plus.core.apiservice.controller; +// +//import cn.estsh.i3plus.icloud.core.controller.DemoCloudInterface; +//import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +//import cn.estsh.impp.framework.boot.util.ResultBean; +//import io.swagger.annotations.Api; +//import io.swagger.annotations.ApiOperation; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.web.bind.annotation.*; +// +//@RestController +//@RequestMapping("/cloud") +//@Api(description="分布式服务测试") +//public class DemoCloudController { +// +// private static final Logger LOGGER = LoggerFactory.getLogger(DemoCloudController.class); +// +// @Autowired +// DemoCloudInterface demoCloudInterface; +// +// @GetMapping(value="/test") +// @ApiOperation(value="测试",notes = "测试") +// public ResultBean simpleTest(String test) { +// LOGGER.info("【接受数据】{}",test); +// +// try { +// demoCloudInterface.testGet("get = " + test); +// }catch (Exception e){ +// LOGGER.error("XXXX --> get调用出错:" + e.getMessage(),e); +// } +// try { +// demoCloudInterface.testPost("post = " + test); +// }catch (Exception e){ +// LOGGER.error("XXXX --> post调用出错:" + e.getMessage(),e); +// } +// try { +// demoCloudInterface.testPut("testPut = " + test); +// }catch (Exception e){ +// LOGGER.error("XXXX --> testPut调用出错:" + e.getMessage(),e); +// } +// try { +// demoCloudInterface.testDelete("delete = " + test); +// }catch (Exception e){ +// LOGGER.error("XXXX --> delete调用出错:" + e.getMessage(),e); +// } +// +// test += "cloud return = "; +// return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); +// } +// +// @GetMapping(value="/test-get") +// @ApiOperation(value="测试get",notes = "测试get") +// public ResultBean testFeignGet(String test) { +// LOGGER.info("【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("【post接受数据】{}" ,test); +// return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); +// } +// +// @PostMapping(value="/test-put") +// @ApiOperation(value="put接受数据",notes = "put接受数据") +// public ResultBean testPut(String test) { +// LOGGER.info("【put接受数据】{}", test); +// return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); +// } +// +// @DeleteMapping(value="/test-delete") +// @ApiOperation(value="delete接受数据",notes = "delete接受数据") +// public ResultBean testDelete(String test) { +// LOGGER.info("【delete接受数据】{}",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) { +// LOGGER.info("【put--->{}",test); +// return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); +// } +//} 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 39ad474..c4465c6 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 @@ -11,6 +11,7 @@ import cn.estsh.i3plus.pojo.platform.bean.LogOperate; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage; import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource; +import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; @@ -39,9 +40,9 @@ import java.util.Locale; * @Modify: **/ @RestController -@RequestMapping("/demo-mongo-service") @Api(description="系统服务demo") -public class DemoMongoController { +@RequestMapping(CoreBaseController.BASE_URL + "/demo-mongo-service") +public class DemoMongoController extends CoreBaseController{ private static final Logger LOGGER = LoggerFactory.getLogger(DemoMongoController.class); @Autowired 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 d1f5473..e16f953 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 @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller; import cn.estsh.i3plus.core.apiservice.mq.I3CoreQueueConfig; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.i3plus.pojo.mes.MachineFactory; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; @@ -32,9 +33,9 @@ import java.util.concurrent.TimeoutException; * @Modify: **/ @RestController -@RequestMapping("/demo") @Api(description="复杂对象服务demo") -public class DemoRedisMqController { +@RequestMapping(CoreBaseController.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 93939b5..f0b3e92 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 @@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; +import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ResultBean; @@ -36,9 +37,9 @@ import java.util.Locale; * @Modify: **/ @RestController -@RequestMapping("/demo-system-service") @Api(description="系统服务demo") -public class DemoResourceController { +@RequestMapping(CoreBaseController.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 5200db6..8cda612 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.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.quartz.ScheduleTool; import cn.estsh.impp.framework.boot.quartz.TaskInfo; @@ -22,9 +23,9 @@ import java.util.List; * @Modify: **/ @RestController -@RequestMapping("/schedule") @Api(description="定时任务demo") -public class DemoScheduleController { +@RequestMapping(CoreBaseController.BASE_URL + "/schedule") +public class DemoScheduleController extends CoreBaseController{ private static final Logger LOGGER = LoggerFactory.getLogger(DemoScheduleController.class); /************ 定时任务demo *********/ 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 00b5686..ce6939a 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 @@ -4,6 +4,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.Department; +import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; @@ -30,9 +31,9 @@ import java.net.URLConnection; * @Modify: **/ @RestController -@RequestMapping("/demo") @Api(description="树和异常demo") -public class DemoTreeAndExceptionController { +@RequestMapping(CoreBaseController.BASE_URL + "/demo") +public class DemoTreeAndExceptionController extends CoreBaseController{ private static final Logger LOGGER = LoggerFactory.getLogger(DemoTreeAndExceptionController.class); @Autowired 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 53cfbc7..3c1915c 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,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.controller; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.fastdfs.FastDFSClient; @@ -23,9 +24,9 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; * @Modify: **/ @RestController -@RequestMapping("/demo-upload") @Api(description="复杂对象服务demo") -public class DemoUploadController { +@RequestMapping(CoreBaseController.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 5dc904a..b58748d 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 @@ -7,6 +7,8 @@ import cn.estsh.i3plus.core.apiservice.controller.DemoAuthController; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysMenu; +import cn.estsh.impp.framework.base.controller.BaseController; +import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; @@ -25,6 +27,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import java.util.List; + /** * @Description : 用户权限服务 * @Reference : @@ -33,9 +36,9 @@ import java.util.List; * @Modify : **/ @RestController -@RequestMapping("/auth") @Api(description="用户所有权限操作服务") -public class AuthController { +@RequestMapping(CoreBaseController.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 a24e4bd..8b95721 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.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.i3plus.pojo.mes.MachineFactory; import io.swagger.annotations.Api; @@ -20,9 +21,9 @@ import java.util.List; * @Modify: **/ @RestController -@RequestMapping("/simple-service") @Api(tags="SimpleController",description="简单服务demo") -public class SimpleController { +@RequestMapping(CoreBaseController.BASE_URL +"/simple-service") +public class SimpleController extends CoreBaseController{ private Logger LOGGER = LoggerFactory.getLogger(this.getClass()); @Autowired diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/DepartmentController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/DepartmentController.java index 93f6d4d..2f95462 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/DepartmentController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/DepartmentController.java @@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.Department; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; +import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; @@ -32,9 +33,9 @@ import java.util.List; * @Modify : **/ @RestController -@RequestMapping("/department") @Api(description = "部门管理服务") -public class DepartmentController { +@RequestMapping(CoreBaseController.BASE_URL +"/department") +public class DepartmentController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(DepartmentController.class); @Autowired diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java index a2a8394..f9c0138 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/EnumController.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; +import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.util.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -21,9 +22,9 @@ import java.util.List; * @Modify : **/ @RestController -@RequestMapping("/enum") @Api(description = "系统枚举服务") -public class EnumController { +@RequestMapping(CoreBaseController.BASE_URL + "/enum") +public class EnumController extends CoreBaseController{ @GetMapping("/method-level") @ApiOperation(value = "功能类型", notes = "查询全部功能类型功能") 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 0343bdb..844c334 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 @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.IDataMoreService; import cn.estsh.i3plus.pojo.platform.bean.FactoryStore; +import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.util.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -20,9 +21,9 @@ import java.util.List; * @Modify: **/ @RestController -@RequestMapping("/factory-store") @Api(description="复杂对象服务demo") -public class FactoryStoreController { +@RequestMapping(CoreBaseController.BASE_URL +"/factory-store") +public class FactoryStoreController extends CoreBaseController { private Logger LOGGER = LoggerFactory.getLogger(this.getClass()); @PostMapping(value="/insert/{name}/{code}") diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogOperateController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogOperateController.java index 1d5888b..9a500ba 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogOperateController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogOperateController.java @@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.LogOperate; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; +import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; @@ -31,9 +32,9 @@ import java.util.List; * @Modify : **/ @RestController -@RequestMapping("/log-operate") @Api(description = "操作日志") -public class LogOperateController { +@RequestMapping(CoreBaseController.BASE_URL + "/log-operate") +public class LogOperateController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(LogOperateController.class); @Autowired diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogSystemController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogSystemController.java index c5da2b7..7f1c675 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogSystemController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogSystemController.java @@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.LogSystem; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; +import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; @@ -29,9 +30,9 @@ import java.util.List; * @Modify : **/ @RestController -@RequestMapping("log-system") @Api(description = "系统日志服务") -public class LogSystemController { +@RequestMapping(CoreBaseController.BASE_URL +"log-system") +public class LogSystemController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(LogSystemController.class); @Autowired diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/OrganizeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/OrganizeController.java index 788c757..4322dd3 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/OrganizeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/OrganizeController.java @@ -7,6 +7,7 @@ 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.Organize; +import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; @@ -30,9 +31,9 @@ import java.util.List; * @Modify : **/ @RestController -@RequestMapping("/organize") @Api(description = "组织") -public class OrganizeController { +@RequestMapping(CoreBaseController.BASE_URL +"/organize") +public class OrganizeController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(OrganizeController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PositionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PositionController.java index 70ac0ab..27b57e1 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PositionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PositionController.java @@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.Position; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; +import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; @@ -31,9 +32,9 @@ import java.util.List; * @Modify : **/ @RestController -@RequestMapping("/position") @Api(description = "岗位管理服务") -public class PositionController { +@RequestMapping(CoreBaseController.BASE_URL +"/position") +public class PositionController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(PositionController.class); @Autowired 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 aaf8f6f..1634a47 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 @@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysConfig; +import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; @@ -29,9 +30,9 @@ import java.util.List; * @Modify : **/ @RestController -@RequestMapping("/sys-config") @Api(description = "系统参数管理服务") -public class SysConfigController { +@RequestMapping(CoreBaseController.BASE_URL +"/sys-config") +public class SysConfigController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysConfigController.class); @Autowired 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 6b01558..4fa3c6e 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 @@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysDictionary; +import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; @@ -31,9 +32,9 @@ import java.util.List; * @Modify : **/ @RestController -@RequestMapping("/sys-dictionary") @Api(description = "字典管理服务") -public class SysDictionaryController { +@RequestMapping(CoreBaseController.BASE_URL +"/sys-dictionary") +public class SysDictionaryController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysConfigController.class); @Autowired 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 59f2300..b11e703 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 @@ -13,6 +13,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SysDictionary; import cn.estsh.i3plus.pojo.platform.bean.SysFile; import cn.estsh.i3plus.pojo.platform.bean.SysMessage; +import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; @@ -41,9 +42,9 @@ import java.util.List; * @Modify : **/ @RestController -@RequestMapping("/sys-file") @Api(description = "文件资源服务") -public class SysFileController { +@RequestMapping(CoreBaseController.BASE_URL +"/sys-file") +public class SysFileController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysFileController.class); @Autowired 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 059e3a5..43069a0 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 @@ -30,8 +30,8 @@ import java.util.List; * @Modify: **/ @RestController -@RequestMapping("/sys-locale-language") @Api(description = "系统语言服务") +@RequestMapping(CoreBaseController.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 3f5f357..62dea51 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 @@ -33,8 +33,8 @@ import java.util.List; * @Modify: **/ @RestController -@RequestMapping("/sys-locale-resource") @Api(description = "系统语言资源服务") +@RequestMapping(CoreBaseController.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/SysMenuController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java index 24e491f..454098a 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 @@ -9,6 +9,7 @@ import cn.estsh.i3plus.pojo.platform.bean.Organize; import cn.estsh.i3plus.pojo.platform.bean.SysMenu; import cn.estsh.impp.framework.base.controller.BaseController; + import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; @@ -32,9 +33,9 @@ * @Modify : **/ @RestController -@RequestMapping("/sys-menu") @Api(description = "系统功能服务") -public class SysMenuController extends BaseController { +@RequestMapping(CoreBaseController.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 c44218c..b927493 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 @@ -11,6 +11,7 @@ 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.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; @@ -38,9 +39,9 @@ import java.util.List; * @Modify : **/ @RestController -@RequestMapping("/sys-message") +@RequestMapping(CoreBaseController.BASE_URL + "/sys-message") @Api(description = "消息管理服务") -public class SysMessageController { +public class SysMessageController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysMessageController.class); @Autowired 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 12d7dfd..3d6bc0d 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 @@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.RefRoleMenu; import cn.estsh.i3plus.pojo.platform.bean.SysRole; +import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; @@ -31,9 +32,9 @@ import java.util.List; * @Modify : **/ @RestController -@RequestMapping("/sys-role") @Api(description = "系统角色服务") -public class SysRoleController { +@RequestMapping(CoreBaseController.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/SysUserController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java index e917922..49fa5c7 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 @@ -11,6 +11,7 @@ import cn.estsh.i3plus.pojo.platform.bean.RefUserRole; 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.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; @@ -34,9 +35,9 @@ import java.util.List; * @Modify : **/ @RestController -@RequestMapping("/sys-user") @Api(description = "系统用户服务") -public class SysUserController { +@RequestMapping(CoreBaseController.BASE_URL + "/sys-user") +public class SysUserController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(TaskTimeController.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 fdb24c6..3e1e754 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 @@ -12,6 +12,7 @@ import cn.estsh.i3plus.pojo.platform.bean.Department; import cn.estsh.i3plus.pojo.platform.bean.SysFile; import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; +import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; @@ -35,9 +36,9 @@ import java.util.List; * @Modify : **/ @RestController -@RequestMapping("/sys-user-info") @Api(description = "系统用户服务") -public class SysUserInfoController { +@RequestMapping(CoreBaseController.BASE_URL + "/sys-user-info") +public class SysUserInfoController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysUserInfoController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java index 5b25bf1..4592c0f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java @@ -9,6 +9,7 @@ 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.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; @@ -32,9 +33,9 @@ import java.util.List; * @Modify : **/ @RestController -@RequestMapping("/task-time") @Api(description = "定时任务服务") -public class TaskTimeController { +@RequestMapping(CoreBaseController.BASE_URL +"/task-time") +public class TaskTimeController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(TaskTimeController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeExpressionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeExpressionController.java index 935f3b9..c8b5e1c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeExpressionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeExpressionController.java @@ -1,13 +1,12 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ITaskTimeExpressionService; -import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.TaskTimeExpression; -import cn.estsh.impp.framework.boot.auth.AuthUtil; +import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; @@ -30,9 +29,9 @@ import java.util.List; * @Modify : **/ @RestController -@RequestMapping("/task-time-expression") @Api(description = "系统时间表达式") -public class TaskTimeExpressionController { +@RequestMapping(CoreBaseController.BASE_URL +"/task-time-expression") +public class TaskTimeExpressionController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(TaskTimeExpressionController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolController.java index ecd33c5..450a3da 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolController.java @@ -1,16 +1,14 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; -import cn.estsh.i3plus.core.api.iservice.busi.IPositionService; import cn.estsh.i3plus.core.api.iservice.busi.IToolService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; -import cn.estsh.i3plus.pojo.platform.bean.Department; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.Tool; +import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; @@ -34,9 +32,9 @@ import java.util.List; * @Modify : **/ @RestController -@RequestMapping("/tool") @Api(description = "硬件服务") -public class ToolController { +@RequestMapping(CoreBaseController.BASE_URL +"/tool") +public class ToolController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(ToolController.class); @Autowired diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolTypeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolTypeController.java index d56a5b8..8aa336d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolTypeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ToolTypeController.java @@ -8,6 +8,7 @@ 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.ToolType; +import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; @@ -31,9 +32,9 @@ import java.util.List; * @Modify : **/ @RestController -@RequestMapping("/tool-type") @Api(description = "硬件类型服务") -public class ToolTypeController { +@RequestMapping(CoreBaseController.BASE_URL +"/tool-type") +public class ToolTypeController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(ToolTypeController.class); @Autowired diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TreeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TreeController.java index 18ef4a1..f1bfeda 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TreeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TreeController.java @@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.platform.bean.Department; import cn.estsh.i3plus.pojo.platform.bean.Organize; import cn.estsh.i3plus.pojo.platform.bean.Position; import cn.estsh.i3plus.pojo.platform.bean.SysMenu; +import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ResultBean; @@ -30,9 +31,9 @@ import java.util.List; * @Modify : **/ @RestController -@RequestMapping("/tree") @Api(description = "树服务") -public class TreeController { +@RequestMapping(CoreBaseController.BASE_URL + "/tree") +public class TreeController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(LogSystemController.class); 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 f307647..cf05dfe 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 @@ -184,7 +184,10 @@ public class SysRoleService implements ISysRoleService { @Override public List findRefRoleMenuByRoleId(String roleId) { LOGGER.info("系统角色权限关系 RefRoleMenu find By RoleId"); - return refRoleMenuRDao.findByProperty("roleId",Long.parseLong(roleId)); + return refRoleMenuRDao.findByProperty( + new String[]{"roleId","isValid"}, + new Object[]{Long.parseLong(roleId),CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()} + ); } @Override