合并代码
Merge remote-tracking branch 'remotes/origin/dev' into test # Conflicts: # modules/i3plus-ics-gateway/src/main/resources/application-docker.propertiesyun-zuoyi
wei.peng
5 years ago
commit
94e62a1aa2
@ -1,31 +0,0 @@
|
||||
//package cn.estsh.i3plus.core.api.iservice.busi;
|
||||
//
|
||||
//import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||
//import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
//import cn.estsh.i3plus.pojo.platform.platbean.SysLogException;
|
||||
//import io.swagger.annotations.ApiOperation;
|
||||
//
|
||||
///**
|
||||
// * @Description : 异常日志服务接口
|
||||
// * @Reference :
|
||||
// * @Author : yunhao
|
||||
// * @CreateDate : 2018-11-19 17:28
|
||||
// * @Modify:
|
||||
// **/
|
||||
//public interface ISysLogExceptionService {
|
||||
//
|
||||
// /**
|
||||
// * 系统异常日志复杂查询，分页，排序
|
||||
// * @param sysLogException
|
||||
// * @param pager
|
||||
// * @return
|
||||
// */
|
||||
// @ApiOperation(value = "系统异常日志复杂查询，分页，排序")
|
||||
// ListPager<SysLogException> querySysLogExceptionByPager(SysLogException sysLogException, Pager pager);
|
||||
//
|
||||
// /**
|
||||
// * 删除指定日期之后的日志
|
||||
// * @param dateTime 日期
|
||||
// */
|
||||
// long deleteSysLogExceptionByDateTimeAfter(String dateTime);
|
||||
//}
|
||||
@ -1,90 +0,0 @@
|
||||
//package cn.estsh.i3plus.core.api.iservice.busi;
|
||||
//
|
||||
//import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||
//import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
//import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate;
|
||||
//import io.swagger.annotations.ApiOperation;
|
||||
//
|
||||
//import java.util.List;
|
||||
//
|
||||
///**
|
||||
// * @Description : 操作日志服务接口
|
||||
// * @Reference :
|
||||
// * @Author : yunhao
|
||||
// * @Date : 2018-10-25 13:49
|
||||
// * @Modify :
|
||||
// **/
|
||||
//public interface ISysLogOperateService {
|
||||
//
|
||||
// /**
|
||||
// * 添加操作日志
|
||||
// * @param logOperate
|
||||
// * @return
|
||||
// */
|
||||
// @ApiOperation(value = "添加操作日志",notes = "添加操作日志")
|
||||
// SysLogOperate insertSysLogOperate(SysLogOperate logOperate);
|
||||
//
|
||||
// /**
|
||||
// * 根据id删除日志
|
||||
// * @param id
|
||||
// */
|
||||
// @ApiOperation(value = "根据id删除日志",notes = "根据id删除日志")
|
||||
// void deleteSysLogOperateById(Long id);
|
||||
//
|
||||
// /**
|
||||
// * 查询全部操作日志
|
||||
// * @return
|
||||
// */
|
||||
// @ApiOperation(value = "查询全部操作日志",notes = "查询全部操作日志")
|
||||
// List listSysLogOperate();
|
||||
//
|
||||
// /**
|
||||
// * 批量删除日志
|
||||
// * @param ids
|
||||
// */
|
||||
// @ApiOperation(value = "批量删除日志",notes = "批量删除日志")
|
||||
// void deleteSysLogOperateByIds(Long[] ids);
|
||||
//
|
||||
// /**
|
||||
// * 根据id查询操作日志
|
||||
// * @param id
|
||||
// * @return
|
||||
// */
|
||||
// @ApiOperation(value = "根据id查询操作日志",notes = "根据id查询操作日志")
|
||||
// SysLogOperate getSysLogOperateById(Long id);
|
||||
//
|
||||
// /**
|
||||
// * 根据操作人姓名模糊查询日志
|
||||
// * @param operateUserName
|
||||
// * @return
|
||||
// */
|
||||
// @ApiOperation(value = "根据操作人姓名模糊查询日志",notes = "根据操作人姓名模糊查询日志")
|
||||
// List<SysLogOperate> listSysLogOperateByOperateUserName(String operateUserName);
|
||||
//
|
||||
// //查询所有日志数量
|
||||
// @ApiOperation(value = "查询所有日志数量")
|
||||
// long countAllSysLogOperate();
|
||||
//
|
||||
// /**
|
||||
// * 操作日志复杂查询，分页，排序
|
||||
// * @param logOperate
|
||||
// * @param pager
|
||||
// * @return
|
||||
// */
|
||||
// @ApiOperation(value = "操作日志复杂查询，分页，排序",notes = "操作日志复杂查询，分页，排序")
|
||||
// ListPager<SysLogOperate> querySysLogOperateByPager(SysLogOperate logOperate, Pager pager);
|
||||
//
|
||||
// /**
|
||||
// * 查询最新的操作日志
|
||||
// * @param num
|
||||
// * @return
|
||||
// */
|
||||
// @ApiOperation(value = "查询最新的操作日志")
|
||||
// List<SysLogOperate> findNewSysLogOperate(Integer num);
|
||||
//
|
||||
// /**
|
||||
// * 删除指定日期之后的日志
|
||||
// * @param dateTime 日期
|
||||
// */
|
||||
// long deleteSysLogOperateByDateTimeAfter(String dateTime);
|
||||
//}
|
||||
@ -1,54 +0,0 @@
|
||||
//package cn.estsh.i3plus.core.api.iservice.busi;
|
||||
//
|
||||
//import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||
//import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
//import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem;
|
||||
//import io.swagger.annotations.ApiOperation;
|
||||
//
|
||||
//import java.util.List;
|
||||
//
|
||||
///**
|
||||
// * @Description : 系统日志服务接口
|
||||
// * @Reference :
|
||||
// * @Author : yunhao
|
||||
// * @Date : 2018-10-25 10:36
|
||||
// * @Modify :
|
||||
// **/
|
||||
//public interface ISysLogSystemService {
|
||||
//
|
||||
// @ApiOperation(value = "添加系统日志",notes = "添加系统日志")
|
||||
// void insertSysLogSystem(SysLogSystem logSystem);
|
||||
//
|
||||
// @ApiOperation(value = "造数据系统日志",notes = "造数据")
|
||||
// void insertSysLogBatch(int num,int waitTime);
|
||||
//
|
||||
// @ApiOperation(value = "删除日志",notes = "删除日志")
|
||||
// long deleteSysLogSystemById(Long id);
|
||||
//
|
||||
// @ApiOperation(value = "查询全部日志",notes = "查询全部日志")
|
||||
// List<SysLogSystem> listSysLogSystem();
|
||||
//
|
||||
// @ApiOperation(value = "根据id查询系统日志",notes = "根据id查询系统日志")
|
||||
// SysLogSystem getSysLogSystemById(long id);
|
||||
//
|
||||
// @ApiOperation(value = "系统日志分页复杂查询",notes = "系统日志分页复杂查询")
|
||||
// ListPager querySysLogSystemByPager(SysLogSystem logSystem, Pager pager);
|
||||
//
|
||||
// @ApiOperation(value = "系统日志批量删除",notes = "系统日志批量删除")
|
||||
// long deleteSysLogSystemByIds(Long[] ids);
|
||||
//
|
||||
// /**
|
||||
// * 压力测试
|
||||
// * @param min
|
||||
// * @param max
|
||||
// * @return
|
||||
// */
|
||||
// @ApiOperation(value = "系统日志按id区间查询",notes = "系统日志按id区间查询")
|
||||
// List<SysLogSystem> findSysLogSystemByIdInterval(long min, long max);
|
||||
//
|
||||
// /**
|
||||
// * 删除指定日期之后的日志
|
||||
// * @param dateTime 日期
|
||||
// */
|
||||
// long deleteSysLogSystemByDateTimeAfter(String dateTime);
|
||||
//}
|
||||
@ -1,53 +0,0 @@
|
||||
//package cn.estsh.i3plus.core.api.iservice.busi;
|
||||
//
|
||||
//import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||
//import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
//import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
|
||||
//import io.swagger.annotations.ApiOperation;
|
||||
//
|
||||
///**
|
||||
// * @Description : 定时任务日志服务接口
|
||||
// * @Reference :
|
||||
// * @Author : yunhao
|
||||
// * @CreateDate : 2019-01-04 15:06
|
||||
// * @Modify:
|
||||
// **/
|
||||
//public interface ISysLogTaskTimeService {
|
||||
//
|
||||
// /**
|
||||
// * 添加定时任务日志
|
||||
// * @param sysLogTaskTime
|
||||
// */
|
||||
// @ApiOperation(value = "添加定时任务日志",notes = "添加定时任务日志")
|
||||
// void insertSysLogTaskTime(SysLogTaskTime sysLogTaskTime);
|
||||
//
|
||||
// /**
|
||||
// * 根据id删除定时任务日志
|
||||
// * @param id
|
||||
// */
|
||||
// @ApiOperation(value = "删除定时任务日志",notes = "删除定时任务日志")
|
||||
// void deleteSysLogTaskTimeById(Long id);
|
||||
//
|
||||
// /**
|
||||
// * 根据id查询定时任务日志
|
||||
// * @param id
|
||||
// * @return
|
||||
// */
|
||||
// @ApiOperation(value = "根据id查询定时任务日志",notes = "根据id查询定时任务日志")
|
||||
// SysLogTaskTime getSysLogTaskTimeById(Long id);
|
||||
//
|
||||
// /**
|
||||
// * 定时任务日志复杂查询
|
||||
// * @param sysLogTaskTime
|
||||
// * @param pager
|
||||
// * @return
|
||||
// */
|
||||
// @ApiOperation(value = "定时任务日志分页复杂查询",notes = "定时任务日志分页复杂查询")
|
||||
// ListPager querySysLogTaskTimeByPager(SysLogTaskTime sysLogTaskTime, Pager pager);
|
||||
//
|
||||
// /**
|
||||
// * 删除指定日期之后的日志
|
||||
// * @param dateTime 日期
|
||||
// */
|
||||
// long deleteSysLogTaskTimeByDateTimeAfter(String dateTime);
|
||||
//}
|
||||
@ -0,0 +1,14 @@
|
||||
package cn.estsh.i3plus.core.api.iservice.busi;
|
||||
|
||||
import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersionDetail;
|
||||
import cn.estsh.impp.framework.base.service.ICrudService;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 20-4-21 下午2:21
|
||||
* @Modify:
|
||||
**/
|
||||
public interface ISysPojoVersionDetailService extends ICrudService<SysPojoVersionDetail> {
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package cn.estsh.i3plus.core.api.iservice.busi;
|
||||
|
||||
import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersionPlan;
|
||||
import cn.estsh.impp.framework.base.service.ICrudService;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 20-4-21 下午2:21
|
||||
* @Modify:
|
||||
**/
|
||||
public interface ISysPojoVersionPlanService extends ICrudService<SysPojoVersionPlan> {
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package cn.estsh.i3plus.core.api.iservice.busi;
|
||||
|
||||
import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersion;
|
||||
import cn.estsh.impp.framework.base.service.ICrudService;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 20-4-21 下午2:21
|
||||
* @Modify:
|
||||
**/
|
||||
public interface ISysPojoVersionService extends ICrudService<SysPojoVersion> {
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
//package cn.estsh.i3plus.core.api.iservice.busi;
|
||||
//
|
||||
//import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
|
||||
//import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||
//import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
//import cn.estsh.i3plus.pojo.platform.bean.SysUser;
|
||||
//import io.swagger.annotations.ApiOperation;
|
||||
//
|
||||
//import javax.transaction.Transactional;
|
||||
//import java.util.List;
|
||||
//
|
||||
///**
|
||||
// * @Description :
|
||||
// * @Reference :
|
||||
// * @Author : yunhao
|
||||
// * @CreateDate : 2019-02-20 21:23
|
||||
// * @Modify:
|
||||
// **/
|
||||
//public interface ITestService {
|
||||
//
|
||||
// @ApiOperation(value = "多表查询")
|
||||
// List<Object> queryToolAndToolType(Pager pager);
|
||||
//
|
||||
// @ApiOperation(value = "条件查询")
|
||||
// public ListPager<SysUser> querySysUserByPager(SysUser user, Pager pager);
|
||||
//
|
||||
// @ApiOperation(value = "in条件封装查询")
|
||||
// List<SysUser> querySysUserByPack(DdlPackBean packBean);
|
||||
//
|
||||
// @ApiOperation(value = "添加用户")
|
||||
// void insertSysUser(SysUser sysUser);
|
||||
//
|
||||
// @ApiOperation(value = "修改用户")
|
||||
// void updateSysUser(SysUser sysUser);
|
||||
//
|
||||
// @ApiOperation(value = "查询用户")
|
||||
// List<SysUser> listSysUser();
|
||||
//
|
||||
// @ApiOperation(value = "读写分离测试写")
|
||||
// @Transactional
|
||||
// void write();
|
||||
//}
|
||||
@ -0,0 +1,31 @@
|
||||
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.platform.bean.SysPojoVersion;
|
||||
import cn.estsh.impp.framework.base.controller.CrudBaseController;
|
||||
import cn.estsh.impp.framework.base.service.ICrudService;
|
||||
import io.swagger.annotations.Api;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 20-4-21 下午2:56
|
||||
* @Modify:
|
||||
**/
|
||||
@RestController
|
||||
@Api(tags = "报表服务")
|
||||
@RequestMapping(CommonConstWords.BASE_URL_CORE+"/pojo-version")
|
||||
public class SysPojoVersionController extends CrudBaseController<SysPojoVersion> {
|
||||
@Autowired
|
||||
private ISysPojoVersionService pojoVersionService;
|
||||
|
||||
@Override
|
||||
public ICrudService getCrudService() {
|
||||
return pojoVersionService;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,33 @@
|
||||
package cn.estsh.i3plus.core.apiservice.controller.busi;
|
||||
|
||||
import cn.estsh.i3plus.core.api.iservice.busi.ISysPojoVersionDetailService;
|
||||
import cn.estsh.i3plus.core.api.iservice.busi.ISysPojoVersionService;
|
||||
import cn.estsh.i3plus.platform.common.util.CommonConstWords;
|
||||
import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersion;
|
||||
import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersionDetail;
|
||||
import cn.estsh.impp.framework.base.controller.CrudBaseController;
|
||||
import cn.estsh.impp.framework.base.service.ICrudService;
|
||||
import io.swagger.annotations.Api;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 20-4-21 下午2:56
|
||||
* @Modify:
|
||||
**/
|
||||
@RestController
|
||||
@Api(tags = "报表服务")
|
||||
@RequestMapping(CommonConstWords.BASE_URL_CORE+"/pojo-version-detail")
|
||||
public class SysPojoVersionDetailController extends CrudBaseController<SysPojoVersionDetail> {
|
||||
@Autowired
|
||||
private ISysPojoVersionDetailService pojoVersionService;
|
||||
|
||||
@Override
|
||||
public ICrudService getCrudService() {
|
||||
return pojoVersionService;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,31 @@
|
||||
package cn.estsh.i3plus.core.apiservice.controller.busi;
|
||||
|
||||
import cn.estsh.i3plus.core.api.iservice.busi.ISysPojoVersionPlanService;
|
||||
import cn.estsh.i3plus.platform.common.util.CommonConstWords;
|
||||
import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersionPlan;
|
||||
import cn.estsh.impp.framework.base.controller.CrudBaseController;
|
||||
import cn.estsh.impp.framework.base.service.ICrudService;
|
||||
import io.swagger.annotations.Api;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 20-4-21 下午2:56
|
||||
* @Modify:
|
||||
**/
|
||||
@RestController
|
||||
@Api(tags = "报表服务")
|
||||
@RequestMapping(CommonConstWords.BASE_URL_CORE+"/pojo-version-plan")
|
||||
public class SysPojoVersionPlanDetailController extends CrudBaseController<SysPojoVersionPlan> {
|
||||
@Autowired
|
||||
private ISysPojoVersionPlanService pojoVersionService;
|
||||
|
||||
@Override
|
||||
public ICrudService getCrudService() {
|
||||
return pojoVersionService;
|
||||
}
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
package cn.estsh.i3plus.core.apiservice.controller.report;
|
||||
package cn.estsh.i3plus.core.apiservice.controller.cloud;
|
||||
|
||||
import cn.estsh.i3plus.core.api.iservice.base.IReportService;
|
||||
import cn.estsh.i3plus.core.api.iservice.busi.ISysRoleService;
|
||||
@ -1,7 +1,6 @@
|
||||
package cn.estsh.i3plus.core.apiservice.controller.report;
|
||||
package cn.estsh.i3plus.core.apiservice.controller.cloud;
|
||||
|
||||
import cn.estsh.i3plus.core.api.iservice.base.IReportService;
|
||||
import cn.estsh.i3plus.icloud.core.sdk.ICoreReportPojoCloud;
|
||||
import cn.estsh.i3plus.platform.common.tool.ClassTool;
|
||||
import cn.estsh.i3plus.platform.common.util.CommonConstWords;
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseResultBean;
|
||||
@ -1,4 +1,4 @@
|
||||
package cn.estsh.i3plus.core.apiservice.controller.message;
|
||||
package cn.estsh.i3plus.core.apiservice.controller.cloud;
|
||||
|
||||
import cn.estsh.i3plus.core.apiservice.controller.base.BaseMessageController;
|
||||
import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
|
||||
@ -1,4 +1,4 @@
|
||||
package cn.estsh.i3plus.core.apiservice.controller.message;
|
||||
package cn.estsh.i3plus.core.apiservice.controller.cloud;
|
||||
|
||||
import cn.estsh.i3plus.core.apiservice.controller.base.BaseMessageController;
|
||||
import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
|
||||
@ -0,0 +1,41 @@
|
||||
package cn.estsh.i3plus.core.apiservice.controller.cloud;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseResultBean;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
|
||||
import cn.estsh.i3plus.pojo.model.softswitch.SuitImppCloudModel;
|
||||
import cn.estsh.impp.framework.base.controller.CoreBaseController;
|
||||
import cn.estsh.impp.framework.boot.util.ResultBean;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* 微服务白名单调用接口
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 20-4-18 上午10:41
|
||||
* @Modify:
|
||||
**/
|
||||
@RestController
|
||||
@Api(tags = "Cloud 白名单服务")
|
||||
@RequestMapping("/impp/white/cloud")
|
||||
public class WhiteCloudController extends CoreBaseController {
|
||||
private static final Logger LOGGER = LoggerFactory.getLogger(WhiteCloudController.class);
|
||||
|
||||
|
||||
@PostMapping(value = "/softwitch/result")
|
||||
@ApiOperation(value = "数据源列表", notes = "获取服务的数据源列表")
|
||||
public BaseResultBean softwitchResult(@RequestBody SuitImppCloudModel model) {
|
||||
LOGGER.info("Cloud Message : {}", model);
|
||||
return ResultBean.success("操作成功")
|
||||
.setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
|
||||
.setMsg("这是 Core 返回的一段数据 -> " + System.currentTimeMillis());
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,52 +0,0 @@
|
||||
//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
|
||||
//
|
||||
//import cn.estsh.i3plus.core.api.iservice.busi.ISysLogExceptionService;
|
||||
//import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||
//import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
//import cn.estsh.i3plus.pojo.base.common.PagerHelper;
|
||||
//import cn.estsh.i3plus.pojo.platform.platbean.SysLogException;
|
||||
//import cn.estsh.i3plus.pojo.platform.platrepositorymongo.SysLogExceptionRepository;
|
||||
//import cn.estsh.i3plus.pojo.platform.sqlpack.CoreBsonPack;
|
||||
//import io.swagger.annotations.ApiOperation;
|
||||
//import org.bson.conversions.Bson;
|
||||
//import org.slf4j.Logger;
|
||||
//import org.slf4j.LoggerFactory;
|
||||
//import org.springframework.beans.factory.annotation.Autowired;
|
||||
//import org.springframework.stereotype.Service;
|
||||
//
|
||||
///**
|
||||
// * @Description :异常日志服务接口实现
|
||||
// * @Reference :
|
||||
// * @Author : yunhao
|
||||
// * @CreateDate : 2018-11-19 17:30
|
||||
// * @Modify:
|
||||
// **/
|
||||
//@Service
|
||||
//public class SysLogExceptionService implements ISysLogExceptionService {
|
||||
// public static final Logger LOGGER = LoggerFactory.getLogger(SysLogExceptionService.class);
|
||||
//
|
||||
//// @Autowired
|
||||
//// private SysLogExceptionRepository sysLogExceptionRDao;
|
||||
//
|
||||
// @Override
|
||||
// @ApiOperation(value = "系统异常日志复杂查询，分页，排序")
|
||||
// public ListPager<SysLogException> querySysLogExceptionByPager(SysLogException sysLogException, Pager pager) {
|
||||
//// if(sysLogException == null) {
|
||||
//// pager = PagerHelper.getPager(pager, (int) sysLogExceptionRDao.count());
|
||||
//// return new ListPager(sysLogExceptionRDao.findAll(),pager);
|
||||
//// }else{
|
||||
//// Bson bson = CoreBsonPack.packMongoBySysLogException(sysLogException);
|
||||
//// pager = PagerHelper.getPager(pager,sysLogExceptionRDao.findByBsonCount(bson));
|
||||
//// //分页，排序
|
||||
//// return new ListPager(sysLogExceptionRDao.findByBsonPager(bson,pager,sysLogException.getOrderByParam()
|
||||
//// ,sysLogException.getAscOrDesc()),pager);
|
||||
//// }
|
||||
// return null;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public long deleteSysLogExceptionByDateTimeAfter(String dateTime) {
|
||||
//// return sysLogExceptionRDao.deleteByProperty(CoreBsonPack.packBsonByDateTimeAfter(dateTime));
|
||||
// return 0;
|
||||
// }
|
||||
//}
|
||||
@ -1,115 +0,0 @@
|
||||
//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
|
||||
//
|
||||
//import cn.estsh.i3plus.core.api.iservice.busi.ISysLogOperateService;
|
||||
//import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||
//import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
//import cn.estsh.i3plus.pojo.base.common.PagerHelper;
|
||||
//import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
//import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate;
|
||||
//import cn.estsh.i3plus.pojo.platform.platrepositorymongo.SysLogOperateRepository;
|
||||
//import cn.estsh.i3plus.pojo.platform.sqlpack.CoreBsonPack;
|
||||
//import io.swagger.annotations.ApiOperation;
|
||||
//import org.bson.conversions.Bson;
|
||||
//import org.slf4j.Logger;
|
||||
//import org.slf4j.LoggerFactory;
|
||||
//import org.springframework.beans.factory.annotation.Autowired;
|
||||
//import org.springframework.stereotype.Service;
|
||||
//
|
||||
//import java.util.List;
|
||||
//
|
||||
///**
|
||||
// * @Description : 操作日志服务接口实现
|
||||
// * @Reference :
|
||||
// * @Author : yunhao
|
||||
// * @Date : 2018-10-25 13:54
|
||||
// * @Modify :
|
||||
// **/
|
||||
//@Service
|
||||
//public class SysLogOperateService implements ISysLogOperateService {
|
||||
//
|
||||
// public static final Logger LOGGER = LoggerFactory.getLogger(SysLogOperateService.class);
|
||||
//
|
||||
//// @Autowired
|
||||
//// public SysLogOperateRepository logOperateRDao;
|
||||
//
|
||||
// @Override
|
||||
// @ApiOperation(value = "添加操作日志",notes = "添加操作日志")
|
||||
// public SysLogOperate insertSysLogOperate(SysLogOperate logOperate) {
|
||||
//// return logOperateRDao.insert(logOperate);
|
||||
// return null;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// @ApiOperation(value = "根据id删除日志",notes = "根据id删除日志")
|
||||
// public void deleteSysLogOperateById(Long id) {
|
||||
//// logOperateRDao.deleteById(id);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// @ApiOperation(value = "查询全部操作日志",notes = "查询全部操作日志")
|
||||
// public List listSysLogOperate() {
|
||||
//// return logOperateRDao.listPager(null);
|
||||
// return null;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void deleteSysLogOperateByIds(Long[] ids) {
|
||||
// for(Long id : ids){
|
||||
//// logOperateRDao.deleteById(id);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// @ApiOperation(value = "根据id查询操作日志",notes = "根据id查询操作日志")
|
||||
// public SysLogOperate getSysLogOperateById(Long id) {
|
||||
//// return logOperateRDao.getById(id);
|
||||
// return null;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// @ApiOperation(value = "根据操作人姓名模糊查询日志",notes = "根据操作人姓名模糊查询日志")
|
||||
// public List<SysLogOperate> listSysLogOperateByOperateUserName(String operateUserName) {
|
||||
//// return logOperateRDao.findByProperty("operateUserName",operateUserName);
|
||||
// return null;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// @ApiOperation(value = "查询所有日志数量")
|
||||
// public long countAllSysLogOperate() {
|
||||
//// return logOperateRDao.listCount();
|
||||
// return 0;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// @ApiOperation(value = "操作日志复杂查询，分页，排序",notes = "操作日志复杂查询，分页，排序")
|
||||
// public ListPager<SysLogOperate> querySysLogOperateByPager(SysLogOperate logOperate, Pager pager) {
|
||||
//// if(logOperate == null) {
|
||||
//// pager = PagerHelper.getPager(pager, (int) logOperateRDao.count());
|
||||
//// return new ListPager(logOperateRDao.findAll(),pager);
|
||||
//// }else{
|
||||
//// Bson bson = CoreBsonPack.packBsonByLogOperate(logOperate);
|
||||
//// pager = PagerHelper.getPager(pager,logOperateRDao.findByBsonCount(bson));
|
||||
//// //分页，排序
|
||||
//// return new ListPager(logOperateRDao.findByBsonPager(bson,pager,logOperate.getOrderByParam(),logOperate.getAscOrDesc()),pager);
|
||||
//// }
|
||||
// return null;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public List<SysLogOperate> findNewSysLogOperate(Integer num) {
|
||||
// Pager page = new Pager();
|
||||
// page.setCurrentPage(1);
|
||||
// page.setPageSize(num);
|
||||
// SysLogOperate sysLogOperate = new SysLogOperate();
|
||||
// sysLogOperate.setOrderByParam("createDatetime");
|
||||
// sysLogOperate.setAscOrDesc(CommonEnumUtil.ASC_OR_DESC.DESC.getValue());
|
||||
//// return logOperateRDao.findByBsonPager(null,page,sysLogOperate.getOrderByParam(),sysLogOperate.getAscOrDesc());
|
||||
// return null;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public long deleteSysLogOperateByDateTimeAfter(String dateTime) {
|
||||
//// return logOperateRDao.deleteByProperty(CoreBsonPack.packBsonByDateTimeAfter(dateTime));
|
||||
// return 0;
|
||||
// }
|
||||
//}
|
||||
@ -1,71 +0,0 @@
|
||||
//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
|
||||
//
|
||||
//import cn.estsh.i3plus.core.api.iservice.busi.ISysLogTaskTimeService;
|
||||
//import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||
//import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
//import cn.estsh.i3plus.pojo.base.common.PagerHelper;
|
||||
//import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem;
|
||||
//import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
|
||||
//import cn.estsh.i3plus.pojo.platform.platrepositorymongo.SysLogTaskTimeRepository;
|
||||
//import cn.estsh.i3plus.pojo.platform.sqlpack.CoreBsonPack;
|
||||
//import io.swagger.annotations.ApiOperation;
|
||||
//import org.bson.conversions.Bson;
|
||||
//import org.slf4j.Logger;
|
||||
//import org.slf4j.LoggerFactory;
|
||||
//import org.springframework.beans.factory.annotation.Autowired;
|
||||
//import org.springframework.stereotype.Service;
|
||||
//
|
||||
///**
|
||||
// * @Description : 定时任务服务接口实现
|
||||
// * @Reference :
|
||||
// * @Author : yunhao
|
||||
// * @CreateDate : 2019-01-04 15:10
|
||||
// * @Modify:
|
||||
// **/
|
||||
//@Service
|
||||
//public class SysLogTaskTimeService implements ISysLogTaskTimeService {
|
||||
// public static final Logger LOGGER = LoggerFactory.getLogger(SysLogTaskTimeService.class);
|
||||
//
|
||||
//// @Autowired
|
||||
//// private SysLogTaskTimeRepository sysLogTaskTimeRDao;
|
||||
//
|
||||
// @Override
|
||||
// @ApiOperation(value = "添加定时任务日志",notes = "添加定时任务日志")
|
||||
// public void insertSysLogTaskTime(SysLogTaskTime sysLogTaskTime) {
|
||||
//// sysLogTaskTimeRDao.insert(sysLogTaskTime);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// @ApiOperation(value = "删除定时任务日志",notes = "删除定时任务日志")
|
||||
// public void deleteSysLogTaskTimeById(Long id) {
|
||||
//// sysLogTaskTimeRDao.deleteById(id);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// @ApiOperation(value = "根据id查询定时任务日志",notes = "根据id查询定时任务日志")
|
||||
// public SysLogTaskTime getSysLogTaskTimeById(Long id) {
|
||||
//// return sysLogTaskTimeRDao.getById(id);
|
||||
// return null;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// @ApiOperation(value = "定时任务日志分页复杂查询",notes = "定时任务日志分页复杂查询")
|
||||
// public ListPager querySysLogTaskTimeByPager(SysLogTaskTime sysLogTaskTime, Pager pager) {
|
||||
//// if (sysLogTaskTime == null) {
|
||||
//// pager = PagerHelper.getPager(pager,sysLogTaskTimeRDao.listCount());
|
||||
//// return new ListPager(sysLogTaskTimeRDao.listPager(pager),pager);
|
||||
//// } else {
|
||||
//// Bson bson = CoreBsonPack.packMongoByLogTaskTime(sysLogTaskTime);
|
||||
//// pager = PagerHelper.getPager(pager,sysLogTaskTimeRDao.findByBsonCount(bson));
|
||||
//// return new ListPager(sysLogTaskTimeRDao.findByBsonPager(bson,pager,sysLogTaskTime.getOrderByParam()
|
||||
//// ,sysLogTaskTime.getAscOrDesc()),pager);
|
||||
//// }
|
||||
// return null;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public long deleteSysLogTaskTimeByDateTimeAfter(String dateTime) {
|
||||
//// return sysLogTaskTimeRDao.deleteByProperty(CoreBsonPack.packBsonByDateTimeAfter(dateTime));
|
||||
// return 0;
|
||||
// }
|
||||
//}
|
||||
@ -0,0 +1,28 @@
|
||||
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
|
||||
|
||||
import cn.estsh.i3plus.core.api.iservice.busi.ISysPojoVersionService;
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersion;
|
||||
import cn.estsh.i3plus.pojo.platform.repository.SysPojoVersionRepository;
|
||||
import cn.estsh.impp.framework.base.service.CrudService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 20-4-21 下午2:28
|
||||
* @Modify:
|
||||
**/
|
||||
@Service
|
||||
public class SysPojoVersionDetailService extends CrudService<SysPojoVersion> implements ISysPojoVersionService {
|
||||
|
||||
@Autowired
|
||||
private SysPojoVersionRepository pojoVersionRDao;
|
||||
|
||||
@Override
|
||||
public BaseRepository<SysPojoVersion, Long> getRepository() {
|
||||
return pojoVersionRDao;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
|
||||
|
||||
import cn.estsh.i3plus.core.api.iservice.busi.ISysPojoVersionPlanService;
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersionPlan;
|
||||
import cn.estsh.i3plus.pojo.platform.repository.SysPojoVersionPlanRepository;
|
||||
import cn.estsh.impp.framework.base.service.CrudService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 20-4-21 下午2:28
|
||||
* @Modify:
|
||||
**/
|
||||
@Service
|
||||
public class SysPojoVersionPlanService extends CrudService<SysPojoVersionPlan> implements ISysPojoVersionPlanService {
|
||||
|
||||
@Autowired
|
||||
private SysPojoVersionPlanRepository pojoVersionPlanRDao;
|
||||
|
||||
@Override
|
||||
public BaseRepository<SysPojoVersionPlan, Long> getRepository() {
|
||||
return pojoVersionPlanRDao;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
|
||||
|
||||
import cn.estsh.i3plus.core.api.iservice.busi.ISysPojoVersionService;
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersion;
|
||||
import cn.estsh.i3plus.pojo.platform.repository.SysPojoVersionRepository;
|
||||
import cn.estsh.impp.framework.base.service.CrudService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wei.peng
|
||||
* @CreateDate : 20-4-21 下午2:28
|
||||
* @Modify:
|
||||
**/
|
||||
@Service
|
||||
public class SysPojoVersionService extends CrudService<SysPojoVersion> implements ISysPojoVersionService {
|
||||
|
||||
@Autowired
|
||||
private SysPojoVersionRepository pojoVersionRDao;
|
||||
|
||||
@Override
|
||||
public BaseRepository<SysPojoVersion, Long> getRepository() {
|
||||
return pojoVersionRDao;
|
||||
}
|
||||
}
|
||||
@ -1,123 +0,0 @@
|
||||
//package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
|
||||
//
|
||||
//import cn.estsh.i3plus.core.api.iservice.busi.ITestService;
|
||||
//import cn.estsh.i3plus.core.apiservice.dao.ITestDao;
|
||||
//import cn.estsh.i3plus.platform.common.tool.StringTool;
|
||||
//import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
|
||||
//import cn.estsh.i3plus.pojo.base.bean.ListPager;
|
||||
//import cn.estsh.i3plus.pojo.base.common.Pager;
|
||||
//import cn.estsh.i3plus.pojo.base.common.PagerHelper;
|
||||
//import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
//import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
|
||||
//import cn.estsh.i3plus.pojo.base.tool.HqlPack;
|
||||
//import cn.estsh.i3plus.pojo.platform.bean.SysDepartment;
|
||||
//import cn.estsh.i3plus.pojo.platform.bean.SysOrganize;
|
||||
//import cn.estsh.i3plus.pojo.platform.bean.SysUser;
|
||||
//import cn.estsh.i3plus.pojo.platform.bean.TestTransUser;
|
||||
//import cn.estsh.i3plus.pojo.platform.repository.SysUserRepository;
|
||||
//import cn.estsh.i3plus.pojo.platform.repository.TestTransUserRepository;
|
||||
//import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
|
||||
//import io.swagger.annotations.ApiOperation;
|
||||
//import org.apache.commons.lang3.StringUtils;
|
||||
//import org.slf4j.Logger;
|
||||
//import org.slf4j.LoggerFactory;
|
||||
//import org.springframework.beans.factory.annotation.Autowired;
|
||||
//import org.springframework.stereotype.Service;
|
||||
//
|
||||
//import java.util.ArrayList;
|
||||
//import java.util.List;
|
||||
//import java.util.Random;
|
||||
//
|
||||
///**
|
||||
// * @Description :
|
||||
// * @Reference :
|
||||
// * @Author : yunhao
|
||||
// * @CreateDate : 2019-02-20 21:24
|
||||
// * @Modify:
|
||||
// **/
|
||||
//@Service
|
||||
//public class TestService implements ITestService {
|
||||
//
|
||||
// public static final Logger LOGGER = LoggerFactory.getLogger(TestService.class);
|
||||
//
|
||||
// @Autowired
|
||||
// ITestDao testDao;
|
||||
//
|
||||
// @Autowired
|
||||
// private SysUserRepository sysUserRDao;
|
||||
//
|
||||
// @Autowired
|
||||
// private TestTransUserRepository testTransUserRepository;
|
||||
//
|
||||
// @Override
|
||||
// @ApiOperation(value = "多表查询")
|
||||
// public List<Object> queryToolAndToolType(Pager pager) {
|
||||
// return testDao.queryToolAndToolType(pager);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// @ApiOperation(value = "账号分页查询", notes = "组合查询")
|
||||
// public ListPager<SysUser> querySysUserByPager(SysUser user, Pager pager) {
|
||||
// LOGGER.debug("系统用户 SysUser find user :{} page :{}", user, pager);
|
||||
//
|
||||
// //生成hql查询语句
|
||||
// String hqlPack = CoreHqlPack.packHqlSysUser(user);
|
||||
// pager = PagerHelper.getPager(pager, sysUserRDao.findByHqlWhereCount(hqlPack));
|
||||
// ListPager<SysUser> list = new ListPager(sysUserRDao.findByHqlWherePage(hqlPack + user.orderBy(), pager), pager);
|
||||
// LOGGER.info("size:{},pager:{}",list.getObjectList().size(),list.getObjectPager());
|
||||
//
|
||||
//// DdlPackBean packBean = new DdlPackBean();
|
||||
//// DdlPreparedPack.getNumEqualPackOverZero(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",packBean);
|
||||
//// DdlPreparedPack.getNumEqualPackOverZero(user.getDepartmentId(),"departmentId",packBean);
|
||||
//// DdlPreparedPack.getNumEqualPackOverZero(user.getUserStatus(),"userStatus",packBean);
|
||||
//// DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",packBean);
|
||||
//// DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",packBean);
|
||||
//// DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",packBean);
|
||||
//// DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",packBean);
|
||||
//
|
||||
// DdlPackBean packBean = CoreHqlPack.packDdlSysUser(user);
|
||||
// System.out.println("getPackedHql=="+packBean.getPackedHql());
|
||||
// System.out.println("getPackedHqlAll=="+packBean.getPackedHqlAll());
|
||||
// System.out.println("getHqlAppend=="+packBean.getHqlAppend());
|
||||
// System.out.println("getWhereAppend=="+packBean.getWhereAppend());
|
||||
// System.out.println("getOrderByStr=="+packBean.getOrderByStr());
|
||||
//
|
||||
// pager = PagerHelper.getPager(pager, sysUserRDao.findByHqlWhereCount(packBean));
|
||||
// list = new ListPager(sysUserRDao.findByHqlWherePage(packBean, pager), pager);
|
||||
// LOGGER.info("size:{},pager:{}",list.getObjectList().size(),list.getObjectPager());
|
||||
//
|
||||
// return list;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public List<SysUser> querySysUserByPack(DdlPackBean packBean) {
|
||||
// return sysUserRDao.findByHqlWhere(packBean);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void write() {
|
||||
// Random ran = new Random(10000);
|
||||
// TestTransUser u = new TestTransUser();
|
||||
// u.setName("na2me" + ran.nextInt(100));
|
||||
// u.setSalary(ran.nextDouble());
|
||||
// System.out.println("插入对象：" + u);
|
||||
//
|
||||
// u = testTransUserRepository.insert(u);
|
||||
// System.out.println("插入对象：" + u);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void insertSysUser(SysUser sysUser) {
|
||||
// sysUserRDao.insert(sysUser);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public void updateSysUser(SysUser sysUser) {
|
||||
// sysUserRDao.update(sysUser);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public List<SysUser> listSysUser() {
|
||||
// return sysUserRDao.list();
|
||||
// }
|
||||
//}
|
||||
Loading…
Reference in New Issue