From b147e319f77e5330231f811f65a9edcb129bba20 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Wed, 7 Nov 2018 15:53:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=88=86=E6=9E=90=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E6=8C=81=E4=B9=85=E5=8C=96=EF=BC=8Cbaserepository?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/api/iservice/busi/ILogSystemService.java | 8 +------- .../controller/busi/FactoryStoreController.java | 2 +- .../controller/busi/LogSystemController.java | 23 +--------------------- .../controller/busi/TaskTimeController.java | 2 +- .../serviceimpl/busi/LogOperateService.java | 4 ++-- .../serviceimpl/busi/LogSystemService.java | 16 ++++----------- .../serviceimpl/busi/SysMenuService.java | 4 ++-- .../serviceimpl/busi/SysRoleService.java | 4 ++-- .../serviceimpl/busi/SysUserService.java | 12 +++++------ .../serviceimpl/busi/SystemResourceService.java | 6 ++---- .../src/main/resources/application-dev.properties | 2 +- 11 files changed, 23 insertions(+), 60 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogSystemService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogSystemService.java index b9c0910..12db2ad 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogSystemService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ILogSystemService.java @@ -26,12 +26,6 @@ public interface ILogSystemService { void deleteLogSystemById(String id); /** - * 添加系统日志 - * @param logSystem - */ - void updateLogSystem(LogSystem logSystem); - - /** * 查询全部日志 * @return */ @@ -42,5 +36,5 @@ public interface ILogSystemService { * @param id * @return */ - LogSystem getLogSystemById(String id); + LogSystem getLogSystemById(long id); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java index 6beb041..016f42d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/FactoryStoreController.java @@ -29,7 +29,7 @@ public class FactoryStoreController { @Autowired private IDataMoreService dataMoreService; - @PutMapping(value="/insert/{name}/{code}") + @PostMapping(value="/insert/{name}/{code}") @ApiOperation(value="service服务",notes="返回内容添加service") public ResultBean insertFactory(@PathVariable("name")String name, @PathVariable("code")String code){ FactoryStore fs = new FactoryStore(); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogSystemController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogSystemController.java index c558c00..23a791c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogSystemController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/LogSystemController.java @@ -75,27 +75,6 @@ public class LogSystemController { } } - @PutMapping(value = "/update") - @ApiOperation(value = "修改系统日志",notes = "修改系统日志") - public ResultBean updateLogSystem(LogSystem logSystem){ - try { - // 登录用户 - SessionUser user = AuthUtil.getSessionUser(); - - // 修改初始化 - ConvertBean.modelInitialize(logSystem,user); - - logSystemService.updateLogSystem(logSystem); - return ResultBean.success("修改日志成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); - }catch(ImppBusiException busExcep){ - LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep); - return ResultBean.fail(busExcep.getErrorShow()); - }catch(Exception e){ - LOGGER.error(ImppExceptionEnum.SYSTEM_EXCEPTION.getDescription() + "：{}",e.getMessage(),e); - return ResultBean.fail().setCode(ImppExceptionEnum.SYSTEM_EXCEPTION.getCode()); - } - } - @GetMapping(value = "/list") @ApiOperation(value = "查询全部系统日志",notes = "查询全部系统日志") public ResultBean findLogSystemAll(){ @@ -117,7 +96,7 @@ public class LogSystemController { @ApiOperation(value = "根据id查询系统日志") public ResultBean getLogSystemById(String id){ try { - LogSystem logSystem = logSystemService.getLogSystemById(id); + LogSystem logSystem = logSystemService.getLogSystemById(Long.parseLong(id)); return ResultBean.success("查询成功") .setResultObject(logSystem) .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java index df4212c..2b38d40 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/TaskTimeController.java @@ -171,7 +171,7 @@ public class TaskTimeController { @PutMapping(value = "/status") @ApiOperation(value = "修改定时任务状态", notes = "根据ID修改定时任务状态") - public ResultBean updateStatus(String id,int status) { + public ResultBean updateQuartzStatus(String id,int status) { try { // 数据校验 ValidatorBean.checkNotNull(id, "功能id 不能为空"); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java index c787ded..f4c61ef 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogOperateService.java @@ -6,7 +6,7 @@ import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.PagerHelper; import cn.estsh.i3plus.pojo.base.tool.BsonPackTool; import cn.estsh.i3plus.pojo.platform.bean.LogOperate; -import cn.estsh.i3plus.pojo.platform.repository.LogOperateRepository; +import cn.estsh.i3plus.pojo.platform.repositorymongo.LogOperateRepository; import com.mongodb.client.model.Filters; import org.bson.conversions.Bson; import org.slf4j.Logger; @@ -41,7 +41,7 @@ public class LogOperateService implements ILogOperateService { if(logOperate == null) { return new ListPager(logOperateRDao.findAll(),pager); }else{ - Bson bson = Filters.and(); + Bson bson = null; BsonPackTool.getStringLikerPack(logOperate.getCreateUser(),"createUser",bson); BsonPackTool.timeBuilder(logOperate.getCreateDateTimeStart(),logOperate.getCreateDateTimeEnd(),"reateDateTime",bson,false); BsonPackTool.getNumEqualPack(logOperate.getOperateModuleId(),"operateModuleId",bson); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogSystemService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogSystemService.java index a09018f..a2f5091 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogSystemService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/LogSystemService.java @@ -2,7 +2,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ILogSystemService; import cn.estsh.i3plus.pojo.platform.bean.LogSystem; -import cn.estsh.i3plus.pojo.platform.repository.LogSystemRepository; +import cn.estsh.i3plus.pojo.platform.repositorymongo.LogSystemRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -37,22 +37,14 @@ public class LogSystemService implements ILogSystemService { } @Override - public void updateLogSystem(LogSystem logSystem) { - LOGGER.info("系统日志 SYS_SYSTEM {}",logSystem); - //logSystemRDao.update(logSystem); - } - - @Override public List listLogSystem() { LOGGER.info("系统日志 LOG_SYSTEM list"); - //return logSystemRDao.list(); - return null; + return logSystemRDao.findAll(); } @Override - public LogSystem getLogSystemById(String id) { + public LogSystem getLogSystemById(long id) { LOGGER.info("系统日志 LOG_SYSTEM id:{}",id); - //return logSystemRDao.getById(Long.parseLong(id)); - return null; + return logSystemRDao.getById(id); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java index 2fc9087..a9aaf9c 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java @@ -116,7 +116,7 @@ public class SysMenuService implements ISysMenuService { } - refRoleMenuRDao.deleteByProperties("menuId",id); + refRoleMenuRDao.deleteByProperty("menuId",id); sysMenuRDao.deleteById(Long.parseLong(id)); } @@ -137,7 +137,7 @@ public class SysMenuService implements ISysMenuService { array[i] = Long.parseLong(ids[i]); } - refRoleMenuRDao.deleteByTypeLong("menuId",array); + refRoleMenuRDao.deleteByPropertyIn("menuId",array); sysMenuRDao.deleteByIds(array); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java index 9cf1d59..eda5967 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java @@ -74,7 +74,7 @@ public class SysRoleService implements ISysRoleService { @Override public void deleteSysRoleById(String id) { LOGGER.info("系统角色 SYS_ROLE Key:{}", id); - refRoleMenuRDao.deleteByProperties("roleId",id); + refRoleMenuRDao.deleteByProperty("roleId",id); sysRoleRDao.deleteById(Long.parseLong(id)); } @@ -94,7 +94,7 @@ public class SysRoleService implements ISysRoleService { for (int i = 0; i < ids.length; i++) { array[i] = Long.parseLong(ids[i]); } - refRoleMenuRDao.deleteByTypeLong("roleId",array); + refRoleMenuRDao.deleteByPropertyIn("roleId",array); sysRoleRDao.deleteByIds(array); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java index 642a428..51eb0b2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java @@ -190,7 +190,7 @@ public class SysUserService implements ISysUserService { LOGGER.info("平台用户 SYS_USER departmentId:{}", departmentId); LOGGER.info("平台用户 SYS_USER SessionUser:{}", user); - refUserDepartmentRDao.deleteByProperties("userId", sysUser.getId()); //删除用户部门关系 + refUserDepartmentRDao.deleteByProperty("userId", sysUser.getId()); //删除用户部门关系 Department dep = departmentRDao.getById(Long.parseLong(departmentId)); if(dep != null ){ @@ -224,7 +224,7 @@ public class SysUserService implements ISysUserService { List list = sysRoleRDao.findByHqlWhere(where); // 删除角色关系信息 - refUserRoleRDao.deleteByProperties("userId", sysUser.getId()); // 删除用户角色关系 + refUserRoleRDao.deleteByProperty("userId", sysUser.getId()); // 删除用户角色关系 if(null != list && list.size() > 0){ // 新增用户角色关系 @@ -256,7 +256,7 @@ public class SysUserService implements ISysUserService { Position pos = positionRDao.getById(Long.parseLong(positionId)); ValidatorBean.checkNotNull(pos); - refUserPositionRDao.deleteByProperties("userId", sysUser.getId()); //删除用户部门关系 + refUserPositionRDao.deleteByProperty("userId", sysUser.getId()); //删除用户部门关系 RefUserPosition refUserPosition = new RefUserPosition(sysUser.getId(), pos.getId(), pos.getName()); refUserPositionRDao.insert(refUserPosition); @@ -272,9 +272,9 @@ public class SysUserService implements ISysUserService { sysUserRDao.updateByProperties("id", id, "isValid", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); // 删除用户关系(物理删除) - refUserRoleRDao.deleteByProperties("userId", Long.parseLong(id)); // 删除用户角色关系 - refUserDepartmentRDao.deleteByProperties("userId", Long.parseLong(id)); //删除用户部门关系 - refUserPositionRDao.deleteByProperties("userId", Long.parseLong(id)); //删除用户部门关系 + refUserRoleRDao.deleteByProperty("userId", Long.parseLong(id)); // 删除用户角色关系 + refUserDepartmentRDao.deleteByProperty("userId", Long.parseLong(id)); //删除用户部门关系 + refUserPositionRDao.deleteByProperty("userId", Long.parseLong(id)); //删除用户部门关系 } @Override diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SystemResourceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SystemResourceService.java index 55a8f6c..bb890bf 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SystemResourceService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SystemResourceService.java @@ -5,15 +5,13 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; 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.bean.LogOperate; import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage; import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource; -import cn.estsh.i3plus.pojo.platform.repository.LogOperateRepository; -import cn.estsh.i3plus.pojo.platform.repository.LogSystemRepository; +import cn.estsh.i3plus.pojo.platform.repositorymongo.LogOperateRepository; +import cn.estsh.i3plus.pojo.platform.repositorymongo.LogSystemRepository; import cn.estsh.i3plus.pojo.platform.repository.SysLocaleLanguageRepository; import cn.estsh.i3plus.pojo.platform.repository.SysLocaleResourceRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; -import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.util.ImppRedis; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties index 83d583f..de908eb 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-dev.properties @@ -1,5 +1,5 @@ #项目端口 -server.port=8888 +server.port=8080 #用户登陆路径 filter.shiro.user.loginuri = /login