yumeng 5 anos atrás
pai
commit
c80923a983
29 arquivos alterados com 508 adições e 270 exclusões
  1. 25 0
      jeecg-boot-base-common/src/main/java/org/jeecg/common/util/DateUtils.java
  2. 1 1
      module-common/src/main/java/cn/com/ctop/common/module/controller/MaterialAscriptionController.java
  3. 1 1
      module-common/src/main/java/cn/com/ctop/common/module/controller/MaterialParameterController.java
  4. 1 1
      module-common/src/main/java/cn/com/ctop/common/module/controller/MaterialTagController.java
  5. 2 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java
  6. 2 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java
  7. 7 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
  8. 5 2
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
  9. 22 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
  10. 3 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
  11. 203 214
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
  12. 2 2
      module-common/pom.xml
  13. 18 1
      module-common/src/main/java/cn/com/ctop/common/module/entity/MaterialInfo.java
  14. 3 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/MaterialAscriptionMapper.java
  15. 6 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/MaterialInfoMapper.java
  16. 4 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/MaterialTagMapper.java
  17. 43 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/MaterialAscriptionMapper.xml
  18. 22 0
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/MaterialInfoMapper.xml
  19. 7 1
      module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/MaterialTagMapper.xml
  20. 4 0
      module-common/src/main/java/cn/com/ctop/common/module/service/IMaterialInfoService.java
  21. 0 5
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/FileInfoServiceImpl.java
  22. 83 12
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java
  23. 1 1
      jeecg-boot-base-common/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java
  24. 1 1
      jeecg-boot-base-common/src/main/java/org/jeecg/common/util/encryption/EncryptedString.java
  25. 1 2
      jeecg-boot-base-common/src/main/java/org/jeecg/common/util/LoadFileUtil.java
  26. 32 7
      module-ctop/src/main/java/cn/com/ctop/manage/modules/material/controller/MaterialInfoController.java
  27. 3 3
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouImageServiceImpl.java
  28. 3 3
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouVideoServiceImpl.java
  29. 3 4
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java

+ 25 - 0
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/DateUtils.java

@@ -534,6 +534,31 @@ public class DateUtils extends PropertyEditorSupport {
         return 0;
         return 0;
     }
     }
 
 
+
+    public static void main(String[] args) throws ParseException {
+        getStartEndTime("2019-11-25 00:00:00");
+    }
+
+    public static Map<String, Object> getStartEndTime(String createTime) throws ParseException {
+
+        SimpleDateFormat smf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date parse = smf.parse(createTime);
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(parse);
+        calendar.set(Calendar.HOUR_OF_DAY, 0);
+        calendar.set(Calendar.MINUTE, 0);
+        calendar.set(Calendar.SECOND, 0);
+        Date start = calendar.getTime();
+        calendar.add(Calendar.DAY_OF_MONTH, 1);
+        calendar.add(Calendar.SECOND, -1);
+        Date end = calendar.getTime();
+        Map<String, Object> map = new HashMap<>();
+        map.put("start", smf.format(start));
+        map.put("end", smf.format(end));
+        return map;
+    }
+
+
     /**
     /**
      * String类型 转换为Date, 如果参数长度为10 转换格式”yyyy-MM-dd“ 如果参数长度为19 转换格式”yyyy-MM-dd
      * String类型 转换为Date, 如果参数长度为10 转换格式”yyyy-MM-dd“ 如果参数长度为19 转换格式”yyyy-MM-dd
      * HH:mm:ss“ * @param text String类型的时间值
      * HH:mm:ss“ * @param text String类型的时间值

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/module/controller/MaterialAscriptionController.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.common.module.controller;
+package org.jeecg.modules.ctop.controller;
 
 
 import cn.com.ctop.common.module.entity.MaterialAscription;
 import cn.com.ctop.common.module.entity.MaterialAscription;
 import cn.com.ctop.common.module.service.IMaterialAscriptionService;
 import cn.com.ctop.common.module.service.IMaterialAscriptionService;

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/module/controller/MaterialParameterController.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.common.module.controller;
+package org.jeecg.modules.ctop.controller;
 
 
 import cn.com.ctop.common.module.entity.MaterialParameter;
 import cn.com.ctop.common.module.entity.MaterialParameter;
 import cn.com.ctop.common.module.service.IMaterialParameterService;
 import cn.com.ctop.common.module.service.IMaterialParameterService;

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/module/controller/MaterialTagController.java

@@ -1,4 +1,4 @@
-package cn.com.ctop.common.module.controller;
+package org.jeecg.modules.ctop.controller;
 
 
 import cn.com.ctop.common.module.entity.MaterialTag;
 import cn.com.ctop.common.module.entity.MaterialTag;
 import cn.com.ctop.common.module.service.IMaterialTagService;
 import cn.com.ctop.common.module.service.IMaterialTagService;

+ 2 - 6
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java

@@ -1,6 +1,6 @@
 package org.jeecg.modules.ctop.controller;
 package org.jeecg.modules.ctop.controller;
 
 
-import cn.com.ctop.bytedance.mapper.MaterialReportMapper;
+
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.Check;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -20,7 +20,6 @@ import org.jeecg.modules.ctop.mapper.ProjectMapper;
 import org.jeecg.modules.ctop.service.IAdvertiserService;
 import org.jeecg.modules.ctop.service.IAdvertiserService;
 import org.jeecg.modules.ctop.service.IProjectMemberService;
 import org.jeecg.modules.ctop.service.IProjectMemberService;
 import org.jeecg.modules.ctop.service.IProjectService;
 import org.jeecg.modules.ctop.service.IProjectService;
-import org.jeecg.modules.system.mapper.UserCompanyMapper;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -60,14 +59,10 @@ public class ProjectController {
     @Autowired
     @Autowired
     private IProjectMemberService projectMemberService;
     private IProjectMemberService projectMemberService;
 
 
-    @Autowired
-    private MaterialReportMapper materialReportMapper;
 
 
     @Autowired
     @Autowired
     private IAdvertiserService advertiserService;
     private IAdvertiserService advertiserService;
 
 
-    @Autowired
-    private UserCompanyMapper userCompanyMapper;
 
 
     @Autowired
     @Autowired
     private ProjectMapper projectMapper;
     private ProjectMapper projectMapper;
@@ -75,6 +70,7 @@ public class ProjectController {
 
 
     /**
     /**
      * 我管理的
      * 我管理的
+     *
      * @param userId
      * @param userId
      * @return
      * @return
      */
      */

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.system.controller;
 package org.jeecg.modules.system.controller;
 
 
+import cn.com.ctop.common.module.utils.AesEncryptUtil;
+import cn.com.ctop.common.module.utils.EncryptedString;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.RandomUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.exceptions.ClientException;
@@ -16,8 +18,6 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.DySmsHelper;
 import org.jeecg.common.util.DySmsHelper;
 import org.jeecg.common.util.PasswordUtil;
 import org.jeecg.common.util.PasswordUtil;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.RedisUtil;
-import org.jeecg.common.util.encryption.AesEncryptUtil;
-import org.jeecg.common.util.encryption.EncryptedString;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.shiro.vo.DefContants;
 import org.jeecg.modules.shiro.vo.DefContants;
 import org.jeecg.modules.system.entity.SysDepart;
 import org.jeecg.modules.system.entity.SysDepart;

+ 7 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -78,6 +78,13 @@ public class SysUserController {
     private IUserCompanyService userCompanyService;
     private IUserCompanyService userCompanyService;
 
 
 
 
+    @RequestMapping(value = "/getRoleInfo", method = RequestMethod.GET)
+    public Map<String, Object> getRoleInfo(String userId) {
+        Map<String, Object> map = sysUserService.queryRoleCode(userId);
+        return map;
+    }
+
+
     /**
     /**
      * @RequiresPermissions("sys:user:list")
      * @RequiresPermissions("sys:user:list")
      */
      */

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

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.entity.SysUser;
 
 
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 /**
 /**
  * <p>
  * <p>
@@ -60,7 +61,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @param phone
      * @param phone
      * @return
      * @return
      */
      */
-    public SysUser getUserByPhone(@Param("phone") String phone);
+     SysUser getUserByPhone(@Param("phone") String phone);
 
 
 
 
     /**
     /**
@@ -69,5 +70,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @param email
      * @param email
      * @return
      * @return
      */
      */
-    public SysUser getUserByEmail(@Param("email") String email);
+     SysUser getUserByEmail(@Param("email") String email);
+
+    Map<String, Object> queryRoleCode(@Param("userId") String userId);
 }
 }

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

@@ -3,7 +3,6 @@
 <mapper namespace="org.jeecg.modules.system.mapper.SysUserMapper">
 <mapper namespace="org.jeecg.modules.system.mapper.SysUserMapper">
 
 
 
 
-
     <select id="selectAllUser" resultType="org.jeecg.modules.system.entity.SysUser">
     <select id="selectAllUser" resultType="org.jeecg.modules.system.entity.SysUser">
 		select * from  sys_user
 		select * from  sys_user
 	</select>
 	</select>
@@ -46,4 +45,26 @@
     <select id="getUserByEmail" resultType="org.jeecg.modules.system.entity.SysUser">
     <select id="getUserByEmail" resultType="org.jeecg.modules.system.entity.SysUser">
 	select * from  sys_user  where email = #{email} and del_flag = '0'
 	select * from  sys_user  where email = #{email} and del_flag = '0'
 	</select>
 	</select>
+
+
+    <select id="queryRoleCode" parameterType="Object" resultType="java.util.Map">
+SELECT
+   role_code roleCode,
+   role_name roleName,
+   id roleId
+   FROM
+   sys_role
+   WHERE
+   id = (
+   SELECT
+   t2.role_id
+   FROM
+   sys_user t1
+   LEFT JOIN sys_user_role t2 ON t1.id = t2.user_id
+   WHERE
+   t1.id = #{userId,jdbcType=VARCHAR}
+   )
+</select>
+
+
 </mapper>
 </mapper>

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

@@ -1,6 +1,7 @@
 package org.jeecg.modules.system.service;
 package org.jeecg.modules.system.service;
 
 
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.Set;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -122,4 +123,6 @@ public interface ISysUserService extends IService<SysUser> {
 	 * @return
 	 * @return
 	 */
 	 */
 	Result checkUserIsEffective(SysUser sysUser);
 	Result checkUserIsEffective(SysUser sysUser);
+
+    Map<String, Object> queryRoleCode(String userId);
 }
 }

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

@@ -1,32 +1,19 @@
 package org.jeecg.modules.system.service.impl;
 package org.jeecg.modules.system.service.impl;
 
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+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;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.constant.CommonConstant;
-
 import org.jeecg.common.system.api.ISysBaseApi;
 import org.jeecg.common.system.api.ISysBaseApi;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.system.vo.SysUserCacheInfo;
 import org.jeecg.common.system.vo.SysUserCacheInfo;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
-
-import org.jeecg.modules.system.entity.SysDepart;
-import org.jeecg.modules.system.entity.SysPermission;
-import org.jeecg.modules.system.entity.SysUser;
-import org.jeecg.modules.system.entity.SysUserRole;
-import org.jeecg.modules.system.mapper.SysDepartMapper;
-import org.jeecg.modules.system.mapper.SysPermissionMapper;
-import org.jeecg.modules.system.mapper.SysUserMapper;
-import org.jeecg.modules.system.mapper.SysUserRoleMapper;
-
 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.service.ISysUserService;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.CacheEvict;
@@ -34,12 +21,7 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import lombok.extern.slf4j.Slf4j;
+import java.util.*;
 
 
 /**
 /**
  * <p>
  * <p>
@@ -52,227 +34,234 @@ import lombok.extern.slf4j.Slf4j;
 @Service
 @Service
 @Slf4j
 @Slf4j
 public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
 public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> implements ISysUserService {
-	
-	@Autowired
-	private SysUserMapper userMapper;
-	@Autowired
-	private SysPermissionMapper sysPermissionMapper;
-	@Autowired
-	private SysUserRoleMapper sysUserRoleMapper;
-	@Autowired
-
-	private SysUserDepartMapper sysUserDepartMapper;
-	@Autowired
+
+    @Autowired
+    private SysUserMapper userMapper;
+    @Autowired
+    private SysPermissionMapper sysPermissionMapper;
+    @Autowired
+    private SysUserRoleMapper sysUserRoleMapper;
+    @Autowired
+
+    private SysUserDepartMapper sysUserDepartMapper;
+    @Autowired
     private ISysBaseApi sysBaseApi;
     private ISysBaseApi sysBaseApi;
-	@Autowired
-	private SysDepartMapper sysDepartMapper;
-	
-	@Override
-	public SysUser getUserByName(String username) {
-		return userMapper.getUserByName(username);
-	}
-	
-	
-	@Override
-	@Transactional
-	public void addUserWithRole(SysUser user, String roles) {
-		this.save(user);
-		if(oConvertUtils.isNotEmpty(roles)) {
-			String[] arr = roles.split(",");
-			for (String roleId : arr) {
-				SysUserRole userRole = new SysUserRole(user.getId(), roleId);
-				sysUserRoleMapper.insert(userRole);
-			}
-		}
-	}
-
-	@Override
-	@CacheEvict(value= CacheConstant.LOGIN_USER_RULES_CACHE, allEntries=true)
-	@Transactional
-	public void editUserWithRole(SysUser user, String roles) {
-		this.updateById(user);
-		//先删后加
-		sysUserRoleMapper.delete(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getUserId, user.getId()));
-		if(oConvertUtils.isNotEmpty(roles)) {
-			String[] arr = roles.split(",");
-			for (String roleId : arr) {
-				SysUserRole userRole = new SysUserRole(user.getId(), roleId);
-				sysUserRoleMapper.insert(userRole);
-			}
-		}
-	}
-
-
-	@Override
-	public List<String> getRole(String username) {
-		return sysUserRoleMapper.getRoleByUserName(username);
-	}
-	
-	/**
-	 * 通过用户名获取用户角色集合
-	 * @param username 用户名
+    @Autowired
+    private SysDepartMapper sysDepartMapper;
+
+    @Override
+    public SysUser getUserByName(String username) {
+        return userMapper.getUserByName(username);
+    }
+
+
+    @Override
+    @Transactional
+    public void addUserWithRole(SysUser user, String roles) {
+        this.save(user);
+        if (oConvertUtils.isNotEmpty(roles)) {
+            String[] arr = roles.split(",");
+            for (String roleId : arr) {
+                SysUserRole userRole = new SysUserRole(user.getId(), roleId);
+                sysUserRoleMapper.insert(userRole);
+            }
+        }
+    }
+
+    @Override
+    @CacheEvict(value = CacheConstant.LOGIN_USER_RULES_CACHE, allEntries = true)
+    @Transactional
+    public void editUserWithRole(SysUser user, String roles) {
+        this.updateById(user);
+        //先删后加
+        sysUserRoleMapper.delete(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getUserId, user.getId()));
+        if (oConvertUtils.isNotEmpty(roles)) {
+            String[] arr = roles.split(",");
+            for (String roleId : arr) {
+                SysUserRole userRole = new SysUserRole(user.getId(), roleId);
+                sysUserRoleMapper.insert(userRole);
+            }
+        }
+    }
+
+
+    @Override
+    public List<String> getRole(String username) {
+        return sysUserRoleMapper.getRoleByUserName(username);
+    }
+
+    /**
+     * 通过用户名获取用户角色集合
+     *
+     * @param username 用户名
      * @return 角色集合
      * @return 角色集合
-	 */
-	@Override
-	@Cacheable(value = CacheConstant.LOGIN_USER_RULES_CACHE,key = "'Roles_'+#username")
-	public Set<String> getUserRolesSet(String username) {
-		// 查询用户拥有的角色集合
-		List<String> roles = sysUserRoleMapper.getRoleByUserName(username);
-		log.info("-------通过数据库读取用户拥有的角色Rules------username: " + username + ",Roles size: " + (roles == null ? 0 : roles.size()));
-		return new HashSet<>(roles);
-	}
-
-	/**
-	 * 通过用户名获取用户权限集合
-	 *
-	 * @param username 用户名
-	 * @return 权限集合
-	 */
-	@Override
-	@Cacheable(value = CacheConstant.LOGIN_USER_RULES_CACHE,key = "'Permissions_'+#username")
-	public Set<String> getUserPermissionsSet(String username) {
-		Set<String> permissionSet = new HashSet<>();
-		List<SysPermission> permissionList = sysPermissionMapper.queryByUser(username);
-		for (SysPermission po : permissionList) {
+     */
+    @Override
+    @Cacheable(value = CacheConstant.LOGIN_USER_RULES_CACHE, key = "'Roles_'+#username")
+    public Set<String> getUserRolesSet(String username) {
+        // 查询用户拥有的角色集合
+        List<String> roles = sysUserRoleMapper.getRoleByUserName(username);
+        log.info("-------通过数据库读取用户拥有的角色Rules------username: " + username + ",Roles size: " + (roles == null ? 0 : roles.size()));
+        return new HashSet<>(roles);
+    }
+
+    /**
+     * 通过用户名获取用户权限集合
+     *
+     * @param username 用户名
+     * @return 权限集合
+     */
+    @Override
+    @Cacheable(value = CacheConstant.LOGIN_USER_RULES_CACHE, key = "'Permissions_'+#username")
+    public Set<String> getUserPermissionsSet(String username) {
+        Set<String> permissionSet = new HashSet<>();
+        List<SysPermission> permissionList = sysPermissionMapper.queryByUser(username);
+        for (SysPermission po : permissionList) {
 //			// TODO URL规则有问题?
 //			// TODO URL规则有问题?
 //			if (oConvertUtils.isNotEmpty(po.getUrl())) {
 //			if (oConvertUtils.isNotEmpty(po.getUrl())) {
 //				permissionSet.add(po.getUrl());
 //				permissionSet.add(po.getUrl());
 //			}
 //			}
-			if (oConvertUtils.isNotEmpty(po.getPerms())) {
-				permissionSet.add(po.getPerms());
-			}
-		}
-		log.info("-------通过数据库读取用户拥有的权限Perms------username: "+ username+",Perms size: "+ (permissionSet==null?0:permissionSet.size()) );
-		return permissionSet;
-	}
-
-	@Override
-	public SysUserCacheInfo getCacheUser(String username) {
-		SysUserCacheInfo info = new SysUserCacheInfo();
-		info.setOneDepart(true);
+            if (oConvertUtils.isNotEmpty(po.getPerms())) {
+                permissionSet.add(po.getPerms());
+            }
+        }
+        log.info("-------通过数据库读取用户拥有的权限Perms------username: " + username + ",Perms size: " + (permissionSet == null ? 0 : permissionSet.size()));
+        return permissionSet;
+    }
+
+    @Override
+    public SysUserCacheInfo getCacheUser(String username) {
+        SysUserCacheInfo info = new SysUserCacheInfo();
+        info.setOneDepart(true);
 //		SysUser user = userMapper.getUserByName(username);
 //		SysUser user = userMapper.getUserByName(username);
 //		info.setSysUserCode(user.getUsername());
 //		info.setSysUserCode(user.getUsername());
 //		info.setSysUserName(user.getRealname());
 //		info.setSysUserName(user.getRealname());
 
 
 
 
         LoginUser user = sysBaseApi.getUserByName(username);
         LoginUser user = sysBaseApi.getUserByName(username);
-		if(user!=null) {
-			info.setSysUserCode(user.getUsername());
-			info.setSysUserName(user.getRealname());
-			info.setSysOrgCode(user.getOrgCode());
-		}
-		
-		//多部门支持in查询
-		List<SysDepart> list = sysDepartMapper.queryUserDeparts(user.getId());
-		List<String> sysMultiOrgCode = new ArrayList<String>();
-		if(list==null || list.size()==0) {
-			//当前用户无部门
-			//sysMultiOrgCode.add("0");
-		}else if(list.size()==1) {
-			sysMultiOrgCode.add(list.get(0).getOrgCode());
-		}else {
-			info.setOneDepart(false);
-			for (SysDepart dpt : list) {
-				sysMultiOrgCode.add(dpt.getOrgCode());
-			}
-		}
-		info.setSysMultiOrgCode(sysMultiOrgCode);
-		
-		return info;
-	}
+        if (user != null) {
+            info.setSysUserCode(user.getUsername());
+            info.setSysUserName(user.getRealname());
+            info.setSysOrgCode(user.getOrgCode());
+        }
+
+        //多部门支持in查询
+        List<SysDepart> list = sysDepartMapper.queryUserDeparts(user.getId());
+        List<String> sysMultiOrgCode = new ArrayList<String>();
+        if (list == null || list.size() == 0) {
+            //当前用户无部门
+            //sysMultiOrgCode.add("0");
+        } else if (list.size() == 1) {
+            sysMultiOrgCode.add(list.get(0).getOrgCode());
+        } else {
+            info.setOneDepart(false);
+            for (SysDepart dpt : list) {
+                sysMultiOrgCode.add(dpt.getOrgCode());
+            }
+        }
+        info.setSysMultiOrgCode(sysMultiOrgCode);
+
+        return info;
+    }
 
 
     /**
     /**
      * 根据部门Id查询
      * 根据部门Id查询
      */
      */
-	@Override
-	public IPage<SysUser> getUserByDepId(Page<SysUser> page, String departId,String username) {
-		return userMapper.getUserByDepId(page, departId,username);
+    @Override
+    public IPage<SysUser> getUserByDepId(Page<SysUser> page, String departId, String username) {
+        return userMapper.getUserByDepId(page, departId, username);
     }
     }
 
 
 
 
     /**
     /**
      * 根据角色Id查询
      * 根据角色Id查询
- 	 */
-	@Override
-	public IPage<SysUser> getUserByRoleId(Page<SysUser> page, String roleId, String username) {
-		return userMapper.getUserByRoleId(page,roleId,username);
-	}
+     */
+    @Override
+    public IPage<SysUser> getUserByRoleId(Page<SysUser> page, String roleId, String username) {
+        return userMapper.getUserByRoleId(page, roleId, username);
+    }
 
 
 
 
-	@Override
-	public void updateUserDepart(String username,String orgCode) {
-		baseMapper.updateUserDepart(username, orgCode);
-	}
+    @Override
+    public void updateUserDepart(String username, String orgCode) {
+        baseMapper.updateUserDepart(username, orgCode);
+    }
 
 
-	@Override
-	public SysUser getUserByPhone(String phone) {
-		return userMapper.getUserByPhone(phone);
-	}
+    @Override
+    public SysUser getUserByPhone(String phone) {
+        return userMapper.getUserByPhone(phone);
+    }
 
 
 
 
-	@Override
-	public SysUser getUserByEmail(String email) {
-		return userMapper.getUserByEmail(email);
-	}
+    @Override
+    public SysUser getUserByEmail(String email) {
+        return userMapper.getUserByEmail(email);
+    }
 
 
-	@Override
-	@Transactional
-	public void addUserWithDepart(SysUser user, String selectedParts) {
+    @Override
+    @Transactional
+    public void addUserWithDepart(SysUser user, String selectedParts) {
 //		this.save(user);  //保存角色的时候已经添加过一次了
 //		this.save(user);  //保存角色的时候已经添加过一次了
-		if(oConvertUtils.isNotEmpty(selectedParts)) {
-			String[] arr = selectedParts.split(",");
-			for (String deaprtId : arr) {
-				SysUserDepart userDeaprt = new SysUserDepart(user.getId(), deaprtId);
-				sysUserDepartMapper.insert(userDeaprt);
-			}
-		}
-	}
-
-
-	@Override
-	@Transactional
-	@CacheEvict(value="loginUser_cacheRules", allEntries=true)
-	public void editUserWithDepart(SysUser user, String departs) {
+        if (oConvertUtils.isNotEmpty(selectedParts)) {
+            String[] arr = selectedParts.split(",");
+            for (String deaprtId : arr) {
+                SysUserDepart userDeaprt = new SysUserDepart(user.getId(), deaprtId);
+                sysUserDepartMapper.insert(userDeaprt);
+            }
+        }
+    }
+
+
+    @Override
+    @Transactional
+    @CacheEvict(value = "loginUser_cacheRules", allEntries = true)
+    public void editUserWithDepart(SysUser user, String departs) {
         //更新角色的时候已经更新了一次了,可以再跟新一次
         //更新角色的时候已经更新了一次了,可以再跟新一次
         this.updateById(user);
         this.updateById(user);
-		//先删后加
-		sysUserDepartMapper.delete(new QueryWrapper<SysUserDepart>().lambda().eq(SysUserDepart::getUserId, user.getId()));
-		if(oConvertUtils.isNotEmpty(departs)) {
-			String[] arr = departs.split(",");
-			for (String departId : arr) {
-				SysUserDepart userDepart = new SysUserDepart(user.getId(), departId);
-				sysUserDepartMapper.insert(userDepart);
-			}
-		}
-	}
-
-
-	/**
-	   * 校验用户是否有效
-	 * @param sysUser
-	 * @return
-	 */
-	@Override
-	public Result<?> checkUserIsEffective(SysUser sysUser) {
-		Result<?> result = new Result<Object>();
-		//情况1:根据用户信息查询,该用户不存在
-		if (sysUser == null) {
-			result.error500("该用户不存在,请注册");
+        //先删后加
+        sysUserDepartMapper.delete(new QueryWrapper<SysUserDepart>().lambda().eq(SysUserDepart::getUserId, user.getId()));
+        if (oConvertUtils.isNotEmpty(departs)) {
+            String[] arr = departs.split(",");
+            for (String departId : arr) {
+                SysUserDepart userDepart = new SysUserDepart(user.getId(), departId);
+                sysUserDepartMapper.insert(userDepart);
+            }
+        }
+    }
+
+
+    /**
+     * 校验用户是否有效
+     *
+     * @param sysUser
+     * @return
+     */
+    @Override
+    public Result<?> checkUserIsEffective(SysUser sysUser) {
+        Result<?> result = new Result<Object>();
+        //情况1:根据用户信息查询,该用户不存在
+        if (sysUser == null) {
+            result.error500("该用户不存在,请注册");
             sysBaseApi.addLog("用户登录失败,用户不存在!", CommonConstant.LOG_TYPE_1, null);
             sysBaseApi.addLog("用户登录失败,用户不存在!", CommonConstant.LOG_TYPE_1, null);
-			return result;
-		}
-		//情况2:根据用户信息查询,该用户已注销
-		if (CommonConstant.DEL_FLAG_1.toString().equals(sysUser.getDelFlag())) {
+            return result;
+        }
+        //情况2:根据用户信息查询,该用户已注销
+        if (CommonConstant.DEL_FLAG_1.toString().equals(sysUser.getDelFlag())) {
             sysBaseApi.addLog("用户登录失败,用户名:" + sysUser.getUsername() + "已注销!", CommonConstant.LOG_TYPE_1, null);
             sysBaseApi.addLog("用户登录失败,用户名:" + sysUser.getUsername() + "已注销!", CommonConstant.LOG_TYPE_1, null);
-			result.error500("该用户已注销");
-			return result;
-		}
-		//情况3:根据用户信息查询,该用户已冻结
-		if (CommonConstant.USER_FREEZE.equals(sysUser.getStatus())) {
+            result.error500("该用户已注销");
+            return result;
+        }
+        //情况3:根据用户信息查询,该用户已冻结
+        if (CommonConstant.USER_FREEZE.equals(sysUser.getStatus())) {
             sysBaseApi.addLog("用户登录失败,用户名:" + sysUser.getUsername() + "已冻结!", CommonConstant.LOG_TYPE_1, null);
             sysBaseApi.addLog("用户登录失败,用户名:" + sysUser.getUsername() + "已冻结!", CommonConstant.LOG_TYPE_1, null);
-			result.error500("该用户已冻结");
-			return result;
-		}
-		return result;
-	}
+            result.error500("该用户已冻结");
+            return result;
+        }
+        return result;
+    }
+
+    @Override
+    public Map<String, Object> queryRoleCode(String userId) {
+        return userMapper.queryRoleCode(userId);
+    }
 }
 }

+ 2 - 2
module-common/pom.xml

@@ -68,11 +68,11 @@
         </dependency>
         </dependency>
 
 
 
 
-        <dependency>
+        <!--<dependency>
             <groupId>org.jeecgframework.boot</groupId>
             <groupId>org.jeecgframework.boot</groupId>
             <artifactId>jeecg-boot-base-common</artifactId>
             <artifactId>jeecg-boot-base-common</artifactId>
             <version>2.0.2</version>
             <version>2.0.2</version>
-        </dependency>
+        </dependency>-->
         <!--<dependency>
         <!--<dependency>
             <groupId>org.apache.commons</groupId>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-csv</artifactId>
             <artifactId>commons-csv</artifactId>

+ 18 - 1
module-common/src/main/java/cn/com/ctop/common/module/entity/MaterialInfo.java

@@ -2,6 +2,7 @@ package cn.com.ctop.common.module.entity;
 
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
@@ -52,6 +53,10 @@ public class MaterialInfo {
 
 
     private String type;
     private String type;
     /**
     /**
+     * 审核人id
+     */
+    private String auditorId;
+    /**
      * status
      * status
      * <p>
      * <p>
      * 0-待审核 1-审核通过 2-审核拒绝
      * 0-待审核 1-审核通过 2-审核拒绝
@@ -83,13 +88,25 @@ public class MaterialInfo {
     private String watermarkMaterialName;
     private String watermarkMaterialName;
 
 
     /**
     /**
+     * 拒绝原因
+     */
+    private String refuseReason;
+    /**
+     * 拒绝上传文件
+     */
+    private String refuseFile;
+
+    /**
      * createTime
      * createTime
      */
      */
     @ApiModelProperty(value = "createTime")
     @ApiModelProperty(value = "createTime")
-    private Date createTime;
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Object createTime;
     /**
     /**
      * updateTime
      * updateTime
      */
      */
     @ApiModelProperty(value = "updateTime")
     @ApiModelProperty(value = "updateTime")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
     private Date updateTime;
     private Date updateTime;
+
 }
 }

+ 3 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/MaterialAscriptionMapper.java

@@ -1,7 +1,9 @@
 package cn.com.ctop.common.module.mapper;
 package cn.com.ctop.common.module.mapper;
 
 
 import cn.com.ctop.common.module.entity.MaterialAscription;
 import cn.com.ctop.common.module.entity.MaterialAscription;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 
 /**
 /**
  * 素材归属标
  * 素材归属标
@@ -12,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
  */
 public interface MaterialAscriptionMapper extends BaseMapper<MaterialAscription> {
 public interface MaterialAscriptionMapper extends BaseMapper<MaterialAscription> {
 
 
+    JSONObject selectByMaterialId(@Param("materialId") String materialId);
 }
 }

+ 6 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/MaterialInfoMapper.java

@@ -2,6 +2,9 @@ package cn.com.ctop.common.module.mapper;
 
 
 import cn.com.ctop.common.module.entity.MaterialInfo;
 import cn.com.ctop.common.module.entity.MaterialInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
 
 
 /**
 /**
  * 素材信息
  * 素材信息
@@ -12,4 +15,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
  */
 public interface MaterialInfoMapper extends BaseMapper<MaterialInfo> {
 public interface MaterialInfoMapper extends BaseMapper<MaterialInfo> {
 
 
+    String selectUserNameById(@Param("auditorId") String auditorId);
+
+    String selectCountByMap(@Param("requestMap") Map<String, Object> requestMap);
 }
 }

+ 4 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/MaterialTagMapper.java

@@ -2,6 +2,9 @@ package cn.com.ctop.common.module.mapper;
 
 
 import cn.com.ctop.common.module.entity.MaterialTag;
 import cn.com.ctop.common.module.entity.MaterialTag;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 
 /**
 /**
  * 素材归属标
  * 素材归属标
@@ -12,4 +15,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
  */
 public interface MaterialTagMapper extends BaseMapper<MaterialTag> {
 public interface MaterialTagMapper extends BaseMapper<MaterialTag> {
 
 
+    List<String> selectByMaterialId(@Param("materialId") String materialId);
 }
 }

+ 43 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/MaterialAscriptionMapper.xml

@@ -2,4 +2,47 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.com.ctop.common.module.mapper.MaterialAscriptionMapper">
 <mapper namespace="cn.com.ctop.common.module.mapper.MaterialAscriptionMapper">
 
 
+    <select id="selectByMaterialId" resultType="com.alibaba.fastjson.JSONObject">
+
+select
+      (case
+        when clip_id != ""
+        then (select realname from sys_user where id = clip_id)
+        else ""
+        end
+        ) clipName, -- 剪辑人姓名
+
+        clip_id clipId,
+
+
+        (case
+        when shot_id != ""
+        then (select realname from sys_user where id = shot_id)
+        else ""
+        end
+        ) shotName, -- 拍摄人姓名
+        shot_id shotId,
+
+         (case
+        when plan_id != ""
+        then (select realname from sys_user where id = plan_id)
+        else ""
+        end
+        ) planName, -- 策划人姓名
+        plan_id planId,
+
+         (case
+        when plane_id != ""
+        then (select realname from sys_user where id = plane_id)
+        else ""
+        end
+        ) planeName, -- 平面姓名
+        plane_id planeId
+        from ctop_material_ascription
+        where material_id = #{materialId}
+        order by create_time desc
+        limit 1
+
+    </select>
+
 </mapper>
 </mapper>

+ 22 - 0
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/MaterialInfoMapper.xml

@@ -2,4 +2,26 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.com.ctop.common.module.mapper.MaterialInfoMapper">
 <mapper namespace="cn.com.ctop.common.module.mapper.MaterialInfoMapper">
 
 
+    <select id="selectUserNameById" resultType="java.lang.String">
+   select realname from  sys_user where  id = #{auditorId}
+    </select>
+
+
+    <select id="selectCountByMap" parameterType="java.util.Map" resultType="java.lang.String">
+
+        select count(1)
+        from ctop_material_info
+        where 1 = 1
+        <if test="userId != null">
+            and user_id = #{userId}
+        </if>
+
+        <if test="status != null">
+            and status = #{status}
+        </if>
+
+
+    </select>
+
+
 </mapper>
 </mapper>

+ 7 - 1
module-common/src/main/java/cn/com/ctop/common/module/mapper/xml/MaterialTagMapper.xml

@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?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">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="cn.com.ctop.common.module.mapper.MaterialTagMapper">
 <mapper namespace="cn.com.ctop.common.module.mapper.MaterialTagMapper">
+    <select id="selectByMaterialId" resultType="java.lang.String">
+    select  tag  from  ctop_material_tag
+    where material_id = #{materialId}
+    </select>
+
+</mapper>
+
 
 
-</mapper>

+ 4 - 0
module-common/src/main/java/cn/com/ctop/common/module/service/IMaterialInfoService.java

@@ -19,4 +19,8 @@ public interface IMaterialInfoService extends IService<MaterialInfo> {
     Map<String, Object> checkMaterialInfo(String code);
     Map<String, Object> checkMaterialInfo(String code);
 
 
     Map<String, Object> insert(JSONObject jsonObject);
     Map<String, Object> insert(JSONObject jsonObject);
+
+    JSONObject getDetail(String materialId);
+
+    JSONObject report(String userId);
 }
 }

+ 0 - 5
module-common/src/main/java/cn/com/ctop/common/module/service/impl/FileInfoServiceImpl.java

@@ -12,7 +12,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import it.sauronsoftware.jave.Encoder;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpEntity;
@@ -23,18 +22,14 @@ import org.apache.http.entity.mime.MultipartEntityBuilder;
 import org.apache.http.entity.mime.content.FileBody;
 import org.apache.http.entity.mime.content.FileBody;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.impl.client.HttpClientBuilder;
-import org.jeecg.common.util.LoadFileUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import java.io.*;
 import java.io.*;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.net.HttpURLConnection;
 import java.net.HttpURLConnection;
 import java.net.URI;
 import java.net.URI;
 import java.net.URL;
 import java.net.URL;
-import java.nio.channels.FileChannel;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;

+ 83 - 12
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialInfoServiceImpl.java

@@ -10,6 +10,7 @@ import cn.com.ctop.common.module.mapper.MaterialParameterMapper;
 import cn.com.ctop.common.module.mapper.MaterialTagMapper;
 import cn.com.ctop.common.module.mapper.MaterialTagMapper;
 import cn.com.ctop.common.module.service.IMaterialInfoService;
 import cn.com.ctop.common.module.service.IMaterialInfoService;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.Check;
+import cn.com.ctop.common.module.utils.LoadFileUtil;
 import cn.com.ctop.common.module.utils.ResultMapUtils;
 import cn.com.ctop.common.module.utils.ResultMapUtils;
 import cn.com.ctop.common.module.utils.StatusCode;
 import cn.com.ctop.common.module.utils.StatusCode;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;
@@ -18,7 +19,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import it.sauronsoftware.jave.Encoder;
 import it.sauronsoftware.jave.Encoder;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.util.LoadFileUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
@@ -30,6 +30,7 @@ import java.math.RoundingMode;
 import java.nio.channels.FileChannel;
 import java.nio.channels.FileChannel;
 import java.util.Date;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Executors;
@@ -91,9 +92,6 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
     public Map<String, Object> insert(JSONObject jsonObject) {
     public Map<String, Object> insert(JSONObject jsonObject) {
         Map<String, Object> resultMap = new HashMap<>();
         Map<String, Object> resultMap = new HashMap<>();
         try {
         try {
-
-
-
             Boolean isVideo = imgLocation(jsonObject.getString("url"));
             Boolean isVideo = imgLocation(jsonObject.getString("url"));
             MaterialInfo info = new MaterialInfo();
             MaterialInfo info = new MaterialInfo();
             info.setId(jsonObject.getString("code"));
             info.setId(jsonObject.getString("code"));
@@ -106,7 +104,7 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
             info.setStatus(0);
             info.setStatus(0);
             info.setMaterialName(jsonObject.getString("materialName"));
             info.setMaterialName(jsonObject.getString("materialName"));
             info.setWatermarkMaterialName(jsonObject.getString("watermarkMaterialName"));
             info.setWatermarkMaterialName(jsonObject.getString("watermarkMaterialName"));
-            info.setMaterialDescribe(jsonObject.getString("describe"));
+            info.setMaterialDescribe(jsonObject.getString("materialDescribe"));
             info.setCreateTime(new Date());
             info.setCreateTime(new Date());
             info.setUpdateTime(new Date());
             info.setUpdateTime(new Date());
             if (isVideo) {
             if (isVideo) {
@@ -130,7 +128,6 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
                 int i = materialAscriptionMapper.insert(materialAscription);
                 int i = materialAscriptionMapper.insert(materialAscription);
                 if (i > 0) {
                 if (i > 0) {
                     log.info("素材归属信息入库完成,MaterialId:{}", info.getId());
                     log.info("素材归属信息入库完成,MaterialId:{}", info.getId());
-
                 }
                 }
             }
             }
             JSONArray tag = jsonObject.getJSONArray("tag");
             JSONArray tag = jsonObject.getJSONArray("tag");
@@ -143,11 +140,8 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
                         materialTag.setMaterialId(info.getId());
                         materialTag.setMaterialId(info.getId());
                         materialTag.setTag(tagStr);
                         materialTag.setTag(tagStr);
                         materialTagMapper.insert(materialTag);
                         materialTagMapper.insert(materialTag);
-
                     }
                     }
-
                 }
                 }
-
             }
             }
             getFile(info);
             getFile(info);
             ResultMapUtils.setResultMap(resultMap, StatusCode.COMMON_SUCCESS.getCode());
             ResultMapUtils.setResultMap(resultMap, StatusCode.COMMON_SUCCESS.getCode());
@@ -162,6 +156,86 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
     }
     }
 
 
 
 
+    /**
+     * 获取素材详细信息
+     *
+     * @param materialId
+     * @return
+     */
+
+    @Autowired
+    private MaterialInfoMapper materialInfoMapper;
+
+
+    @Override
+    public JSONObject getDetail(String materialId) {
+        JSONObject json = new JSONObject();
+
+        MaterialInfo materialInfo = this.getById(materialId);
+        if (!Check.isNull(materialInfo.getAuditorId())) {
+            String auditorName = materialInfoMapper.selectUserNameById(materialInfo.getAuditorId());
+            json.put("auditorName", auditorName);
+        } else {
+            json.put("auditorName", "");
+        }
+
+        List<String> tagList = materialTagMapper.selectByMaterialId(materialId);
+        if (!Check.isNull(tagList)) {
+            json.put("tag", tagList);
+        }
+        QueryWrapper<MaterialParameter> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("material_id", materialId);
+        queryWrapper.orderByDesc("create_time");
+        queryWrapper.last("limit 1");
+        MaterialParameter materialParameter = materialParameterMapper.selectOne(queryWrapper);
+        if (!Check.isNull(materialParameter)) {
+            json.put("parameter", materialParameter);
+        }
+        JSONObject ascriptionJson = materialAscriptionMapper.selectByMaterialId(materialId);
+        if (!Check.isNull(ascriptionJson)) {
+            json.put("ascription", ascriptionJson);
+        }
+
+        return json;
+    }
+
+    /**
+     * 工作台报表
+     *
+     * @param userId
+     * @return
+     */
+    @Override
+    public JSONObject report(String userId) {
+
+        JSONObject json = new JSONObject();
+        try {
+            Map<String, Object> requestMap = new HashMap<>();
+            requestMap.put("userId", userId);
+
+            String totalCount = materialInfoMapper.selectCountByMap(requestMap);
+            json.put("total", totalCount);
+
+            requestMap.put("status", 0);
+            String waitAudit = materialInfoMapper.selectCountByMap(requestMap);
+            json.put("waitAudit", waitAudit);
+
+            requestMap.put("status", 1);
+            String passAudit = materialInfoMapper.selectCountByMap(requestMap);
+            json.put("passAudit", passAudit);
+
+            requestMap.put("status", 2);
+            String refuseAudit = materialInfoMapper.selectCountByMap(requestMap);
+            json.put("refuseAudit", refuseAudit);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+
+        return json;
+    }
+
+
     @Autowired
     @Autowired
     private MaterialParameterMapper materialParameterMapper;
     private MaterialParameterMapper materialParameterMapper;
 
 
@@ -182,7 +256,6 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
                     long l = System.currentTimeMillis();
                     long l = System.currentTimeMillis();
                     String localUrl = LoadFileUtil.downLoadFromUrl(url, "D:\\tets1\\video");
                     String localUrl = LoadFileUtil.downLoadFromUrl(url, "D:\\tets1\\video");
                     File file = new File(localUrl);
                     File file = new File(localUrl);
-
                     it.sauronsoftware.jave.Encoder encoder = new Encoder();
                     it.sauronsoftware.jave.Encoder encoder = new Encoder();
                     try {
                     try {
                         it.sauronsoftware.jave.MultimediaInfo m = encoder.getInfo(file);
                         it.sauronsoftware.jave.MultimediaInfo m = encoder.getInfo(file);
@@ -220,8 +293,6 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
 
 
             }
             }
         });
         });
-        executorService.shutdown();
-
     }
     }
 
 
 
 

+ 1 - 1
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/encryption/AesEncryptUtil.java

@@ -1,4 +1,4 @@
-package org.jeecg.common.util.encryption;
+package cn.com.ctop.common.module.utils;
 
 
 import org.apache.shiro.codec.Base64;
 import org.apache.shiro.codec.Base64;
 
 

+ 1 - 1
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/encryption/EncryptedString.java

@@ -1,4 +1,4 @@
-package org.jeecg.common.util.encryption;
+package cn.com.ctop.common.module.utils;
 
 
 
 
 import lombok.Data;
 import lombok.Data;

+ 1 - 2
jeecg-boot-base-common/src/main/java/org/jeecg/common/util/LoadFileUtil.java

@@ -1,7 +1,6 @@
-package org.jeecg.common.util;
+package cn.com.ctop.common.module.utils;
 
 
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.codec.digest.DigestUtils;
-import org.jeecg.common.util.encryption.AesEncryptUtil;
 
 
 import java.io.*;
 import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.HttpURLConnection;

+ 32 - 7
module-ctop/src/main/java/cn/com/ctop/manage/modules/material/controller/MaterialInfoController.java

@@ -3,18 +3,19 @@ package cn.com.ctop.manage.modules.material.controller;
 
 
 import cn.com.ctop.common.module.entity.MaterialInfo;
 import cn.com.ctop.common.module.entity.MaterialInfo;
 import cn.com.ctop.common.module.service.IMaterialInfoService;
 import cn.com.ctop.common.module.service.IMaterialInfoService;
+import cn.com.ctop.common.module.utils.Check;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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 io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -32,6 +33,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLDecoder;
+import java.text.ParseException;
 import java.util.Arrays;
 import java.util.Arrays;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
@@ -51,6 +53,21 @@ public class MaterialInfoController {
     @Autowired
     @Autowired
     private IMaterialInfoService materialInfoService;
     private IMaterialInfoService materialInfoService;
 
 
+    @GetMapping(value = "/report")
+    public JSONObject report(String userId) {
+        return materialInfoService.report(userId);
+
+    }
+
+
+    @GetMapping(value = "/getDetail")
+    public JSONObject getDetail(String materialId) {
+
+        return materialInfoService.getDetail(materialId);
+
+    }
+
+
     /**
     /**
      * 分页列表查询
      * 分页列表查询
      *
      *
@@ -67,12 +84,20 @@ public class MaterialInfoController {
                                                      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                      HttpServletRequest req) {
                                                      HttpServletRequest req) {
+
         Result<IPage<MaterialInfo>> result = new Result<>();
         Result<IPage<MaterialInfo>> result = new Result<>();
-       QueryWrapper<MaterialInfo> queryWrapper = QueryGenerator.initQueryWrapper(materialInfo, req.getParameterMap());
-       /*  LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        if (null != user.getUsername() && !user.getUsername().contains("admin")) {
-            queryWrapper.eq("user_id", user.getId());
-        }*/
+        Object createTime = materialInfo.getCreateTime();
+        materialInfo.setCreateTime(null);
+        QueryWrapper<MaterialInfo> queryWrapper = QueryGenerator.initQueryWrapper(materialInfo, req.getParameterMap());
+        if (!Check.isNull(createTime)) {
+            try {
+                Map<String, Object> map = DateUtils.getStartEndTime(createTime.toString());
+                queryWrapper.ge("create_time", map.get("start"));
+                queryWrapper.lt("create_time", map.get("end"));
+            } catch (ParseException e) {
+                e.printStackTrace();
+            }
+        }
         Page<MaterialInfo> page = new Page<>(pageNo, pageSize);
         Page<MaterialInfo> page = new Page<>(pageNo, pageSize);
         IPage<MaterialInfo> pageList = materialInfoService.page(page, queryWrapper);
         IPage<MaterialInfo> pageList = materialInfoService.page(page, queryWrapper);
         result.setSuccess(true);
         result.setSuccess(true);

+ 3 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouImageServiceImpl.java

@@ -1,19 +1,19 @@
 package cn.com.ctop.kuaishou.modules.batch.service.impl;
 package cn.com.ctop.kuaishou.modules.batch.service.impl;
 
 
+import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.service.ICtopOauthTokenService;
+import cn.com.ctop.common.module.utils.AesEncryptUtil;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
 import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImage;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouImage;
 import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouImageMapper;
 import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouImageMapper;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouImageService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouImageService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
-import cn.com.ctop.common.module.entity.CtopOauthToken;
-import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.util.encryption.AesEncryptUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 

+ 3 - 3
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaiShouVideoServiceImpl.java

@@ -1,19 +1,19 @@
 package cn.com.ctop.kuaishou.modules.batch.service.impl;
 package cn.com.ctop.kuaishou.modules.batch.service.impl;
 
 
+import cn.com.ctop.common.module.entity.CtopOauthToken;
+import cn.com.ctop.common.module.service.ICtopOauthTokenService;
+import cn.com.ctop.common.module.utils.AesEncryptUtil;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
 import cn.com.ctop.common.module.utils.KuaishouInterfaceConstant;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouVideo;
 import cn.com.ctop.kuaishou.modules.batch.entity.KuaiShouVideo;
 import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouVideoMapper;
 import cn.com.ctop.kuaishou.modules.batch.mapper.KuaiShouVideoMapper;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouVideoService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaiShouVideoService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
 import cn.com.ctop.kuaishou.modules.batch.service.IKuaishouInterfaceService;
-import cn.com.ctop.common.module.entity.CtopOauthToken;
-import cn.com.ctop.common.module.service.ICtopOauthTokenService;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.util.encryption.AesEncryptUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 

+ 3 - 4
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/service/impl/KuaishouInterfaceServiceImpl.java

@@ -30,7 +30,6 @@ import lombok.extern.slf4j.Slf4j;
 import lombok.var;
 import lombok.var;
 import org.apache.http.ParseException;
 import org.apache.http.ParseException;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.DateUtils;
-import org.jeecg.common.util.LoadFileUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpEntity;
@@ -952,9 +951,9 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
     /**
     /**
      * 创建广告计划
      * 创建广告计划
      *
      *
-     * @param accessToken token信息
-     * @param advertiserId  广告主id
-     * @param requestJson 请求参数拼装
+     * @param accessToken  token信息
+     * @param advertiserId 广告主id
+     * @param requestJson  请求参数拼装
      */
      */
     @Override
     @Override
     public Map<String, Object> campaignCreate(String accessToken, Long advertiserId, JSONObject requestJson) {
     public Map<String, Object> campaignCreate(String accessToken, Long advertiserId, JSONObject requestJson) {