Procházet zdrojové kódy

素材标签逻辑

syh před 4 roky
rodič
revize
f200d186e4

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

@@ -5,6 +5,8 @@ import cn.com.ctop.common.module.entity.SysUser;
 import cn.com.ctop.common.module.service.IProjectService;
 import cn.com.ctop.common.module.service.ISysRoleExtService;
 import cn.com.ctop.common.module.utils.Check;
+import cn.com.ctop.common.module.utils.ResultMapUtils;
+import cn.com.ctop.common.module.utils.StatusCode;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -120,10 +122,32 @@ public class ProjectMemberController {
             map.put("success", false);
             map.put("code", -1);
         }
-
         return map;
     }
 
+    @GetMapping("/projectList")
+    public Map<String,Object>projectList(){
+        Map<String, Object> result = new HashMap<>();
+        try {
+            String userId = ((LoginUser) SecurityUtils.getSubject().getPrincipal()).getId();
+            String roleCode = sysRoleService.getRoleCodeByUserId(userId);
+            if (!"admin".equals(roleCode) && !roleCode.contains("sale") && !"meidaManager".equals(roleCode)) {
+                List<Project>projects = projectService.list();
+                result.put("data",projects);
+                ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
+                return result;
+            }
+            List<Project> projects = projectMemberService.selectListByUserId(userId);
+            result.put("data",projects);
+            ResultMapUtils.setResultMap(result,StatusCode.COMMON_SUCCESS);
+            return result;
+        } catch (Exception e) {
+            e.printStackTrace();
+            ResultMapUtils.setResultMap(result,StatusCode.COMMON_PARAM_ERROR);
+            return result;
+        }
+    }
+
 
     @GetMapping(value = "/participateListV2")
     public Result<IPage<ProjectMember>> participateListV2(ProjectMember projectMember,

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

@@ -1,5 +1,6 @@
 package org.jeecg.modules.ctop.mapper;
 
+import cn.com.ctop.common.module.entity.Project;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.ctop.entity.ProjectMember;
@@ -36,4 +37,6 @@ public interface ProjectMemberMapper extends BaseMapper<ProjectMember> {
     List<ProjectMember> getSaleProjects(@Param("userId")String userId, @Param("mediaIds")List<Integer> mediaIds);
 
     List<Long> getProjectByMap(@Param("userId") String userId);
+
+    List<Project> getProjectByUserId(@Param("userId")String userId);
 }

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

@@ -149,5 +149,13 @@
         where user_id = #{userId}
         group by project_id
     </select>
+    <select id="getProjectByUserId" resultType="cn.com.ctop.common.module.entity.Project">
+        select
+            project.*
+        from
+            ctop_project_member member left join ctop_project project on project.id = member.project_id
+        where
+            member.user_id = #{userId}
+    </select>
 
 </mapper>

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

@@ -31,4 +31,6 @@ public interface IProjectMemberService extends IService<ProjectMember> {
     List<ProjectMember> getSaleOwnProjects(List<Integer> mediaIds);
 
     List<Long> getProjectByMap(String userId);
+
+    List<Project> selectListByUserId(String userId);
 }

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

@@ -194,6 +194,11 @@ public class ProjectMemberServiceImpl extends ServiceImpl<ProjectMemberMapper, P
         return memberMapper.getProjectByMap(userId);
     }
 
+    @Override
+    public List<Project> selectListByUserId(String userId) {
+        return memberMapper.getProjectByUserId(userId);
+    }
+
     //视频报表
     @Override
     public List<ProjectMember> getOwnProjects(List<Integer> mediaIds) {

+ 2 - 0
module-common/src/main/java/cn/com/ctop/common/module/entity/MaterialTagInfo.java

@@ -30,11 +30,13 @@ public class MaterialTagInfo {
 	private Integer status;
 	private String tagName;
 	private String tagCode;
+	private Long tagId;
 	private String userId;
 	private Date createTime;
 	private Date updateTime;
 
 	public MaterialTagInfo(String code, TagInfo tagInfo,String userId) {
+		this.tagId = tagInfo.getId();
 		this.code = code;
 		this.status = 1;
 		this.tagCode = tagInfo.getTagCode();

+ 1 - 1
module-common/src/main/java/cn/com/ctop/common/module/service/impl/MaterialTagInfoServiceImpl.java

@@ -47,7 +47,7 @@ public class MaterialTagInfoServiceImpl extends ServiceImpl<MaterialTagInfoMappe
             return result;
         }
         JSONArray tagList = data.getJSONArray("tagList");
-        if(null == tagList||tagList.size()<=6){
+        if(null == tagList){
             ResultMapUtils.setResultMap(result, StatusCode.COMMON_PARAM_ERROR);
             return result;
         }