From 85967219b66c6d35ccd586e7812a11f346be2fd2 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Tue, 6 Aug 2024 14:03:58 +0800 Subject: [PATCH] 11 --- .../yxt/portal/apiadmin/DictCommonRest.java | 8 +- .../com/yxt/portal/apiadmin/DictTypeRest.java | 5 +- .../com/yxt/portal/apiadmin/SysMenuRest.java | 20 +++- .../portal/apiadmin/SysOrganizationRest.java | 8 +- .../com/yxt/portal/apiadmin/SysPostRest.java | 2 +- .../yxt/portal/apiadmin/SystemLogRest.java | 107 +++++++++++++++++ .../biz/dictcommon/DictCommonMapper.xml | 4 +- .../biz/dictcommon/DictCommonService.java | 2 + .../portal/biz/dicttype/DictTypeService.java | 1 + .../com/yxt/portal/biz/sysmenu/SysMenu.java | 1 - .../yxt/portal/biz/sysmenu/SysMenuDto.java | 1 - .../yxt/portal/biz/sysmenu/SysMenuMapper.java | 1 + .../yxt/portal/biz/sysmenu/SysMenuMapper.xml | 2 +- .../portal/biz/sysmenu/SysMenuService.java | 3 + .../yxt/portal/biz/sysmenu/SysMenuTreeVo.java | 1 - .../com/yxt/portal/biz/sysmenu/SysMenuVo.java | 1 - .../SysOrganizationMapper.java | 1 + .../sysorganization/SysOrganizationMapper.xml | 11 +- .../SysOrganizationService.java | 8 +- .../yxt/portal/biz/syspost/SysPostMapper.java | 2 +- .../yxt/portal/biz/syspost/SysPostMapper.xml | 8 ++ .../portal/biz/syspost/SysPostService.java | 7 +- .../yxt/portal/biz/sysrole/SysRoleMapper.java | 1 + .../yxt/portal/biz/sysrole/SysRoleMapper.xml | 11 +- .../portal/biz/sysrole/SysRoleService.java | 30 ++--- .../SysRoleAuthorizeService.java | 1 + .../yxt/portal/biz/systemlog/SystemLog.java | 44 +++++++ .../portal/biz/systemlog/SystemLogDto.java | 46 ++++++++ .../portal/biz/systemlog/SystemLogMapper.java | 38 ++++++ .../portal/biz/systemlog/SystemLogMapper.xml | 13 +++ .../portal/biz/systemlog/SystemLogQuery.java | 44 +++++++ .../biz/systemlog/SystemLogService.java | 109 ++++++++++++++++++ .../yxt/portal/biz/systemlog/SystemLogVo.java | 44 +++++++ 33 files changed, 540 insertions(+), 45 deletions(-) create mode 100644 src/main/java/com/yxt/portal/apiadmin/SystemLogRest.java create mode 100644 src/main/java/com/yxt/portal/biz/systemlog/SystemLog.java create mode 100644 src/main/java/com/yxt/portal/biz/systemlog/SystemLogDto.java create mode 100644 src/main/java/com/yxt/portal/biz/systemlog/SystemLogMapper.java create mode 100644 src/main/java/com/yxt/portal/biz/systemlog/SystemLogMapper.xml create mode 100644 src/main/java/com/yxt/portal/biz/systemlog/SystemLogQuery.java create mode 100644 src/main/java/com/yxt/portal/biz/systemlog/SystemLogService.java create mode 100644 src/main/java/com/yxt/portal/biz/systemlog/SystemLogVo.java diff --git a/src/main/java/com/yxt/portal/apiadmin/DictCommonRest.java b/src/main/java/com/yxt/portal/apiadmin/DictCommonRest.java index ac0c27a..014a5a3 100644 --- a/src/main/java/com/yxt/portal/apiadmin/DictCommonRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/DictCommonRest.java @@ -1,5 +1,6 @@ package com.yxt.portal.apiadmin; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -111,9 +112,10 @@ public class DictCommonRest { if (null == dictCommon) { return ResultBean.fireFail().setMsg("该数据项不存在"); } - if (0 == dictCommonService.deleteBySid(sid)) { - return ResultBean.fireFail().setMsg("删除失败"); - } + dictCommonService.update(dictCommon,new QueryWrapper().eq("sid",sid)); +// if (0 == ) { +// return ResultBean.fireFail().setMsg("删除失败"); +// } return ResultBean.fireSuccess().setMsg("删除成功"); } diff --git a/src/main/java/com/yxt/portal/apiadmin/DictTypeRest.java b/src/main/java/com/yxt/portal/apiadmin/DictTypeRest.java index 4e3b6e2..9015e55 100644 --- a/src/main/java/com/yxt/portal/apiadmin/DictTypeRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/DictTypeRest.java @@ -1,5 +1,6 @@ package com.yxt.portal.apiadmin; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -97,9 +98,7 @@ public class DictTypeRest{ if (dictCommon.size() > 0) { return ResultBean.fireFail().setMsg("该数据字典类型下存在数据项，请先删除该类下的数据项"); } - if (0 == dictTypeService.deleteBySid(sid)) { - return ResultBean.fireFail().setMsg("删除失败"); - } + dictTypeService.update(dictType,new QueryWrapper().eq("sid",sid)); return ResultBean.fireSuccess().setMsg("删除成功"); } } diff --git a/src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java b/src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java index 95c02c3..54a8af0 100644 --- a/src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/SysMenuRest.java @@ -347,19 +347,27 @@ public class SysMenuRest { * @param sid 菜单sid * @return */ +// @ApiOperation("删除记录 根据sid") +// @GetMapping("/delBySids/{sid}") +// public ResultBean delBySids(@PathVariable("sid") String sid) { +// ResultBean rb = ResultBean.fireFail(); +// SysMenu sysMenu = sysMenuService.fetchBySid(sid); +// if (sysMenu == null) { +// return rb.setMsg("该菜单不存在"); +// } +//// sysSourceMenuService.delByMenuSid(sid); +// sysMenuService.deleteBySid(sid); +// return rb.success(); +// } @ApiOperation("删除记录 根据sid") @GetMapping("/delBySids/{sid}") public ResultBean delBySids(@PathVariable("sid") String sid) { ResultBean rb = ResultBean.fireFail(); SysMenu sysMenu = sysMenuService.fetchBySid(sid); - if (sysMenu == null) { - return rb.setMsg("该菜单不存在"); - } -// sysSourceMenuService.delByMenuSid(sid); - sysMenuService.deleteBySid(sid); + sysMenu.setIsDelete(1); + sysMenuService.update(sysMenu,new QueryWrapper().eq("sid",sid)); return rb.success(); } - /* @Override public ResultBean fetch(String id) { ResultBean rb = ResultBean.fireFail(); diff --git a/src/main/java/com/yxt/portal/apiadmin/SysOrganizationRest.java b/src/main/java/com/yxt/portal/apiadmin/SysOrganizationRest.java index c2da3f2..f7d2eae 100644 --- a/src/main/java/com/yxt/portal/apiadmin/SysOrganizationRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/SysOrganizationRest.java @@ -210,10 +210,10 @@ public class SysOrganizationRest{ return ResultBean.fireFail().setMessage("sid不能为空!"); } String[] sidArr = sid.split(","); - sysOrganizationService.delBySids(sidArr); - for (String s : sidArr) { - sysStaffOrgService.delByOrgSid(s); - } + sysOrganizationService.updateIsDelete(sidArr); +// for (String s : sidArr) { +// sysStaffOrgService.delByOrgSid(s); +// } return rb.success(); } diff --git a/src/main/java/com/yxt/portal/apiadmin/SysPostRest.java b/src/main/java/com/yxt/portal/apiadmin/SysPostRest.java index b6eec6a..8436745 100644 --- a/src/main/java/com/yxt/portal/apiadmin/SysPostRest.java +++ b/src/main/java/com/yxt/portal/apiadmin/SysPostRest.java @@ -90,7 +90,7 @@ public class SysPostRest { public ResultBean delBySids(@PathVariable("sids") String sids){ ResultBean rb = ResultBean.fireFail(); String[] sidArr = sids.split(","); - sysPostService.delBySids(sidArr); + sysPostService.updateIsDelete(sidArr); return rb.success(); } diff --git a/src/main/java/com/yxt/portal/apiadmin/SystemLogRest.java b/src/main/java/com/yxt/portal/apiadmin/SystemLogRest.java new file mode 100644 index 0000000..a9112d3 --- /dev/null +++ b/src/main/java/com/yxt/portal/apiadmin/SystemLogRest.java @@ -0,0 +1,107 @@ +package com.yxt.portal.apiadmin; + +import com.yxt.common.base.utils.WebUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.portal.biz.systemlog.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + + +/** + * Project: anrui_portal(门户建设)
+ * File: SystemLogFeignFallback.java
+ * Class: com.yxt.anrui.portal.biz.systemlog.SystemLogRest
+ * Description: 系统日志表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "系统日志表") +@RestController +@RequestMapping("apiadmin/systemlog") +public class SystemLogRest { + + @Resource + private SystemLogService systemLogService; + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + SystemLogDto systemLogDto = SystemLogDto.builder() + .userIp(WebUtil.getIp()) + .eventContent("日志列表查询") + .eventName("日志列表查询") + .eventUrl("/v1/systemlog/listPage") + .userName("") + .userSid("") + .build(); + systemLogService.saveOrUpdateDto(systemLogDto); + SystemLog log=new SystemLog(); + log.setEventName("日志列表查询"); + log.setEventContent("日志列表查询"); + log.setUserName(""); + log.setUserIp("0.0.0.0"); + systemLogService.save(log); + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = systemLogService.listPageVo(pq); + return rb.success().setData(pv); + } + + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody SystemLogQuery query){ + ResultBean rb = ResultBean.fireFail(); + List list = systemLogService.listAllVo(query); + return rb.success().setData(list); + } + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list(){ + ResultBean rb = ResultBean.fireFail(); + List list = systemLogService.listVo(); + return rb.success().setData(list); + } + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(SystemLogDto dto){ + ResultBean rb = ResultBean.fireFail(); + systemLogService.saveOrUpdateDto(dto); + return rb.success(); + } + + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(SystemLogDto dto,String sid){ + ResultBean rb = ResultBean.fireFail(); + systemLogService.updateBySid(dto.toMap(),sid); + return rb.success(); + } + + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(String ids){ + ResultBean rb = ResultBean.fireFail(); + systemLogService.delByIds(ids); + return rb.success(); + } + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(String id){ + ResultBean rb = ResultBean.fireFail(); + SystemLogVo vo = systemLogService.fetchByIdVo(id); + return rb.success().setData(vo); + } +} diff --git a/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonMapper.xml b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonMapper.xml index c676e4c..3d15194 100644 --- a/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonMapper.xml +++ b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonMapper.xml @@ -12,7 +12,7 @@ \ No newline at end of file diff --git a/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonService.java b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonService.java index abd5059..7c26762 100644 --- a/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonService.java +++ b/src/main/java/com/yxt/portal/biz/dictcommon/DictCommonService.java @@ -44,6 +44,7 @@ public class DictCommonService extends MybatisBaseService { List selectByMenuUrl(String menuUrl); + /** * 查询该资源下一级菜单列表 * diff --git a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.xml b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.xml index d8793cf..4577d48 100644 --- a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.xml +++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuMapper.xml @@ -85,7 +85,7 @@ (select name from sys_menu where sid=menu.pSid) as pName FROM sys_menu menu left join sys_source source on source.sid = menu.sourceSid - where menu.pSid = #{sid} + where menu.pSid = #{sid} and menu.isDelete !="1" ORDER BY menu.sortNo ASC diff --git a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuService.java b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuService.java index e3777db..1154d7d 100644 --- a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuService.java +++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuService.java @@ -117,6 +117,7 @@ public class SysMenuService extends MybatisBaseService { if (StringUtils.isNotBlank(query.getMenuType())) { qw.eq("menuType", query.getMenuType()); } + qw.ne("isDelete","1"); return qw; } @@ -448,6 +449,8 @@ public class SysMenuService extends MybatisBaseService { return baseMapper.selectByMenuUrl(menuUrl); } + + /** * 根据资源sid查询该资源下的一级菜单列表（yxt_mtl 2024-01-31） * diff --git a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuTreeVo.java b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuTreeVo.java index dba60ba..99fe0ba 100644 --- a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuTreeVo.java +++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuTreeVo.java @@ -61,5 +61,4 @@ public class SysMenuTreeVo implements Vo { @ApiModelProperty("子菜单") private List children; private String orgSid; - private String btnKey; } diff --git a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuVo.java b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuVo.java index 6b71b7b..53ba103 100644 --- a/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuVo.java +++ b/src/main/java/com/yxt/portal/biz/sysmenu/SysMenuVo.java @@ -72,5 +72,4 @@ public class SysMenuVo implements Vo { @ApiModelProperty("资源名称") private String sourceName; private String cid; - private String btnKey; } diff --git a/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationMapper.java b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationMapper.java index b69faf1..e2ec9df 100644 --- a/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationMapper.java +++ b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationMapper.java @@ -42,6 +42,7 @@ public interface SysOrganizationMapper extends BaseMapper { @Select("SELECT * FROM sys_organization") List selectListVo(); + Integer updateIsDelete(List list); @Select("SELECT name FROM sys_organization WHERE sid=#{sid}") String selectOrgnameBySid(@Param("sid") String sid); diff --git a/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationMapper.xml b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationMapper.xml index b5b6aa2..c3922f6 100644 --- a/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationMapper.xml +++ b/src/main/java/com/yxt/portal/biz/sysorganization/SysOrganizationMapper.xml @@ -44,7 +44,7 @@ - + + UPDATE sys_organization + SET isDelete=1 + where sid in + + #{item} + + + + UPDATE sys_post + SET isDelete=1 + where sid in + + #{item} + + @@ -71,7 +71,14 @@ FROM sys_role WHERE sid = #{sid} - + + UPDATE sys_role + SET isDelete=1 + where sid in + + #{item} + + UPDATE sys_role SET isEnable = #{isEnable} diff --git a/src/main/java/com/yxt/portal/biz/sysrole/SysRoleService.java b/src/main/java/com/yxt/portal/biz/sysrole/SysRoleService.java index bab417b..6e368b5 100644 --- a/src/main/java/com/yxt/portal/biz/sysrole/SysRoleService.java +++ b/src/main/java/com/yxt/portal/biz/sysrole/SysRoleService.java @@ -14,7 +14,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; /** * Project: anrui_portal(门户建设)
@@ -72,6 +74,7 @@ public class SysRoleService extends MybatisBaseService { qw.eq("sr.orgSid", query.getOrgSid()); } qw.eq("sr.isEnable","1"); + qw.ne("sr.isDelete","1"); return qw; } @@ -130,19 +133,20 @@ public class SysRoleService extends MybatisBaseService { */ public int delBySids(String sids) { String[] split = sids.split(","); - if (split.length < 1) { - return 0; - } else if (split.length == 1) { - //删除该角色下的用户关联 - sysUserRoleService.deleteByRoleSid(sids); - return baseMapper.deleteBySid(sids); - } else { - List list = new ArrayList<>(); - for (String sid : split) { - list.add(sid); - } - return baseMapper.deleteBatchSids(list); - } + return baseMapper.updateIsDelete(Arrays.stream(split).collect(Collectors.toList())); +// if (split.length < 1) { +// return 0; +// } else if (split.length == 1) { +// //删除该角色下的用户关联 +// sysUserRoleService.deleteByRoleSid(sids); +// return baseMapper.updateIsDelete(sids); +// } else { +// List list = new ArrayList<>(); +// for (String sid : split) { +// list.add(sid); +// } +// return baseMapper.deleteBatchSids(list); +// } } public SysRoleVo fetchBySidVo(String sid) { diff --git a/src/main/java/com/yxt/portal/biz/sysroleauthorize/SysRoleAuthorizeService.java b/src/main/java/com/yxt/portal/biz/sysroleauthorize/SysRoleAuthorizeService.java index 84b4ef3..41d2305 100644 --- a/src/main/java/com/yxt/portal/biz/sysroleauthorize/SysRoleAuthorizeService.java +++ b/src/main/java/com/yxt/portal/biz/sysroleauthorize/SysRoleAuthorizeService.java @@ -67,6 +67,7 @@ public class SysRoleAuthorizeService extends MybatisBaseService + * File: SystemLog.java
+ * Class: com.yxt.anrui.portal.api.systemlog.SystemLog
+ * Description: 系统日志表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "系统日志表", description = "系统日志表") +@TableName("system_log") +@Data +public class SystemLog extends BaseEntity { + private static final long serialVersionUID = 1L; + @ApiModelProperty("事件名称或类别") + private String eventName; + + @ApiModelProperty("事件内容") + private String eventContent; + + @ApiModelProperty("事件url") + private String eventUrl; + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("用户名") + private String userName; + + @ApiModelProperty("用户iP") + private String userIp; +} diff --git a/src/main/java/com/yxt/portal/biz/systemlog/SystemLogDto.java b/src/main/java/com/yxt/portal/biz/systemlog/SystemLogDto.java new file mode 100644 index 0000000..d47fe9a --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/systemlog/SystemLogDto.java @@ -0,0 +1,46 @@ +package com.yxt.portal.biz.systemlog; + + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Builder; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SystemLogDto.java
+ * Class: com.yxt.anrui.portal.api.systemlog.SystemLogDto
+ * Description: 系统日志表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Builder +@ApiModel(value = "系统日志表 数据传输对象", description = "系统日志表 数据传输对象") +@Data +public class SystemLogDto implements Dto { + + + @ApiModelProperty("事件名称或类别") + private String eventName; + + @ApiModelProperty("事件内容") + private String eventContent; + + @ApiModelProperty("事件url") + private String eventUrl; + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("用户名") + private String userName; + + @ApiModelProperty("用户iP") + private String userIp; +} \ No newline at end of file diff --git a/src/main/java/com/yxt/portal/biz/systemlog/SystemLogMapper.java b/src/main/java/com/yxt/portal/biz/systemlog/SystemLogMapper.java new file mode 100644 index 0000000..fe3553f --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/systemlog/SystemLogMapper.java @@ -0,0 +1,38 @@ +package com.yxt.portal.biz.systemlog; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Project: anrui_portal(门户建设)
+ * File: SystemLogMapper.java
+ * Class: com.yxt.anrui.portal.biz.systemlog.SystemLogMapper
+ * Description: 系统日志表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface SystemLogMapper extends BaseMapper { + + //@Update("update system_log set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from system_log") + List selectListVo(); +} \ No newline at end of file diff --git a/src/main/java/com/yxt/portal/biz/systemlog/SystemLogMapper.xml b/src/main/java/com/yxt/portal/biz/systemlog/SystemLogMapper.xml new file mode 100644 index 0000000..3951c08 --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/systemlog/SystemLogMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/yxt/portal/biz/systemlog/SystemLogQuery.java b/src/main/java/com/yxt/portal/biz/systemlog/SystemLogQuery.java new file mode 100644 index 0000000..21acf4b --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/systemlog/SystemLogQuery.java @@ -0,0 +1,44 @@ +package com.yxt.portal.biz.systemlog; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SystemLogQuery.java
+ * Class: com.yxt.anrui.portal.api.systemlog.SystemLogQuery
+ * Description: 系统日志表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "系统日志表 查询条件", description = "系统日志表 查询条件") +@Data +public class SystemLogQuery implements Query { + + + @ApiModelProperty("事件名称或类别") + private String eventName; + + @ApiModelProperty("事件内容") + private String eventContent; + + @ApiModelProperty("事件url") + private String eventUrl; + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("用户名") + private String userName; + + @ApiModelProperty("用户iP") + private String userIp; +} diff --git a/src/main/java/com/yxt/portal/biz/systemlog/SystemLogService.java b/src/main/java/com/yxt/portal/biz/systemlog/SystemLogService.java new file mode 100644 index 0000000..8bb72aa --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/systemlog/SystemLogService.java @@ -0,0 +1,109 @@ +package com.yxt.portal.biz.systemlog; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.portal.biz.systemlog.SystemLog; +import com.yxt.portal.biz.systemlog.SystemLogDto; +import com.yxt.portal.biz.systemlog.SystemLogQuery; +import com.yxt.portal.biz.systemlog.SystemLogVo; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.vo.PagerVo; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + * Project: anrui_portal(门户建设)
+ * File: SystemLogService.java
+ * Class: com.yxt.anrui.portal.biz.systemlog.SystemLogService
+ * Description: 系统日志表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class SystemLogService extends MybatisBaseService { + public PagerVo listPage(PagerQuery pq) { + SystemLogQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public List listAll(SystemLogQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectList(qw); + } + private QueryWrapper createQueryWrapper(SystemLogQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + + if (StringUtils.isNotBlank(query.getEventName())) { + qw.eq("eventName", query.getEventName()); + } + + if (StringUtils.isNotBlank(query.getEventContent())) { + qw.eq("eventContent", query.getEventContent()); + } + + if (StringUtils.isNotBlank(query.getEventUrl())) { + qw.eq("eventUrl", query.getEventUrl()); + } + + if (StringUtils.isNotBlank(query.getUserSid())) { + qw.eq("userSid", query.getUserSid()); + } + + if (StringUtils.isNotBlank(query.getUserName())) { + qw.eq("userName", query.getUserName()); + } + + if (StringUtils.isNotBlank(query.getUserIp())) { + qw.eq("userIp", query.getUserIp()); + } + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + SystemLogQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public List listAllVo(SystemLogQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectListAllVo(qw); + } + + public List listVo() { + return baseMapper.selectListVo(); + } + + public void saveOrUpdateDto(SystemLogDto dto){ + SystemLog entity = new SystemLog(); + dto.fillEntity(entity); + this.saveOrUpdate(entity); + } + + public SystemLogVo fetchByIdVo(String id){ + SystemLog entity = this.fetchById(id); + SystemLogVo vo = new SystemLogVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } +} \ No newline at end of file diff --git a/src/main/java/com/yxt/portal/biz/systemlog/SystemLogVo.java b/src/main/java/com/yxt/portal/biz/systemlog/SystemLogVo.java new file mode 100644 index 0000000..0afb51f --- /dev/null +++ b/src/main/java/com/yxt/portal/biz/systemlog/SystemLogVo.java @@ -0,0 +1,44 @@ +package com.yxt.portal.biz.systemlog; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui_portal(门户建设)
+ * File: SystemLogVo.java
+ * Class: com.yxt.anrui.portal.api.systemlog.SystemLogVo
+ * Description: 系统日志表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "系统日志表 视图数据对象", description = "系统日志表 视图数据对象") +@Data +public class SystemLogVo implements Vo { + + + @ApiModelProperty("事件名称或类别") + private String eventName; + + @ApiModelProperty("事件内容") + private String eventContent; + + @ApiModelProperty("事件url") + private String eventUrl; + + @ApiModelProperty("用户sid") + private String userSid; + + @ApiModelProperty("用户名") + private String userName; + + @ApiModelProperty("用户iP") + private String userIp; +}