I3_YF_SEAT
/
impp-core
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

密码规则完善 合并代码

Browse Source
yun-zuoyi
wei.peng 5 years ago
parent 8783b9a33f ade26c6230
commit 071c6cd40d
19 changed files with 248 additions and 491 deletions
Show Stats Download Patch File Download Diff File

10
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java
Unescape Escape View File

@ -2,6 +2,8 @@ package cn.estsh.i3plus.core.apiservice.configuration;
import cn.estsh.i3plus.core.api.iservice.base.ISystemInitService; import cn.estsh.i3plus.core.api.iservice.base.ISystemInitService;
import cn.estsh.i3plus.platform.common.util.CommonConstWords; 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.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; 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); public static final Logger LOGGER = LoggerFactory.getLogger(CommonConstWords.SYSTEM_LOG);
@Autowired @Autowired(required = false)
private ISystemInitService systemInitService; private ISystemInitService systemInitService;
@Override @Override
public void run(String... args) throws Exception { public void run(String... args) throws Exception {
try { try {
if(ImppSystemTool.isJunitTest()) {
LOGGER.info("【单元测试环境 跳过初始化...】");
return;
}
LOGGER.info("【IMPP-Core开始加载基础信息...】"); LOGGER.info("【IMPP-Core开始加载基础信息...】");
systemInitService.putAndLoadAll();
systemInitService.putAndLoadAll();
}catch (Exception e){ }catch (Exception e){
e.printStackTrace(); e.printStackTrace();
} }

68
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/ScanMongoPackageConfiguration.java
Unescape Escape View File

@ -1,34 +1,34 @@
package cn.estsh.i3plus.core.apiservice.configuration; //package cn.estsh.i3plus.core.apiservice.configuration;
//
import cn.estsh.i3plus.platform.common.util.CommonConstWords; //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.BaseMongoRepositoryFactoryBean;
import cn.estsh.i3plus.pojo.base.jpa.factory.BaseRepositoryFactoryBean; //import cn.estsh.i3plus.pojo.base.jpa.factory.BaseRepositoryFactoryBean;
import org.slf4j.Logger; //import org.slf4j.Logger;
import org.slf4j.LoggerFactory; //import org.slf4j.LoggerFactory;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; //import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.boot.autoconfigure.domain.EntityScan; //import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.Configuration; //import org.springframework.context.annotation.Configuration;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories; //import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.data.mongodb.repository.config.EnableMongoRepositories; //import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
//
/** ///**
* @Description : 需要扫描其他包的配置文件 // * @Description : 需要扫描其他包的配置文件
* 此类专门添加需要单独加载的其他模块的包 // * 此类专门添加需要单独加载的其他模块的包
* @Reference : // * @Reference :
* @Author : alwaysfrin // * @Author : alwaysfrin
* @CreateDate : 2018-12-12 20:49 // * @CreateDate : 2018-12-12 20:49
* @Modify: // * @Modify:
**/ // **/
@Configuration //@Configuration
@ConditionalOnExpression("'${" + CommonConstWords.PROP_SWITCH_MONGO + ":false}' == 'true'") //@ConditionalOnExpression("'${" + CommonConstWords.PROP_SWITCH_MONGO + ":false}' == 'true'")
//扫描需要单独处理的持久化包 ////扫描需要单独处理的持久化包
@EnableMongoRepositories(basePackages = { //@EnableMongoRepositories(basePackages = {
"cn.estsh.i3plus.**.platrepositorymongo" // "cn.estsh.i3plus.**.platrepositorymongo"
},repositoryFactoryBeanClass = BaseMongoRepositoryFactoryBean.class) //},repositoryFactoryBeanClass = BaseMongoRepositoryFactoryBean.class)
public class ScanMongoPackageConfiguration { //public class ScanMongoPackageConfiguration {
public static final Logger LOGGER = LoggerFactory.getLogger(CommonConstWords.SYSTEM_LOG); // public static final Logger LOGGER = LoggerFactory.getLogger(CommonConstWords.SYSTEM_LOG);
//
public ScanMongoPackageConfiguration(){ // public ScanMongoPackageConfiguration(){
LOGGER.info("【扫描关联包...】"); // LOGGER.info("【扫描关联包...】");
} // }
} //}

70
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/ScanPackageConfiguration.java
Unescape Escape View File

@ -1,35 +1,35 @@
package cn.estsh.i3plus.core.apiservice.configuration; //package cn.estsh.i3plus.core.apiservice.configuration;
//
import cn.estsh.i3plus.platform.common.util.CommonConstWords; //import cn.estsh.i3plus.platform.common.util.CommonConstWords;
import cn.estsh.i3plus.pojo.base.jpa.factory.BaseRepositoryFactoryBean; //import cn.estsh.i3plus.pojo.base.jpa.factory.BaseRepositoryFactoryBean;
import org.slf4j.Logger; //import org.slf4j.Logger;
import org.slf4j.LoggerFactory; //import org.slf4j.LoggerFactory;
import org.springframework.boot.autoconfigure.domain.EntityScan; //import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.context.annotation.Configuration; //import org.springframework.context.annotation.Configuration;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories; //import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
//
/** ///**
* @Description : 需要扫描其他包的配置文件 // * @Description : 需要扫描其他包的配置文件
* 此类专门添加需要单独加载的其他模块的包 // * 此类专门添加需要单独加载的其他模块的包
* @Reference : // * @Reference :
* @Author : alwaysfrin // * @Author : alwaysfrin
* @CreateDate : 2018-12-12 20:49 // * @CreateDate : 2018-12-12 20:49
* @Modify: // * @Modify:
**/ // **/
@Configuration //@Configuration
//扫描需要单独处理的包 ////扫描需要单独处理的包
@EntityScan(basePackages = { //@EntityScan(basePackages = {
"cn.estsh.i3plus.**.platbean" // "cn.estsh.i3plus.**.platbean"
}) //})
//
//需要单独处理的其他模块包 ////需要单独处理的其他模块包
@EnableJpaRepositories(basePackages = { //@EnableJpaRepositories(basePackages = {
"cn.estsh.i3plus.**.platrepository" // "cn.estsh.i3plus.**.platrepository"
}, repositoryFactoryBeanClass = BaseRepositoryFactoryBean.class) //}, repositoryFactoryBeanClass = BaseRepositoryFactoryBean.class)
public class ScanPackageConfiguration { //public class ScanPackageConfiguration {
public static final Logger LOGGER = LoggerFactory.getLogger(CommonConstWords.SYSTEM_LOG); // public static final Logger LOGGER = LoggerFactory.getLogger(CommonConstWords.SYSTEM_LOG);
//
public ScanPackageConfiguration(){ // public ScanPackageConfiguration(){
LOGGER.info("【扫描关联包...】"); // LOGGER.info("【扫描关联包...】");
} // }
} //}

3
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java
Unescape Escape View File

@ -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.base.ISystemLoginService;
import cn.estsh.i3plus.core.api.iservice.busi.*; import cn.estsh.i3plus.core.api.iservice.busi.*;
import cn.estsh.i3plus.core.apiservice.util.SysUserPasswordUtil; 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.exception.ImppExceptionEnum;
import cn.estsh.i3plus.platform.common.tool.*; import cn.estsh.i3plus.platform.common.tool.*;
import cn.estsh.i3plus.platform.common.util.CommonConstWords; import cn.estsh.i3plus.platform.common.util.CommonConstWords;
@ -353,6 +354,8 @@ public class WhiteController extends CoreBaseController {
sysFile.setFileTypeId(dictionary.getId()); sysFile.setFileTypeId(dictionary.getId());
sysFile.setFileTypeName(dictionary.getName()); sysFile.setFileTypeName(dictionary.getName());
ConvertBean.serviceModelInitialize(sysFile,"白名单");
sysFile = sysFileService.insertSysFile(sysFile); sysFile = sysFileService.insertSysFile(sysFile);
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(sysFile); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(sysFile);
}catch(ImppBusiException busExcep){ }catch(ImppBusiException busExcep){

99
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/ImppLogController.java
Unescape Escape View File

@ -6,6 +6,7 @@ import cn.estsh.i3plus.platform.common.util.CommonConstWords;
import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
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.ResourceEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import cn.estsh.i3plus.pojo.platform.platbean.*; import cn.estsh.i3plus.pojo.platform.platbean.*;
import cn.estsh.impp.framework.base.controller.CoreBaseController; 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.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -42,110 +44,116 @@ public class ImppLogController extends CoreBaseController {
/** /**
* 系统日志分页复杂查询 * 系统日志分页复杂查询
*
* @param logSystem 查询条件 * @param logSystem 查询条件
* @param pager 分页数据 * @param pager 分页数据
* @return 处理结果 * @return 处理结果
*/ */
@GetMapping("/system/query") @GetMapping("/system/query")
@ApiOperation(value = "系统日志分页复杂查询",notes = "系统日志分页复杂查询") @ApiOperation(value = "系统日志分页复杂查询", notes = "系统日志分页复杂查询")
public ResultBean querySysLogSystemByPager(SysLogSystem logSystem, Pager pager){ public ResultBean querySysLogSystemByPager(SysLogSystem logSystem, Pager pager) {
try { try {
ListPager logSystemList = logService.queryLogSystemPager(logSystem, pager); ListPager logSystemList = logService.queryLogSystemPager(logSystem, pager);
return ResultBean.success("操作成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("操作成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){ } catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
}catch(Exception e){ } catch (Exception e) {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
} }
} }
/** /**
* 定时任务日志分页复杂查询 * 定时任务日志分页复杂查询
*
* @param sysLogTaskTime 查询日志 * @param sysLogTaskTime 查询日志
* @param pager 分页数据 * @param pager 分页数据
* @return 处理结果 * @return 处理结果
*/ */
@GetMapping("/task-time/query") @GetMapping("/task-time/query")
@ApiOperation(value = "定时任务日志分页复杂查询",notes = "定时任务日志分页复杂查询") @ApiOperation(value = "定时任务日志分页复杂查询", notes = "定时任务日志分页复杂查询")
public ResultBean querySysLogSystemByPager(SysLogTaskTime sysLogTaskTime, Pager pager){ public ResultBean querySysLogSystemByPager(SysLogTaskTime sysLogTaskTime, Pager pager) {
try { try {
ListPager logSystemList = logService.queryLogTaskTimePager(sysLogTaskTime, pager); ListPager logSystemList = logService.queryLogTaskTimePager(sysLogTaskTime, pager);
return ResultBean.success("操作成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("操作成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){ } catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
}catch(Exception e){ } catch (Exception e) {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
} }
} }
/** /**
* 操作日志复杂查询，分页，排序 * 操作日志复杂查询，分页，排序
*
* @param logOperate 操作日志 * @param logOperate 操作日志
* @param pager 分页数据 * @param pager 分页数据
* @return 处理结果 * @return 处理结果
*/ */
@GetMapping(value = "/operate/query") @GetMapping(value = "/operate/query")
@ApiOperation(value = "操作日志复杂查询，分页，排序",notes = "操作日志复杂查询，分页，排序") @ApiOperation(value = "操作日志复杂查询，分页，排序", notes = "操作日志复杂查询，分页，排序")
public ResultBean querySysLogOperateByPager(SysLogOperate logOperate, Pager pager){ public ResultBean querySysLogOperateByPager(SysLogOperate logOperate, Pager pager) {
try { try {
ListPager logSystemList = logService.queryLogOperatePager(logOperate, pager); ListPager logSystemList = logService.queryLogOperatePager(logOperate, pager);
return ResultBean.success("操作成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("操作成功").setListPager(logSystemList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){ } catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
}catch(Exception e){ } catch (Exception e) {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
} }
} }
/** /**
* 异常日志复杂查询，分页，排序 * 异常日志复杂查询，分页，排序
*
* @param sysLogException 查询条件 * @param sysLogException 查询条件
* @param pager 分页信息 * @param pager 分页信息
* @return 处理结果 * @return 处理结果
*/ */
@GetMapping(value = "/exception/query") @GetMapping(value = "/exception/query")
@ApiOperation(value = "异常日志复杂查询，分页，排序",notes = "异常日志复杂查询，分页，排序") @ApiOperation(value = "异常日志复杂查询，分页，排序", notes = "异常日志复杂查询，分页，排序")
public ResultBean querySysLogExceptionByPager(SysLogException sysLogException, Pager pager){ public ResultBean querySysLogExceptionByPager(SysLogException sysLogException, Pager pager) {
try { try {
ListPager logExceptionList = logService.queryLogExceptionPager(sysLogException, pager); ListPager logExceptionList = logService.queryLogExceptionPager(sysLogException, pager);
return ResultBean.success("查询成功").setListPager(logExceptionList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("查询成功").setListPager(logExceptionList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){ } catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
}catch(Exception e){ } catch (Exception e) {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
} }
} }
/** /**
* 异常日志复杂查询，分页，排序 * 异常日志复杂查询，分页，排序
* @param bean 查询条件 *
* @param bean 查询条件
* @param pager 分页信息 * @param pager 分页信息
* @return 处理结果 * @return 处理结果
*/ */
@GetMapping(value = "/console/query") @GetMapping(value = "/console/query")
@ApiOperation(value = "异常日志复杂查询，分页，排序",notes = "异常日志复杂查询，分页，排序") @ApiOperation(value = "异常日志复杂查询，分页，排序", notes = "异常日志复杂查询，分页，排序")
public ResultBean querySysLogConsoleByPager(SysLogConsole bean, Pager pager){ public ResultBean querySysLogConsoleByPager(SysLogConsole bean, Pager pager) {
try { try {
ListPager logExceptionList = logService.queryLogConsolePager(bean, pager); ListPager logExceptionList = logService.queryLogConsolePager(bean, pager);
return ResultBean.success("查询成功").setListPager(logExceptionList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("查询成功").setListPager(logExceptionList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){ } catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
}catch(Exception e){ } catch (Exception e) {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
} }
} }
/** /**
* 定时任务控制台日志，分页，排序 * 定时任务控制台日志，分页，排序
*
* @param bean 查询条件 * @param bean 查询条件
* @return 处理结果 * @return 处理结果
*/ */
@GetMapping(value = "/console/query-schedule") @GetMapping(value = "/console/query-schedule")
@ApiOperation(value = "定时任务控制台日志，分页，排序",notes = "定时任务控制台日志") @ApiOperation(value = "定时任务控制台日志，分页，排序", notes = "定时任务控制台日志")
public ResultBean querySchdeuleLogConsoleByPager(SysLogConsole bean){ public ResultBean querySchdeuleLogConsoleByPager(SysLogConsole bean) {
try { try {
ValidatorBean.beginValid(bean) ValidatorBean.beginValid(bean)
.notNull("logGroup",bean.getLogGroup()); .notNull("logGroup", bean.getLogGroup());
// 参数 // 参数
// 1. group = CommonConstWords.SCHEDULE_LOG:Gourp.Name // 1. group = CommonConstWords.SCHEDULE_LOG:Gourp.Name
// 2. // 2.
@ -162,11 +170,34 @@ public class ImppLogController extends CoreBaseController {
if (StringUtils.isBlank(bean.getCreateDateTimeEnd())) { if (StringUtils.isBlank(bean.getCreateDateTimeEnd())) {
bean.setCreateDateTimeEnd(TimeTool.getNowTime(true)); bean.setCreateDateTimeEnd(TimeTool.getNowTime(true));
} }
List logExceptionList = logService.findLogConsoleList(bean); // 一次100条
return ResultBean.success("查询成功").setResultList(logExceptionList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); bean.setOrderByParam("createDatetime");
}catch(ImppBusiException busExcep){ 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); return ResultBean.fail(busExcep);
}catch(Exception e){ } catch (Exception e) {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
} }
} }
@ -174,12 +205,12 @@ public class ImppLogController extends CoreBaseController {
@GetMapping(value = "/clean-log") @GetMapping(value = "/clean-log")
@ApiOperation(value = "添加操作日志", notes = "添加操作日志，可用于国际化") @ApiOperation(value = "添加操作日志", notes = "添加操作日志，可用于国际化")
public ResultBean logClean(String time) { public ResultBean logClean(String time) {
try{ try {
Date thisTime = TimeTool.parseDate(time); Date thisTime = TimeTool.parseDate(time);
String startTime = TimeTool.getToday(TimeTool.getDateBefore(thisTime, 0)) + " 00:00:00"; String startTime = TimeTool.getToday(TimeTool.getDateBefore(thisTime, 0)) + " 00:00:00";
String endTime = TimeTool.getToday(TimeTool.getDateBefore(thisTime, 0)) + " 23:59:59"; 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()); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
} catch (ImppBusiException busExcep) { } catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep).build(); return ResultBean.fail(busExcep).build();

25
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysPojoVersionController.java
Unescape Escape View File

@ -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.core.api.iservice.busi.ISysPojoVersionService;
import cn.estsh.i3plus.platform.common.util.CommonConstWords; 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.i3plus.pojo.platform.bean.SysPojoVersion;
import cn.estsh.impp.framework.base.controller.CrudBaseController; import cn.estsh.impp.framework.base.controller.CrudBaseController;
import cn.estsh.impp.framework.base.service.ICrudService; 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.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; 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.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@ -28,4 +37,20 @@ public class SysPojoVersionController extends CrudBaseController<SysPojoVersion>
public ICrudService getCrudService() { public ICrudService getCrudService() {
return pojoVersionService; return pojoVersionService;
} }
@PostMapping("/cloud-query")
@ApiOperation(value = "查询数据", notes = "复杂查询，分页，排序")
BaseResultBean<SysPojoVersion> queryPojoVersionByPagerCloud(@RequestBody CloudPagerModel<SysPojoVersion> 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);
}
}
} }

169
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/BaseMdmDataSyncQueueReceiver.java
Unescape Escape View File

@ -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<String, Class<BaseBusiSyncMdmDataService>> masterDateRefMap = new HashMap<>();
private static final HashMap<String, Class<BaseBusiSyncMdmDataService>> busiDateRefMap = new HashMap<>();
private static final HashMap<Class<BaseBusiSyncMdmDataService>, 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<BaseBusiSyncMdmDataService> 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);
}

71
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MdmDataSyncQueueReceiver.java
Unescape Escape View File

@ -1,34 +1,37 @@
//package cn.estsh.i3plus.core.apiservice.mq; package cn.estsh.i3plus.core.apiservice.mq;
//
//import cn.estsh.i3plus.core.apiservice.serviceimpl.mdm.SysToolSyncDataService; import cn.estsh.i3plus.core.apiservice.serviceimpl.mdm.SysToolSyncDataService;
//import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreBusiExtd; import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreBusiExtd;
//import com.rabbitmq.client.Channel; import cn.estsh.impp.framework.boot.mdm.mq.BaseMdmDataSyncQueueReceiver;
//import org.springframework.amqp.core.Message; import com.rabbitmq.client.Channel;
//import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.amqp.core.Message;
//import org.springframework.stereotype.Component; import org.springframework.amqp.rabbit.annotation.RabbitListener;
// import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
//import static cn.estsh.i3plus.platform.common.util.MdmConstWords.QUEUE_MDM_SYNC_DATA_CORE; import org.springframework.context.annotation.Configuration;
//
///** import static cn.estsh.i3plus.platform.common.util.MdmConstWords.QUEUE_MDM_SYNC_DATA_CORE;
// * @Description :
// * @Reference : /**
// * @Author : yunhao * @Description :
// * @CreateDate : 2020-05-28 16:54 * @Reference :
// * @Modify: * @Author : yunhao
// **/ * @CreateDate : 2020-05-28 16:54
//@Component * @Modify:
//public class MdmDataSyncQueueReceiver extends BaseMdmDataSyncQueueReceiver { **/
// @ConditionalOnExpression("'${impp.mq.queue.mdm.sync:true}' == 'true'")
// /** @Configuration
// * 初始化类关系 public class MdmDataSyncQueueReceiver extends BaseMdmDataSyncQueueReceiver {
// */
// public MdmDataSyncQueueReceiver() { /**
// putMdmDataRef(SysToolSyncDataService.class, MdmGearCoreBusiExtd.mdmMasterClass, MdmGearCoreBusiExtd.class); * 初始化类关系
// } */
// public MdmDataSyncQueueReceiver() {
// @Override putMdmDataRef(SysToolSyncDataService.class, MdmGearCoreBusiExtd.mdmMasterClass, MdmGearCoreBusiExtd.class);
// @RabbitListener(queues = QUEUE_MDM_SYNC_DATA_CORE) }
// public void syncMasterData(String syncDataStr, Channel channel, Message message) {
// processSyncMasterData(syncDataStr, channel, message); @Override
// } @RabbitListener(queues = QUEUE_MDM_SYNC_DATA_CORE)
//} public void syncMasterData(String syncDataStr, Channel channel, Message message) {
processSyncMasterData(syncDataStr, channel, message);
}
}

7
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageLetterQueueReceiver.java
Unescape Escape View File

@ -25,7 +25,8 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.stereotype.Component; import org.springframework.context.annotation.Configuration;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -37,8 +38,8 @@ import java.util.List;
* @CreateDate : 2018-11-15 22:35 * @CreateDate : 2018-11-15 22:35
* @Modify: * @Modify:
**/ **/
@ConditionalOnExpression("'${impp.mq.queue.letter}' == 'true'") @ConditionalOnExpression("'${impp.mq.queue.letter:true}' == 'true'")
@Component @Configuration
public class MessageLetterQueueReceiver { public class MessageLetterQueueReceiver {
private static final Logger LOGGER = LoggerFactory.getLogger(MessageLetterQueueReceiver.class); private static final Logger LOGGER = LoggerFactory.getLogger(MessageLetterQueueReceiver.class);

7
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java
Unescape Escape View File

@ -21,7 +21,8 @@ import org.springframework.amqp.core.Message;
import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.stereotype.Component; import org.springframework.context.annotation.Configuration;
import java.io.IOException; import java.io.IOException;
/** /**
@ -31,8 +32,8 @@ import java.io.IOException;
* @CreateDate : 2018-11-15 22:15 * @CreateDate : 2018-11-15 22:15
* @Modify: * @Modify:
**/ **/
@ConditionalOnExpression("'${impp.mq.queue.mail}' == 'true'") @ConditionalOnExpression("'${impp.mq.queue.mail:true}' == 'true'")
@Component @Configuration
public class MessageMailQueueReceiver { public class MessageMailQueueReceiver {
private static final Logger LOGGER = LoggerFactory.getLogger(MessageMailQueueReceiver.class); private static final Logger LOGGER = LoggerFactory.getLogger(MessageMailQueueReceiver.class);

6
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageSWebNoticeQueueReceiver.java
Unescape Escape View File

@ -24,7 +24,7 @@ import org.springframework.amqp.core.Message;
import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.stereotype.Component; import org.springframework.context.annotation.Configuration;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
@ -37,8 +37,8 @@ import java.util.List;
* @CreateDate : 2018-11-15 22:15 * @CreateDate : 2018-11-15 22:15
* @Modify: * @Modify:
**/ **/
@ConditionalOnExpression("'${impp.mq.queue.sweb.notice}' == 'true'") @ConditionalOnExpression("'${impp.mq.queue.sweb.notice:true}' == 'true'")
@Component @Configuration
public class MessageSWebNoticeQueueReceiver { public class MessageSWebNoticeQueueReceiver {
private static final Logger LOGGER = LoggerFactory.getLogger(MessageSWebNoticeQueueReceiver.class); private static final Logger LOGGER = LoggerFactory.getLogger(MessageSWebNoticeQueueReceiver.class);

4
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/PojoVersionQueueReceiver.java
Unescape Escape View File

@ -42,8 +42,8 @@ import static cn.estsh.i3plus.platform.common.util.PlatformConstWords.QUEUE_IMPP
* @CreateDate : 20-4-26 下午2:32 * @CreateDate : 20-4-26 下午2:32
* @Modify: * @Modify:
**/ **/
@Component @ConditionalOnExpression("'${impp.mq.queue.pojo.version:true}' == 'true'")
@ConditionalOnExpression("'${impp.mq.queue.letter}' == 'true'") @Configuration
public class PojoVersionQueueReceiver { public class PojoVersionQueueReceiver {
private static final Logger LOGGER = LoggerFactory.getLogger(PojoVersionQueueReceiver.class); private static final Logger LOGGER = LoggerFactory.getLogger(PojoVersionQueueReceiver.class);

6
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java
Unescape Escape View File

@ -23,7 +23,7 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.stereotype.Component; import org.springframework.context.annotation.Configuration;
import java.io.IOException; import java.io.IOException;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -35,8 +35,8 @@ import java.util.stream.Collectors;
* @CreateDate : 2018-12-20 21:56 * @CreateDate : 2018-12-20 21:56
* @Modify: * @Modify:
**/ **/
@ConditionalOnExpression("'${impp.mq.queue.schedule}' == 'true'") @ConditionalOnExpression("'${impp.mq.queue.schedule:true}' == 'true'")
@Component @Configuration
public class ScheduleQueueReceiver { public class ScheduleQueueReceiver {
private static final Logger LOGGER = LoggerFactory.getLogger(ScheduleQueueReceiver.class); private static final Logger LOGGER = LoggerFactory.getLogger(ScheduleQueueReceiver.class);

6
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/SysLocalResourceQueue.java
Unescape Escape View File

@ -12,7 +12,8 @@ import org.slf4j.LoggerFactory;
import org.springframework.amqp.core.Message; import org.springframework.amqp.core.Message;
import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.amqp.rabbit.annotation.RabbitListener;
import org.springframework.beans.factory.annotation.Autowired; 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.io.IOException;
import java.util.Map; 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 * @CreateDate : 19-8-23 下午3:12
* @Modify: * @Modify:
**/ **/
@Component @ConditionalOnExpression("'${impp.mq.queue.resource:true}' == 'true'")
@Configuration
public class SysLocalResourceQueue { public class SysLocalResourceQueue {
private static final Logger LOGGER = LoggerFactory.getLogger(SysLocalResourceQueue.class); private static final Logger LOGGER = LoggerFactory.getLogger(SysLocalResourceQueue.class);

139
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/BaseBusiSyncMdmDataService.java
Unescape Escape View File

@ -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<T, M extends BaseMdmBusiModelBean> {
private IBaseMdmBusiExtdCloud baseMdmBusiExtdCloud;
private IBaseMdmBusiModelCloud<M> baseMdmBusiModelCloud;
public BaseBusiSyncMdmDataService(IBaseMdmBusiExtdCloud baseMdmBusiExtdCloud, IBaseMdmBusiModelCloud<M> 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<M> 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<M> 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<M> 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<M> modelBeanList = baseResultBean.getResultList();
insertBusiList(transform(modelBeanList));
}
/**
* 业务数据修改同步
* @param syncData
*/
public void busiUpdateSync(MdmSyncData syncData){
BaseResultBean<M> 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<M> modelBeanList = baseResultBean.getResultList();
updateBusiList(transform(modelBeanList));
}
/**
* 业务数据删除同步
* @param syncData
*/
public void busiDeleteSync(MdmSyncData syncData){
deleteBusiList(syncData.getSyncDataId());
}
/**
* 类型转换
* @param syncDataList
* @return
*/
public abstract List<T> transform(List<M> syncDataList);
/**
* 新增业务数据
* @param beanList
*/
public abstract void insertBusiList(List<T> beanList);
/**
* 修改业务数据
* @param beanList
*/
public abstract void updateBusiList(List<T> beanList);
/**
* 删除业务数据
* @param idList
*/
public abstract void deleteBusiList(List<Long> idList);
}

8
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java
Unescape Escape View File

@ -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.CommonConstWords;
import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
import cn.estsh.i3plus.platform.plugin.elasticsearch.ElasticSearchTool; 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.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;
@ -78,6 +77,8 @@ public class SystemInitService implements ISystemInitService {
@Override @Override
@ApiOperation(value = "初始化加载所有数据",notes = "初始化加载所有数据") @ApiOperation(value = "初始化加载所有数据",notes = "初始化加载所有数据")
public void putAndLoadAll() { public void putAndLoadAll() {
try {
type = ImppEnumUtil.SYS_CACHE_TYPE.REDIS.getValue(); type = ImppEnumUtil.SYS_CACHE_TYPE.REDIS.getValue();
LOGGER.info("加载 SysConfig 信息"); LOGGER.info("加载 SysConfig 信息");
@ -99,8 +100,9 @@ public class SystemInitService implements ISystemInitService {
LOGGER.info("加载 对象版本控制信息"); LOGGER.info("加载 对象版本控制信息");
reloadPojoVersionPlan(); reloadPojoVersionPlan();
LOGGER.info("加载 对象版本控制信息 信息完成"); LOGGER.info("加载 对象版本控制信息 信息完成");
}catch (Exception e){
e.printStackTrace();
}
} }
@Override @Override

27
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysToolService.java
Unescape Escape View File

@ -1,7 +1,7 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
import cn.estsh.i3plus.core.api.iservice.busi.ISysToolService; 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.bean.ListPager;
import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.common.PagerHelper; 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.repository.SysToolTypeRepository;
import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
import cn.estsh.impp.framework.boot.util.ValidatorBean; import cn.estsh.impp.framework.boot.util.ValidatorBean;
import com.alibaba.fastjson.JSON;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -82,24 +81,12 @@ public class SysToolService implements ISysToolService {
@Override @Override
@ApiOperation(value = "更新硬件信息") @ApiOperation(value = "更新硬件信息")
public void updateSysTool(SysTool tool) { public void updateSysTool(SysTool tool) {
// 查询硬件类型名称 SysTool orginTool = toolRDao.getById(tool.getId());
LOGGER.info("硬件类型 TOOL_TYPE :{}", tool); if(orginTool == null){
SysToolType toolType = toolTypeRDao.getById(tool.getToolTypeId()); orginTool = tool;
ValidatorBean.checkNotNull(toolType); }
BeanCopyTool.beanCopy(tool,orginTool);
SysTool newSysTool = toolRDao.getById(tool.getId()); toolRDao.update(orginTool);
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);
} }
@Override @Override

13
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/mdm/SysToolSyncDataService.java
Unescape Escape View File

@ -1,11 +1,12 @@
package cn.estsh.i3plus.core.apiservice.serviceimpl.mdm; package cn.estsh.i3plus.core.apiservice.serviceimpl.mdm;
import cn.estsh.i3plus.core.api.iservice.busi.ISysToolService; import cn.estsh.i3plus.core.api.iservice.busi.ISysToolService;
import cn.estsh.i3plus.core.apiservice.serviceimpl.base.BaseBusiSyncMdmDataService; import cn.estsh.i3plus.platform.common.convert.ConvertBean;
import cn.estsh.i3plus.icloud.mdm.sdk.base.IBaseMdmBusiExtdCloud;
import cn.estsh.i3plus.icloud.mdm.sdk.base.IBaseMdmBusiModelCloud;
import cn.estsh.i3plus.pojo.mdm.model.core.MdmGearCoreBusiModel; import cn.estsh.i3plus.pojo.mdm.model.core.MdmGearCoreBusiModel;
import cn.estsh.i3plus.pojo.platform.bean.SysTool; 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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -31,13 +32,15 @@ public class SysToolSyncDataService extends BaseBusiSyncMdmDataService<SysTool,
} }
@Override @Override
public List<SysTool> transform(List<MdmGearCoreBusiModel> syncDataList) { public List<SysTool> transform(List<MdmGearCoreBusiModel> syncDataList,String userName) {
return syncDataList.stream().map(gearCoreBusiModel -> { return syncDataList.stream().map(gearCoreBusiModel -> {
SysTool sysTool = new SysTool(); SysTool sysTool = new SysTool();
if (gearCoreBusiModel != null && gearCoreBusiModel.getBusi() != null && gearCoreBusiModel.getMaster() != null) { if (gearCoreBusiModel != null && gearCoreBusiModel.getBusi() != null && gearCoreBusiModel.getMaster() != null) {
sysTool.setId(gearCoreBusiModel.getBusi().getId());
sysTool.setName(gearCoreBusiModel.getMaster().getName()); sysTool.setName(gearCoreBusiModel.getMaster().getName());
sysTool.setToolIp(gearCoreBusiModel.getMaster().getGearModel()); sysTool.setToolIp(gearCoreBusiModel.getMaster().getGearModel());
sysTool.setToolDescription(gearCoreBusiModel.getBusi().getCoreNum()); sysTool.setToolDescription(gearCoreBusiModel.getBusi().getCoreNum());
ConvertBean.serviceModelInitialize(sysTool,userName);
} }
return sysTool; return sysTool;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
@ -58,7 +61,7 @@ public class SysToolSyncDataService extends BaseBusiSyncMdmDataService<SysTool,
} }
@Override @Override
public void deleteBusiList(List<Long> id) { public void deleteBusiList(List<Long> id,String userName) {
sysToolService.deleteSysToolByIds(id.toArray(new Long[id.size()])); sysToolService.deleteSysToolByIds(id.toArray(new Long[id.size()]));
} }
} }

1
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/NoSqlPack.java
Unescape Escape View File

@ -177,6 +177,7 @@ public class NoSqlPack {
public static ElasticSearchPack packEsSysLogConsole(SysLogConsole bean) { public static ElasticSearchPack packEsSysLogConsole(SysLogConsole bean) {
ElasticSearchPack result = packElasticSearchPack(bean); ElasticSearchPack result = packElasticSearchPack(bean);
result.andNumberBigger("id",bean.getId());
result.andNumberEquals("softType",bean.getSoftType()); result.andNumberEquals("softType",bean.getSoftType());
result.andNumberEquals("requestId",bean.getRequestId()); result.andNumberEquals("requestId",bean.getRequestId());
result.andStringLeftLike("logHost",bean.getLogHost()); result.andStringLeftLike("logHost",bean.getLogHost());

Write Preview
Loading…
Cancel
Save