Переглянути джерело

Merge branch 'master' into test

yumeng 5 роки тому
батько
коміт
bbcb8685b3

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

@@ -84,10 +84,14 @@ public class AdvertiserController {
 
         Result<IPage<Advertiser>> result = new Result<IPage<Advertiser>>();
         String roleCode = materialReportMapper.getRoleCodeByUserId(advertiser.getUserId());
+        String userId = advertiser.getUserId();
+        if ("admin".equals(roleCode) || "kuaishouOperationManager".equals(roleCode)) {
+            advertiser.setUserId(null);
+        }
         QueryWrapper<Advertiser> queryWrapper = QueryGenerator.initQueryWrapper(advertiser, req.getParameterMap());
-        if (!"admin".equals(roleCode) && !Check.isNull(roleCode)) {
+        if ("kuaishouOperationManager".equals(roleCode)) {
             QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
-            userCompanyQueryWrapper.eq("user_id", advertiser.getUserId());
+            userCompanyQueryWrapper.eq("user_id", userId);
             userCompanyQueryWrapper.orderByDesc("create_time");
             userCompanyQueryWrapper.last("limit 1");
             UserCompany userCompany = userCompanyMapper.selectOne(userCompanyQueryWrapper);
@@ -124,6 +128,16 @@ public class AdvertiserController {
     public Result<Advertiser> add(@RequestBody Advertiser advertiser) {
         Result<Advertiser> result = new Result<Advertiser>();
         try {
+            String name = advertiser.getName().trim();
+            QueryWrapper<Advertiser> advertiserQueryWrapper = new QueryWrapper<>();
+            advertiserQueryWrapper.eq("name", name);
+            advertiserQueryWrapper.last("limit 1");
+            advertiserQueryWrapper.orderByDesc("create_time");
+            Advertiser checkAdvertiser = advertiserService.getOne(advertiserQueryWrapper);
+            if (!Check.isNull(checkAdvertiser)) {
+                throw new Exception("广告主已存在");
+            }
+
             String userId = advertiser.getUserId();
             if (!Check.isNull(userId)) {
                 QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
@@ -139,7 +153,7 @@ public class AdvertiserController {
             result.success("添加成功!");
         } catch (Exception e) {
             log.error(e.getMessage(), e);
-            result.error500("操作失败");
+            result.error500("添加失败 " + e.getMessage());
         }
         return result;
     }

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

@@ -21,6 +21,8 @@ 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.entity.SysUser;
+import org.jeecg.modules.system.service.ISysUserService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -84,29 +86,12 @@ public class ProjectController {
     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;
-        }
+        String roleCode = materialReportMapper.getRoleCodeByUserId(userId);
         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");
+            queryWrapper.eq("responsible_id", userId);
+            queryWrapper.orderByDesc("create_time");
+        }
         List<Project> projects = projectMapper.selectList(queryWrapper);
         map.put("success", true);
         map.put("code", 0);
@@ -148,6 +133,9 @@ public class ProjectController {
      * @param project
      * @return
      */
+    @Autowired
+    private ISysUserService sysUserService;
+
     @AutoLog(value = "项目-添加")
     @ApiOperation(value = "项目-添加", notes = "项目-添加")
     @PostMapping(value = "/add")
@@ -159,6 +147,10 @@ public class ProjectController {
             if (!Check.isNull(advertiser)) {
                 project.setCompanyId(advertiser.getCompanyId());
             }
+            SysUser sysUser = sysUserService.getById(project.getResponsibleId());
+            if (!Check.isNull(sysUser)) {
+                project.setResponsibleName(sysUser.getRealname());
+            }
             projectService.save(project);
             Long id = project.getId();
             Map<String, Object> map = new HashMap<>();
@@ -169,7 +161,9 @@ public class ProjectController {
             member.setProjectId(id);
             member.setProjectName(project.getProjectName());
             member.setUserId(project.getResponsibleId());
-            member.setUserName(project.getResponsibleName());
+            if (!Check.isNull(sysUser)) {
+                member.setUserName(sysUser.getRealname());
+            }
             String roleCode = materialReportMapper.getRoleCodeByUserId(project.getUserId());
             if (!Check.isNull(roleCode)) {
                 member.setRoleCode(roleCode);
@@ -177,7 +171,7 @@ public class ProjectController {
             projectMemberService.save(member);
             result.success("添加成功!");
         } catch (Exception e) {
-            log.error(e.getMessage(), e);
+            e.printStackTrace();
             result.error500("操作失败");
         }
         return result;
@@ -194,6 +188,12 @@ public class ProjectController {
     @PutMapping(value = "/edit")
     public Result<Project> edit(@RequestBody Project project) {
         Result<Project> result = new Result<Project>();
+
+        SysUser sysUser = sysUserService.getById(project.getResponsibleId());
+        if (!Check.isNull(sysUser)) {
+            project.setResponsibleName(sysUser.getRealname());
+        }
+
         Project projectEntity = projectService.getById(project.getId());
         if (projectEntity == null) {
             result.error500("未找到对应实体");

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

@@ -20,6 +20,8 @@ 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.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.service.ISysUserService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -58,6 +60,8 @@ public class ProjectMemberController {
     private IProjectService projectService;
     @Autowired
     private MaterialReportMapper materialReportMapper;
+    @Autowired
+    private ISysUserService sysUserService;
 
 
     /**
@@ -101,7 +105,11 @@ public class ProjectMemberController {
         Map<String, Object> map = new HashMap<>();
         try {
             QueryWrapper<ProjectMember> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("user_id", userId);
+            String roleCode = materialReportMapper.getRoleCodeByUserId(userId);
+            if (!"admin".equals(roleCode)) {
+                queryWrapper.eq("user_id", userId);
+
+            }
             queryWrapper.groupBy("project_id");
             queryWrapper.orderByDesc("create_time");
             List<ProjectMember> projectMembers = projectMemberMapper.selectList(queryWrapper);
@@ -109,17 +117,21 @@ public class ProjectMemberController {
             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);
+                    if (!Check.isNull(project)) {
+                        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) {
+            e.printStackTrace();
             map.put("success", false);
             map.put("code", -1);
         }
@@ -160,6 +172,8 @@ public class ProjectMemberController {
      * @param jsonObject
      * @return
      */
+
+
     @AutoLog(value = "项目成员-添加")
     @ApiOperation(value = "项目成员-添加", notes = "项目成员-添加")
     @PostMapping(value = "/batchAdd")
@@ -176,9 +190,8 @@ public class ProjectMemberController {
                 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");
+                String userId = memberArr.get(i).toString();
+                if (!Check.isNull(userId)) {
                     QueryWrapper<ProjectMember> queryWrapper = new QueryWrapper<>();
                     queryWrapper.eq("user_id", userId);
                     queryWrapper.eq("project_id", projectId);
@@ -194,7 +207,11 @@ public class ProjectMemberController {
                     member.setProjectId(projectId);
                     member.setProjectName(projectName);
                     member.setUserId(userId);
-                    member.setUserName(memberJson.getString("userName"));
+                    SysUser sysUser = sysUserService.getById(userId);
+                    if (!Check.isNull(sysUser)) {
+                        member.setUserName(sysUser.getRealname());
+                    }
+
                     projectMemberService.save(member);
                 }
             }

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

@@ -18,10 +18,8 @@ import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.PasswordUtil;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.oConvertUtils;
-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.SysUserRole;
+import org.jeecg.modules.system.entity.*;
+import org.jeecg.modules.system.mapper.SysUserMapper;
 import org.jeecg.modules.system.model.DepartIdModel;
 import org.jeecg.modules.system.model.SysUserDepartsVO;
 import org.jeecg.modules.system.service.*;
@@ -76,6 +74,8 @@ public class SysUserController {
 
     @Autowired
     private IUserCompanyService userCompanyService;
+    @Autowired
+    private SysUserMapper sysUserMapper;
 
 
     @RequestMapping(value = "/getRoleInfo", method = RequestMethod.GET)
@@ -100,6 +100,26 @@ public class SysUserController {
         return result;
     }
 
+
+    @RequestMapping(value = "/getAllUserList", method = RequestMethod.GET)
+    public Result<List<SysUserVo>> getAllList() {
+        Result<List<SysUserVo>> result = new Result<>();
+        try {
+
+            List<SysUserVo> userList = sysUserService.getAllUser();
+            result.setSuccess(true);
+            result.setResult(userList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            result.setSuccess(false);
+            result.setMessage("请求失败");
+
+        }
+
+        return result;
+    }
+
+
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     @RequiresPermissions("user:add")
     public Result<SysUser> add(@RequestBody JSONObject jsonObject) {

+ 33 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUserVo.java

@@ -0,0 +1,33 @@
+package org.jeecg.modules.system.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 用户表
+ * </p>
+ *
+ * @Author scott
+ * @since 2018-12-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class SysUserVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    private String userId;
+
+    private String username;
+
+    private String realName;
+
+    private String roleName;
+
+}

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

@@ -5,6 +5,7 @@ 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 org.jeecg.modules.system.entity.SysUserVo;
 
 import java.util.List;
 import java.util.Map;
@@ -73,4 +74,6 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      SysUser getUserByEmail(@Param("email") String email);
 
     Map<String, Object> queryRoleCode(@Param("userId") String userId);
+
+    List<SysUserVo> getAllUser();
 }

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

@@ -67,4 +67,18 @@ SELECT
 </select>
 
 
+    <select id="getAllUser" resultType="org.jeecg.modules.system.entity.SysUserVo">
+
+      SELECT
+      t1.id userId,
+      t1.username userName,
+      t1.realname realName,
+      (SELECT role_name FROM sys_role WHERE id = t2.role_id ) roleName
+    FROM sys_user t1
+    LEFT JOIN sys_user_role t2 on t1.id = t2.user_id;
+
+
+</select>
+
+
 </mapper>

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

@@ -12,6 +12,7 @@ import org.jeecg.common.system.vo.SysUserCacheInfo;
 import org.jeecg.modules.system.entity.SysUser;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.system.entity.SysUserVo;
 
 /**
  * <p>
@@ -125,4 +126,6 @@ public interface ISysUserService extends IService<SysUser> {
 	Result checkUserIsEffective(SysUser sysUser);
 
     Map<String, Object> queryRoleCode(String userId);
+
+    List<SysUserVo> getAllUser();
 }

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

@@ -264,4 +264,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public Map<String, Object> queryRoleCode(String userId) {
         return userMapper.queryRoleCode(userId);
     }
+
+    @Override
+    public List<SysUserVo> getAllUser() {
+        return userMapper.getAllUser();
+    }
 }

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

@@ -13,7 +13,6 @@ import cn.com.ctop.kuaishou.modules.batch.service.*;
 import cn.com.ctop.kuaishou.modules.material.entity.KuaishouResult;
 import cn.com.ctop.kuaishou.modules.material.entity.KuaishouResultToken;
 import cn.com.ctop.kuaishou.modules.report.entity.*;
-import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyAccountMapper;
 import cn.com.ctop.kuaishou.modules.report.mapper.KuaishouReportDailyCampaignMapper;
 import cn.com.ctop.kuaishou.modules.report.service.*;
 import com.alibaba.fastjson.JSONArray;
@@ -58,14 +57,12 @@ import java.util.concurrent.Executors;
 @Slf4j
 @Service
 public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
-    @Autowired
-    private KuaishouReportDailyAccountMapper dailyAccountMapper;
+
     @Autowired
     KuaishouReportDailyCampaignMapper dailyCampaignMapper;
     @Autowired
     private KuaiShouCampaignCreateMapper kuaiShouCampaignCreateMapper;
-    @Autowired
-    private KuaiShouCampaignMapper campaignMapper;
+
     @Autowired
     private KuaiShouGroupMapper groupMapper;
     @Autowired
@@ -84,8 +81,7 @@ public class KuaishouInterfaceServiceImpl implements IKuaishouInterfaceService {
     private KuaiShouVideoUploadMapper videoUploadMapper;
     @Autowired
     private KuaiShouVideoMapper kuaiShouVideoMapper;
-    @Autowired
-    private KuaiShouVideoGetMapper videoGetMapper;
+
     @Autowired
     private KuaiShouImageGetMapper imageGetMapper;
     @Autowired