Bläddra i källkod

1操作日志表的添加。2用户管理(运营)显示普通用户下管理的所有层级的用户。3文案库广告语在驳回情况下保存先删除再保存

huangxuechao 4 år sedan
förälder
incheckning
99fe9dae60

+ 61 - 0
jeecg-boot-bytedance/src/main/java/org/jeecg/modules/bytedance/common/entity/BytedanceOperationLog.java

@@ -0,0 +1,61 @@
+package org.jeecg.modules.bytedance.common.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+/**
+ * 操作日志
+ * @author jeecg-boot
+ * @date   2021-06-17
+ * @version V1.0
+ */
+@Data
+@TableName("ctop_bytedance_operation_log")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ctop_bytedance_operation_log对象", description="操作日志")
+public class BytedanceOperationLog {
+    
+	/**id*/
+	@TableId(type = IdType.UUID)
+    @ApiModelProperty(value = "id")
+	private Integer id;
+	/**原始数据*/
+	@Excel(name = "原始数据", width = 15)
+    @ApiModelProperty(value = "原始数据")
+	private Object oldData;
+	/**修改后的数据*/
+	@Excel(name = "修改后的数据", width = 15)
+    @ApiModelProperty(value = "修改后的数据")
+	private Object newData;
+	/**操作类型*/
+	@Excel(name = "操作类型", width = 15)
+    @ApiModelProperty(value = "操作类型")
+	private String operationType;
+	/**操作内容*/
+	@Excel(name = "操作内容", width = 15)
+    @ApiModelProperty(value = "操作内容")
+	private Object operationContent;
+	/**创建人id*/
+	@Excel(name = "创建人id", width = 15)
+    @ApiModelProperty(value = "创建人id")
+	private String createById;
+	/**创建时间*/
+	@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+	private Date createTime;
+}

+ 17 - 0
jeecg-boot-bytedance/src/main/java/org/jeecg/modules/bytedance/common/mapper/BytedanceOperationLogMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.bytedance.common.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.bytedance.common.entity.BytedanceOperationLog;
+
+/**
+ * 操作日志
+ * @author jeecg-boot
+ * 2021-06-17
+ * @version V1.0
+ */
+public interface BytedanceOperationLogMapper extends BaseMapper<BytedanceOperationLog> {
+
+}

+ 5 - 0
jeecg-boot-bytedance/src/main/java/org/jeecg/modules/bytedance/common/mapper/xml/BytedanceOperationLogMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.bytedance.common.mapper.BytedanceOperationLogMapper">
+
+</mapper>

+ 14 - 0
jeecg-boot-bytedance/src/main/java/org/jeecg/modules/bytedance/common/service/IBytedanceOperationLogService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.bytedance.common.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.bytedance.common.entity.BytedanceOperationLog;
+
+/**
+ * 操作日志
+ * @author jeecg-boot
+ * 2021-06-17
+ * @version V1.0
+ */
+public interface IBytedanceOperationLogService extends IService<BytedanceOperationLog> {
+
+}

+ 19 - 0
jeecg-boot-bytedance/src/main/java/org/jeecg/modules/bytedance/common/service/impl/BytedanceOperationLogServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.bytedance.common.service.impl;
+
+import org.jeecg.modules.bytedance.common.entity.BytedanceOperationLog;
+import org.jeecg.modules.bytedance.common.mapper.BytedanceOperationLogMapper;
+import org.jeecg.modules.bytedance.common.service.IBytedanceOperationLogService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * 操作日志
+ * @author jeecg-boot
+ * 2021-06-17
+ * @version V1.0
+ */
+@Service
+public class BytedanceOperationLogServiceImpl extends ServiceImpl<BytedanceOperationLogMapper, BytedanceOperationLog> implements IBytedanceOperationLogService {
+
+}

+ 15 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -28,6 +28,7 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.*;
 import org.jeecg.common.util.*;
+import org.jeecg.modules.bytedance.advertise.vo.IndustryVo;
 import org.jeecg.modules.bytedance.common.utils.Check;
 import org.jeecg.modules.bytedance.common.utils.Check;
 import org.jeecg.modules.system.entity.*;
 import org.jeecg.modules.system.entity.*;
 import org.jeecg.modules.system.model.DepartIdModel;
 import org.jeecg.modules.system.model.DepartIdModel;
@@ -151,6 +152,7 @@ public class SysUserController {
     public Result<Object> queryPageListV2(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
     public Result<Object> queryPageListV2(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
                                           @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
         try {
         try {
+
             String userId = user.getId();
             String userId = user.getId();
             String roleCode = sysRoleService.getRoleCodeByUserId(userId);
             String roleCode = sysRoleService.getRoleCodeByUserId(userId);
             if (Check.isNull(roleCode)){
             if (Check.isNull(roleCode)){
@@ -160,18 +162,27 @@ public class SysUserController {
 
 
             if (!"admin".equals(roleCode)) {
             if (!"admin".equals(roleCode)) {
                 user.setLeaderId(userId);
                 user.setLeaderId(userId);
+                PageHelper.startPage(pageNo, pageSize);
+                List<SysUser> list = sysUserService.queryPageList(user);
+                PageInfo<SysUser> pageInfo = new PageInfo<>(list);
+                return Result.ok(pageInfo);
+            }else{
+                user.setId(null);
+                PageHelper.startPage(pageNo, pageSize);
+                List<SysUser> list = sysUserService.queryAdminPageList(user);
+                PageInfo<SysUser> pageInfo = new PageInfo<>(list);
+                return Result.ok(pageInfo);
             }
             }
 
 
-            PageHelper.startPage(pageNo, pageSize);
-            List<SysUser> list = sysUserService.queryPageList(user);
-            PageInfo<SysUser> pageInfo = new PageInfo<>(list);
-            return Result.ok(pageInfo);
+
         } catch (Exception e) {
         } catch (Exception e) {
             log.error("获取用户列表数据-分页列表查询异常", e);
             log.error("获取用户列表数据-分页列表查询异常", e);
         }
         }
         return Result.error("查询失败");
         return Result.error("查询失败");
     }
     }
 
 
+
+
     //@RequiresRoles({"admin"})
     //@RequiresRoles({"admin"})
     //@RequiresPermissions("user:add")
     //@RequiresPermissions("user:add")
 	@RequestMapping(value = "/add", method = RequestMethod.POST)
 	@RequestMapping(value = "/add", method = RequestMethod.POST)

+ 2 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java

@@ -141,4 +141,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 	List<SysUser> queryByDepIds(@Param("departIds")List<String> departIds,@Param("username") String username);
 	List<SysUser> queryByDepIds(@Param("departIds")List<String> departIds,@Param("username") String username);
 
 
 	List<SysUser> queryPageList(SysUser user);
 	List<SysUser> queryPageList(SysUser user);
+
+	List<SysUser> selectAllUser();
 }
 }

+ 7 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml

@@ -194,11 +194,16 @@
 		<if test="sex != null and sex != ''">
 		<if test="sex != null and sex != ''">
 			AND t1.sex =#{sex}
 			AND t1.sex =#{sex}
 		</if>
 		</if>
-		<if test="leaderId != null and leaderId !=''">
-			and  (t1.leader_id = #{leaderId} or t1.id = #{leaderId})
+		<if test="id != null and id!=''">
+			and t1.id = #{id}
 		</if>
 		</if>
 
 
 		) t4
 		) t4
 		GROUP BY t4.id
 		GROUP BY t4.id
 	</select>
 	</select>
+
+	<select id="selectAllUser" resultType="org.jeecg.modules.system.entity.SysUser">
+		select * from  sys_user where del_flag = 0
+	</select>
+
 </mapper>
 </mapper>

+ 3 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java

@@ -235,4 +235,7 @@ public interface ISysUserService extends IService<SysUser> {
 	List<SysUser> queryByDepIds(List<String> departIds, String username);
 	List<SysUser> queryByDepIds(List<String> departIds, String username);
 
 
 	List<SysUser> queryPageList(SysUser user);
 	List<SysUser> queryPageList(SysUser user);
+
+	List<SysUser> queryAdminPageList(SysUser user);
+
 }
 }

+ 40 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.constant.CacheConstant;
 import org.jeecg.common.constant.CacheConstant;
@@ -16,6 +18,7 @@ import org.jeecg.common.system.vo.SysUserCacheInfo;
 import org.jeecg.common.util.PasswordUtil;
 import org.jeecg.common.util.PasswordUtil;
 import org.jeecg.common.util.UUIDGenerator;
 import org.jeecg.common.util.UUIDGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.bytedance.common.utils.Check;
 import org.jeecg.modules.system.entity.*;
 import org.jeecg.modules.system.entity.*;
 import org.jeecg.modules.system.mapper.*;
 import org.jeecg.modules.system.mapper.*;
 import org.jeecg.modules.system.model.SysUserSysDepartModel;
 import org.jeecg.modules.system.model.SysUserSysDepartModel;
@@ -438,8 +441,45 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 	public List<SysUser> queryByDepIds(List<String> departIds, String username) {
 	public List<SysUser> queryByDepIds(List<String> departIds, String username) {
 		return userMapper.queryByDepIds(departIds,username);
 		return userMapper.queryByDepIds(departIds,username);
 	}
 	}
+
+
 	@Override
 	@Override
 	public List<SysUser> queryPageList(SysUser user) {
 	public List<SysUser> queryPageList(SysUser user) {
+		SysUser sysUser = queryUserInfoById(user.getId());
+		if(Check.isNull(sysUser.getLeaderId())){
+			List<SysUser>  mulUserList = new ArrayList<>();
+			mulUserList.add(sysUser);
+			return mulUserList;
+		}
+		List<SysUser> allList = userMapper.selectAllUser();
+		List<SysUser>  mulUserList = treeCategoryData(allList, sysUser.getId());
+		mulUserList.add(sysUser);
+		return mulUserList;
+	}
+
+	@Override
+	public List<SysUser> queryAdminPageList(SysUser user) {
 		return userMapper.queryPageList(user);
 		return userMapper.queryPageList(user);
 	}
 	}
+
+
+	public SysUser queryUserInfoById(String id){
+		SysUser nullValueUser = new SysUser();
+		nullValueUser.setId(id);
+		List<SysUser> mulUserList = userMapper.queryPageList(nullValueUser);
+		return Check.isNull(mulUserList) ? null : mulUserList.get(0);
+	}
+
+	public List<SysUser> treeCategoryData(List<SysUser> allList, String leaderId) {
+		List<SysUser> mapList = new ArrayList<>();
+		for (SysUser vo : allList) {
+			if (leaderId.equals(vo.getLeaderId())){
+				mapList.add(vo);
+				mapList.addAll(treeCategoryData(allList,vo.getId()));
+			}
+		}
+		return mapList;
+
+	}
+
 }
 }