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 bf77af3..49616ff 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 @@ -2,6 +2,8 @@ package cn.estsh.i3plus.core.apiservice.configuration; import cn.estsh.i3plus.core.api.iservice.base.ISystemInitService; import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.impp.framework.boot.util.ImppSwitchUtil; +import cn.estsh.impp.framework.boot.util.ImppSystemTool; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -20,16 +22,20 @@ public class AppStartSystemInit implements CommandLineRunner { public static final Logger LOGGER = LoggerFactory.getLogger(CommonConstWords.SYSTEM_LOG); - @Autowired + @Autowired(required = false) private ISystemInitService systemInitService; @Override public void run(String... args) throws Exception { try { + if(ImppSystemTool.isJunitTest()) { + LOGGER.info("【单元测试环境 跳过初始化...】"); + return; + } LOGGER.info("【IMPP-Core开始加载基础信息...】"); - systemInitService.putAndLoadAll(); + systemInitService.putAndLoadAll(); }catch (Exception e){ e.printStackTrace(); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/ScanMongoPackageConfiguration.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/ScanMongoPackageConfiguration.java index c544b0d..3d3fa9c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/ScanMongoPackageConfiguration.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/ScanMongoPackageConfiguration.java @@ -1,34 +1,34 @@ -package cn.estsh.i3plus.core.apiservice.configuration; - -import cn.estsh.i3plus.platform.common.util.CommonConstWords; -import cn.estsh.i3plus.pojo.base.jpa.factory.BaseMongoRepositoryFactoryBean; -import cn.estsh.i3plus.pojo.base.jpa.factory.BaseRepositoryFactoryBean; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -import org.springframework.data.mongodb.repository.config.EnableMongoRepositories; - -/** - * @Description : 需要扫描其他包的配置文件 - * 此类专门添加需要单独加载的其他模块的包 - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-12-12 20:49 - * @Modify: - **/ -@Configuration -@ConditionalOnExpression("'${" + CommonConstWords.PROP_SWITCH_MONGO + ":false}' == 'true'") -//扫描需要单独处理的持久化包 -@EnableMongoRepositories(basePackages = { - "cn.estsh.i3plus.**.platrepositorymongo" -},repositoryFactoryBeanClass = BaseMongoRepositoryFactoryBean.class) -public class ScanMongoPackageConfiguration { - public static final Logger LOGGER = LoggerFactory.getLogger(CommonConstWords.SYSTEM_LOG); - - public ScanMongoPackageConfiguration(){ - LOGGER.info("【扫描关联包...】"); - } -} +//package cn.estsh.i3plus.core.apiservice.configuration; +// +//import cn.estsh.i3plus.platform.common.util.CommonConstWords; +//import cn.estsh.i3plus.pojo.base.jpa.factory.BaseMongoRepositoryFactoryBean; +//import cn.estsh.i3plus.pojo.base.jpa.factory.BaseRepositoryFactoryBean; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +//import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; +//import org.springframework.boot.autoconfigure.domain.EntityScan; +//import org.springframework.context.annotation.Configuration; +//import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +//import org.springframework.data.mongodb.repository.config.EnableMongoRepositories; +// +///** +// * @Description : 需要扫描其他包的配置文件 +// * 此类专门添加需要单独加载的其他模块的包 +// * @Reference : +// * @Author : alwaysfrin +// * @CreateDate : 2018-12-12 20:49 +// * @Modify: +// **/ +//@Configuration +//@ConditionalOnExpression("'${" + CommonConstWords.PROP_SWITCH_MONGO + ":false}' == 'true'") +////扫描需要单独处理的持久化包 +//@EnableMongoRepositories(basePackages = { +// "cn.estsh.i3plus.**.platrepositorymongo" +//},repositoryFactoryBeanClass = BaseMongoRepositoryFactoryBean.class) +//public class ScanMongoPackageConfiguration { +// public static final Logger LOGGER = LoggerFactory.getLogger(CommonConstWords.SYSTEM_LOG); +// +// public ScanMongoPackageConfiguration(){ +// LOGGER.info("【扫描关联包...】"); +// } +//} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/ScanPackageConfiguration.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/ScanPackageConfiguration.java index 0c4371d..40f7947 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/ScanPackageConfiguration.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/ScanPackageConfiguration.java @@ -1,35 +1,35 @@ -package cn.estsh.i3plus.core.apiservice.configuration; - -import cn.estsh.i3plus.platform.common.util.CommonConstWords; -import cn.estsh.i3plus.pojo.base.jpa.factory.BaseRepositoryFactoryBean; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; - -/** - * @Description : 需要扫描其他包的配置文件 - * 此类专门添加需要单独加载的其他模块的包 - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2018-12-12 20:49 - * @Modify: - **/ -@Configuration -//扫描需要单独处理的包 -@EntityScan(basePackages = { - "cn.estsh.i3plus.**.platbean" -}) - -//需要单独处理的其他模块包 -@EnableJpaRepositories(basePackages = { - "cn.estsh.i3plus.**.platrepository" -}, repositoryFactoryBeanClass = BaseRepositoryFactoryBean.class) -public class ScanPackageConfiguration { - public static final Logger LOGGER = LoggerFactory.getLogger(CommonConstWords.SYSTEM_LOG); - - public ScanPackageConfiguration(){ - LOGGER.info("【扫描关联包...】"); - } -} +//package cn.estsh.i3plus.core.apiservice.configuration; +// +//import cn.estsh.i3plus.platform.common.util.CommonConstWords; +//import cn.estsh.i3plus.pojo.base.jpa.factory.BaseRepositoryFactoryBean; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +//import org.springframework.boot.autoconfigure.domain.EntityScan; +//import org.springframework.context.annotation.Configuration; +//import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +// +///** +// * @Description : 需要扫描其他包的配置文件 +// * 此类专门添加需要单独加载的其他模块的包 +// * @Reference : +// * @Author : alwaysfrin +// * @CreateDate : 2018-12-12 20:49 +// * @Modify: +// **/ +//@Configuration +////扫描需要单独处理的包 +//@EntityScan(basePackages = { +// "cn.estsh.i3plus.**.platbean" +//}) +// +////需要单独处理的其他模块包 +//@EnableJpaRepositories(basePackages = { +// "cn.estsh.i3plus.**.platrepository" +//}, repositoryFactoryBeanClass = BaseRepositoryFactoryBean.class) +//public class ScanPackageConfiguration { +// public static final Logger LOGGER = LoggerFactory.getLogger(CommonConstWords.SYSTEM_LOG); +// +// public ScanPackageConfiguration(){ +// LOGGER.info("【扫描关联包...】"); +// } +//} 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 a7d4527..a31b71f 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 @@ -5,6 +5,7 @@ import cn.estsh.i3plus.core.api.iservice.base.ISystemInitService; import cn.estsh.i3plus.core.api.iservice.base.ISystemLoginService; import cn.estsh.i3plus.core.api.iservice.busi.*; import cn.estsh.i3plus.core.apiservice.util.SysUserPasswordUtil; +import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.platform.common.tool.*; import cn.estsh.i3plus.platform.common.util.CommonConstWords; @@ -353,6 +354,8 @@ public class WhiteController extends CoreBaseController { sysFile.setFileTypeId(dictionary.getId()); sysFile.setFileTypeName(dictionary.getName()); + ConvertBean.serviceModelInitialize(sysFile,"白名单"); + sysFile = sysFileService.insertSysFile(sysFile); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(sysFile); }catch(ImppBusiException busExcep){ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ImppLogController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ImppLogController.java index d6e72f9..6e44358 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ImppLogController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ImppLogController.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.platform.common.util.CommonConstWords; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; import cn.estsh.i3plus.pojo.platform.platbean.*; import cn.estsh.impp.framework.base.controller.CoreBaseController; @@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.List; @@ -42,110 +44,116 @@ public class ImppLogController extends CoreBaseController { /** * 系统日志分页复杂查询 + * * @param logSystem 查询条件 - * @param pager 分页数据 + * @param pager 分页数据 * @return 处理结果 */ @GetMapping("/system/query") - @ApiOperation(value = "系统日志分页复杂查询",notes = "系统日志分页复杂查询") - public ResultBean querySysLogSystemByPager(SysLogSystem logSystem, Pager pager){ + @ApiOperation(value = "系统日志分页复杂查询", notes = "系统日志分页复杂查询") + public ResultBean querySysLogSystemByPager(SysLogSystem logSystem, Pager pager) { try { ListPager logSystemList = logService.queryLogSystemPager(logSystem, pager); return ResultBean.success("操作成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }catch(ImppBusiException busExcep){ + } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); - }catch(Exception e){ + } catch (Exception e) { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } /** * 定时任务日志分页复杂查询 + * * @param sysLogTaskTime 查询日志 - * @param pager 分页数据 + * @param pager 分页数据 * @return 处理结果 */ @GetMapping("/task-time/query") - @ApiOperation(value = "定时任务日志分页复杂查询",notes = "定时任务日志分页复杂查询") - public ResultBean querySysLogSystemByPager(SysLogTaskTime sysLogTaskTime, Pager pager){ + @ApiOperation(value = "定时任务日志分页复杂查询", notes = "定时任务日志分页复杂查询") + public ResultBean querySysLogSystemByPager(SysLogTaskTime sysLogTaskTime, Pager pager) { try { ListPager logSystemList = logService.queryLogTaskTimePager(sysLogTaskTime, pager); return ResultBean.success("操作成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }catch(ImppBusiException busExcep){ + } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); - }catch(Exception e){ + } catch (Exception e) { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } /** * 操作日志复杂查询，分页，排序 + * * @param logOperate 操作日志 - * @param pager 分页数据 + * @param pager 分页数据 * @return 处理结果 */ @GetMapping(value = "/operate/query") - @ApiOperation(value = "操作日志复杂查询，分页，排序",notes = "操作日志复杂查询，分页，排序") - public ResultBean querySysLogOperateByPager(SysLogOperate logOperate, Pager pager){ + @ApiOperation(value = "操作日志复杂查询，分页，排序", notes = "操作日志复杂查询，分页，排序") + public ResultBean querySysLogOperateByPager(SysLogOperate logOperate, Pager pager) { try { ListPager logSystemList = logService.queryLogOperatePager(logOperate, pager); return ResultBean.success("操作成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }catch(ImppBusiException busExcep){ + } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); - }catch(Exception e){ + } catch (Exception e) { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } /** * 异常日志复杂查询，分页，排序 + * * @param sysLogException 查询条件 - * @param pager 分页信息 + * @param pager 分页信息 * @return 处理结果 */ @GetMapping(value = "/exception/query") - @ApiOperation(value = "异常日志复杂查询，分页，排序",notes = "异常日志复杂查询，分页，排序") - public ResultBean querySysLogExceptionByPager(SysLogException sysLogException, Pager pager){ + @ApiOperation(value = "异常日志复杂查询，分页，排序", notes = "异常日志复杂查询，分页，排序") + public ResultBean querySysLogExceptionByPager(SysLogException sysLogException, Pager pager) { try { ListPager logExceptionList = logService.queryLogExceptionPager(sysLogException, pager); return ResultBean.success("查询成功").setListPager(logExceptionList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }catch(ImppBusiException busExcep){ + } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); - }catch(Exception e){ + } catch (Exception e) { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } /** * 异常日志复杂查询，分页，排序 - * @param bean 查询条件 + * + * @param bean 查询条件 * @param pager 分页信息 * @return 处理结果 */ @GetMapping(value = "/console/query") - @ApiOperation(value = "异常日志复杂查询，分页，排序",notes = "异常日志复杂查询，分页，排序") - public ResultBean querySysLogConsoleByPager(SysLogConsole bean, Pager pager){ + @ApiOperation(value = "异常日志复杂查询，分页，排序", notes = "异常日志复杂查询，分页，排序") + public ResultBean querySysLogConsoleByPager(SysLogConsole bean, Pager pager) { try { ListPager logExceptionList = logService.queryLogConsolePager(bean, pager); return ResultBean.success("查询成功").setListPager(logExceptionList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }catch(ImppBusiException busExcep){ + } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); - }catch(Exception e){ + } catch (Exception e) { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } /** * 定时任务控制台日志，分页，排序 + * * @param bean 查询条件 * @return 处理结果 */ @GetMapping(value = "/console/query-schedule") - @ApiOperation(value = "定时任务控制台日志，分页，排序",notes = "定时任务控制台日志") - public ResultBean querySchdeuleLogConsoleByPager(SysLogConsole bean){ + @ApiOperation(value = "定时任务控制台日志，分页，排序", notes = "定时任务控制台日志") + public ResultBean querySchdeuleLogConsoleByPager(SysLogConsole bean) { try { ValidatorBean.beginValid(bean) - .notNull("logGroup",bean.getLogGroup()); + .notNull("logGroup", bean.getLogGroup()); // 参数 // 1. group = CommonConstWords.SCHEDULE_LOG:Gourp.Name // 2. @@ -162,11 +170,34 @@ public class ImppLogController extends CoreBaseController { if (StringUtils.isBlank(bean.getCreateDateTimeEnd())) { bean.setCreateDateTimeEnd(TimeTool.getNowTime(true)); } - List logExceptionList = logService.findLogConsoleList(bean); - return ResultBean.success("查询成功").setResultList(logExceptionList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }catch(ImppBusiException busExcep){ + // 一次100条 + bean.setOrderByParam("createDatetime"); + bean.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.ASC.getValue()); + + List logScheduleList = new ArrayList(); + + Pager pager = new Pager(); + pager.setPageSize(100); + pager.setCurrentPage(1); + + ListPager listPager; + do { + if (pager.getTotalRows() != 0) { + pager.next(); + } + listPager = logService.queryLogConsolePager(bean, pager); + if(listPager!= null && listPager.getObjectList()!= null) { + logScheduleList.addAll(listPager.getObjectList()); + pager = listPager.getObjectPager(); + }else if(pager.hasNext()) { + pager.setCurrentPage(pager.getTotalPages()); + } + } while (pager.hasNext()); + + return ResultBean.success("查询成功").setResultList(logScheduleList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); - }catch(Exception e){ + } catch (Exception e) { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @@ -174,12 +205,12 @@ public class ImppLogController extends CoreBaseController { @GetMapping(value = "/clean-log") @ApiOperation(value = "添加操作日志", notes = "添加操作日志，可用于国际化") public ResultBean logClean(String time) { - try{ + try { Date thisTime = TimeTool.parseDate(time); String startTime = TimeTool.getToday(TimeTool.getDateBefore(thisTime, 0)) + " 00:00:00"; String endTime = TimeTool.getToday(TimeTool.getDateBefore(thisTime, 0)) + " 23:59:59"; - logService.actionCleanLog(startTime,endTime); + logService.actionCleanLog(startTime, endTime); 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/busi/SysPojoVersionController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPojoVersionController.java index 1f82e03..63e70ad 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPojoVersionController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPojoVersionController.java @@ -2,11 +2,20 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysPojoVersionService; import cn.estsh.i3plus.platform.common.util.CommonConstWords; +import cn.estsh.i3plus.pojo.base.bean.BaseResultBean; +import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; +import cn.estsh.i3plus.pojo.model.common.CloudPagerModel; import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersion; import cn.estsh.impp.framework.base.controller.CrudBaseController; import cn.estsh.impp.framework.base.service.ICrudService; +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 io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; +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; @@ -28,4 +37,20 @@ public class SysPojoVersionController extends CrudBaseController public ICrudService getCrudService() { return pojoVersionService; } + + @PostMapping("/cloud-query") + @ApiOperation(value = "查询数据", notes = "复杂查询，分页，排序") + BaseResultBean queryPojoVersionByPagerCloud(@RequestBody CloudPagerModel model){ + try { + SysPojoVersion bean = packQueryPager(model.getObj()); + + return ResultBean.success("操作成功") + .setListPager(getCrudService().findPager(bean, model.getPager())) + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } 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/mq/BaseMdmDataSyncQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/BaseMdmDataSyncQueueReceiver.java deleted file mode 100644 index 5be2dad..0000000 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/BaseMdmDataSyncQueueReceiver.java +++ /dev/null @@ -1,169 +0,0 @@ -package cn.estsh.i3plus.core.apiservice.mq; - -import cn.estsh.i3plus.core.apiservice.serviceimpl.base.BaseBusiSyncMdmDataService; -import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; -import cn.estsh.i3plus.platform.common.tool.JsonUtilTool; -import cn.estsh.i3plus.platform.common.tool.TimeTool; -import cn.estsh.i3plus.platform.common.util.CommonConstWords; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.base.enumutil.MdmEnumUtil; -import cn.estsh.i3plus.pojo.mdm.bean.base.MdmSyncData; -import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; -import cn.estsh.impp.framework.boot.util.ImppRedis; -import cn.estsh.impp.framework.boot.util.SpringContextsUtil; -import com.rabbitmq.client.Channel; -import org.apache.commons.lang3.exception.ExceptionUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.amqp.core.Message; -import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.beans.factory.annotation.Autowired; - -import javax.annotation.Resource; -import java.io.IOException; -import java.util.HashMap; - -import static cn.estsh.i3plus.platform.common.util.MdmConstWords.REDIS_MDM_SYNC_FAIL; - -/** - * @Description : - * @Reference : - * @Author : yunhao - * @CreateDate : 2020-05-28 16:54 - * @Modify: - **/ -public abstract class BaseMdmDataSyncQueueReceiver { - - private static final Logger LOGGER = LoggerFactory.getLogger(BaseMdmDataSyncQueueReceiver.class); - - @Autowired - private RabbitTemplate rabbitTemplate; - - @Resource(name = CommonConstWords.IMPP_REDIS_MDM) - private ImppRedis mdmRedis; - - private static final HashMap> masterDateRefMap = new HashMap<>(); - private static final HashMap> busiDateRefMap = new HashMap<>(); - private static final HashMap, BaseBusiSyncMdmDataService> syncServiceMap = new HashMap<>(); - - public void putMdmDataRef(Class syncService, Class mdmMasterClass, Class mdmBusiClass) { - masterDateRefMap.put(mdmMasterClass.getName(), syncService); - busiDateRefMap.put(mdmBusiClass.getName(), syncService); - } - - /** - * 获取同步服务 - * - * @param syncData - * @return - */ - private BaseBusiSyncMdmDataService getSyncService(MdmSyncData syncData) { - Class syncServiceClass = null; - - // 根据MdmClass查找对应关系 - if (CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(syncData.getIsMasterDataVal())) { - syncServiceClass = masterDateRefMap.get(syncData.getSyncDataClass()); - } else { - syncServiceClass = busiDateRefMap.get(syncData.getSyncDataClass()); - } - - if (syncServiceClass == null) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MDM.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) - .setErrorDetail("【MDM同步关系未维护】MdmClass %s", syncData.getSyncDataClass()) - .setErrorSolution("维护Mdm同步关系") - .build(); - } - - // 根据同步服务Class获取服务对象 - BaseBusiSyncMdmDataService busiSyncMdmDataService = syncServiceMap.get(syncServiceClass); - if (busiSyncMdmDataService == null) { - busiSyncMdmDataService = SpringContextsUtil.getBean(syncServiceClass); - syncServiceMap.put(syncServiceClass, busiSyncMdmDataService); - } - if (busiSyncMdmDataService == null) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MDM.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) - .setErrorDetail("【MDM同步服务为找到】SyncServiceClass %s", syncServiceClass) - .build(); - } - - return busiSyncMdmDataService; - } - - /** - * Mdm主数据同步 - * - * @param syncDataStr 消息 - * @param channel 通道 - * @param message 消息 - */ - public void processSyncMasterData(String syncDataStr, Channel channel, Message message) { - MdmSyncData syncData = null; - try { - LOGGER.info("【MQ-QUEUE_MDM_SYNC_MASTER_DATA_CORE】数据接收成功：{}", syncDataStr); - syncData = JsonUtilTool.decode(syncDataStr, MdmSyncData.class); - if (syncData == null) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) - .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode()) - .setErrorDetail("同步数据不存在") - .build(); - } - - // 同步数据类型 - BaseBusiSyncMdmDataService busiSyncMdmDataService = getSyncService(syncData); - - boolean isMaster = CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(syncData.getIsMasterDataVal()); - - // 判断操作类型与同步数据类型调用对应的方法 - if (syncData.getSyncTypeVal() == MdmEnumUtil.MDM_SYNC_TYPE.INSERT.getValue()) { - if (isMaster) { - busiSyncMdmDataService.masterInsertSync(syncData); - } else { - busiSyncMdmDataService.busiInsertSync(syncData); - } - } else if (syncData.getSyncTypeVal() == MdmEnumUtil.MDM_SYNC_TYPE.UPDATE.getValue()) { - if (isMaster) { - busiSyncMdmDataService.masterUpdateSync(syncData); - } else { - busiSyncMdmDataService.busiUpdateSync(syncData); - } - } else if (syncData.getSyncTypeVal() == MdmEnumUtil.MDM_SYNC_TYPE.DELETE.getValue()) { - if (isMaster) { - busiSyncMdmDataService.masterDeleteSync(syncData); - } else { - busiSyncMdmDataService.busiDeleteSync(syncData); - } - } - - //信息已处理 - LOGGER.info("【MQ-QUEUE_MDM_SYNC_MASTER_DATA_CORE】数据处理成功：{}", syncDataStr); - } catch (Exception e) { - LOGGER.error("【MQ-QUEUE_MDM_SYNC_MASTER_DATA_CORE】处理出错：{}", syncData, e); - if (syncData != null) { - // 保存异常信息和堆栈数据 - syncData.setSyncFailDateTime(TimeTool.getNowTime(true)); - syncData.setSyncFailMessage(ExceptionUtils.getStackTrace(e)); - - //放入MDM 缓存中 - mdmRedis.putObject(getFailRedisKey(syncData), syncData, -1); - } - } finally { - try { - channel.basicAck(message.getMessageProperties().getDeliveryTag(), false); - } catch (IOException e1) { - e1.printStackTrace(); - } - } - } - - private String getFailRedisKey(MdmSyncData syncData) { - return REDIS_MDM_SYNC_FAIL + "-" + syncData.getSyncSoftType() + ":" + syncData.getSyncDataClassSimpleName() + ":" + syncData.getSyncFailDateTime() + "-" + System.currentTimeMillis(); - } - - public abstract void syncMasterData(String syncDataStr, Channel channel, Message message); - -} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MdmDataSyncQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MdmDataSyncQueueReceiver.java index 0637367..8fd202b 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MdmDataSyncQueueReceiver.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MdmDataSyncQueueReceiver.java @@ -1,34 +1,37 @@ -//package cn.estsh.i3plus.core.apiservice.mq; -// -//import cn.estsh.i3plus.core.apiservice.serviceimpl.mdm.SysToolSyncDataService; -//import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreBusiExtd; -//import com.rabbitmq.client.Channel; -//import org.springframework.amqp.core.Message; -//import org.springframework.amqp.rabbit.annotation.RabbitListener; -//import org.springframework.stereotype.Component; -// -//import static cn.estsh.i3plus.platform.common.util.MdmConstWords.QUEUE_MDM_SYNC_DATA_CORE; -// -///** -// * @Description : -// * @Reference : -// * @Author : yunhao -// * @CreateDate : 2020-05-28 16:54 -// * @Modify: -// **/ -//@Component -//public class MdmDataSyncQueueReceiver extends BaseMdmDataSyncQueueReceiver { -// -// /** -// * 初始化类关系 -// */ -// public MdmDataSyncQueueReceiver() { -// putMdmDataRef(SysToolSyncDataService.class, MdmGearCoreBusiExtd.mdmMasterClass, MdmGearCoreBusiExtd.class); -// } -// -// @Override -// @RabbitListener(queues = QUEUE_MDM_SYNC_DATA_CORE) -// public void syncMasterData(String syncDataStr, Channel channel, Message message) { -// processSyncMasterData(syncDataStr, channel, message); -// } -//} +package cn.estsh.i3plus.core.apiservice.mq; + +import cn.estsh.i3plus.core.apiservice.serviceimpl.mdm.SysToolSyncDataService; +import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreBusiExtd; +import cn.estsh.impp.framework.boot.mdm.mq.BaseMdmDataSyncQueueReceiver; +import com.rabbitmq.client.Channel; +import org.springframework.amqp.core.Message; +import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; +import org.springframework.context.annotation.Configuration; + +import static cn.estsh.i3plus.platform.common.util.MdmConstWords.QUEUE_MDM_SYNC_DATA_CORE; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2020-05-28 16:54 + * @Modify: + **/ +@ConditionalOnExpression("'${impp.mq.queue.mdm.sync:true}' == 'true'") +@Configuration +public class MdmDataSyncQueueReceiver extends BaseMdmDataSyncQueueReceiver { + + /** + * 初始化类关系 + */ + public MdmDataSyncQueueReceiver() { + putMdmDataRef(SysToolSyncDataService.class, MdmGearCoreBusiExtd.mdmMasterClass, MdmGearCoreBusiExtd.class); + } + + @Override + @RabbitListener(queues = QUEUE_MDM_SYNC_DATA_CORE) + public void syncMasterData(String syncDataStr, Channel channel, Message message) { + processSyncMasterData(syncDataStr, channel, message); + } +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageLetterQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageLetterQueueReceiver.java index 6b4f98a..a65b2cf 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageLetterQueueReceiver.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageLetterQueueReceiver.java @@ -25,7 +25,8 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; -import org.springframework.stereotype.Component; +import org.springframework.context.annotation.Configuration; + import java.io.IOException; import java.util.ArrayList; import java.util.List; @@ -37,8 +38,8 @@ import java.util.List; * @CreateDate : 2018-11-15 22:35 * @Modify: **/ -@ConditionalOnExpression("'${impp.mq.queue.letter}' == 'true'") -@Component +@ConditionalOnExpression("'${impp.mq.queue.letter:true}' == 'true'") +@Configuration public class MessageLetterQueueReceiver { private static final Logger LOGGER = LoggerFactory.getLogger(MessageLetterQueueReceiver.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java index f7565b0..c8910d0 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java @@ -21,7 +21,8 @@ import org.springframework.amqp.core.Message; import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; -import org.springframework.stereotype.Component; +import org.springframework.context.annotation.Configuration; + import java.io.IOException; /** @@ -31,8 +32,8 @@ import java.io.IOException; * @CreateDate : 2018-11-15 22:15 * @Modify: **/ -@ConditionalOnExpression("'${impp.mq.queue.mail}' == 'true'") -@Component +@ConditionalOnExpression("'${impp.mq.queue.mail:true}' == 'true'") +@Configuration public class MessageMailQueueReceiver { private static final Logger LOGGER = LoggerFactory.getLogger(MessageMailQueueReceiver.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageSWebNoticeQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageSWebNoticeQueueReceiver.java index d62d190..f8889a4 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageSWebNoticeQueueReceiver.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageSWebNoticeQueueReceiver.java @@ -24,7 +24,7 @@ import org.springframework.amqp.core.Message; import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; -import org.springframework.stereotype.Component; +import org.springframework.context.annotation.Configuration; import java.io.IOException; import java.util.ArrayList; @@ -37,8 +37,8 @@ import java.util.List; * @CreateDate : 2018-11-15 22:15 * @Modify: **/ -@ConditionalOnExpression("'${impp.mq.queue.sweb.notice}' == 'true'") -@Component +@ConditionalOnExpression("'${impp.mq.queue.sweb.notice:true}' == 'true'") +@Configuration public class MessageSWebNoticeQueueReceiver { private static final Logger LOGGER = LoggerFactory.getLogger(MessageSWebNoticeQueueReceiver.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/PojoVersionQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/PojoVersionQueueReceiver.java index ef83299..dbca05d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/PojoVersionQueueReceiver.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/PojoVersionQueueReceiver.java @@ -42,8 +42,8 @@ import static cn.estsh.i3plus.platform.common.util.PlatformConstWords.QUEUE_IMPP * @CreateDate : 20-4-26 下午2:32 * @Modify: **/ -@Component -@ConditionalOnExpression("'${impp.mq.queue.letter}' == 'true'") +@ConditionalOnExpression("'${impp.mq.queue.pojo.version:true}' == 'true'") +@Configuration public class PojoVersionQueueReceiver { private static final Logger LOGGER = LoggerFactory.getLogger(PojoVersionQueueReceiver.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java index 6edde9a..b64f989 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java @@ -23,7 +23,7 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; -import org.springframework.stereotype.Component; +import org.springframework.context.annotation.Configuration; import java.io.IOException; import java.util.stream.Collectors; @@ -35,8 +35,8 @@ import java.util.stream.Collectors; * @CreateDate : 2018-12-20 21:56 * @Modify: **/ -@ConditionalOnExpression("'${impp.mq.queue.schedule}' == 'true'") -@Component +@ConditionalOnExpression("'${impp.mq.queue.schedule:true}' == 'true'") +@Configuration public class ScheduleQueueReceiver { private static final Logger LOGGER = LoggerFactory.getLogger(ScheduleQueueReceiver.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/SysLocalResourceQueue.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/SysLocalResourceQueue.java index af897f6..a83b589 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/SysLocalResourceQueue.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/SysLocalResourceQueue.java @@ -12,7 +12,8 @@ import org.slf4j.LoggerFactory; import org.springframework.amqp.core.Message; import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; +import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; +import org.springframework.context.annotation.Configuration; import java.io.IOException; import java.util.Map; @@ -27,7 +28,8 @@ import static cn.estsh.i3plus.platform.common.util.PlatformConstWords.QUEUE_IMPP * @CreateDate : 19-8-23 下午3:12 * @Modify: **/ -@Component +@ConditionalOnExpression("'${impp.mq.queue.resource:true}' == 'true'") +@Configuration public class SysLocalResourceQueue { private static final Logger LOGGER = LoggerFactory.getLogger(SysLocalResourceQueue.class); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/BaseBusiSyncMdmDataService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/BaseBusiSyncMdmDataService.java deleted file mode 100644 index e0e1d16..0000000 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/BaseBusiSyncMdmDataService.java +++ /dev/null @@ -1,139 +0,0 @@ -package cn.estsh.i3plus.core.apiservice.serviceimpl.base; - -import cn.estsh.i3plus.icloud.mdm.sdk.base.IBaseMdmBusiExtdCloud; -import cn.estsh.i3plus.icloud.mdm.sdk.base.IBaseMdmBusiModelCloud; -import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; -import cn.estsh.i3plus.pojo.base.bean.BaseResultBean; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; -import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBusiModelBean; -import cn.estsh.i3plus.pojo.mdm.bean.base.MdmSyncData; -import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; - -import java.util.List; - -/** - * @Description : 业务同步setvice - * @Reference : - * @Author : yunhao - * @CreateDate : 2020-05-15 17:58 - * @Modify: - **/ -public abstract class BaseBusiSyncMdmDataService { - - private IBaseMdmBusiExtdCloud baseMdmBusiExtdCloud; - - private IBaseMdmBusiModelCloud baseMdmBusiModelCloud; - - public BaseBusiSyncMdmDataService(IBaseMdmBusiExtdCloud baseMdmBusiExtdCloud, IBaseMdmBusiModelCloud baseMdmBusiModelCloud) { - this.baseMdmBusiExtdCloud = baseMdmBusiExtdCloud; - this.baseMdmBusiModelCloud = baseMdmBusiModelCloud; - } - - /** - * 主数据新增同步 - * @param syncData - */ - public void masterInsertSync(MdmSyncData syncData) { - baseMdmBusiExtdCloud.whiteDoProcessMissBusiExtdByMaster(syncData.getSyncDataId().toArray(new Long[syncData.getSyncDataId().size()]), syncData.getSyncDateUserName()); - } - - /** - * 主数据修改同步 - * @param syncData - */ - public void masterUpdateSync(MdmSyncData syncData) { - BaseResultBean baseResultBean = - baseMdmBusiModelCloud.whiteFindByMasterIds(syncData.getSyncDataId().toArray(new Long[syncData.getSyncDataId().size()])); - if (!baseResultBean.isSuccess()) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MDM.getCode()) - .setErrorCode(ImppExceptionEnum.CLOUD_CALL_EXCEPTION.getCode()) - .setErrorDetail(baseResultBean.getErrorMsg()) - .build(); - } - - List modelBeanList = baseResultBean.getResultList(); - updateBusiList(transform(modelBeanList)); - } - - /** - * 主数据删除同步 - * @param syncData - */ - public void masterDeleteSync(MdmSyncData syncData) { - baseMdmBusiExtdCloud.whiteDeleteWeaklyByMasterIds(syncData.getSyncDataId().toArray(new Long[syncData.getSyncDataId().size()]),syncData.getSyncDateUserName()); - } - - /** - * 业务数据新增同步 - * @param syncData - */ - public void busiInsertSync(MdmSyncData syncData){ - BaseResultBean baseResultBean = - baseMdmBusiModelCloud.whiteFindByIds(syncData.getSyncDataId().toArray(new Long[syncData.getSyncDataId().size()])); - if (!baseResultBean.isSuccess()) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MDM.getCode()) - .setErrorCode(ImppExceptionEnum.CLOUD_CALL_EXCEPTION.getCode()) - .setErrorDetail(baseResultBean.getErrorMsg()) - .build(); - } - - List modelBeanList = baseResultBean.getResultList(); - insertBusiList(transform(modelBeanList)); - } - - /** - * 业务数据修改同步 - * @param syncData - */ - public void busiUpdateSync(MdmSyncData syncData){ - BaseResultBean baseResultBean = - baseMdmBusiModelCloud.findByIds(syncData.getSyncDataId().toArray(new Long[syncData.getSyncDataId().size()])); - if (!baseResultBean.isSuccess()) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.MDM.getCode()) - .setErrorCode(ImppExceptionEnum.CLOUD_CALL_EXCEPTION.getCode()) - .setErrorDetail(baseResultBean.getErrorMsg()) - .build(); - } - - List modelBeanList = baseResultBean.getResultList(); - updateBusiList(transform(modelBeanList)); - - } - - /** - * 业务数据删除同步 - * @param syncData - */ - public void busiDeleteSync(MdmSyncData syncData){ - deleteBusiList(syncData.getSyncDataId()); - } - - /** - * 类型转换 - * @param syncDataList - * @return - */ - public abstract List transform(List syncDataList); - - /** - * 新增业务数据 - * @param beanList - */ - public abstract void insertBusiList(List beanList); - - /** - * 修改业务数据 - * @param beanList - */ - public abstract void updateBusiList(List beanList); - - /** - * 删除业务数据 - * @param idList - */ - public abstract void deleteBusiList(List idList); - -} 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 0ae905f..01b1afe 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 @@ -9,7 +9,6 @@ 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; @@ -78,6 +77,8 @@ public class SystemInitService implements ISystemInitService { @Override @ApiOperation(value = "初始化加载所有数据",notes = "初始化加载所有数据") public void putAndLoadAll() { + try { + type = ImppEnumUtil.SYS_CACHE_TYPE.REDIS.getValue(); LOGGER.info("加载 SysConfig 信息"); @@ -99,8 +100,9 @@ public class SystemInitService implements ISystemInitService { LOGGER.info("加载 对象版本控制信息"); reloadPojoVersionPlan(); LOGGER.info("加载 对象版本控制信息 信息完成"); - - + }catch (Exception e){ + e.printStackTrace(); + } } @Override diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolService.java index 68bc7cf..2cc3088 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolService.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysToolService; -import cn.estsh.i3plus.core.apiservice.dao.ITestDao; +import cn.estsh.i3plus.platform.common.tool.BeanCopyTool; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.PagerHelper; @@ -12,7 +12,6 @@ import cn.estsh.i3plus.pojo.platform.repository.SysToolRepository; import cn.estsh.i3plus.pojo.platform.repository.SysToolTypeRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.impp.framework.boot.util.ValidatorBean; -import com.alibaba.fastjson.JSON; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -82,24 +81,12 @@ public class SysToolService implements ISysToolService { @Override @ApiOperation(value = "更新硬件信息") public void updateSysTool(SysTool tool) { - // 查询硬件类型名称 - LOGGER.info("硬件类型 TOOL_TYPE :{}", tool); - SysToolType toolType = toolTypeRDao.getById(tool.getToolTypeId()); - ValidatorBean.checkNotNull(toolType); - - SysTool newSysTool = toolRDao.getById(tool.getId()); - newSysTool.setName(tool.getName()); - newSysTool.setToolConnType(tool.getToolConnType()); - newSysTool.setToolDataType(tool.getToolDataType()); - newSysTool.setToolIp(tool.getToolIp()); - newSysTool.setToolPort(tool.getToolPort()); - newSysTool.setToolDescription(tool.getToolDescription()); - newSysTool.setToolTypeId(tool.getToolTypeId()); - newSysTool.setToolTypeNameRdd(toolType.getName()); - newSysTool.setToolOperating(tool.getToolOperating()); - - LOGGER.info("硬件 TOOL :{}",newSysTool); - toolRDao.update(newSysTool); + SysTool orginTool = toolRDao.getById(tool.getId()); + if(orginTool == null){ + orginTool = tool; + } + BeanCopyTool.beanCopy(tool,orginTool); + toolRDao.update(orginTool); } @Override diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/mdm/SysToolSyncDataService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/mdm/SysToolSyncDataService.java index 5b29d18..5ae08a0 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/mdm/SysToolSyncDataService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/mdm/SysToolSyncDataService.java @@ -1,11 +1,12 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.mdm; import cn.estsh.i3plus.core.api.iservice.busi.ISysToolService; -import cn.estsh.i3plus.core.apiservice.serviceimpl.base.BaseBusiSyncMdmDataService; -import cn.estsh.i3plus.icloud.mdm.sdk.base.IBaseMdmBusiExtdCloud; -import cn.estsh.i3plus.icloud.mdm.sdk.base.IBaseMdmBusiModelCloud; +import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.pojo.mdm.model.core.MdmGearCoreBusiModel; import cn.estsh.i3plus.pojo.platform.bean.SysTool; +import cn.estsh.impp.framework.boot.mdm.cloud.IBaseMdmBusiExtdCloud; +import cn.estsh.impp.framework.boot.mdm.cloud.IBaseMdmBusiModelCloud; +import cn.estsh.impp.framework.boot.mdm.service.BaseBusiSyncMdmDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -31,13 +32,15 @@ public class SysToolSyncDataService extends BaseBusiSyncMdmDataService transform(List syncDataList) { + public List transform(List syncDataList,String userName) { return syncDataList.stream().map(gearCoreBusiModel -> { SysTool sysTool = new SysTool(); if (gearCoreBusiModel != null && gearCoreBusiModel.getBusi() != null && gearCoreBusiModel.getMaster() != null) { + sysTool.setId(gearCoreBusiModel.getBusi().getId()); sysTool.setName(gearCoreBusiModel.getMaster().getName()); sysTool.setToolIp(gearCoreBusiModel.getMaster().getGearModel()); sysTool.setToolDescription(gearCoreBusiModel.getBusi().getCoreNum()); + ConvertBean.serviceModelInitialize(sysTool,userName); } return sysTool; }).collect(Collectors.toList()); @@ -58,7 +61,7 @@ public class SysToolSyncDataService extends BaseBusiSyncMdmDataService id) { + public void deleteBusiList(List id,String userName) { sysToolService.deleteSysToolByIds(id.toArray(new Long[id.size()])); } } 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 92bf6f5..5264265 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 @@ -177,6 +177,7 @@ public class NoSqlPack { public static ElasticSearchPack packEsSysLogConsole(SysLogConsole bean) { ElasticSearchPack result = packElasticSearchPack(bean); + result.andNumberBigger("id",bean.getId()); result.andNumberEquals("softType",bean.getSoftType()); result.andNumberEquals("requestId",bean.getRequestId()); result.andStringLeftLike("logHost",bean.getLogHost());