From 02171105fedb4a8fc50e64eed5c907cf76c86c61 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 27 Dec 2019 20:04:36 +0800 Subject: [PATCH] =?UTF-8?q?Swagger=20=E6=B3=A8=E8=A7=A3=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiservice/controller/DemoAuthController.java | 2 +- .../apiservice/controller/DemoCloudController.java | 2 +- .../controller/DemoDdlPackController.java | 2 +- .../controller/DemoDynamicFormController.java | 2 +- .../controller/DemoEurekaController.java | 2 +- .../controller/DemoExceptionController.java | 2 +- .../apiservice/controller/DemoMongoController.java | 2 +- .../controller/DemoResourceController.java | 2 +- .../controller/DemoScheduleController.java | 2 +- .../controller/DemoTestingController.java | 2 +- .../controller/DemoTransactionController.java | 2 +- .../controller/DemoTreeAndExceptionController.java | 2 +- .../controller/DemoUploadController.java | 2 +- .../apiservice/controller/base/AuthController.java | 2 +- .../controller/base/BackstageController.java | 23 ++++- .../controller/base/CoreCommonController.java | 2 +- .../controller/base/SystemController.java | 2 +- .../controller/base/WhiteController.java | 2 +- .../controller/busi/FactoryStoreController.java | 2 +- .../controller/busi/PersonnelController.java | 2 +- .../controller/busi/SysBarcodeRuleController.java | 2 +- .../controller/busi/SysConfigController.java | 2 +- .../controller/busi/SysDashboardController.java | 2 +- .../controller/busi/SysDepartmentController.java | 2 +- .../controller/busi/SysDictionaryController.java | 2 +- .../controller/busi/SysEnumController.java | 2 +- .../controller/busi/SysFileController.java | 2 +- .../busi/SysLabelTemplateController.java | 2 +- .../busi/SysLocaleLanguageController.java | 2 +- .../busi/SysLocaleResourceController.java | 2 +- .../controller/busi/SysLogExceptionController.java | 2 +- .../controller/busi/SysLogOperateController.java | 2 +- .../controller/busi/SysLogSystemController.java | 2 +- .../controller/busi/SysLogTaskTimeController.java | 2 +- .../controller/busi/SysMemTreeController.java | 2 +- .../controller/busi/SysMenuController.java | 24 ++++- .../controller/busi/SysMessageController.java | 2 +- .../controller/busi/SysOrderNoRuleController.java | 2 +- .../controller/busi/SysOrganizeController.java | 2 +- .../controller/busi/SysPositionController.java | 2 +- .../controller/busi/SysRoleController.java | 2 +- .../controller/busi/SysTaskController.java | 2 +- .../controller/busi/SysTaskCycleController.java | 2 +- .../controller/busi/SysTaskPlanController.java | 2 +- .../controller/busi/SysToolController.java | 2 +- .../controller/busi/SysToolTypeController.java | 2 +- .../controller/busi/SysTreeController.java | 2 +- .../controller/busi/SysUserController.java | 2 +- .../controller/busi/SysUserInfoController.java | 2 +- .../controller/message/SwebMessageController.java | 2 +- .../controller/message/WMSMessageController.java | 2 +- .../controller/report/CoreReportController.java | 96 ++---------------- .../report/ReportPojoCloudController.java | 111 +++++++++++++++++++++ 53 files changed, 208 insertions(+), 144 deletions(-) create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/report/ReportPojoCloudController.java 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 b4b368c..c0f378b 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 @@ -28,7 +28,7 @@ import java.util.Enumeration; * @Modify: **/ @RestController -@Api(description = "登陆授权demo") +@Api(tags = "登陆授权demo") @RequestMapping(PlatformConstWords.BASE_URL + "/demo") public class DemoAuthController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(DemoAuthController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoCloudController.java index 64ffaa1..047bd28 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 @@ -26,7 +26,7 @@ import java.util.Map; @RestController @RequestMapping("/impp") -@Api(description="分布式服务测试") +@Api(tags="分布式服务测试") public class DemoCloudController { private static final Logger LOGGER = LoggerFactory.getLogger(DemoCloudController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoDdlPackController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoDdlPackController.java index dcde661..99fd51e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoDdlPackController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoDdlPackController.java @@ -22,7 +22,7 @@ // //@RestController //@RequestMapping("/impp-ddl") -//@Api(description="hql封装demo") +//@Api(tags="hql封装demo") //public class DemoDdlPackController { // // private static final Logger LOGGER = LoggerFactory.getLogger(DemoDdlPackController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoDynamicFormController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoDynamicFormController.java index 30cefb5..5eb35c5 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoDynamicFormController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoDynamicFormController.java @@ -34,7 +34,7 @@ import java.util.Map; **/ @RestController @RequestMapping("/impp/form") -@Api(description="动态报表设置") +@Api(tags="动态报表设置") public class DemoDynamicFormController { private static final Logger LOGGER = LoggerFactory.getLogger(DemoDynamicFormController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoEurekaController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoEurekaController.java index 3d0a39a..fafd6b9 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoEurekaController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoEurekaController.java @@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController; * @Modify: **/ @RestController -@Api(description="微服功能demo") +@Api(tags="微服功能demo") @RequestMapping("/demo-eureka-service") @ConditionalOnExpression("'${eureka.client.enabled}' == 'true'") public class DemoEurekaController { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoExceptionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoExceptionController.java index 1c7275c..01ecba6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoExceptionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoExceptionController.java @@ -25,7 +25,7 @@ import java.sql.SQLException; @RestController @RequestMapping("/impp") -@Api(description="异常服务测试") +@Api(tags="异常服务测试") public class DemoExceptionController { private static final Logger LOGGER = LoggerFactory.getLogger(DemoExceptionController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoMongoController.java index 6358b8b..11174ed 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 @@ -27,7 +27,7 @@ import java.util.List; * @Modify: **/ @RestController -@Api(description = "系统服务demo") +@Api(tags = "系统服务demo") @RequestMapping(PlatformConstWords.BASE_URL + "/demo-mongo-service") public class DemoMongoController extends CoreBaseController { private static final Logger LOGGER = LoggerFactory.getLogger(DemoMongoController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java index 0ca5362..37b9966 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 @@ -40,7 +40,7 @@ import java.util.Locale; * @Modify: **/ @RestController -@Api(description="系统服务demo") +@Api(tags="系统服务demo") @RequestMapping(PlatformConstWords.BASE_URL + "/demo-system-service") public class DemoResourceController extends CoreBaseController { private static final Logger LOGGER = LoggerFactory.getLogger(DemoResourceController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoScheduleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoScheduleController.java index b1daab5..7c4236e 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 @@ -27,7 +27,7 @@ import java.util.List; * @Modify: **/ @RestController -@Api(description = "定时任务demo") +@Api(tags = "定时任务demo") @RequestMapping(PlatformConstWords.BASE_URL + "/schedule") public class DemoScheduleController extends CoreBaseController { private static final Logger LOGGER = LoggerFactory.getLogger(DemoScheduleController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTestingController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTestingController.java index 170bf44..068fed2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTestingController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTestingController.java @@ -69,7 +69,7 @@ // * @Modify: // **/ //@RestController -//@Api(description = "IMPP性能测试") +//@Api(tags = "IMPP性能测试") //@RequestMapping("/impp/white/sys-test") //public class DemoTestingController { // public static final Logger LOGGER = LoggerFactory.getLogger(DemoTestingController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTransactionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTransactionController.java index 0bd3412..4fd37e9 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTransactionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTransactionController.java @@ -25,7 +25,7 @@ // * @Modify: // **/ //@RestController -//@Api(description = "对事务以及entityManager的操作演示") +//@Api(tags = "对事务以及entityManager的操作演示") //@RequestMapping("/demo-trans") //public class DemoTransactionController extends CoreBaseController { // private static final Logger LOGGER = LoggerFactory.getLogger(DemoTransactionController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTreeAndExceptionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoTreeAndExceptionController.java index b9dda71..a6615db 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 @@ -32,7 +32,7 @@ import java.net.URLConnection; * @Modify: **/ @RestController -@Api(description="树和异常demo") +@Api(tags="树和异常demo") @RequestMapping(PlatformConstWords.BASE_URL + "/demo") public class DemoTreeAndExceptionController extends CoreBaseController{ private static final Logger LOGGER = LoggerFactory.getLogger(DemoTreeAndExceptionController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUploadController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoUploadController.java index efb607a..8807063 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 @@ -25,7 +25,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; * @Modify: **/ @RestController -@Api(description="复杂对象服务demo") +@Api(tags="复杂对象服务demo") @RequestMapping(PlatformConstWords.BASE_URL + "/demo-upload") public class DemoUploadController extends CoreBaseController{ private static final Logger LOGGER = LoggerFactory.getLogger(DemoUploadController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java index 14253dc..ef60842 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 @@ -36,7 +36,7 @@ import java.util.List; * @Modify : **/ @RestController -@Api(description = "用户所有权限操作服务") +@Api(tags = "用户所有权限操作服务") @RequestMapping(PlatformConstWords.BASE_URL + "/auth") public class AuthController extends CoreBaseController { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BackstageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BackstageController.java index 6c8105e..571f58c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BackstageController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BackstageController.java @@ -1,11 +1,20 @@ package cn.estsh.i3plus.core.apiservice.controller.base; import cn.estsh.i3plus.core.api.iservice.base.ISystemInitService; +import cn.estsh.i3plus.core.api.iservice.busi.ICoreMemTreeService; +import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService; +import cn.estsh.i3plus.platform.common.tool.SerializeTool; +import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.i3plus.platform.common.util.PlatformConstWords; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.i3plus.pojo.platform.bean.SysMenu; import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.util.ImppRedis; import cn.estsh.impp.framework.boot.util.ResultBean; +import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; @@ -15,6 +24,9 @@ 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; +import java.util.List; + /** * @Description : 后台服务 * @Reference : @@ -23,7 +35,7 @@ import org.springframework.web.bind.annotation.RestController; * @Modify: **/ @RestController -@Api(description = "后台运维服务") +@Api(tags = "后台运维服务") @RequestMapping("/impp/white/backstage") public class BackstageController extends CoreBaseController { @@ -32,6 +44,15 @@ public class BackstageController extends CoreBaseController { @Autowired private ISystemInitService systemInitService; + @Autowired + private ISysMenuService menuService; + + @Autowired + private ICoreMemTreeService memTreeService; + + @Resource(name= CommonConstWords.IMPP_REDIS_CORE) + private ImppRedis redisRes; + @GetMapping(value = "/redis-put-all") @ApiOperation(value = "重新加载所有缓存数据",notes = "重新加载所有缓存数据") public ResultBean redisPutAll(){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/CoreCommonController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/CoreCommonController.java index 8477326..cfce949 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/CoreCommonController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/CoreCommonController.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController; * @Modify: **/ @RestController -@Api(description = "通用功能服务") +@Api(tags = "通用功能服务") @RequestMapping(PlatformConstWords.BASE_URL +"/common") public class CoreCommonController extends BaseCommonController { } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SystemController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SystemController.java index 2e7d3ee..6de22d1 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SystemController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SystemController.java @@ -38,7 +38,7 @@ import java.util.*; * @Modify: **/ @RestController -@Api(description = "系统服务") +@Api(tags = "系统服务") @RequestMapping(PlatformConstWords.BASE_URL + "/system") public class SystemController { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java index b4370fb..3fe4b32 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java @@ -44,7 +44,7 @@ import java.util.*; * @Modify: **/ @RestController -@Api(description = "非权限服务") +@Api(tags = "非权限服务") @RequestMapping("/impp/white") public class WhiteController extends CoreBaseController { 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 81f4510..2dce1fc 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 @@ -21,7 +21,7 @@ // * @Modify: // **/ //@RestController -//@Api(description="复杂对象服务demo") +//@Api(tags="复杂对象服务demo") //@RequestMapping(PlatformConstWords.BASE_URL +"/factory-store") //public class FactoryStoreController extends CoreBaseController { // private Logger LOGGER = LoggerFactory.getLogger(this.getClass()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java index 059850a..7e7387a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/PersonnelController.java @@ -43,7 +43,7 @@ import java.util.Map; * @Modify: **/ @RestController -@Api(description = "系统用户管理服务") +@Api(tags = "系统用户管理服务") @RequestMapping(PlatformConstWords.BASE_URL + "/personnel") public class PersonnelController extends CoreBaseController { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysBarcodeRuleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysBarcodeRuleController.java index 455772d..e5b0f21 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysBarcodeRuleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysBarcodeRuleController.java @@ -31,7 +31,7 @@ import java.util.Map; * @Modify: **/ @RestController -@Api(description = "条码规则管理服务") +@Api(tags = "条码规则管理服务") @RequestMapping(PlatformConstWords.BASE_URL +"/sys-barcode-rule") public class SysBarcodeRuleController extends CoreBaseController { 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 f73f9fa..2b74ddf 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 @@ -43,7 +43,7 @@ import java.util.List; * @Modify : **/ @RestController -@Api(description = "系统参数管理服务") +@Api(tags = "系统参数管理服务") @RequestMapping(PlatformConstWords.BASE_URL +"/sys-config") public class SysConfigController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysConfigController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java index 5baff47..e952499 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java @@ -35,7 +35,7 @@ import java.util.Map; * @Modify: **/ @RestController -@Api(description = "Dashboard服务") +@Api(tags = "Dashboard服务") @RequestMapping(PlatformConstWords.BASE_URL + "/dashboard") public class SysDashboardController extends CoreBaseController { private static final Logger LOGGER = LoggerFactory.getLogger(SysDashboardController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java index 317163f..435e6f4 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDepartmentController.java @@ -36,7 +36,7 @@ import java.util.List; * @Modify : **/ @RestController -@Api(description = "部门管理服务") +@Api(tags = "部门管理服务") @RequestMapping(PlatformConstWords.BASE_URL +"/department") public class SysDepartmentController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysDepartmentController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java index ac718d0..cbeeb6d 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 @@ -40,7 +40,7 @@ import java.util.stream.Collectors; * @Modify : **/ @RestController -@Api(description = "字典管理服务") +@Api(tags = "字典管理服务") @RequestMapping(PlatformConstWords.BASE_URL +"/sys-dictionary") public class SysDictionaryController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysConfigController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java index 1c9d31e..592c4b2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java @@ -24,7 +24,7 @@ import java.util.List; * @Modify : **/ @RestController -@Api(description = "系统枚举服务") +@Api(tags = "系统枚举服务") @RequestMapping(PlatformConstWords.BASE_URL + "/sys-enum") public class SysEnumController extends CoreBaseController { 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 5b72986..50cc92e 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 @@ -50,7 +50,7 @@ import java.util.List; * @Modify : **/ @RestController -@Api(description = "文件资源服务") +@Api(tags = "文件资源服务") @RequestMapping(PlatformConstWords.BASE_URL + "/sys-file") public class SysFileController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysFileController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLabelTemplateController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLabelTemplateController.java index ac8a80d..d68099a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLabelTemplateController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLabelTemplateController.java @@ -42,7 +42,7 @@ import java.util.List; * @Modify : **/ @RestController -@Api(description = "打印模板管理服务") +@Api(tags = "打印模板管理服务") @RequestMapping(PlatformConstWords.BASE_URL +"/sys-label-template") public class SysLabelTemplateController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysLabelTemplateController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java index 68cbf3b..5df99d4 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 @@ -34,7 +34,7 @@ import java.util.List; * @Modify: **/ @RestController -@Api(description = "系统语言服务") +@Api(tags = "系统语言服务") @RequestMapping(PlatformConstWords.BASE_URL + "/sys-locale-language") public class SysLocaleLanguageController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysFileController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java index ad4d062..bd3f717 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 @@ -58,7 +58,7 @@ import java.util.Map; * @Modify: **/ @RestController -@Api(description = "系统语言资源服务") +@Api(tags = "系统语言资源服务") @RequestMapping(PlatformConstWords.BASE_URL + "/sys-locale-resource") public class SysLocaleResourceController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysFileController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java index 88dea89..2b7001b 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogExceptionController.java @@ -43,7 +43,7 @@ import java.util.List; * @Modify: **/ @RestController -@Api(description = "系统异常日志服务") +@Api(tags = "系统异常日志服务") @RequestMapping(PlatformConstWords.BASE_URL + "/sys-log-exception") public class SysLogExceptionController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysLogExceptionController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java index 1cdeacc..4f0014d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogOperateController.java @@ -39,7 +39,7 @@ import java.util.List; * @Modify : **/ @RestController -@Api(description = "操作日志") +@Api(tags = "操作日志") @RequestMapping(PlatformConstWords.BASE_URL + "/sys-log-operate") public class SysLogOperateController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysLogOperateController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java index b36ef7f..b67eb08 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogSystemController.java @@ -42,7 +42,7 @@ import java.util.List; * @Modify : **/ @RestController -@Api(description = "系统日志服务") +@Api(tags = "系统日志服务") @RequestMapping(PlatformConstWords.BASE_URL +"/sys-log-system") public class SysLogSystemController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysLogSystemController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogTaskTimeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogTaskTimeController.java index e021b6f..da29aa3 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogTaskTimeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLogTaskTimeController.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.*; * @Modify : **/ @RestController -@Api(description = "定时任务日志服务") +@Api(tags = "定时任务日志服务") @RequestMapping(PlatformConstWords.BASE_URL +"/sys-log-task-time") public class SysLogTaskTimeController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysLogTaskTimeController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMemTreeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMemTreeController.java index b6e27ce..8344df7 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMemTreeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMemTreeController.java @@ -31,7 +31,7 @@ import java.util.List; * @Modify: **/ @RestController -@Api(description = "内存树服务") +@Api(tags = "内存树服务") @RequestMapping(PlatformConstWords.BASE_URL + "/mem-tree") public class SysMemTreeController extends CoreBaseController { 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 855186d..bad3b6b 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 @@ -1,5 +1,6 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; +import cn.estsh.i3plus.core.api.iservice.busi.ICoreMemTreeService; import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService; import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; @@ -7,6 +8,7 @@ import cn.estsh.i3plus.platform.common.exception.BaseImppException; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.platform.common.tool.ExcelTool; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.CommonConstWords; import cn.estsh.i3plus.platform.common.util.FileContentTypeTool; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; @@ -47,7 +49,7 @@ import java.util.Map; * @Modify : **/ @RestController -@Api(description = "系统功能服务") +@Api(tags = "系统功能服务") @RequestMapping(PlatformConstWords.BASE_URL + "/sys-menu") public class SysMenuController extends CoreBaseController { @@ -59,10 +61,13 @@ public class SysMenuController extends CoreBaseController { @Autowired private EntityManager entityManager; - @Resource(name="redisRes") + @Resource(name= CommonConstWords.IMPP_REDIS_RES) private ImppRedis redisRes; @Autowired + private ICoreMemTreeService memTreeService; + + @Autowired private IPersonnelService personnelService; /** @@ -117,12 +122,22 @@ public class SysMenuController extends CoreBaseController { .notNull("menuCode", menu.getMenuCode()) .notNull("name", menu.getName()); + SysMenu sysMenu = sysMenuService.getSysMenuById(menu.getId()); + ValidatorBean.checkNotNull(sysMenu,"不存在的功能权限信息"); + ConvertBean.modelUpdate(menu, getSessionUser()); -// 用户自定义输入，方便快速记忆 -// menu.setNameZhShortening(StringTool.getAllFirstLetter(menu.getName())); + if (menu.getParentId() == null || menu.getParentId().intValue() == 0) { menu.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); + } else { + List menuList = sysMenuService.findSysMenuAll(); + sysMenu = memTreeService.packTreeSysMenuById(menuList,sysMenu.getId()); + List idList = memTreeService.findChildSysMenu(sysMenu); + if(idList.contains(menu.getParentId())){ + return ResultBean.fail("父节点不能使用当前的子节点").build(); + } } + if (menu.getMenuSort() == null) { menu.setMenuSort(0); } @@ -313,6 +328,7 @@ public class SysMenuController extends CoreBaseController { * @param multipart 文件 * @return 处理结果 */ + @Deprecated @PostMapping("/upload") @ApiOperation(value = "文件上传", notes = "文件上传") public ResultBean singleFileUpload(@RequestParam("file") MultipartFile multipart) { 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 384b8d7..5acd640 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 @@ -38,7 +38,7 @@ import java.util.List; **/ @RestController @RequestMapping("/impp") -@Api(description = "消息管理服务") +@Api(tags = "消息管理服务") public class SysMessageController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysMessageController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java index b00e393..0d3e58c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java @@ -46,7 +46,7 @@ import java.util.List; * @Modify: **/ @RestController -@Api(description = "系统单号规则管理服务") +@Api(tags = "系统单号规则管理服务") @RequestMapping(PlatformConstWords.BASE_URL + "/sys-order-no-rule") public class SysOrderNoRuleController extends CoreBaseController { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java index f19a8b7..61172bc 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrganizeController.java @@ -43,7 +43,7 @@ import java.util.List; * @Modify : **/ @RestController -@Api(description = "组织") +@Api(tags = "组织") @RequestMapping(PlatformConstWords.BASE_URL +"/organize") public class SysOrganizeController extends CoreBaseController{ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java index 0804218..0ec9519 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPositionController.java @@ -38,7 +38,7 @@ import java.util.List; * @Modify : **/ @RestController -@Api(description = "岗位管理服务") +@Api(tags = "岗位管理服务") @RequestMapping(PlatformConstWords.BASE_URL + "/position") public class SysPositionController extends CoreBaseController { public static final Logger LOGGER = LoggerFactory.getLogger(SysPositionController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysRoleController.java index 28a2c08..a2bd25f 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 @@ -37,7 +37,7 @@ import java.util.List; * @Modify : **/ @RestController -@Api(description = "系统角色服务") +@Api(tags = "系统角色服务") @RequestMapping(PlatformConstWords.BASE_URL + "/sys-role") public class SysRoleController extends CoreBaseController{ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java index 2b7a535..c14153d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java @@ -45,7 +45,7 @@ import java.util.List; * @Modify: **/ @RestController -@Api(description = "任务管理服务") +@Api(tags = "任务管理服务") @RequestMapping(PlatformConstWords.BASE_URL + "/task") public class SysTaskController extends CoreBaseController { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java index 339fa55..6ca6b16 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java @@ -46,7 +46,7 @@ import java.util.List; * @Modify : **/ @RestController -@Api(description = "任务周期") +@Api(tags = "任务周期") @RequestMapping(PlatformConstWords.BASE_URL + "/task-cycle") public class SysTaskCycleController extends CoreBaseController { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java index 8b85dff..c9bde05 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java @@ -43,7 +43,7 @@ import java.util.List; * @Modify : **/ @RestController -@Api(description = "任务计划管理服务") +@Api(tags = "任务计划管理服务") @RequestMapping(PlatformConstWords.BASE_URL + "/task-plan") public class SysTaskPlanController extends CoreBaseController { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java index 7c342c5..80b2f77 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolController.java @@ -41,7 +41,7 @@ import java.util.List; * @Modify : **/ @RestController -@Api(description = "硬件服务") +@Api(tags = "硬件服务") @RequestMapping(PlatformConstWords.BASE_URL +"/tool") public class SysToolController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysToolController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java index 903cf0b..31252d1 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysToolTypeController.java @@ -34,7 +34,7 @@ import java.util.List; * @Modify : **/ @RestController -@Api(description = "硬件类型服务") +@Api(tags = "硬件类型服务") @RequestMapping(PlatformConstWords.BASE_URL +"/tool-type") public class SysToolTypeController extends CoreBaseController{ public static final Logger LOGGER = LoggerFactory.getLogger(SysToolTypeController.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java index f8b3275..1176560 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTreeController.java @@ -34,7 +34,7 @@ import java.util.List; * @Modify : **/ @RestController -@Api(description = "树服务") +@Api(tags = "树服务") @RequestMapping(PlatformConstWords.BASE_URL + "/sys-tree") public class SysTreeController extends CoreBaseController { 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 c7b2778..03ba236 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 @@ -39,7 +39,7 @@ import java.util.List; * @Modify : **/ @RestController -@Api(description = "系统用户服务") +@Api(tags = "系统用户服务") @RequestMapping(PlatformConstWords.BASE_URL + "/sys-user") public class SysUserController extends CoreBaseController{ 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 ab355b7..7dfdd6a 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 @@ -44,7 +44,7 @@ import java.util.List; * @Modify : **/ @RestController -@Api(description = "系统用户服务") +@Api(tags = "系统用户服务") @RequestMapping(PlatformConstWords.BASE_URL + "/sys-user-info") public class SysUserInfoController extends CoreBaseController{ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/message/SwebMessageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/message/SwebMessageController.java index d8f90d8..392d932 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/message/SwebMessageController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/message/SwebMessageController.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*; **/ @RestController @RequestMapping(PlatformConstWords.BASE_URL +"/sweb") -@Api(description = "消息管理服务") +@Api(tags = "消息管理服务") public class SwebMessageController extends CoreBaseController { @Autowired diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/message/WMSMessageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/message/WMSMessageController.java index 497d266..31cf075 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/message/WMSMessageController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/message/WMSMessageController.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*; **/ @RestController @RequestMapping(PlatformConstWords.BASE_URL +"/wms") -@Api(description = "消息管理服务") +@Api(tags = "消息管理服务") public class WMSMessageController extends CoreBaseController { @Autowired diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/report/CoreReportController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/report/CoreReportController.java index f4c5259..20e5d83 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/report/CoreReportController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/report/CoreReportController.java @@ -6,7 +6,6 @@ import cn.estsh.i3plus.platform.common.tool.ClassTool; import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.BaseResultBean; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.model.common.ClassFieldModel; import cn.estsh.i3plus.pojo.model.common.ClassModel; @@ -17,18 +16,14 @@ import cn.estsh.impp.framework.base.controller.CoreBaseController; import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.util.ResultBean; -import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import org.apache.commons.lang3.StringUtils; 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 javax.persistence.Transient; -import java.lang.reflect.Field; + import java.util.ArrayList; import java.util.List; @@ -37,7 +32,7 @@ import java.util.List; */ @RestController @RequestMapping(PlatformConstWords.BASE_URL + "/cloud/report") -@Api(description = "报表服务") +@Api(tags = "报表服务") public class CoreReportController extends CoreBaseController { private static final Logger LOGGER = LoggerFactory.getLogger(CoreReportController.class); @@ -140,14 +135,7 @@ public class CoreReportController extends CoreBaseController { LOGGER.info("【类信息：{}】", clzNameList); List clzList = new ArrayList<>(clzNameList.size()); for (String clzName : clzNameList) { - ClassModel model = getClassModel(clzName); - if (model != null) { - if (StringUtils.isNotBlank(model.getClzFullName())) { - List list = getClassFieldModel(model.getClzFullName()); - model.setFieldList(list); - } - clzList.add(model); - } + ClassModel model = ClassTool.getClassModel(clzName); } return ResultBean.success("获取类：" + clzList.size()).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(clzList); } @@ -161,13 +149,7 @@ public class CoreReportController extends CoreBaseController { @ApiOperation(value = "查询管理后台所有类", notes = "根据核心包路径列出所有类") public BaseResultBean getClzModel(@PathVariable("classPath") String classPath) { LOGGER.info("【类路径：{}】", pojoPackagePath); - ClassModel model = getClassModel(classPath); - if (model != null) { - if (StringUtils.isNotBlank(model.getClzFullName())) { - List list = getClassFieldModel(model.getClzFullName()); - model.setFieldList(list); - } - } + ClassModel model = ClassTool.getClassModel(classPath); return ResultBean.success("获取类：" + model.getClzDesc()).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(model); } @@ -182,7 +164,7 @@ public class CoreReportController extends CoreBaseController { List clzNameList = ClassTool.getClassName(pojoPackagePath, true); List clzList = new ArrayList<>(clzNameList.size()); for (String clzName : clzNameList) { - clzList.add(getClassModel(clzName)); + clzList.add(ClassTool.getClassModel(clzName)); } return ResultBean.success("获取类：" + clzList.size()) @@ -199,78 +181,12 @@ public class CoreReportController extends CoreBaseController { @ApiOperation(value = "查询类所有属性") public ResultBean testWms(@RequestParam("clzFullName") String clzFullName) { LOGGER.info("【查询类属性：{}】", clzFullName); - List fieldModelList = getClassFieldModel(clzFullName); + List fieldModelList = ClassTool.getClassFieldModel(clzFullName); return ResultBean.success("获取属性：" + fieldModelList.size()) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) .setResultList(fieldModelList); } - /** - * 获取类信息 - * @param clzName 全类名 - * @return 类信息 - */ - private ClassModel getClassModel(String clzName) { - try { - LOGGER.info("【获取类信息：{}】", clzName); - //注册类 - Class tmpClz = Class.forName(clzName); - ClassModel classModel = new ClassModel(); - classModel.setServerId(CommonEnumUtil.SOFT_TYPE.CORE.getValue()); - classModel.setServerName(CommonEnumUtil.SOFT_TYPE.CORE.getCode()); - classModel.setPackageName(pojoPackagePath); - classModel.setClzFullName(clzName); - classModel.setClzSimpleName(tmpClz.getSimpleName()); - Api api = ( Api ) tmpClz.getAnnotation(Api.class); - if (api != null) { - classModel.setClzDesc(api.value()); - return classModel; - } else { - LOGGER.warn("不添加类：{},因为没有添加api描述", tmpClz); - } - } catch (ClassNotFoundException e) { - LOGGER.error("【类：{}注册出错】", clzName, clzName, e); - } - return null; - } - - /** - * 查询类型属性 - * @param clzFullName 全类名 - * @return 属性集合 - */ - private List getClassFieldModel(String clzFullName) { - List fieldModelList = new ArrayList<>(); - try { - Class tmpClz = Class.forName(clzFullName); - List fields = ClassTool.getAllFieldsList(tmpClz); - ClassFieldModel fieldModel = null; - ApiParam apiParam; - Transient tran; - for (Field f : fields) { - tran = f.getAnnotation(Transient.class); - if (tran == null && !"serialVersionUID".equals(f.getName())) { - // 临时对象不需要处理 - fieldModel = new ClassFieldModel(); - fieldModel.setPackageName(pojoPackagePath); - fieldModel.setClzFullName(clzFullName); - fieldModel.setClzSimpleName(tmpClz.getSimpleName()); - fieldModel.setFieldName(f.getName()); - - apiParam = f.getAnnotation(ApiParam.class); - if (apiParam != null) { - fieldModel.setFieldDesc(apiParam.value()); - } - fieldModelList.add(fieldModel); - } else { - LOGGER.info("【临时属性：{}】", f.getName()); - } - } - } catch (ClassNotFoundException e) { - LOGGER.error("【类：{}实例化出错】", clzFullName, e); - } - return fieldModelList; - } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/report/ReportPojoCloudController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/report/ReportPojoCloudController.java new file mode 100644 index 0000000..18f6b38 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/report/ReportPojoCloudController.java @@ -0,0 +1,111 @@ +package cn.estsh.i3plus.core.apiservice.controller.report; + +import cn.estsh.i3plus.core.api.iservice.base.IReportService; +import cn.estsh.i3plus.icloud.core.sdk.ICoreReportPojoCloud; +import cn.estsh.i3plus.platform.common.tool.ClassTool; +import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.i3plus.pojo.base.bean.BaseResultBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.i3plus.pojo.model.common.ClassModel; +import cn.estsh.i3plus.pojo.model.report.BrDataSourceModel; +import cn.estsh.i3plus.pojo.model.report.TemplateModel; +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.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 19-12-5 下午5:25 + * @Modify: + **/ +@RestController +@Api(tags = "Cloud 报表服务") +@RequestMapping(CommonConstWords.BASE_URL_CORE + "/cloud/report-pojo") +public class ReportPojoCloudController { + + private static final Logger LOGGER = LoggerFactory.getLogger(ReportPojoCloudController.class); + + @Value("${impp.app.pojo-packages}.bean") + private String pojoPackagePath; + + @Autowired + private IReportService reportService; + + @PostMapping(value = "/find-data-source") + @ApiOperation(value = "数据源列表", notes = "获取服务的数据源列表") + public BaseResultBean findDataSource() { + return ResultBean.success("操作成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultList(Arrays.asList(BrDataSourceModel.DEFAULT_DATA_SOURCE)); + } + + @PostMapping(value = "/find-pojo-detail") + @ApiOperation(value = "获取对象列表", notes = "获取对象列表包含对象属性信息") + public BaseResultBean findCloudPojoDetail(@RequestBody BrDataSourceModel model) { + LOGGER.info("【类路径：{}】", pojoPackagePath); + List clzNameList = ClassTool.getClassName(pojoPackagePath, true); + LOGGER.info("【类信息：{}】", clzNameList); + List clzList = new ArrayList<>(clzNameList.size()); + for (String clzName : clzNameList) { + ClassModel classModel = ClassTool.getClassModel(clzName, CommonEnumUtil.SOFT_TYPE.REPORT); + if (classModel != null) { + clzList.add(classModel); + } + } + return ResultBean.success("获取类：" + clzList.size()).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(clzList); + } + + /** + * 根据核心包路径列出所有类 + * + * @param model 模板模型 + * @return 处理结果 + */ + @PostMapping(value = "/hql/run") + @ApiOperation(value = "查询管理后台所有类", notes = "根据核心包路径列出所有类") + public BaseResultBean runHql(@RequestBody TemplateModel model) { + LOGGER.info("【执行 HQL】TemplateModel：{}", model); + try { + List result = reportService.selectTemplateModel(model); + return ResultBean.success("操作成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultList(result); + } catch (Exception e) { + return ResultBean.fail("操作失败").setMsg(e.getMessage()).setErrorMsg(e.getLocalizedMessage()); + } + } + + + /** + * 根据核心包路径列出所有类 + * + * @param model 模板模型 + * @return 处理结果 + */ + @PostMapping(value = "/hql/run-count") + @ApiOperation(value = "查询管理后台所有类", notes = "根据核心包路径列出所有类") + public BaseResultBean runHqlCount(@RequestBody TemplateModel model) { + LOGGER.info("【执行 HQL】TemplateModel：{}", model); + try { + Long count = reportService.countTemplateModel(model); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(count); + } catch (Exception e) { + return ResultBean.fail("操作失败").setMsg(e.getMessage()).setErrorMsg(e.getLocalizedMessage()); + } + } +}