yumeng 5 vuotta sitten
vanhempi
commit
be861234b3
37 muutettua tiedostoa jossa 2238 lisäystä ja 563 poistoa
  1. 5 0
      jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java
  2. 50 6
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AdvertiserController.java
  3. 2 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BindAccountAuthController.java
  4. 7 11
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BindAccountLoginController.java
  5. 38 17
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CallbackController.java
  6. 336 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java
  7. 375 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectMemberController.java
  8. 65 36
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/Advertiser.java
  9. 96 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/Project.java
  10. 89 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ProjectMember.java
  11. 15 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ProjectMapper.java
  12. 15 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ProjectMemberMapper.java
  13. 5 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/ProjectMapper.xml
  14. 5 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/ProjectMemberMapper.xml
  15. 15 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IProjectMemberService.java
  16. 15 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IProjectService.java
  17. 19 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ProjectMemberServiceImpl.java
  18. 19 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ProjectServiceImpl.java
  19. 5 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/fileupload/controller/FileController.java
  20. 380 401
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
  21. 295 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/UserCompanyController.java
  22. 65 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/UserCompany.java
  23. 3 1
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java
  24. 5 5
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java
  25. 56 45
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java
  26. 15 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/UserCompanyMapper.java
  27. 8 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml
  28. 9 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml
  29. 7 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserMapper.xml
  30. 5 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/UserCompanyMapper.xml
  31. 19 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IUserCompanyService.java
  32. 98 0
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/UserCompanyServiceImpl.java
  33. 46 0
      module-common/pom.xml
  34. 11 36
      module-common/src/main/java/cn/com/ctop/common/module/entity/UserAllocation.java
  35. 36 0
      module-common/src/main/java/cn/com/ctop/common/module/service/impl/FileInfoServiceImpl.java
  36. 3 3
      module-ctop/src/main/java/cn/com/ctop/manage/modules/material/controller/MaterialInfoController.java
  37. 1 0
      module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/MaterialRefuseController.java

+ 5 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/config/ShiroConfig.java

@@ -121,6 +121,11 @@ public class ShiroConfig {
 		filterChainDefinitionMap.put("/upload/**", "anon");
         filterChainDefinitionMap.put("/appium/appiumTask/run", "anon");
 
+
+        filterChainDefinitionMap.put("/system/userCompany/**", "anon");
+
+
+
 		//爬虫接口
 		filterChainDefinitionMap.put("/graphql/video", "anon");
 

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

@@ -1,5 +1,7 @@
 package org.jeecg.modules.ctop.controller;
 
+import cn.com.ctop.bytedance.mapper.MaterialReportMapper;
+import cn.com.ctop.common.module.utils.Check;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -12,8 +14,13 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.ctop.entity.Advertiser;
+import org.jeecg.modules.ctop.entity.Project;
+import org.jeecg.modules.ctop.mapper.ProjectMapper;
+import org.jeecg.modules.ctop.mapper.ProjectMemberMapper;
 import org.jeecg.modules.ctop.service.IAdvertiserService;
 import org.jeecg.modules.system.entity.SysCategory;
+import org.jeecg.modules.system.entity.UserCompany;
+import org.jeecg.modules.system.mapper.UserCompanyMapper;
 import org.jeecg.modules.system.service.ISysCategoryService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -31,10 +38,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @Description: 广告主信息表
@@ -51,6 +55,14 @@ public class AdvertiserController {
     private IAdvertiserService advertiserService;
     @Autowired
     private ISysCategoryService sysCategoryService;
+    @Autowired
+    private UserCompanyMapper userCompanyMapper;
+    @Autowired
+    private MaterialReportMapper materialReportMapper;
+    @Autowired
+    private ProjectMapper projectMapper;
+    @Autowired
+    private ProjectMemberMapper projectMemberMapper;
 
     /**
      * 分页列表查询
@@ -66,10 +78,20 @@ public class AdvertiserController {
     @GetMapping(value = "/list")
     public Result<IPage<Advertiser>> queryPageList(Advertiser advertiser,
                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                   @RequestParam(name = "pageSize", defaultValue = "1000") Integer pageSize,
                                                    HttpServletRequest req) {
+
         Result<IPage<Advertiser>> result = new Result<IPage<Advertiser>>();
+        String roleCode = materialReportMapper.getRoleCodeByUserId(advertiser.getUserId());
         QueryWrapper<Advertiser> queryWrapper = QueryGenerator.initQueryWrapper(advertiser, req.getParameterMap());
+        if (!"admin".equals(roleCode) && !Check.isNull(roleCode)) {
+            QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
+            userCompanyQueryWrapper.eq("user_id", advertiser.getUserId());
+            userCompanyQueryWrapper.orderByDesc("create_time");
+            userCompanyQueryWrapper.last("limit 1");
+            UserCompany userCompany = userCompanyMapper.selectOne(userCompanyQueryWrapper);
+            queryWrapper.eq("company_id", userCompany.getCompanyId());
+        }
         Page<Advertiser> page = new Page<Advertiser>(pageNo, pageSize);
         IPage<Advertiser> pageList = advertiserService.page(page, queryWrapper);
         if (pageList != null && pageList.getRecords() != null && pageList.getRecords().size() > 0) {
@@ -77,7 +99,6 @@ public class AdvertiserController {
             for (int i = 0; i < pageList.getRecords().size(); i++) {
                 Advertiser advertiserRecord = pageList.getRecords().get(i);
                 SysCategory sysCategory = sysCategoryService.getById(advertiserRecord.getIndustryId());
-
                 if (sysCategory != null) {
                     advertiserRecord.setIndustryId(sysCategory.getName());
                 }
@@ -102,6 +123,17 @@ public class AdvertiserController {
     public Result<Advertiser> add(@RequestBody Advertiser advertiser) {
         Result<Advertiser> result = new Result<Advertiser>();
         try {
+            String userId = advertiser.getUserId();
+            if (!Check.isNull(userId)) {
+                QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
+                userCompanyQueryWrapper.eq("user_id", userId);
+                userCompanyQueryWrapper.orderByDesc("create_time");
+                userCompanyQueryWrapper.last("limit 1");
+                UserCompany userCompany = userCompanyMapper.selectOne(userCompanyQueryWrapper);
+                if (!Check.isNull(userCompany)) {
+                    advertiser.setCompanyId(userCompany.getCompanyId());
+                }
+            }
             advertiserService.save(advertiser);
             result.success("添加成功!");
         } catch (Exception e) {
@@ -151,6 +183,18 @@ public class AdvertiserController {
         if (advertiser == null) {
             result.error500("未找到对应实体");
         } else {
+            QueryWrapper<Project> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("advertiser_id", id);
+            List<Project> projects = projectMapper.selectList(queryWrapper);
+            if (!Check.isNull(projects)) {
+                for (Project project : projects) {
+                    Map<String, Object> map = new HashMap<>();
+                    map.put("project_id", project.getId());
+                    projectMemberMapper.deleteByMap(map);
+                }
+
+            }
+            projectMapper.delete(queryWrapper);
             boolean ok = advertiserService.removeById(id);
             if (ok) {
                 result.success("删除成功!");

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

@@ -1,8 +1,8 @@
 package org.jeecg.modules.ctop.controller;
 
-import cn.com.ctop.common.module.utils.Check;
 import cn.com.ctop.common.module.entity.BindAccountAuth;
 import cn.com.ctop.common.module.service.IBindAccountAuthService;
+import cn.com.ctop.common.module.utils.Check;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -57,6 +57,7 @@ public class BindAccountAuthController {
      */
     @PostMapping(value = "/authorization")
     public Result<IPage<BindAccountAuth>> authorization(@RequestBody JSONObject json) {
+        log.info("授权入参:{}", json);
         Result<IPage<BindAccountAuth>> result = new Result<IPage<BindAccountAuth>>();
         String codeUrl = null;
         try {

+ 7 - 11
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/BindAccountLoginController.java

@@ -69,6 +69,7 @@ public class BindAccountLoginController {
      */
     @PostMapping(value = "/login")
     public Result<IPage<BindAccountLogin>> login(@RequestBody JSONObject json) {
+        log.info("登录入参:{}", json);
         Result<IPage<BindAccountLogin>> result = new Result<>();
         String advertiserId = json.getString("advertiserId");
         if (Check.isNull(advertiserId)) {
@@ -92,32 +93,27 @@ public class BindAccountLoginController {
             deleteMap.put("user_id", userId);
             deleteMap.put("advertiser_id", advertiserId);
             userAllocationMapper.deleteByMap(deleteMap);
-
             Long accountId = (Long) stringObjectMap.get("accountId");
-
-            String realName = json.getString("realName");
-            //部门id
-            String departmentId = json.getString("departmentId");
-            //指定分配人姓名
-            String distributionName = json.getString("distributionName");
+            String userName = json.getString("userName");
             // 媒体类型: 1 头条 2 快手
             String mediaId = json.getString("mediaId");
+            Long projectId = json.getLong("projectId");
+            String projectName = json.getString("projectName");
             UserAllocation userAllocation = new UserAllocation();
-            userAllocation.setDistributionName(distributionName);
+            userAllocation.setUserName(userName);
             userAllocation.setUserId(userId);
             userAllocation.setAdvertiserId(advertiserId);
             userAllocation.setAccountId(accountId);
-            userAllocation.setDepartmentId(departmentId);
             userAllocation.setAdvertiserName(advertiserName);
             userAllocation.setAccountName(accountName);
+            userAllocation.setProjectId(projectId);
+            userAllocation.setProjectName(projectName);
             userAllocation.setMediaId(mediaId);
-            userAllocation.setOperationName(realName);
             int i = userAllocationMapper.insert(userAllocation);
             if (i > 0) {
                 logger.info("用户分配入库完成,advertiserId:{}", advertiserId);
             }
         }
-
         result.setSuccess(trueOrFalse);
         result.setMessage((String) stringObjectMap.get("message"));
         return result;

+ 38 - 17
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/CallbackController.java

@@ -2,7 +2,6 @@ package org.jeecg.modules.ctop.controller;
 
 import cn.com.ctop.common.module.entity.CtopOauthToken;
 import cn.com.ctop.common.module.entity.UserAllocation;
-import cn.com.ctop.common.module.mapper.CtopOauthTokenMapper;
 import cn.com.ctop.common.module.mapper.UserAllocationMapper;
 import cn.com.ctop.common.module.service.IBindAccountAuthService;
 import cn.com.ctop.common.module.service.ICtopOauthTokenService;
@@ -13,6 +12,7 @@ import cn.com.ctop.kuaishou.modules.material.entity.KuaishouResultToken;
 import cn.com.ctop.toutiao.entity.ByteDanceAdvertiser;
 import cn.com.ctop.toutiao.service.IByteDanceAdvertiserDataService;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -37,8 +37,6 @@ public class CallbackController {
     private IKuaishouInterfaceService kuaishouInterfaceService;
 
     @Autowired
-    private CtopOauthTokenMapper cTopOauthTokenMapper;
-    @Autowired
     private IBindAccountAuthService bindAccountAuthService;
 
     @Autowired
@@ -76,28 +74,38 @@ public class CallbackController {
                 KuaishouAccessToken token = accessToken.getData();
                 if (token != null) {
                     Long accountId = token.getAccountId();
+                    if (Check.isNull(accountId)) {
+                        return "授权绑定失败!";
+                    }
+                    QueryWrapper<UserAllocation> userAllocationQueryWrapper = new QueryWrapper<>();
+                    userAllocationQueryWrapper.eq("account_id", accountId);
+                    userAllocationQueryWrapper.eq("media_id", 2);
+                    userAllocationQueryWrapper.orderByDesc("create_time");
+                    userAllocationQueryWrapper.last("limit 1");
+                    UserAllocation checkUserAllocation = allocationMapper.selectOne(userAllocationQueryWrapper);
+                    if (Check.isNull(checkUserAllocation)) {
+                        return "授权失败,该账号已被:" + checkUserAllocation.getAuthName() + "绑定!";
+                    }
                     String advertiserId = json.getString("advertiserId");
-                    String distributionName = json.getString("distributionName");//指定分配人姓名
+                    String userName = json.getString("userName");//指定分配人姓名
                     String advertiserName = json.getString("advertiser_name"); // 广告主名称
                     String mediaId = json.getString("mediaId"); // 媒体类型: 1 头条 2 快手
-                    String realName = json.getString("realName");
-                    String departmentId = json.getString("departmentId"); //部门id
                     String userId = json.getString("userId"); //创建人
+                    Long projectId = json.getLong("projectId");
+                    String projectName = json.getString("projectName");
                     UserAllocation userAllocation = new UserAllocation();
-                    userAllocation.setDistributionName(distributionName);
+                    userAllocation.setUserName(userName);
                     userAllocation.setUserId(userId);
                     userAllocation.setAdvertiserId(advertiserId);
-
-
                     Map<String, Object> advertiseBaseInfoMap = kuaishouInterfaceService.advertiserInfo(accountId, token.getAccessToken());// 获取快手昵称
                     if ((Integer) advertiseBaseInfoMap.get("code") == 0) {
                         userAllocation.setAuthName((String) advertiseBaseInfoMap.get("userName"));
                     }
                     userAllocation.setAdvertiserName(advertiserName);
                     userAllocation.setMediaId(mediaId);
-                    userAllocation.setDepartmentId(departmentId);
-                    userAllocation.setOperationName(realName);
                     userAllocation.setAccountId(accountId);
+                    userAllocation.setProjectId(projectId);
+                    userAllocation.setProjectName(projectName);
                     userAllocation.setCreateTime(new Date());
                     userAllocation.setUpdateTime(new Date());
                     allocationMapper.deleteById(userAllocation.getId());
@@ -185,11 +193,12 @@ public class CallbackController {
             }
             String advertiserId = json.getString("advertiserId");//广告主id
             String mediaId = json.getString("mediaId"); // 媒体类型: 1 头条 2 快手
-            String realName = json.getString("realName");
-            String departmentId = json.getString("departmentId"); //部门id
-            String distributionName = json.getString("distributionName");//指定分配人姓名
+
             String advertiserName = json.getString("advertiser_name"); // 广告主名称
             String userId = json.getString("userId"); //创建人
+            String userName = json.getString("userName"); //创建人
+            Long projectId = json.getLong("projectId");
+            String projectName = json.getString("projectName");
 
             JSONObject data = resultObject.getJSONObject("data");
             CtopOauthToken token = new CtopOauthToken(advertiserId, data);
@@ -202,14 +211,26 @@ public class CallbackController {
                 throw new Exception("获取广告主信息失败");
             }
             ByteDanceAdvertiser advertiserData = (ByteDanceAdvertiser) advertiserDataMap.get("data");
+            Long accountId = token.getAccountId();
+            QueryWrapper<UserAllocation> userAllocationQueryWrapper = new QueryWrapper<>();
+            userAllocationQueryWrapper.eq("account_id", accountId);
+            userAllocationQueryWrapper.eq("media_id", 1);
+            userAllocationQueryWrapper.orderByDesc("create_time");
+            userAllocationQueryWrapper.last("limit 1");
+            UserAllocation checkUserAllocation = allocationMapper.selectOne(userAllocationQueryWrapper);
+            if (Check.isNull(checkUserAllocation)) {
+                returnMap.put("code", -1);
+                returnMap.put("desc", "授权失败,账号已被:" + checkUserAllocation.getUserName() + "绑定");
+            }
+
             UserAllocation userAllocation = new UserAllocation();
-            userAllocation.setDistributionName(distributionName);
             userAllocation.setUserId(userId);
-            userAllocation.setDepartmentId(departmentId);
-            userAllocation.setOperationName(realName);
+            userAllocation.setUserName(userName);
             userAllocation.setAccountId(token.getAccountId());
             userAllocation.setAdvertiserName(advertiserName);
             userAllocation.setMediaId(mediaId);
+            userAllocation.setProjectId(projectId);
+            userAllocation.setProjectName(projectName);
             userAllocation.setAuthName(advertiserData.getName());
             userAllocation.setAdvertiserId(advertiserId);
             userAllocation.setCreateTime(new Date());

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

@@ -0,0 +1,336 @@
+package org.jeecg.modules.ctop.controller;
+
+import cn.com.ctop.bytedance.mapper.MaterialReportMapper;
+import cn.com.ctop.common.module.utils.Check;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.ctop.entity.Advertiser;
+import org.jeecg.modules.ctop.entity.Project;
+import org.jeecg.modules.ctop.entity.ProjectMember;
+import org.jeecg.modules.ctop.mapper.ProjectMapper;
+import org.jeecg.modules.ctop.service.IAdvertiserService;
+import org.jeecg.modules.ctop.service.IProjectMemberService;
+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.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 项目
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-11-19
+ */
+@Slf4j
+@Api(tags = "项目")
+@RestController
+@RequestMapping("/ctop/project")
+public class ProjectController {
+    @Autowired
+    private IProjectService projectService;
+
+    @Autowired
+    private IProjectMemberService projectMemberService;
+
+    @Autowired
+    private MaterialReportMapper materialReportMapper;
+
+    @Autowired
+    private IAdvertiserService advertiserService;
+
+    @Autowired
+    private UserCompanyMapper userCompanyMapper;
+
+    @Autowired
+    private ProjectMapper projectMapper;
+
+
+    /**
+     * 我管理的
+     * @param userId
+     * @return
+     */
+    @AutoLog(value = "项目成员-分页列表查询")
+    @ApiOperation(value = "项目成员-分页列表查询", notes = "项目成员-分页列表查询")
+    @GetMapping(value = "/responsibleList")
+    public Map<String, Object> responsibleList(String userId) {
+        Map<String, Object> map = new HashMap<>();
+
+      /*  String roleCode = materialReportMapper.getRoleCodeByUserId(userId);
+        if (Check.isNull(roleCode)) {
+            map.put("code", -1);
+            return map;
+        }
+        QueryWrapper<Project> queryWrapper = new QueryWrapper<>();
+        if (!"admin".equals(roleCode)) {
+            QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
+            userCompanyQueryWrapper.eq("user_id", userId);
+            userCompanyQueryWrapper.orderByDesc("create_time");
+            userCompanyQueryWrapper.last("limit 1");
+            UserCompany userCompany = userCompanyMapper.selectOne(userCompanyQueryWrapper);
+            queryWrapper.eq("company_id", userCompany.getCompanyId());
+            if ("kuaishouOperationManager".equals(roleCode)) {
+
+                queryWrapper.eq("media_id", "2");
+            } else if ("toutiaoOperationManager".equals(roleCode)) {
+                queryWrapper.eq("media_id", "1");
+            }
+        }*/
+        QueryWrapper<Project> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("responsible_id", userId);
+        queryWrapper.orderByDesc("create_time");
+        List<Project> projects = projectMapper.selectList(queryWrapper);
+        map.put("success", true);
+        map.put("code", 0);
+        map.put("result", projects);
+
+
+        return map;
+    }
+
+
+    /**
+     * 分页列表查询
+     *
+     * @param project
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "项目-分页列表查询")
+    @ApiOperation(value = "项目-分页列表查询", notes = "项目-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<Project>> queryPageList(Project project,
+                                                @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                HttpServletRequest req) {
+        Result<IPage<Project>> result = new Result<IPage<Project>>();
+        QueryWrapper<Project> queryWrapper = QueryGenerator.initQueryWrapper(project, req.getParameterMap());
+        Page<Project> page = new Page<Project>(pageNo, pageSize);
+        IPage<Project> pageList = projectService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param project
+     * @return
+     */
+    @AutoLog(value = "项目-添加")
+    @ApiOperation(value = "项目-添加", notes = "项目-添加")
+    @PostMapping(value = "/add")
+    public Result<Project> add(@RequestBody Project project) {
+        Result<Project> result = new Result<Project>();
+        try {
+            String advertiserId = project.getAdvertiserId();
+            Advertiser advertiser = advertiserService.getById(advertiserId);
+            if (!Check.isNull(advertiser)) {
+                project.setCompanyId(advertiser.getCompanyId());
+            }
+            projectService.save(project);
+            Long id = project.getId();
+            Map<String, Object> map = new HashMap<>();
+            map.put("project_id", id);
+            map.put("user_id", project.getResponsibleId());
+            projectMemberService.removeByMap(map);
+            ProjectMember member = new ProjectMember();
+            member.setProjectId(id);
+            member.setProjectName(project.getProjectName());
+            member.setUserId(project.getResponsibleId());
+            member.setUserName(project.getResponsibleName());
+            projectMemberService.save(member);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param project
+     * @return
+     */
+    @AutoLog(value = "项目-编辑")
+    @ApiOperation(value = "项目-编辑", notes = "项目-编辑")
+    @PutMapping(value = "/edit")
+    public Result<Project> edit(@RequestBody Project project) {
+        Result<Project> result = new Result<Project>();
+        Project projectEntity = projectService.getById(project.getId());
+        if (projectEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = projectService.updateById(project);
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "项目-通过id删除")
+    @ApiOperation(value = "项目-通过id删除", notes = "项目-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        try {
+            projectService.removeById(id);
+            Map<String, Object> deleteMap = new HashMap<>();
+            deleteMap.put("project_id", id);
+            projectMemberService.removeByMap(deleteMap);
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "项目-批量删除")
+    @ApiOperation(value = "项目-批量删除", notes = "项目-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<Project> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<Project> result = new Result<Project>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.projectService.removeByIds(Arrays.asList(ids.split(",")));
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "项目-通过id查询")
+    @ApiOperation(value = "项目-通过id查询", notes = "项目-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<Project> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<Project> result = new Result<Project>();
+        Project project = projectService.getById(id);
+        if (project == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(project);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<Project> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                Project project = JSON.parseObject(deString, Project.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(project, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<Project> pageList = projectService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "项目列表");
+        mv.addObject(NormalExcelConstants.CLASS, Project.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("项目列表数据", "导出人:Jeecg", "导出信息"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<Project> listProjects = ExcelImportUtil.importExcel(file.getInputStream(), Project.class, params);
+                projectService.saveBatch(listProjects);
+                return Result.ok("文件导入成功!数据行数:" + listProjects.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.ok("文件导入失败!");
+    }
+
+}

+ 375 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectMemberController.java

@@ -0,0 +1,375 @@
+package org.jeecg.modules.ctop.controller;
+
+import cn.com.ctop.common.module.utils.Check;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.ctop.entity.Project;
+import org.jeecg.modules.ctop.entity.ProjectMember;
+import org.jeecg.modules.ctop.mapper.ProjectMemberMapper;
+import org.jeecg.modules.ctop.service.IProjectMemberService;
+import org.jeecg.modules.ctop.service.IProjectService;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.*;
+
+/**
+ * 项目成员
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-11-19
+ */
+@Slf4j
+@Api(tags = "项目成员")
+@RestController
+@RequestMapping("/ctop/projectMember")
+public class ProjectMemberController {
+    @Autowired
+    private IProjectMemberService projectMemberService;
+    @Autowired
+    private ProjectMemberMapper projectMemberMapper;
+    @Autowired
+    private IProjectService projectService;
+
+
+    /**
+     * 我参与项目
+     *
+     * @param projectId
+     * @return
+     */
+    @AutoLog(value = "项目成员-分页列表查询")
+    @ApiOperation(value = "项目成员-分页列表查询", notes = "项目成员-分页列表查询")
+    @GetMapping(value = "/getMemberList")
+    public Map<String, Object> getMemberList(String projectId) {
+        Map<String, Object> map = new HashMap<>();
+        try {
+            QueryWrapper<ProjectMember> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("project_id", projectId);
+            queryWrapper.orderByDesc("create_time");
+            List<ProjectMember> projectMemberList = projectMemberMapper.selectList(queryWrapper);
+            map.put("code", 0);
+            map.put("success", true);
+            map.put("result", projectMemberList);
+        } catch (Exception e) {
+            map.put("success", false);
+            map.put("code", -1);
+        }
+
+        return map;
+    }
+
+
+    /**
+     * 我参与项目
+     *
+     * @param userId
+     * @return
+     */
+    @AutoLog(value = "项目成员-分页列表查询")
+    @ApiOperation(value = "项目成员-分页列表查询", notes = "项目成员-分页列表查询")
+    @GetMapping(value = "/participateList")
+    public Map<String, Object> participateList(String userId) {
+        Map<String, Object> map = new HashMap<>();
+        try {
+            QueryWrapper<ProjectMember> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("user_id", userId);
+            queryWrapper.groupBy("project_id");
+            queryWrapper.orderByDesc("create_time");
+            List<ProjectMember> projectMembers = projectMemberMapper.selectList(queryWrapper);
+            List<ProjectMember> projectMemberList = new ArrayList<>();
+            if (!Check.isNull(projectMembers)) {
+                for (ProjectMember projectMember : projectMembers) {
+                    Project project = projectService.getById(projectMember.getProjectId());
+                    projectMember.setResponsibleName(project.getResponsibleName());
+                    projectMember.setAdvertiserName(project.getAdvertiserName());
+                    projectMember.setAdvertiserId(project.getAdvertiserId());
+                    projectMember.setMediaId(project.getMediaId());
+                    projectMemberList.add(projectMember);
+                }
+            }
+            map.put("code", 0);
+            map.put("success", true);
+            map.put("result", projectMemberList);
+        } catch (Exception e) {
+            map.put("success", false);
+            map.put("code", -1);
+        }
+
+        return map;
+    }
+
+
+    /**
+     * 分页列表查询
+     *
+     * @param projectMember
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "项目成员-分页列表查询")
+    @ApiOperation(value = "项目成员-分页列表查询", notes = "项目成员-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<ProjectMember>> queryPageList(ProjectMember projectMember,
+                                                      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                      HttpServletRequest req) {
+        Result<IPage<ProjectMember>> result = new Result<IPage<ProjectMember>>();
+        QueryWrapper<ProjectMember> queryWrapper = QueryGenerator.initQueryWrapper(projectMember, req.getParameterMap());
+        Page<ProjectMember> page = new Page<ProjectMember>(pageNo, pageSize);
+        IPage<ProjectMember> pageList = projectMemberService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+
+    /**
+     * 批量添加
+     *
+     * @param jsonObject
+     * @return
+     */
+    @AutoLog(value = "项目成员-添加")
+    @ApiOperation(value = "项目成员-添加", notes = "项目成员-添加")
+    @PostMapping(value = "/batchAdd")
+    public Result<ProjectMember> batchAdd(@RequestBody JSONObject jsonObject) {
+        Result<ProjectMember> result = new Result<ProjectMember>();
+        try {
+            if (Check.isNull(jsonObject)) {
+                throw new Exception("入参不能为空");
+            }
+            Long projectId = jsonObject.getLong("projectId");
+            String projectName = jsonObject.getString("projectName");
+            JSONArray memberArr = jsonObject.getJSONArray("memberArr");
+            if (Check.isNull(memberArr)) {
+                throw new Exception("请选择项目成员");
+            }
+            for (int i = 0; i < memberArr.size(); i++) {
+                JSONObject memberJson = memberArr.getJSONObject(i);
+                if (!Check.isNull(memberJson)) {
+                    String userId = memberJson.getString("userId");
+                    QueryWrapper<ProjectMember> queryWrapper = new QueryWrapper<>();
+                    queryWrapper.eq("user_id", userId);
+                    queryWrapper.eq("project_id", projectId);
+                    ProjectMember selectMember = (ProjectMember) projectMemberService.getObj(queryWrapper);
+                    if (!Check.isNull(selectMember)) {
+                        continue;
+                    }
+                    ProjectMember member = new ProjectMember();
+                    member.setProjectId(projectId);
+                    member.setProjectName(projectName);
+                    member.setUserId(userId);
+                    member.setUserName(memberJson.getString("userName"));
+                    projectMemberService.save(member);
+                }
+            }
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+
+    /**
+     * 添加
+     *
+     * @param projectMember
+     * @return
+     */
+    @AutoLog(value = "项目成员-添加")
+    @ApiOperation(value = "项目成员-添加", notes = "项目成员-添加")
+    @PostMapping(value = "/add")
+    public Result<ProjectMember> add(@RequestBody ProjectMember projectMember) {
+        Result<ProjectMember> result = new Result<ProjectMember>();
+        try {
+            projectMemberService.save(projectMember);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param projectMember
+     * @return
+     */
+    @AutoLog(value = "项目成员-编辑")
+    @ApiOperation(value = "项目成员-编辑", notes = "项目成员-编辑")
+    @PutMapping(value = "/edit")
+    public Result<ProjectMember> edit(@RequestBody ProjectMember projectMember) {
+        Result<ProjectMember> result = new Result<ProjectMember>();
+        ProjectMember projectMemberEntity = projectMemberService.getById(projectMember.getId());
+        if (projectMemberEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = projectMemberService.updateById(projectMember);
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "项目成员-通过id删除")
+    @ApiOperation(value = "项目成员-通过id删除", notes = "项目成员-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        try {
+            projectMemberService.removeById(id);
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "项目成员-批量删除")
+    @ApiOperation(value = "项目成员-批量删除", notes = "项目成员-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<ProjectMember> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<ProjectMember> result = new Result<ProjectMember>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.projectMemberService.removeByIds(Arrays.asList(ids.split(",")));
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "项目成员-通过id查询")
+    @ApiOperation(value = "项目成员-通过id查询", notes = "项目成员-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<ProjectMember> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<ProjectMember> result = new Result<ProjectMember>();
+        ProjectMember projectMember = projectMemberService.getById(id);
+        if (projectMember == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(projectMember);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<ProjectMember> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                ProjectMember projectMember = JSON.parseObject(deString, ProjectMember.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(projectMember, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<ProjectMember> pageList = projectMemberService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "项目成员列表");
+        mv.addObject(NormalExcelConstants.CLASS, ProjectMember.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("项目成员列表数据", "导出人:Jeecg", "导出信息"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<ProjectMember> listProjectMembers = ExcelImportUtil.importExcel(file.getInputStream(), ProjectMember.class, params);
+                projectMemberService.saveBatch(listProjectMembers);
+                return Result.ok("文件导入成功!数据行数:" + listProjectMembers.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.ok("文件导入失败!");
+    }
+
+}

+ 65 - 36
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/Advertiser.java

@@ -16,59 +16,88 @@ import java.util.Date;
 
 /**
  * 广告主信息表
+ *
  * @author jeecg-boot
- * @date 2019-06-11
  * @version V1.0
+ * @date 2019-06-11
  */
 @Data
 @TableName("ctop_advertiser")
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="ctop_advertiser对象", description="广告主信息表")
+@ApiModel(value = "ctop_advertiser对象", description = "广告主信息表")
 public class Advertiser {
 
-	/**主键ID*/
-	@TableId(type = IdType.UUID)
+    /**
+     * 主键ID
+     */
+    @TableId(type = IdType.UUID)
     @ApiModelProperty(value = "主键ID")
-	private String id;
-	/**广告主名称*/
-	@Excel(name = "广告主名称", width = 15)
+    private String id;
+    /**
+     * 广告主名称
+     */
+    @Excel(name = "广告主名称", width = 15)
     @ApiModelProperty(value = "广告主名称")
-	private String name;
-	/**行业ID*/
-	@Excel(name = "行业ID", width = 15)
+    private String name;
+    /**
+     * 行业ID
+     */
+    @Excel(name = "行业ID", width = 15)
     @ApiModelProperty(value = "行业ID")
-	private String industryId;
-	/**联系人姓名*/
-	@Excel(name = "联系人姓名", width = 15)
+    private String industryId;
+    /**
+     * 联系人姓名
+     */
+    @Excel(name = "联系人姓名", width = 15)
     @ApiModelProperty(value = "联系人姓名")
-	private String contact;
-	/**联系人手机*/
-	@Excel(name = "联系人手机", width = 15)
+    private String contact;
+    /**
+     * 联系人手机
+     */
+    @Excel(name = "联系人手机", width = 15)
     @ApiModelProperty(value = "联系人手机")
-	private String mobile;
-	/**联系人邮箱*/
-	@Excel(name = "联系人邮箱", width = 15)
+    private String mobile;
+    /**
+     * 联系人邮箱
+     */
+    @Excel(name = "联系人邮箱", width = 15)
     @ApiModelProperty(value = "联系人邮箱")
-	private String email;
-	/**创建人*/
-	@Excel(name = "创建人", width = 15)
+    private String email;
+    /**
+     * 创建人
+     */
+    @Excel(name = "创建人", width = 15)
     @ApiModelProperty(value = "创建人")
-	private String createBy;
-	/**创建时间*/
-	@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")
+    private String createBy;
+    /**
+     * 创建时间
+     */
+    @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;
-	/**修改人*/
-	@Excel(name = "修改人", width = 15)
+    private Date createTime;
+    /**
+     * 修改人
+     */
+    @Excel(name = "修改人", width = 15)
     @ApiModelProperty(value = "修改人")
-	private String updateBy;
-	/**修改时间*/
-	@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")
+    private String updateBy;
+    /**
+     * 修改时间
+     */
+    @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 updateTime;
+    private Date updateTime;
+
+
+
+    private String userId;
+
+    private String companyId;
+
+
 }

+ 96 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/Project.java

@@ -0,0 +1,96 @@
+package org.jeecg.modules.ctop.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 项目
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-11-19
+ */
+@Data
+@TableName("ctop_project")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ctop_project对象", description = "项目")
+public class Project {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "id")
+    private Long id;
+    /**
+     * 项目名称
+     */
+    @Excel(name = "项目名称", width = 15)
+    @ApiModelProperty(value = "项目名称")
+    private String projectName;
+    /**
+     * 广告主id
+     */
+    @Excel(name = "广告主id", width = 15)
+    @ApiModelProperty(value = "广告主id")
+    private String advertiserId;
+
+    @Excel(name = "广告主名称", width = 15)
+    @ApiModelProperty(value = "广告主名称")
+    private String advertiserName;
+    /**
+     * 创建人
+     */
+    @Excel(name = "创建人", width = 15)
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    /**
+     * 负责人id
+     */
+    @Excel(name = "负责人id", width = 15)
+    @ApiModelProperty(value = "负责人id")
+    private String responsibleId;
+
+
+    @Excel(name = "负责人名称", width = 15)
+    @ApiModelProperty(value = "负责人名称")
+    private String responsibleName;
+
+    @Excel(name = "公司id", width = 15)
+    @ApiModelProperty(value = "公司id")
+    private String companyId;
+    /**
+     * 媒体类型
+     */
+    @Excel(name = "媒体类型", width = 15)
+    @ApiModelProperty(value = "媒体类型")
+    private String mediaId;
+    /**
+     * 创建时间
+     */
+    @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;
+    /**
+     * 修改时间
+     */
+    @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 updateTime;
+}

+ 89 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/entity/ProjectMember.java

@@ -0,0 +1,89 @@
+package org.jeecg.modules.ctop.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 项目成员
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-11-19
+ */
+@Data
+@TableName("ctop_project_member")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "ctop_project_member对象", description = "项目成员")
+public class ProjectMember {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.AUTO)
+    @ApiModelProperty(value = "id")
+    private Long id;
+    /**
+     * 项目id
+     */
+    @Excel(name = "项目id", width = 15)
+    @ApiModelProperty(value = "项目id")
+    private Long projectId;
+
+
+    @Excel(name = "项目名称", width = 15)
+    @ApiModelProperty(value = "项目名称")
+    private String projectName;
+    /**
+     * 成员id
+     */
+    @Excel(name = "成员id", width = 15)
+    @ApiModelProperty(value = "成员id")
+    private String userId;
+
+    @Excel(name = "成员名称", width = 15)
+    @ApiModelProperty(value = "成员名称")
+    private String userName;
+
+
+    @TableField(exist = false)
+    private String responsibleName;
+
+    @TableField(exist = false)
+    private String advertiserName;
+    @TableField(exist = false)
+    private String advertiserId;
+
+
+    @TableField(exist = false)
+    private String mediaId;
+
+    /**
+     * 创建时间
+     */
+    @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;
+    /**
+     * 修改时间
+     */
+    @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 updateTime;
+}

+ 15 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ProjectMapper.java

@@ -0,0 +1,15 @@
+package org.jeecg.modules.ctop.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.ctop.entity.Project;
+
+/**
+ * 项目
+ *
+ * @author: jeecg-boot
+ * @date: 2019-11-19
+ * @cersion: V1.0
+ */
+public interface ProjectMapper extends BaseMapper<Project> {
+
+}

+ 15 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/ProjectMemberMapper.java

@@ -0,0 +1,15 @@
+package org.jeecg.modules.ctop.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.ctop.entity.ProjectMember;
+
+/**
+ * 项目成员
+ *
+ * @author: jeecg-boot
+ * @date: 2019-11-19
+ * @cersion: V1.0
+ */
+public interface ProjectMemberMapper extends BaseMapper<ProjectMember> {
+
+}

+ 5 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/ProjectMapper.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.ctop.mapper.ProjectMapper">
+
+</mapper>

+ 5 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/mapper/xml/ProjectMemberMapper.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.ctop.mapper.ProjectMemberMapper">
+
+</mapper>

+ 15 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IProjectMemberService.java

@@ -0,0 +1,15 @@
+package org.jeecg.modules.ctop.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.ctop.entity.ProjectMember;
+
+/**
+ * 项目成员
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-11-19
+ */
+public interface IProjectMemberService extends IService<ProjectMember> {
+
+}

+ 15 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/IProjectService.java

@@ -0,0 +1,15 @@
+package org.jeecg.modules.ctop.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.ctop.entity.Project;
+
+/**
+ * 项目
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-11-19
+ */
+public interface IProjectService extends IService<Project> {
+
+}

+ 19 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ProjectMemberServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.ctop.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.ctop.entity.ProjectMember;
+import org.jeecg.modules.ctop.mapper.ProjectMemberMapper;
+import org.jeecg.modules.ctop.service.IProjectMemberService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 项目成员
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-11-19
+ */
+@Service
+public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, ProjectMember> implements IProjectMemberService {
+
+}

+ 19 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/service/impl/ProjectServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.ctop.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.ctop.entity.Project;
+import org.jeecg.modules.ctop.mapper.ProjectMapper;
+import org.jeecg.modules.ctop.service.IProjectService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 项目
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-11-19
+ */
+@Service
+public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> implements IProjectService {
+
+}

+ 5 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/fileupload/controller/FileController.java

@@ -1,10 +1,12 @@
 package org.jeecg.modules.fileupload.controller;
 
 import cn.com.ctop.common.module.service.IMaterialInfoService;
+import com.alibaba.fastjson.JSONObject;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.vo.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -26,8 +28,10 @@ public class FileController {
     }
 
     @PostMapping("file/insert")
-    public Map<String, Object> insertFile(String code, String url) {
+    public Map<String, Object> insertFile(@RequestBody JSONObject json) {
         LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String code = json.getString("code");
+        String url = json.getString("url");
         return materialInfoService.insert(user.getId(), code, url);
     }
 }

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 380 - 401
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysUserController.java


+ 295 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/UserCompanyController.java

@@ -0,0 +1,295 @@
+package org.jeecg.modules.system.controller;
+
+import cn.com.ctop.common.module.utils.Check;
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.entity.UserCompany;
+import org.jeecg.modules.system.mapper.SysUserMapper;
+import org.jeecg.modules.system.mapper.UserCompanyMapper;
+import org.jeecg.modules.system.service.IUserCompanyService;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 用户够公司
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-11-14
+ */
+@Slf4j
+@Api(tags = "用户够公司")
+@RestController
+@RequestMapping("/system/userCompany")
+public class UserCompanyController {
+    @Autowired
+    private IUserCompanyService userCompanyService;
+    @Autowired
+    private SysUserMapper sysUserMapper;
+    @Autowired
+    private UserCompanyMapper userCompanyMapper;
+
+
+    @GetMapping(value = "/companyUser")
+    public void companyUser() {
+
+        List<SysUser> sysUsers = sysUserMapper.selectAllUser();
+        if (!Check.isNull(sysUsers)) {
+            for (SysUser user : sysUsers) {
+                if (!Check.isNull(user)) {
+                    userCompanyService.addOrUpdateUserWithCompany(user);
+                }
+            }
+
+        }
+    }
+
+
+    /**
+     * 获取公司所有用户信息
+     *
+     * @param userId
+     * @return
+     */
+    @PostMapping(value = "/getUserByCompany")
+    public List<UserCompany> companyUser(@RequestBody String userId) {
+        QueryWrapper<UserCompany> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_id", userId);
+        UserCompany userCompany = userCompanyService.getOne(queryWrapper);
+        if (!Check.isNull(userCompany)) {
+            String companyId = userCompany.getCompanyId();
+            queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("company_id", companyId);
+            List<UserCompany> userCompanies = userCompanyMapper.selectList(queryWrapper);
+            return userCompanies;
+        }
+
+        return null;
+    }
+
+
+    /**
+     * 分页列表查询
+     *
+     * @param userCompany
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    @AutoLog(value = "用户够公司-分页列表查询")
+    @ApiOperation(value = "用户够公司-分页列表查询", notes = "用户够公司-分页列表查询")
+    @GetMapping(value = "/list")
+    public Result<IPage<UserCompany>> queryPageList(UserCompany userCompany,
+                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                    HttpServletRequest req) {
+        Result<IPage<UserCompany>> result = new Result<IPage<UserCompany>>();
+        QueryWrapper<UserCompany> queryWrapper = QueryGenerator.initQueryWrapper(userCompany, req.getParameterMap());
+        Page<UserCompany> page = new Page<UserCompany>(pageNo, pageSize);
+        IPage<UserCompany> pageList = userCompanyService.page(page, queryWrapper);
+        result.setSuccess(true);
+        result.setResult(pageList);
+        return result;
+    }
+
+    /**
+     * 添加
+     *
+     * @param userCompany
+     * @return
+     */
+    @AutoLog(value = "用户够公司-添加")
+    @ApiOperation(value = "用户够公司-添加", notes = "用户够公司-添加")
+    @PostMapping(value = "/add")
+    public Result<UserCompany> add(@RequestBody UserCompany userCompany) {
+        Result<UserCompany> result = new Result<UserCompany>();
+        try {
+            userCompanyService.save(userCompany);
+            result.success("添加成功!");
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.error500("操作失败");
+        }
+        return result;
+    }
+
+    /**
+     * 编辑
+     *
+     * @param userCompany
+     * @return
+     */
+    @AutoLog(value = "用户够公司-编辑")
+    @ApiOperation(value = "用户够公司-编辑", notes = "用户够公司-编辑")
+    @PutMapping(value = "/edit")
+    public Result<UserCompany> edit(@RequestBody UserCompany userCompany) {
+        Result<UserCompany> result = new Result<UserCompany>();
+        UserCompany userCompanyEntity = userCompanyService.getById(userCompany.getId());
+        if (userCompanyEntity == null) {
+            result.error500("未找到对应实体");
+        } else {
+            boolean ok = userCompanyService.updateById(userCompany);
+            if (ok) {
+                result.success("修改成功!");
+            }
+        }
+
+        return result;
+    }
+
+    /**
+     * 通过id删除
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "用户够公司-通过id删除")
+    @ApiOperation(value = "用户够公司-通过id删除", notes = "用户够公司-通过id删除")
+    @DeleteMapping(value = "/delete")
+    public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+        try {
+            userCompanyService.removeById(id);
+        } catch (Exception e) {
+            log.error("删除失败", e.getMessage());
+            return Result.error("删除失败!");
+        }
+        return Result.ok("删除成功!");
+    }
+
+    /**
+     * 批量删除
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "用户够公司-批量删除")
+    @ApiOperation(value = "用户够公司-批量删除", notes = "用户够公司-批量删除")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<UserCompany> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        Result<UserCompany> result = new Result<UserCompany>();
+        if (ids == null || "".equals(ids.trim())) {
+            result.error500("参数不识别!");
+        } else {
+            this.userCompanyService.removeByIds(Arrays.asList(ids.split(",")));
+            result.success("删除成功!");
+        }
+        return result;
+    }
+
+    /**
+     * 通过id查询
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "用户够公司-通过id查询")
+    @ApiOperation(value = "用户够公司-通过id查询", notes = "用户够公司-通过id查询")
+    @GetMapping(value = "/queryById")
+    public Result<UserCompany> queryById(@RequestParam(name = "id", required = true) String id) {
+        Result<UserCompany> result = new Result<UserCompany>();
+        UserCompany userCompany = userCompanyService.getById(id);
+        if (userCompany == null) {
+            result.error500("未找到对应实体");
+        } else {
+            result.setResult(userCompany);
+            result.setSuccess(true);
+        }
+        return result;
+    }
+
+    /**
+     * 导出excel
+     *
+     * @param request
+     * @param response
+     */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) {
+        // Step.1 组装查询条件
+        QueryWrapper<UserCompany> queryWrapper = null;
+        try {
+            String paramsStr = request.getParameter("paramsStr");
+            if (oConvertUtils.isNotEmpty(paramsStr)) {
+                String deString = URLDecoder.decode(paramsStr, "UTF-8");
+                UserCompany userCompany = JSON.parseObject(deString, UserCompany.class);
+                queryWrapper = QueryGenerator.initQueryWrapper(userCompany, request.getParameterMap());
+            }
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        //Step.2 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        List<UserCompany> pageList = userCompanyService.list(queryWrapper);
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, "用户够公司列表");
+        mv.addObject(NormalExcelConstants.CLASS, UserCompany.class);
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("用户够公司列表数据", "导出人:Jeecg", "导出信息"));
+        mv.addObject(NormalExcelConstants.DATA_LIST, pageList);
+        return mv;
+    }
+
+    /**
+     * 通过excel导入数据
+     *
+     * @param request
+     * @param response
+     * @return
+     */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+        for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+            MultipartFile file = entity.getValue();
+            ImportParams params = new ImportParams();
+            params.setTitleRows(2);
+            params.setHeadRows(1);
+            params.setNeedSave(true);
+            try {
+                List<UserCompany> listUserCompanys = ExcelImportUtil.importExcel(file.getInputStream(), UserCompany.class, params);
+                userCompanyService.saveBatch(listUserCompanys);
+                return Result.ok("文件导入成功!数据行数:" + listUserCompanys.size());
+            } catch (Exception e) {
+                log.error(e.getMessage(), e);
+                return Result.error("文件导入失败:" + e.getMessage());
+            } finally {
+                try {
+                    file.getInputStream().close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return Result.ok("文件导入失败!");
+    }
+
+}

+ 65 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/UserCompany.java

@@ -0,0 +1,65 @@
+package org.jeecg.modules.system.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+
+import java.util.Date;
+
+/**
+ * 用户够公司
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-11-14
+ */
+@Data
+@TableName("user_company")
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "user_company对象", description = "用户够公司")
+public class UserCompany {
+
+    /**
+     * id
+     */
+    @TableId(type = IdType.UUID)
+    @ApiModelProperty(value = "id")
+    private String id;
+    /**
+     * 用户id
+     */
+    @Excel(name = "用户id", width = 15)
+    @ApiModelProperty(value = "用户id")
+    private String userId;
+    /**
+     * 用户名称
+     */
+    @Excel(name = "用户名称", width = 15)
+    @ApiModelProperty(value = "用户名称")
+    private String userName;
+    /**
+     * 部门id
+     */
+    @Excel(name = "部门id", width = 15)
+    @ApiModelProperty(value = "部门id")
+    private String companyId;
+    /**
+     * 公司名称
+     */
+    @Excel(name = "公司名称", width = 15)
+    @ApiModelProperty(value = "公司名称")
+    private String companyName;
+
+
+    private Date createTime;
+    private Date updateTime;
+
+
+}

+ 3 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java

@@ -21,5 +21,7 @@ public interface SysDepartMapper extends BaseMapper<SysDepart> {
 	/**
 	 * 根据用户ID查询部门集合
 	 */
-	public List<SysDepart> queryUserDeparts(@Param("userId") String userId);
+	 List<SysDepart> queryUserDeparts(@Param("userId") String userId);
+
+	SysDepart queryUserDepartsByDepartId(@Param("departId") String departId);
 }

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

@@ -1,14 +1,14 @@
 package org.jeecg.modules.system.mapper;
 
-import java.util.List;
-
-import org.jeecg.modules.system.entity.SysUserDepart;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
 import io.lettuce.core.dynamic.annotation.Param;
+import org.jeecg.modules.system.entity.SysUserDepart;
+
+import java.util.List;
 
 public interface SysUserDepartMapper extends BaseMapper<SysUserDepart>{
 	
 	List<SysUserDepart> getUserDepartByUid(@Param("userId") String userId);
+
+	SysUserDepart getUserDepartByUserId(@Param("userId") String userId);
 }

+ 56 - 45
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserMapper.java

@@ -1,10 +1,12 @@
 package org.jeecg.modules.system.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.system.entity.SysUser;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,48 +17,57 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @since 2018-12-20
  */
 public interface SysUserMapper extends BaseMapper<SysUser> {
-	/**
-	  * 通过用户账号查询用户信息
-	 * @param username
-	 * @return
-	 */
-	public SysUser getUserByName(@Param("username") String username);
-
-	/**
-	 *  根据部门Id查询用户信息
-	 * @param page
-	 * @param departId
-	 * @return
-	 */
-	IPage<SysUser> getUserByDepId(Page page, @Param("departId") String departId, @Param("username") String username);
-
-	/**
-	 * 根据角色Id查询用户信息
-	 * @param page
-	 * @param
-	 * @return
-	 */
-	IPage<SysUser> getUserByRoleId(Page page, @Param("roleId") String roleId, @Param("username") String username);
-	
-	/**
-	 * 根据用户名设置部门ID
-	 * @param username
-	 * @param orgCode
-	 */
-	void updateUserDepart(@Param("username") String username,@Param("orgCode") String orgCode);
-	
-	/**
-	 * 根据手机号查询用户信息
-	 * @param phone
-	 * @return
-	 */
-	public SysUser getUserByPhone(@Param("phone") String phone);
-	
-	
-	/**
-	 * 根据邮箱查询用户信息
-	 * @param email
-	 * @return
-	 */
-	public SysUser getUserByEmail(@Param("email")String email);
+    List<SysUser> selectAllUser();
+
+
+    /**
+     * 通过用户账号查询用户信息
+     *
+     * @param username
+     * @return
+     */
+    public SysUser getUserByName(@Param("username") String username);
+
+    /**
+     * 根据部门Id查询用户信息
+     *
+     * @param page
+     * @param departId
+     * @return
+     */
+    IPage<SysUser> getUserByDepId(Page page, @Param("departId") String departId, @Param("username") String username);
+
+    /**
+     * 根据角色Id查询用户信息
+     *
+     * @param page
+     * @param
+     * @return
+     */
+    IPage<SysUser> getUserByRoleId(Page page, @Param("roleId") String roleId, @Param("username") String username);
+
+    /**
+     * 根据用户名设置部门ID
+     *
+     * @param username
+     * @param orgCode
+     */
+    void updateUserDepart(@Param("username") String username, @Param("orgCode") String orgCode);
+
+    /**
+     * 根据手机号查询用户信息
+     *
+     * @param phone
+     * @return
+     */
+    public SysUser getUserByPhone(@Param("phone") String phone);
+
+
+    /**
+     * 根据邮箱查询用户信息
+     *
+     * @param email
+     * @return
+     */
+    public SysUser getUserByEmail(@Param("email") String email);
 }

+ 15 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/UserCompanyMapper.java

@@ -0,0 +1,15 @@
+package org.jeecg.modules.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.system.entity.UserCompany;
+
+/**
+ * 用户够公司
+ *
+ * @author: jeecg-boot
+ * @date: 2019-11-14
+ * @cersion: V1.0
+ */
+public interface UserCompanyMapper extends BaseMapper<UserCompany> {
+
+}

+ 8 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml

@@ -7,4 +7,12 @@
 			join sys_user_depart b on a.id = b.dep_id
 			where b.user_id = #{userId}
 	</select>
+
+    <select id="queryUserDepartsByDepartId" parameterType="String" resultType="org.jeecg.modules.system.entity.SysDepart">
+		select * from sys_depart
+			where id = #{departId}
+			limit 1
+	</select>
+
+
 </mapper>

+ 9 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysUserDepartMapper.xml

@@ -6,4 +6,13 @@
 		FROM sys_user_depart
 		WHERE user_id = #{userId, jdbcType=VARCHAR}
     </select>
+
+    <select id="getUserDepartByUserId" parameterType="String"
+            resultType="org.jeecg.modules.system.entity.SysUserDepart">
+		SELECT *
+		FROM sys_user_depart
+		WHERE user_id = #{userId, jdbcType=VARCHAR}
+		limit 1
+    </select>
+
 </mapper>

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

@@ -2,6 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.system.mapper.SysUserMapper">
 
+
+
+    <select id="selectAllUser" resultType="org.jeecg.modules.system.entity.SysUser">
+		select * from  sys_user
+	</select>
+
+
     <!-- 根据用户名查询 -->
     <select id="getUserByName" resultType="org.jeecg.modules.system.entity.SysUser">
 		select * from  sys_user  where username = #{username} and del_flag = '0'

+ 5 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/UserCompanyMapper.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.system.mapper.UserCompanyMapper">
+
+</mapper>

+ 19 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/IUserCompanyService.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.entity.UserCompany;
+
+/**
+ * 用户够公司
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-11-14
+ */
+public interface IUserCompanyService extends IService<UserCompany> {
+
+    void addOrUpdateUserWithCompany(SysUser user);
+
+    void removeByUserId(String id);
+}

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

@@ -0,0 +1,98 @@
+package org.jeecg.modules.system.service.impl;
+
+import cn.com.ctop.common.module.utils.Check;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.modules.system.entity.SysDepart;
+import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.entity.SysUserDepart;
+import org.jeecg.modules.system.entity.UserCompany;
+import org.jeecg.modules.system.mapper.SysDepartMapper;
+import org.jeecg.modules.system.mapper.SysUserDepartMapper;
+import org.jeecg.modules.system.mapper.UserCompanyMapper;
+import org.jeecg.modules.system.service.IUserCompanyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 用户够公司
+ *
+ * @author jeecg-boot
+ * @version V1.0
+ * @date 2019-11-14
+ */
+@Slf4j
+@Service
+public class UserCompanyServiceImpl extends ServiceImpl<UserCompanyMapper, UserCompany> implements IUserCompanyService {
+    @Autowired
+    private SysUserDepartMapper userDepartMapper;
+    @Autowired
+    private SysDepartMapper departMapper;
+    @Autowired
+    private UserCompanyMapper userCompanyMapper;
+
+    @Override
+    public void addOrUpdateUserWithCompany(SysUser user) {
+        SysUserDepart userDepart = userDepartMapper.getUserDepartByUserId(user.getId());
+        if (!Check.isNull(userDepart)) {
+            String depId = userDepart.getDepId();
+            for (int i = 0; i <= 10; i++) {
+                SysDepart depart = departMapper.queryUserDepartsByDepartId(depId);
+                if (Check.isNull(depart)) {
+                    break;
+                }
+                if (!"1".equals(depart.getOrgType())) {
+                    depId = depart.getParentId();
+                    continue;
+                } else {
+                    UserCompany userCompany = new UserCompany();
+                    userCompany.setUserId(user.getId());
+                    userCompany.setUserName(user.getRealname());
+                    userCompany.setCompanyId(depart.getId());
+                    userCompany.setCompanyName(depart.getDepartName());
+                    QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper();
+                    userCompanyQueryWrapper.eq("user_id", user.getId());
+                    userCompanyQueryWrapper.last("limit 1");
+                    UserCompany addUserCompany = userCompanyMapper.selectOne(userCompanyQueryWrapper);
+                    int j;
+                    if (Check.isNull(addUserCompany)) {
+                        userCompany.setCreateTime(new Date());
+                        userCompany.setUpdateTime(new Date());
+                        j = userCompanyMapper.insert(userCompany);
+                    } else {
+                        QueryWrapper<UserCompany> updateUserCompanyQueryWrapper = new QueryWrapper();
+                        updateUserCompanyQueryWrapper.eq("user_id", user.getId());
+                        userCompany.setUpdateTime(new Date());
+                        j = userCompanyMapper.update(userCompany, updateUserCompanyQueryWrapper);
+                    }
+
+                    if (j > 0) {
+                        log.info("同步用户公司信息完成,userId:{}", user.getId());
+                    }
+                    break;
+                }
+            }
+
+        }
+
+
+    }
+
+    /**
+     * 删除公司信息
+     *
+     * @param
+     */
+    @Override
+    public void removeByUserId(String userId) {
+        Map<String, Object> deleteMap = new HashMap<>();
+        deleteMap.put("user_id", userId);
+        userCompanyMapper.deleteByMap(deleteMap);
+
+    }
+}

+ 46 - 0
module-common/pom.xml

@@ -33,6 +33,17 @@
             <artifactId>module-kuaishou</artifactId>
             <version>2.0.2</version>
         </dependency>-->
+
+
+        <dependency>
+            <groupId>com.lgg.jave</groupId>
+            <artifactId>jave</artifactId>
+            <scope>system</scope>
+            <version>1.0.2</version>
+            <systemPath>${project.basedir}/lib/jave-1.0.2.jar</systemPath>
+        </dependency>
+
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -55,6 +66,13 @@
             <version>0.7.3</version>
             <scope>compile</scope>
         </dependency>
+
+
+        <dependency>
+            <groupId>org.jeecgframework.boot</groupId>
+            <artifactId>jeecg-boot-base-common</artifactId>
+            <version>2.0.2</version>
+        </dependency>
         <!--<dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-csv</artifactId>
@@ -69,7 +87,35 @@
 
     </dependencies>
     <build>
+
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                </configuration>
+            </plugin>
+        </plugins>
+
+
         <resources>
+
+
+            <resource>
+                <directory>lib</directory>
+                <targetPath>BOOT-INF/lib/</targetPath>
+                <includes>
+                    <include>**/*.jar</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>src/main/resources</directory>
+                <targetPath>BOOT-INF/classes/</targetPath>
+            </resource>
+
+
+
             <!-- 解决MyBatis配置文件引入问题 -->
             <resource>
                 <directory>src/main/java</directory>

+ 11 - 36
module-common/src/main/java/cn/com/ctop/common/module/entity/UserAllocation.java

@@ -40,6 +40,12 @@ public class UserAllocation {
     @Excel(name = "登陆人id", width = 15)
     @ApiModelProperty(value = "登陆人id")
     private String userId;
+
+
+    @Excel(name = "登陆人名称", width = 15)
+    @ApiModelProperty(value = "登陆人名称")
+    private String userName;
+
     /**
      * 账户id --授权
      */
@@ -52,24 +58,10 @@ public class UserAllocation {
     @Excel(name = "广告主ID", width = 15)
     @ApiModelProperty(value = "广告主ID")
     private String advertiserId;
-    /**
-     * 指定分配人
-     */
-    @Excel(name = "指定分配人", width = 15)
-    @ApiModelProperty(value = "指定分配人")
-    private String distributionName;
-    /**
-     * 部门id
-     */
-    @Excel(name = "部门id", width = 15)
-    @ApiModelProperty(value = "部门id")
-    private String departmentId;
-    /**
-     * 管理员名称
-     */
-    @Excel(name = "管理员名称", width = 15)
-    @ApiModelProperty(value = "管理员名称")
-    private String adminName;
+
+    private Long projectId;
+    private String projectName;
+
     /**
      * 广告主名称
      */
@@ -90,12 +82,7 @@ public class UserAllocation {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
-    /**
-     * 操作人姓名
-     */
-    @Excel(name = "操作人姓名", width = 15)
-    @ApiModelProperty(value = "操作人姓名")
-    private String operationName;
+
     /**
      * 授权名称
      */
@@ -103,18 +90,6 @@ public class UserAllocation {
     @ApiModelProperty(value = "授权名称")
     private String authName;
     /**
-     * 创建人
-     */
-    @Excel(name = "创建人", width = 15)
-    @ApiModelProperty(value = "创建人")
-    private String createBy;
-    /**
-     * 修改人
-     */
-    @Excel(name = "修改人", width = 15)
-    @ApiModelProperty(value = "修改人")
-    private String updateBy;
-    /**
      * 修改时间
      */
     @Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")

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

@@ -12,6 +12,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import it.sauronsoftware.jave.Encoder;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.http.HttpEntity;
@@ -22,14 +23,18 @@ import org.apache.http.entity.mime.MultipartEntityBuilder;
 import org.apache.http.entity.mime.content.FileBody;
 import org.apache.http.impl.client.CloseableHttpClient;
 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.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.*;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.net.HttpURLConnection;
 import java.net.URI;
 import java.net.URL;
+import java.nio.channels.FileChannel;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -418,4 +423,35 @@ public class FileInfoServiceImpl extends ServiceImpl<FileInfoMapper, FileInfo> i
         }
         return null;
     }
+
+    public static void main(String[] args) throws IOException {
+        long l = System.currentTimeMillis();
+
+        String localUrl = LoadFileUtil.downLoadFromUrl("https://ctop-media.oss-cn-beijing.aliyuncs.com/%E4%BC%8A%E5%AF%B9%20-%20PPT%20-%20%E4%BA%8E%E5%B0%A4%E4%BD%B3%20-%200920%20-%203-1571710256384.mp4", "D:\\tets1\\video");
+
+
+        File file = new File(localUrl);
+        Map map = new HashMap();
+        it.sauronsoftware.jave.Encoder encoder = new Encoder();
+        try {
+            it.sauronsoftware.jave.MultimediaInfo m = encoder.getInfo(file);
+            long duration = m.getDuration();
+            long secondDuration = duration / 1000;
+            map.put("secondDuration", secondDuration);//获取视频秒数
+            map.put("format", m.getFormat());//获取视频格式
+            map.put("width", m.getVideo().getSize().getWidth());//获取视频宽高
+            map.put("height", m.getVideo().getSize().getHeight());//获取视频长高
+            FileInputStream fis = new FileInputStream(file);
+            FileChannel fc = fis.getChannel();
+            BigDecimal fileSize = new BigDecimal(fc.size());
+            String size = fileSize.divide(new BigDecimal(1048576), 2, RoundingMode.HALF_UP) + "MB";
+            map.put("size", size);//获取视频大小
+            System.err.println(map);
+            System.err.println((System.currentTimeMillis() - l) / 1000);
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            file.delete();
+        }
+    }
 }

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

@@ -68,11 +68,11 @@ public class MaterialInfoController {
                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                      HttpServletRequest req) {
         Result<IPage<MaterialInfo>> result = new Result<>();
-        QueryWrapper<MaterialInfo> queryWrapper = QueryGenerator.initQueryWrapper(materialInfo, req.getParameterMap());
-        LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+       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());
-        }
+        }*/
         Page<MaterialInfo> page = new Page<>(pageNo, pageSize);
         IPage<MaterialInfo> pageList = materialInfoService.page(page, queryWrapper);
         result.setSuccess(true);

+ 1 - 0
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/MaterialRefuseController.java

@@ -71,6 +71,7 @@ public class MaterialRefuseController {
 
         Map<String, Object> creativeMap = updateService.updateCreative(ctopOauthToken.getAccessToken(), accountId, jsonObject);
         if (Check.isNullMap(creativeMap)) {
+
             map.put("code", -1);
             map.put("message", "修改失败,返回为空");
             return map;