连接添加前缀 /impp

yun-zuoyi
wei.peng 7 years ago
parent cb6d498143
commit abefec9e97

@ -14,6 +14,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -31,6 +32,7 @@ import java.util.Map;
**/ **/
@RestController @RestController
@Api(description="登陆授权demo") @Api(description="登陆授权demo")
@RequestMapping(CoreBaseController.BASE_URL + "/demo")
public class DemoAuthController extends CoreBaseController { public class DemoAuthController extends CoreBaseController {
public static final Logger LOGGER = LoggerFactory.getLogger(DemoAuthController.class); public static final Logger LOGGER = LoggerFactory.getLogger(DemoAuthController.class);

@ -1,87 +1,87 @@
package cn.estsh.i3plus.core.apiservice.controller; //package cn.estsh.i3plus.core.apiservice.controller;
//
import cn.estsh.i3plus.icloud.core.controller.DemoCloudInterface; //import cn.estsh.i3plus.icloud.core.controller.DemoCloudInterface;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; //import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.impp.framework.boot.util.ResultBean; //import cn.estsh.impp.framework.boot.util.ResultBean;
import io.swagger.annotations.Api; //import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; //import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; //import org.slf4j.Logger;
import org.slf4j.LoggerFactory; //import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; //import org.springframework.web.bind.annotation.*;
//
@RestController //@RestController
@RequestMapping("/cloud") //@RequestMapping("/cloud")
@Api(description="分布式服务测试") //@Api(description="分布式服务测试")
public class DemoCloudController { //public class DemoCloudController {
//
private static final Logger LOGGER = LoggerFactory.getLogger(DemoCloudController.class); // private static final Logger LOGGER = LoggerFactory.getLogger(DemoCloudController.class);
//
@Autowired // @Autowired
DemoCloudInterface demoCloudInterface; // DemoCloudInterface demoCloudInterface;
//
@GetMapping(value="/test") // @GetMapping(value="/test")
@ApiOperation(value="测试",notes = "测试") // @ApiOperation(value="测试",notes = "测试")
public ResultBean simpleTest(String test) { // public ResultBean simpleTest(String test) {
LOGGER.info("【接受数据】{}",test); // LOGGER.info("【接受数据】{}",test);
//
try { // try {
demoCloudInterface.testGet("get = " + test); // demoCloudInterface.testGet("get = " + test);
}catch (Exception e){ // }catch (Exception e){
LOGGER.error("XXXX --> get调用出错" + e.getMessage(),e); // LOGGER.error("XXXX --> get调用出错" + e.getMessage(),e);
} // }
try { // try {
demoCloudInterface.testPost("post = " + test); // demoCloudInterface.testPost("post = " + test);
}catch (Exception e){ // }catch (Exception e){
LOGGER.error("XXXX --> post调用出错" + e.getMessage(),e); // LOGGER.error("XXXX --> post调用出错" + e.getMessage(),e);
} // }
try { // try {
demoCloudInterface.testPut("testPut = " + test); // demoCloudInterface.testPut("testPut = " + test);
}catch (Exception e){ // }catch (Exception e){
LOGGER.error("XXXX --> testPut调用出错" + e.getMessage(),e); // LOGGER.error("XXXX --> testPut调用出错" + e.getMessage(),e);
} // }
try { // try {
demoCloudInterface.testDelete("delete = " + test); // demoCloudInterface.testDelete("delete = " + test);
}catch (Exception e){ // }catch (Exception e){
LOGGER.error("XXXX --> delete调用出错" + e.getMessage(),e); // LOGGER.error("XXXX --> delete调用出错" + e.getMessage(),e);
} // }
//
test += "cloud return = "; // test += "cloud return = ";
return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); // return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} // }
//
@GetMapping(value="/test-get") // @GetMapping(value="/test-get")
@ApiOperation(value="测试get",notes = "测试get") // @ApiOperation(value="测试get",notes = "测试get")
public ResultBean testFeignGet(String test) { // public ResultBean testFeignGet(String test) {
LOGGER.info("【get接受数据】{}" ,test); // LOGGER.info("【get接受数据】{}" ,test);
return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); // return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} // }
//
@PostMapping(value="/test-post") // @PostMapping(value="/test-post")
@ApiOperation(value="测试post",notes = "测试post") // @ApiOperation(value="测试post",notes = "测试post")
public ResultBean testFeignPost(String test) { // public ResultBean testFeignPost(String test) {
LOGGER.info("【post接受数据】{}" ,test); // LOGGER.info("【post接受数据】{}" ,test);
return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); // return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} // }
//
@PostMapping(value="/test-put") // @PostMapping(value="/test-put")
@ApiOperation(value="put接受数据",notes = "put接受数据") // @ApiOperation(value="put接受数据",notes = "put接受数据")
public ResultBean testPut(String test) { // public ResultBean testPut(String test) {
LOGGER.info("【put接受数据】{}", test); // LOGGER.info("【put接受数据】{}", test);
return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); // return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} // }
//
@DeleteMapping(value="/test-delete") // @DeleteMapping(value="/test-delete")
@ApiOperation(value="delete接受数据",notes = "delete接受数据") // @ApiOperation(value="delete接受数据",notes = "delete接受数据")
public ResultBean testDelete(String test) { // public ResultBean testDelete(String test) {
LOGGER.info("【delete接受数据】{}",test); // LOGGER.info("【delete接受数据】{}",test);
return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); // return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} // }
//
@PutMapping(value="/test-cloud-put") // @PutMapping(value="/test-cloud-put")
@ApiOperation(value="测试cloudput",notes = "测试cloudput") // @ApiOperation(value="测试cloudput",notes = "测试cloudput")
public ResultBean putTestCloud(String test) { // public ResultBean putTestCloud(String test) {
LOGGER.info("【put--->{}",test); // LOGGER.info("【put--->{}",test);
return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); // return ResultBean.success("返回:" + test).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} // }
} //}

@ -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.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage; import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage;
import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource; 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.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@ -39,9 +40,9 @@ import java.util.Locale;
* @Modify: * @Modify:
**/ **/
@RestController @RestController
@RequestMapping("/demo-mongo-service")
@Api(description="系统服务demo") @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); private static final Logger LOGGER = LoggerFactory.getLogger(DemoMongoController.class);
@Autowired @Autowired

@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller;
import cn.estsh.i3plus.core.apiservice.mq.I3CoreQueueConfig; import cn.estsh.i3plus.core.apiservice.mq.I3CoreQueueConfig;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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.impp.framework.boot.util.ResultBean;
import cn.estsh.i3plus.pojo.mes.MachineFactory; import cn.estsh.i3plus.pojo.mes.MachineFactory;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@ -32,9 +33,9 @@ import java.util.concurrent.TimeoutException;
* @Modify: * @Modify:
**/ **/
@RestController @RestController
@RequestMapping("/demo")
@Api(description="复杂对象服务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); private static final Logger LOGGER = LoggerFactory.getLogger(DemoRedisMqController.class);
/** /**

@ -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.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser; 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.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ResultBean;
@ -36,9 +37,9 @@ import java.util.Locale;
* @Modify: * @Modify:
**/ **/
@RestController @RestController
@RequestMapping("/demo-system-service")
@Api(description="系统服务demo") @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); private static final Logger LOGGER = LoggerFactory.getLogger(DemoResourceController.class);
/** /**

@ -1,5 +1,6 @@
package cn.estsh.i3plus.core.apiservice.controller; 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.util.ResultBean;
import cn.estsh.impp.framework.boot.quartz.ScheduleTool; import cn.estsh.impp.framework.boot.quartz.ScheduleTool;
import cn.estsh.impp.framework.boot.quartz.TaskInfo; import cn.estsh.impp.framework.boot.quartz.TaskInfo;
@ -22,9 +23,9 @@ import java.util.List;
* @Modify: * @Modify:
**/ **/
@RestController @RestController
@RequestMapping("/schedule")
@Api(description="定时任务demo") @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); private static final Logger LOGGER = LoggerFactory.getLogger(DemoScheduleController.class);
/************ 定时任务demo *********/ /************ 定时任务demo *********/

@ -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.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.Department; 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.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
@ -30,9 +31,9 @@ import java.net.URLConnection;
* @Modify: * @Modify:
**/ **/
@RestController @RestController
@RequestMapping("/demo")
@Api(description="树和异常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); private static final Logger LOGGER = LoggerFactory.getLogger(DemoTreeAndExceptionController.class);
@Autowired @Autowired

@ -1,6 +1,7 @@
package cn.estsh.i3plus.core.apiservice.controller; package cn.estsh.i3plus.core.apiservice.controller;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; 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.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.fastdfs.FastDFSClient; import cn.estsh.impp.framework.boot.fastdfs.FastDFSClient;
@ -23,9 +24,9 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
* @Modify: * @Modify:
**/ **/
@RestController @RestController
@RequestMapping("/demo-upload")
@Api(description="复杂对象服务demo") @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); private static final Logger LOGGER = LoggerFactory.getLogger(DemoUploadController.class);
/********************** 文件上传 ***********************/ /********************** 文件上传 ***********************/

@ -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.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.SysMenu; 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.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; 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 javax.servlet.http.HttpServletRequest;
import java.util.List; import java.util.List;
/** /**
* @Description : * @Description :
* @Reference : * @Reference :
@ -33,9 +36,9 @@ import java.util.List;
* @Modify : * @Modify :
**/ **/
@RestController @RestController
@RequestMapping("/auth")
@Api(description="用户所有权限操作服务") @Api(description="用户所有权限操作服务")
public class AuthController { @RequestMapping(CoreBaseController.BASE_URL + "/auth")
public class AuthController extends CoreBaseController {
public static final Logger LOGGER = LoggerFactory.getLogger(DemoAuthController.class); public static final Logger LOGGER = LoggerFactory.getLogger(DemoAuthController.class);

@ -1,6 +1,7 @@
package cn.estsh.i3plus.core.apiservice.controller.base; package cn.estsh.i3plus.core.apiservice.controller.base;
import cn.estsh.i3plus.core.api.iservice.base.IDataSimpleService; 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.impp.framework.boot.util.ResultBean;
import cn.estsh.i3plus.pojo.mes.MachineFactory; import cn.estsh.i3plus.pojo.mes.MachineFactory;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@ -20,9 +21,9 @@ import java.util.List;
* @Modify: * @Modify:
**/ **/
@RestController @RestController
@RequestMapping("/simple-service")
@Api(tags="SimpleController",description="简单服务demo") @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()); private Logger LOGGER = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired

@ -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.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.Department; import cn.estsh.i3plus.pojo.platform.bean.Department;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser; 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.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@ -32,9 +33,9 @@ import java.util.List;
* @Modify : * @Modify :
**/ **/
@RestController @RestController
@RequestMapping("/department")
@Api(description = "部门管理服务") @Api(description = "部门管理服务")
public class DepartmentController { @RequestMapping(CoreBaseController.BASE_URL +"/department")
public class DepartmentController extends CoreBaseController {
public static final Logger LOGGER = LoggerFactory.getLogger(DepartmentController.class); public static final Logger LOGGER = LoggerFactory.getLogger(DepartmentController.class);
@Autowired @Autowired

@ -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.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; 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 cn.estsh.impp.framework.boot.util.ResultBean;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@ -21,9 +22,9 @@ import java.util.List;
* @Modify : * @Modify :
**/ **/
@RestController @RestController
@RequestMapping("/enum")
@Api(description = "系统枚举服务") @Api(description = "系统枚举服务")
public class EnumController { @RequestMapping(CoreBaseController.BASE_URL + "/enum")
public class EnumController extends CoreBaseController{
@GetMapping("/method-level") @GetMapping("/method-level")
@ApiOperation(value = "功能类型", notes = "查询全部功能类型功能") @ApiOperation(value = "功能类型", notes = "查询全部功能类型功能")

@ -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.core.api.iservice.busi.IDataMoreService;
import cn.estsh.i3plus.pojo.platform.bean.FactoryStore; 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 cn.estsh.impp.framework.boot.util.ResultBean;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@ -20,9 +21,9 @@ import java.util.List;
* @Modify: * @Modify:
**/ **/
@RestController @RestController
@RequestMapping("/factory-store")
@Api(description="复杂对象服务demo") @Api(description="复杂对象服务demo")
public class FactoryStoreController { @RequestMapping(CoreBaseController.BASE_URL +"/factory-store")
public class FactoryStoreController extends CoreBaseController {
private Logger LOGGER = LoggerFactory.getLogger(this.getClass()); private Logger LOGGER = LoggerFactory.getLogger(this.getClass());
@PostMapping(value="/insert/{name}/{code}") @PostMapping(value="/insert/{name}/{code}")

@ -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.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.LogOperate; import cn.estsh.i3plus.pojo.platform.bean.LogOperate;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser; 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.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
@ -31,9 +32,9 @@ import java.util.List;
* @Modify : * @Modify :
**/ **/
@RestController @RestController
@RequestMapping("/log-operate")
@Api(description = "操作日志") @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); public static final Logger LOGGER = LoggerFactory.getLogger(LogOperateController.class);
@Autowired @Autowired

@ -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.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.LogSystem; import cn.estsh.i3plus.pojo.platform.bean.LogSystem;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser; 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.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
@ -29,9 +30,9 @@ import java.util.List;
* @Modify : * @Modify :
**/ **/
@RestController @RestController
@RequestMapping("log-system")
@Api(description = "系统日志服务") @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); public static final Logger LOGGER = LoggerFactory.getLogger(LogSystemController.class);
@Autowired @Autowired

@ -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.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.Organize; 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.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@ -30,9 +31,9 @@ import java.util.List;
* @Modify : * @Modify :
**/ **/
@RestController @RestController
@RequestMapping("/organize")
@Api(description = "组织") @Api(description = "组织")
public class OrganizeController { @RequestMapping(CoreBaseController.BASE_URL +"/organize")
public class OrganizeController extends CoreBaseController{
public static final Logger LOGGER = LoggerFactory.getLogger(OrganizeController.class); public static final Logger LOGGER = LoggerFactory.getLogger(OrganizeController.class);

@ -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.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.Position; import cn.estsh.i3plus.pojo.platform.bean.Position;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser; 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.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@ -31,9 +32,9 @@ import java.util.List;
* @Modify : * @Modify :
**/ **/
@RestController @RestController
@RequestMapping("/position")
@Api(description = "岗位管理服务") @Api(description = "岗位管理服务")
public class PositionController { @RequestMapping(CoreBaseController.BASE_URL +"/position")
public class PositionController extends CoreBaseController {
public static final Logger LOGGER = LoggerFactory.getLogger(PositionController.class); public static final Logger LOGGER = LoggerFactory.getLogger(PositionController.class);
@Autowired @Autowired

@ -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.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.SysConfig; 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.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
@ -29,9 +30,9 @@ import java.util.List;
* @Modify : * @Modify :
**/ **/
@RestController @RestController
@RequestMapping("/sys-config")
@Api(description = "系统参数管理服务") @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); public static final Logger LOGGER = LoggerFactory.getLogger(SysConfigController.class);
@Autowired @Autowired

@ -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.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.SysDictionary; 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.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@ -31,9 +32,9 @@ import java.util.List;
* @Modify : * @Modify :
**/ **/
@RestController @RestController
@RequestMapping("/sys-dictionary")
@Api(description = "字典管理服务") @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); public static final Logger LOGGER = LoggerFactory.getLogger(SysConfigController.class);
@Autowired @Autowired

@ -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.SysDictionary;
import cn.estsh.i3plus.pojo.platform.bean.SysFile; import cn.estsh.i3plus.pojo.platform.bean.SysFile;
import cn.estsh.i3plus.pojo.platform.bean.SysMessage; 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.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@ -41,9 +42,9 @@ import java.util.List;
* @Modify : * @Modify :
**/ **/
@RestController @RestController
@RequestMapping("/sys-file")
@Api(description = "文件资源服务") @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); public static final Logger LOGGER = LoggerFactory.getLogger(SysFileController.class);
@Autowired @Autowired

@ -30,8 +30,8 @@ import java.util.List;
* @Modify: * @Modify:
**/ **/
@RestController @RestController
@RequestMapping("/sys-locale-language")
@Api(description = "系统语言服务") @Api(description = "系统语言服务")
@RequestMapping(CoreBaseController.BASE_URL + "/sys-locale-language")
public class SysLocaleLanguageController extends CoreBaseController { public class SysLocaleLanguageController extends CoreBaseController {
public static final Logger LOGGER = LoggerFactory.getLogger(SysFileController.class); public static final Logger LOGGER = LoggerFactory.getLogger(SysFileController.class);

@ -33,8 +33,8 @@ import java.util.List;
* @Modify: * @Modify:
**/ **/
@RestController @RestController
@RequestMapping("/sys-locale-resource")
@Api(description = "系统语言资源服务") @Api(description = "系统语言资源服务")
@RequestMapping(CoreBaseController.BASE_URL + "/sys-locale-resource")
public class SysLocaleResourceController extends CoreBaseController { public class SysLocaleResourceController extends CoreBaseController {
public static final Logger LOGGER = LoggerFactory.getLogger(SysFileController.class); public static final Logger LOGGER = LoggerFactory.getLogger(SysFileController.class);

@ -9,6 +9,7 @@
import cn.estsh.i3plus.pojo.platform.bean.Organize; import cn.estsh.i3plus.pojo.platform.bean.Organize;
import cn.estsh.i3plus.pojo.platform.bean.SysMenu; import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
import cn.estsh.impp.framework.base.controller.BaseController; 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.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@ -32,9 +33,9 @@
* @Modify : * @Modify :
**/ **/
@RestController @RestController
@RequestMapping("/sys-menu")
@Api(description = "系统功能服务") @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); public static final Logger LOGGER = LoggerFactory.getLogger(SysMenuController.class);

@ -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.ImppEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.*; 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.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@ -38,9 +39,9 @@ import java.util.List;
* @Modify : * @Modify :
**/ **/
@RestController @RestController
@RequestMapping("/sys-message") @RequestMapping(CoreBaseController.BASE_URL + "/sys-message")
@Api(description = "消息管理服务") @Api(description = "消息管理服务")
public class SysMessageController { public class SysMessageController extends CoreBaseController {
public static final Logger LOGGER = LoggerFactory.getLogger(SysMessageController.class); public static final Logger LOGGER = LoggerFactory.getLogger(SysMessageController.class);
@Autowired @Autowired

@ -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.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.RefRoleMenu; import cn.estsh.i3plus.pojo.platform.bean.RefRoleMenu;
import cn.estsh.i3plus.pojo.platform.bean.SysRole; 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.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@ -31,9 +32,9 @@ import java.util.List;
* @Modify : * @Modify :
**/ **/
@RestController @RestController
@RequestMapping("/sys-role")
@Api(description = "系统角色服务") @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); public static final Logger LOGGER = LoggerFactory.getLogger(SysRoleController.class);

@ -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.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.SysUser; import cn.estsh.i3plus.pojo.platform.bean.SysUser;
import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo; 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.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@ -34,9 +35,9 @@ import java.util.List;
* @Modify : * @Modify :
**/ **/
@RestController @RestController
@RequestMapping("/sys-user")
@Api(description = "系统用户服务") @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); public static final Logger LOGGER = LoggerFactory.getLogger(TaskTimeController.class);

@ -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.SysFile;
import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo; import cn.estsh.i3plus.pojo.platform.bean.SysUserInfo;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser; 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.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@ -35,9 +36,9 @@ import java.util.List;
* @Modify : * @Modify :
**/ **/
@RestController @RestController
@RequestMapping("/sys-user-info")
@Api(description = "系统用户服务") @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); public static final Logger LOGGER = LoggerFactory.getLogger(SysUserInfoController.class);

@ -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.ImppEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.*; 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.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@ -32,9 +33,9 @@ import java.util.List;
* @Modify : * @Modify :
**/ **/
@RestController @RestController
@RequestMapping("/task-time")
@Api(description = "定时任务服务") @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); public static final Logger LOGGER = LoggerFactory.getLogger(TaskTimeController.class);

@ -1,13 +1,12 @@
package cn.estsh.i3plus.core.apiservice.controller.busi; package cn.estsh.i3plus.core.apiservice.controller.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ITaskTimeExpressionService; 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.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.TaskTimeExpression; 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.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
@ -30,9 +29,9 @@ import java.util.List;
* @Modify : * @Modify :
**/ **/
@RestController @RestController
@RequestMapping("/task-time-expression")
@Api(description = "系统时间表达式") @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); public static final Logger LOGGER = LoggerFactory.getLogger(TaskTimeExpressionController.class);

@ -1,16 +1,14 @@
package cn.estsh.i3plus.core.apiservice.controller.busi; 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.core.api.iservice.busi.IToolService;
import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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.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.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.Tool; 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.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@ -34,9 +32,9 @@ import java.util.List;
* @Modify : * @Modify :
**/ **/
@RestController @RestController
@RequestMapping("/tool")
@Api(description = "硬件服务") @Api(description = "硬件服务")
public class ToolController { @RequestMapping(CoreBaseController.BASE_URL +"/tool")
public class ToolController extends CoreBaseController{
public static final Logger LOGGER = LoggerFactory.getLogger(ToolController.class); public static final Logger LOGGER = LoggerFactory.getLogger(ToolController.class);
@Autowired @Autowired

@ -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.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.bean.SessionUser; import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
import cn.estsh.i3plus.pojo.platform.bean.ToolType; 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.auth.AuthUtil;
import cn.estsh.impp.framework.boot.exception.ImppBusiException; import cn.estsh.impp.framework.boot.exception.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
@ -31,9 +32,9 @@ import java.util.List;
* @Modify : * @Modify :
**/ **/
@RestController @RestController
@RequestMapping("/tool-type")
@Api(description = "硬件类型服务") @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); public static final Logger LOGGER = LoggerFactory.getLogger(ToolTypeController.class);
@Autowired @Autowired

@ -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.Organize;
import cn.estsh.i3plus.pojo.platform.bean.Position; import cn.estsh.i3plus.pojo.platform.bean.Position;
import cn.estsh.i3plus.pojo.platform.bean.SysMenu; 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.ImppBusiException;
import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ResultBean;
@ -30,9 +31,9 @@ import java.util.List;
* @Modify : * @Modify :
**/ **/
@RestController @RestController
@RequestMapping("/tree")
@Api(description = "树服务") @Api(description = "树服务")
public class TreeController { @RequestMapping(CoreBaseController.BASE_URL + "/tree")
public class TreeController extends CoreBaseController {
public static final Logger LOGGER = LoggerFactory.getLogger(LogSystemController.class); public static final Logger LOGGER = LoggerFactory.getLogger(LogSystemController.class);

@ -184,7 +184,10 @@ public class SysRoleService implements ISysRoleService {
@Override @Override
public List<RefRoleMenu> findRefRoleMenuByRoleId(String roleId) { public List<RefRoleMenu> findRefRoleMenuByRoleId(String roleId) {
LOGGER.info("系统角色权限关系 RefRoleMenu find By 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 @Override

Loading…
Cancel
Save