From bc735ab7c439cb9a316023617ab95ab9fe9820d2 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Sat, 18 Apr 2020 15:47:20 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=8E=88=E6=9D=83=E5=B0=81=E8=A3=85?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4=202.=20=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=9F=A5=E8=AF=A2=E5=B0=81=E8=A3=85?= =?UTF-8?q?=203.=20=E6=B7=BB=E5=8A=A0=E8=BD=AF=E9=80=82=E9=85=8D=20?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8=204.=20p?= =?UTF-8?q?om.xml=20=E5=BC=95=E7=94=A8=E9=94=99=E8=AF=AF=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/iservice/base/ISysLogConsoleService.java | 26 +++ .../configuration/AppStartSystemInit.java | 5 +- .../core/apiservice/controller/DemoController.java | 10 +- .../controller/base/BackstageController.java | 50 ++---- .../controller/base/PressureTestController.java | 176 --------------------- .../i3plus/core/apiservice/controller/base/log.txt | 0 .../controller/busi/PersonnelController.java | 20 +++ .../{report => cloud}/CoreReportController.java | 2 +- .../ReportPojoCloudController.java | 3 +- .../{message => cloud}/SwebMessageController.java | 2 +- .../{message => cloud}/WMSMessageController.java | 2 +- .../controller/cloud/WhiteCloudController.java | 41 +++++ .../core/apiservice/daoimpl/ReportDaoImpl.java | 2 +- .../serviceimpl/base/SysLogConsoleService.java | 54 +++++++ .../serviceimpl/base/SystemInitService.java | 11 +- .../serviceimpl/busi/LicenseClickService.java | 2 +- .../i3plus/core/apiservice/util/NoSqlPack.java | 24 ++- 17 files changed, 192 insertions(+), 238 deletions(-) create mode 100644 modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISysLogConsoleService.java delete mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/PressureTestController.java delete mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/log.txt rename modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/{report => cloud}/CoreReportController.java (99%) rename modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/{report => cloud}/ReportPojoCloudController.java (96%) rename modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/{message => cloud}/SwebMessageController.java (98%) rename modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/{message => cloud}/WMSMessageController.java (98%) create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/cloud/WhiteCloudController.java create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogConsoleService.java diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISysLogConsoleService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISysLogConsoleService.java new file mode 100644 index 0000000..5958e19 --- /dev/null +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/base/ISysLogConsoleService.java @@ -0,0 +1,26 @@ +package cn.estsh.i3plus.core.api.iservice.base; + +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.platform.platbean.*; +import io.swagger.annotations.ApiOperation; + +import java.util.List; +import java.util.Map; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-2-13 下午3:43 + * @Modify: + **/ +public interface ISysLogConsoleService { + + ListPager queryLogConsolePager(SysLogConsole log, Pager pager); + List findLogConsoleList(SysLogConsole log, Pager pager); + List findLogConsoleList(SysLogConsole log); + SysLogConsole insertLogConsole(SysLogConsole log); + SysLogConsole getLogConsole(SysLogConsole log); + void deleteLogConsole(SysLogConsole log); +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java index f4d4f6a..1e95693 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java @@ -6,7 +6,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysUserInfoService; import cn.estsh.i3plus.core.api.iservice.busi.ISystemResourceService; import cn.estsh.i3plus.platform.common.util.CommonConstWords; import cn.estsh.i3plus.platform.plugin.elasticsearch.ElasticSearchTool; -import cn.estsh.i3plus.platform.plugin.license.ImppLicenseTool; +import cn.estsh.impp.framework.boot.license.ImppLicenseTool; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.impp.framework.boot.configuration.SystemConfig; import cn.estsh.impp.framework.boot.util.ImppRedis; @@ -72,9 +72,6 @@ public class AppStartSystemInit implements CommandLineRunner { systemConfig.loadSystemConfig(CommonEnumUtil.SOFT_TYPE.CORE.getCode()); LOGGER.info("【IMPP-Core 加载系统配置文件到缓存完成】"); - LOGGER.info("【IMPP-License 加载 License ...】"); - ImppLicenseTool.getLicense(); - LOGGER.info("【IMPP-License 加载 License完成】"); } /** diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoController.java index 11c9abc..a298bef 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoController.java @@ -1,21 +1,17 @@ package cn.estsh.i3plus.core.apiservice.controller; import cn.estsh.i3plus.core.apiservice.schedulejob.CoreLogClearJob; -import cn.estsh.i3plus.platform.common.tool.HttpClientTool; -import cn.estsh.i3plus.platform.common.tool.SerializeTool; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.platform.plugin.elasticsearch.ElasticSearchPack; import cn.estsh.i3plus.platform.plugin.elasticsearch.ElasticSearchTool; -import cn.estsh.i3plus.platform.plugin.license.ImppLicense; -import cn.estsh.i3plus.platform.plugin.license.ImppLicenseTool; -import cn.estsh.i3plus.platform.plugin.license.serviceimpl.SenseLockUtil; +import cn.estsh.i3plus.pojo.model.license.ImppLicense; +import cn.estsh.impp.framework.boot.license.ImppLicenseTool; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate; 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 org.springframework.beans.factory.annotation.Autowired; @@ -23,8 +19,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Base64; -import java.util.HashMap; import java.util.List; /** 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 c183bda..b74ff6f 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,20 +1,12 @@ package cn.estsh.i3plus.core.apiservice.controller.base; +import cn.estsh.i3plus.core.api.iservice.base.ISysLogService; 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.core.apiservice.serviceimpl.base.SysLogElasticSearchService; -import cn.estsh.i3plus.core.apiservice.serviceimpl.base.SysLogMongoService; -import cn.estsh.i3plus.platform.common.tool.SerializeTool; import cn.estsh.i3plus.platform.common.tool.TimeTool; -import cn.estsh.i3plus.platform.common.util.CommonConstWords; -import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.platform.plugin.elasticsearch.ElasticSearchTool; -import cn.estsh.i3plus.platform.plugin.license.ImppLicense; -import cn.estsh.i3plus.platform.plugin.license.ImppLicenseTool; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.model.license.ImppLicense; +import cn.estsh.impp.framework.boot.license.ImppLicenseTool; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; -import cn.estsh.i3plus.pojo.platform.bean.SysMenu; import cn.estsh.i3plus.pojo.platform.platbean.SysLogException; import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate; import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem; @@ -22,10 +14,8 @@ import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime; 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 cn.estsh.impp.framework.boot.util.ValidatorBean; -import com.alibaba.fastjson.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; @@ -35,9 +25,7 @@ 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.Date; -import java.util.List; /** * @Description : 后台服务 @@ -55,21 +43,9 @@ public class BackstageController extends CoreBaseController { @Autowired private ISystemInitService systemInitService; - - @Autowired - private ISysMenuService menuService; - - @Autowired - private ICoreMemTreeService memTreeService; - - @Autowired - private SysLogElasticSearchService elasticSearchService; - @Autowired - private SysLogMongoService mongoService; + private ISysLogService logService; - @Resource(name= CommonConstWords.IMPP_REDIS_CORE) - private ImppRedis redisRes; @GetMapping(value = "/redis-put-all") @ApiOperation(value = "重新加载所有缓存数据",notes = "重新加载所有缓存数据") @@ -176,15 +152,15 @@ public class BackstageController extends CoreBaseController { taskTime.setCreateDateTimeEnd(endTime); ElasticSearchTool.reload(); - elasticSearchService.deleteLogOperate(operate); - elasticSearchService.deleteLogSystem(system); - elasticSearchService.deleteLogException(exception); - elasticSearchService.deleteLogTaskTime(taskTime); - - mongoService.deleteLogOperate(operate); - mongoService.deleteLogSystem(system); - mongoService.deleteLogException(exception); - mongoService.deleteLogTaskTime(taskTime); + logService.deleteLogOperate(operate); + logService.deleteLogSystem(system); + logService.deleteLogException(exception); + logService.deleteLogTaskTime(taskTime); + +// mongoService.deleteLogOperate(operate); +// mongoService.deleteLogSystem(system); +// mongoService.deleteLogException(exception); +// mongoService.deleteLogTaskTime(taskTime); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep).build(); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/PressureTestController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/PressureTestController.java deleted file mode 100644 index ce9ae98..0000000 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/PressureTestController.java +++ /dev/null @@ -1,176 +0,0 @@ -//package cn.estsh.i3plus.core.apiservice.controller.base; -// -//import cn.estsh.i3plus.platform.common.tool.HttpClientTool; -//import cn.estsh.i3plus.platform.plugin.opc.pojo.OpcUAParam; -//import cn.estsh.i3plus.platform.plugin.opc.service.OpcUAService; -//import cn.estsh.i3plus.pojo.base.annotation.AnnoIgnoreLog; -//import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -//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.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 org.eclipse.milo.opcua.sdk.client.api.subscriptions.UaSubscription; -//import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UInteger; -//import org.slf4j.Logger; -//import org.slf4j.LoggerFactory; -//import org.springframework.web.bind.annotation.GetMapping; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RestController; -// -//import java.util.HashMap; -//import java.util.Hashtable; -//import java.util.Map; -// -///** -// * @Description : -// * @Reference : -// * @Author : yunhao -// * @CreateDate : 2020-01-08 11:53 -// * @Modify: -// **/ -//@RestController -//@Api(tags = "压测接口") -//@RequestMapping("/impp/pressure-test") -//public class PressureTestController extends CoreBaseController { -// public static final Logger LOGGER = LoggerFactory.getLogger(PressureTestController.class); -// -// private static Map uaServiceMap = new Hashtable<>(); -// -// public static Map upcSub = new Hashtable<>(); -// -// private OpcUAService getOpcUaService(OpcUAParam opcUAParam){ -// if(!uaServiceMap.containsKey(opcUAParam.getServerUrl())){ -// OpcUAService opcService = new OpcUAService(); -// opcService.connUaService(opcUAParam); -// uaServiceMap.put(opcUAParam.getServerUrl(),opcService); -// } -// return uaServiceMap.get(opcUAParam.getServerUrl()); -// } -// -// @GetMapping("/opc-write") -// @ApiOperation(value = "写Opc", notes = "写Opc") -// @AnnoIgnoreLog -// public ResultBean writeOpc(OpcUAParam opcUA){ -// try { -// OpcUAService opcService = new OpcUAService(); -// boolean editResult = opcService.editOpcParamValue(opcUA); -// return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(editResult); -// }catch(ImppBusiException busExcep){ -// return ResultBean.fail(busExcep); -// }catch(Exception e){ -// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); -// } -// } -// -// @GetMapping("/opc-read") -// @ApiOperation(value = "读Opc", notes = "读Opc") -// @AnnoIgnoreLog -// public ResultBean readOpc(OpcUAParam opcUA){ -// try { -// Object readResult = getOpcUaService(opcUA).getOpcParamValue(opcUA); -// if(readResult == null){ -// return ResultBean.fail(); -// } -// return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(readResult); -// }catch(ImppBusiException busExcep){ -// return ResultBean.fail(busExcep); -// }catch(Exception e){ -// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); -// } -// } -// -// -// @GetMapping("/opc-sub") -// @ApiOperation(value = "订阅Opc", notes = "订阅Opc") -// @AnnoIgnoreLog -// public ResultBean subOpc(OpcUAParam opcUA,String callbackMethod,String callbackUrl){ -// try { -// UaSubscription subscription = getOpcUaService(opcUA).createSubscription(opcUA, (uaMonitoredItem, integer) -> { -// uaMonitoredItem.setValueConsumer((node, value) -> { -// LOGGER.info("OPC订阅回调： {} - {} , callback {}", node.getReadValueId().getNodeId(), value.getValue(), -// callbackMethod+callbackUrl); -// HashMap param = new HashMap<>(); -// param.put("key",node.getReadValueId().getNodeId().toString()); -// param.put("value",value.getValue().toString()); -// -// HttpClientTool.doHttpUrl(CommonEnumUtil.HTTP_METHOD_TYPE.valueOf(callbackMethod), callbackUrl, param); -// } ); -// }); -// upcSub.put(subscription.getSubscriptionId(),opcUA); -// return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(subscription.getSubscriptionId().toString()); -// }catch(ImppBusiException busExcep){ -// return ResultBean.fail(busExcep); -// }catch(Exception e){ -// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); -// } -// } -// -// @GetMapping("/remove-opc-sub") -// @ApiOperation(value = "移除Opc订阅", notes = "移除Opc订阅") -// @AnnoIgnoreLog -// public ResultBean removeSubOpc(OpcUAParam opcUA,String subscriptionId){ -// try { -// getOpcUaService(opcUA).deleteSubscription(opcUA,UInteger.valueOf(subscriptionId)); -// upcSub.remove(UInteger.valueOf(subscriptionId)); -// return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); -// }catch(ImppBusiException busExcep){ -// return ResultBean.fail(busExcep); -// }catch(Exception e){ -// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); -// } -// } -// -// @GetMapping("/remove-all-opc-sub") -// @ApiOperation(value = "移除Opc订阅", notes = "移除Opc订阅") -// @AnnoIgnoreLog -// public ResultBean removeAllSubOpc(OpcUAParam opcUA){ -// try { -// OpcUAService opcService = getOpcUaService(opcUA); -// for (UInteger uInteger : upcSub.keySet()) { -// opcService.deleteSubscription(opcUA,uInteger); -// } -// upcSub.clear(); -// return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); -// }catch(ImppBusiException busExcep){ -// return ResultBean.fail(busExcep); -// }catch(Exception e){ -// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); -// } -// } -// -// @GetMapping("/show-opc-sub-list") -// @ApiOperation(value = "查询Opc订阅", notes = "查询Opc订阅") -// @AnnoIgnoreLog -// public ResultBean showSubOpcList(){ -// try { -// HashMap resultMap = new HashMap<>(); -// for (UInteger uInteger : upcSub.keySet()) { -// resultMap.put(uInteger.toString(), JSON.toJSONString(upcSub.get(uInteger))); -// } -// return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultMap(resultMap); -// }catch(ImppBusiException busExcep){ -// return ResultBean.fail(busExcep); -// }catch(Exception e){ -// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); -// } -// } -// -// @GetMapping("/test-callback") -// @ApiOperation(value = "查询Opc订阅", notes = "查询Opc订阅") -// @AnnoIgnoreLog -// public ResultBean showSubOpcList(String key,String value){ -// try { -// LOGGER.info("回调：{} : {}", key,value); -// return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(key+":"+value); -// }catch(ImppBusiException busExcep){ -// return ResultBean.fail(busExcep); -// }catch(Exception e){ -// return ImppExceptionBuilder.newInstance().buildExceptionResult(e); -// } -// } -// -//} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/log.txt b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/log.txt deleted file mode 100644 index e69de29..0000000 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 bb6f84c..d46d275 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 @@ -10,6 +10,8 @@ import cn.estsh.i3plus.platform.common.tool.EncryptTool; import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; +import cn.estsh.i3plus.pojo.model.license.ImppLicense; +import cn.estsh.impp.framework.boot.license.ImppLicenseTool; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; @@ -798,4 +800,22 @@ public class PersonnelController extends CoreBaseController { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } + + /** + * 查询所有组织信息 + * @return 处理结果 + */ + @GetMapping(value = "/license") + @ApiOperation(value = "获取授权信息") + public ResultBean getLicense(){ + try{ + return ResultBean.success("操作成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultObject(ImppLicenseTool.getLicense()); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } } 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/cloud/CoreReportController.java similarity index 99% rename from modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/report/CoreReportController.java rename to modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/cloud/CoreReportController.java index 20e5d83..923e943 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/cloud/CoreReportController.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.core.apiservice.controller.report; +package cn.estsh.i3plus.core.apiservice.controller.cloud; import cn.estsh.i3plus.core.api.iservice.base.IReportService; import cn.estsh.i3plus.core.api.iservice.busi.ISysRoleService; 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/cloud/ReportPojoCloudController.java similarity index 96% rename from modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/report/ReportPojoCloudController.java rename to modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/cloud/ReportPojoCloudController.java index f5e0e81..15f8118 100644 --- 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/cloud/ReportPojoCloudController.java @@ -1,7 +1,6 @@ -package cn.estsh.i3plus.core.apiservice.controller.report; +package cn.estsh.i3plus.core.apiservice.controller.cloud; 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; 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/cloud/SwebMessageController.java similarity index 98% rename from modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/message/SwebMessageController.java rename to modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/cloud/SwebMessageController.java index 392d932..9597ca0 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/cloud/SwebMessageController.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.core.apiservice.controller.message; +package cn.estsh.i3plus.core.apiservice.controller.cloud; import cn.estsh.i3plus.core.apiservice.controller.base.BaseMessageController; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; 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/cloud/WMSMessageController.java similarity index 98% rename from modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/message/WMSMessageController.java rename to modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/cloud/WMSMessageController.java index 31cf075..8000d49 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/cloud/WMSMessageController.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.core.apiservice.controller.message; +package cn.estsh.i3plus.core.apiservice.controller.cloud; import cn.estsh.i3plus.core.apiservice.controller.base.BaseMessageController; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/cloud/WhiteCloudController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/cloud/WhiteCloudController.java new file mode 100644 index 0000000..e6691da --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/cloud/WhiteCloudController.java @@ -0,0 +1,41 @@ +package cn.estsh.i3plus.core.apiservice.controller.cloud; + +import cn.estsh.i3plus.pojo.base.bean.BaseResultBean; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.i3plus.pojo.model.softswitch.SuitImppCloudModel; +import cn.estsh.impp.framework.base.controller.CoreBaseController; +import cn.estsh.impp.framework.boot.util.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +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; + +/** + * @Description : + * 微服务白名单调用接口 + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-18 上午10:41 + * @Modify: + **/ +@RestController +@Api(tags = "Cloud 白名单服务") +@RequestMapping("/impp/white/cloud") +public class WhiteCloudController extends CoreBaseController { + private static final Logger LOGGER = LoggerFactory.getLogger(WhiteCloudController.class); + + + @PostMapping(value = "/softwitch/result") + @ApiOperation(value = "数据源列表", notes = "获取服务的数据源列表") + public BaseResultBean softwitchResult(@RequestBody SuitImppCloudModel model) { + LOGGER.info("Cloud Message : {}", model); + return ResultBean.success("操作成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setMsg("这是 Core 返回的一段数据 -> " + System.currentTimeMillis()); + } + +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/ReportDaoImpl.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/ReportDaoImpl.java index 506604b..b43b614 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/ReportDaoImpl.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/ReportDaoImpl.java @@ -52,4 +52,4 @@ public class ReportDaoImpl implements IReportDao { entityManager.clear(); return (Long)queryObject.getSingleResult(); } -} +} \ No newline at end of file diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogConsoleService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogConsoleService.java new file mode 100644 index 0000000..27bc7ed --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SysLogConsoleService.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.core.apiservice.serviceimpl.base; + +import cn.estsh.i3plus.core.api.iservice.base.ISysLogConsoleService; +import cn.estsh.i3plus.core.api.iservice.base.ISysLogService; +import cn.estsh.i3plus.pojo.base.bean.ListPager; +import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.platform.platbean.SysLogConsole; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @Description : + * @Reference : + * @Author : wei.peng + * @CreateDate : 20-4-16 上午10:39 + * @Modify: + **/ +@Service +public class SysLogConsoleService implements ISysLogConsoleService { + public static final Logger LOGGER = LoggerFactory.getLogger(SysLogElasticSearchService.class); + + @Override + public ListPager queryLogConsolePager(SysLogConsole log, Pager pager) { + return null; + } + + @Override + public List findLogConsoleList(SysLogConsole log, Pager pager) { + return null; + } + + @Override + public List findLogConsoleList(SysLogConsole log) { + return null; + } + + @Override + public SysLogConsole insertLogConsole(SysLogConsole log) { + return null; + } + + @Override + public SysLogConsole getLogConsole(SysLogConsole log) { + return null; + } + + @Override + public void deleteLogConsole(SysLogConsole log) { + + } +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java index f710173..8b93184 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java @@ -8,6 +8,7 @@ import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.util.CommonConstWords; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.platform.plugin.elasticsearch.ElasticSearchTool; +import cn.estsh.impp.framework.boot.license.ImppLicenseTool; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -74,7 +75,15 @@ public class SystemInitService implements ISystemInitService { putAndLoadSysConfig(); putAndLoadSysDictionary(); putAndLoadSysLocaleLanguage(); + + LOGGER.info("加载ElasticSearch Client Url 信息"); reloadElasticSearchClient(); + LOGGER.info("加载ElasticSearch Client Url 信息完成"); + + LOGGER.info("【IMPP-License 加载 License ...】"); + ImppLicenseTool.cloneLicense(); + ImppLicenseTool.getLicense(); + LOGGER.info("【IMPP-License 加载 License完成】"); } @Override @@ -349,7 +358,6 @@ public class SystemInitService implements ISystemInitService { @Override public void reloadElasticSearchClient() { - LOGGER.info("加载ElasticSearch Client Url 信息"); String url = RedisCacheTool.getSysConfigStrVal(CommonConstWords.PROP_IMPP_ELASTICSEARCH_CONFIG_URL); if(StringUtils.isBlank(url)){ if(Objects.nonNull(ImppSystemTool.getEnvironment())){ @@ -363,6 +371,5 @@ public class SystemInitService implements ISystemInitService { LOGGER.info("加载ElasticSearch Client Url:{}",url); ElasticSearchTool.init(url); - LOGGER.info("加载ElasticSearch Client Url 信息完成"); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LicenseClickService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LicenseClickService.java index 68b682b..acdde31 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LicenseClickService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LicenseClickService.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ILicenseClickService; import cn.estsh.i3plus.platform.common.util.CommonConstWords; -import cn.estsh.i3plus.platform.plugin.license.ImppLicenseTool; +import cn.estsh.impp.framework.boot.license.ImppLicenseTool; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java index 2e8bb6e..41510a6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java @@ -5,10 +5,7 @@ import cn.estsh.i3plus.platform.plugin.elasticsearch.ElasticSearchPack; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.tool.BsonPackTool; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogException; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem; -import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime; +import cn.estsh.i3plus.pojo.platform.platbean.*; import com.mongodb.BasicDBObject; import org.apache.commons.lang3.StringUtils; import org.bson.conversions.Bson; @@ -168,4 +165,23 @@ public class NoSqlPack { return result; } + public static ElasticSearchPack packEsSysLogConsole(SysLogConsole bean) { + ElasticSearchPack result = packElasticSearchPack(bean); + + result.andStringEquals("softType",bean.getSoftType()); + result.andStringLeftLike("logHost",bean.getLogHost()); + result.andStringLike("userLoginName",bean.getUserLoginName()); + result.andStringEquals("logLevel",bean.getLogLevel()); + result.andStringLeftLike("executeClassName",bean.getExecuteClassName()); + result.andStringLike("executeMethod",bean.getExecuteMethod()); + result.andStringLike("executeArgs",bean.getExecuteArgs()); + result.andStringLike("executeTitle",bean.getExecuteTitle()); + result.andStringLike("executeMessage",bean.getExecuteMessage()); + result.andStringLike("errorStackTrace",bean.getErrorStackTrace()); +// result.andNumberBetween("executeTime",bean.getErrorStackTrace()); + result.andKeywordDateTimeBetween("createDatetime",bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd()); + + return result; + } + }