9-8登录获取项目信息

yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationFeign.java

@@ -1,8 +1,13 @@
 package com.yxt.supervise.crm.api.projectinformation;
 
-import com.yxt.supervise.crm.api.warehouselocation.WarehouseLocationFeignFallback;
+import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
 
 /**
  * @author wangpengfei
@@ -15,4 +20,7 @@ import org.springframework.cloud.openfeign.FeignClient;
         path = "v1/projectinformation",
         fallback = ProjectInformationFeignFallback.class)
 public interface ProjectInformationFeign {
+    @ApiOperation("根据userSid查询该人的项目")
+    @PostMapping("/getProjectSidByUserSid")
+    ResultBean<List<ProjectInformationVo>> getProjectSidByUserSid(@RequestParam("userSid") String userSid);
 }

yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/userproject/UserProjectFeign.java

@@ -1,17 +0,0 @@
-package com.yxt.supervise.crm.api.userproject;
-
-import io.swagger.annotations.Api;
-import org.springframework.cloud.openfeign.FeignClient;
-
-
-/**
- * @author feikefei
- * @create 2023-09-07-9:06
- */
-@Api(tags = "用户项目表")
-@FeignClient(
-        contextId = "supervise-crm-UserProject",
-        name = "supervise-crm",
-        path = "userproject")
-public interface UserProjectFeign {
-}

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java

@@ -30,5 +30,5 @@ public interface ProjectInformationMapper extends BaseMapper<ProjectInformation>
     @Select("select p.*,i.enterpriseName as enterpriseName from project_information p left join enterprise_project e on e.projectSid=p.sid left join enterprise_information i on i.sid=e.enterpriseSid")
     List<ProjectInformationVo> getProjectByUser( @Param("sid") String sid);
     void insertFiles(List<Map<String, String>> maps);
-
+    List<ProjectInformationVo> getProjectListByUserSid(@Param("userSid") String userSid);
 }

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.xml

@@ -61,4 +61,8 @@
             )
         </foreach>
     </insert>
+
+    <select id="getProjectListByUserSid" resultType="com.yxt.supervise.crm.api.projectinformation.ProjectInformationVo">
+        select p.sid,p.entryName from user_project u right join project_information p on u.projectSid = p.sid where userSid = #{userSid}
+    </select>
 </mapper>

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java

@@ -6,7 +6,9 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import com.yxt.supervise.crm.api.projectinformation.*;
 import com.yxt.supervise.crm.api.storehouseproject.StoreHouseProjectDto;
+import com.yxt.supervise.crm.api.userproject.UserProject;
 import com.yxt.supervise.crm.biz.storehouseproject.StoreHouseProjectService;
+import com.yxt.supervise.crm.biz.userproject.UserProjectService;
 import com.yxt.supervise.crm.feign.system.SysUserFeign;
 import com.yxt.supervise.crm.feign.wh.ShStorehouseFeign;
 import com.yxt.supervise.crm.feign.wh.StoreHouseProjectFeign;
@@ -127,4 +129,12 @@ public class ProjectInformationRest implements ProjectInformationFeign {
     public ResultBean getProjectType(){
         return ProjectInformationService.getProjectType();
     }
+
+    @ApiOperation("根据userSid查询该人的项目")
+    @PostMapping("/getProjectSidByUserSid")
+    public ResultBean<List<ProjectInformationVo>> getProjectSidByUserSid(@RequestParam("userSid") String userSid){
+        ResultBean rb = ResultBean.fireFail();
+        List<ProjectInformationVo> projectSidListByUserSid = ProjectInformationService.getProjectListByUserSid(userSid);
+        return rb.success().setData(projectSidListByUserSid);
+    }
 }

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java

@@ -185,4 +185,9 @@ public class ProjectInformationService extends MybatisBaseService<ProjectInforma
     public ResultBean getProjectType(){
         return projectTypeDictionaryService.getProjectTypeList();
     }
+
+    public List<ProjectInformationVo> getProjectListByUserSid(String sid){
+        List<ProjectInformationVo> projectByUserSid = baseMapper.getProjectListByUserSid(sid);
+        return projectByUserSid;
+    }
 }

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectRest.java

@@ -82,12 +82,4 @@ public class UserProjectRest {
         return UserProjectService.getUsersByprojectSid(projectSid);
     }
 
-    @ApiOperation("根据userSid查询该人的项目")
-    @PostMapping("/getProjectSidByUserSid")
-    public ResultBean<List<UserProject>> getProjectSidByUserSid(@RequestParam("userSid") String userSid){
-        ResultBean rb = ResultBean.fireFail();
-        System.out.println(userSid);
-        List<UserProject> projectSidListByUserSid = UserProjectService.getProjectSidListByUserSid(userSid);
-        return rb.success().setData(projectSidListByUserSid);
-    }
 }

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectService.java

@@ -8,6 +8,7 @@ import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.crm.api.projectinformation.ProjectInformationVo;
 import com.yxt.supervise.crm.api.userproject.UserProject;
 import com.yxt.supervise.crm.api.userproject.UserProjectDto;
 import com.yxt.supervise.crm.api.userproject.UserProjectQuery;
@@ -100,4 +101,5 @@ public class UserProjectService extends MybatisBaseService<UserProjectMapper, Us
     public List<UserProject> getProjectSidListByUserSid(String sid){
         return baseMapper.selectList(new QueryWrapper<UserProject>().eq("userSid",sid));
     }
+
 }

yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/ProjectInformationVo.java

@@ -0,0 +1,18 @@
+package com.yxt.supervise.system.sysuser;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+
+/**
+ * @author wangpengfei
+ * @date 2023/4/25 9:29
+ */
+@ApiModel(value = "项目信息 视图数据对象", description = "项目信息 视图数据对象")
+@Data
+public class ProjectInformationVo implements Vo {
+    private String sid;
+    //项目名称
+    private String  entryName;
+}

yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserVo.java

@@ -11,6 +11,7 @@ import lombok.NoArgsConstructor;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui_portal(门户建设) <br/>
@@ -92,5 +93,5 @@ public class SysUserVo implements Vo {
     private String jobNumber;
     private String openid;
     @ApiModelProperty("项目sid集合")
-    private List<String> projectSidList;
+    private List<ProjectInformationVo> projectSidList;
 }

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/userproject/UserProjectFeign.java → yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/userproject/ProjectInformationFeign.java

@@ -1,9 +1,9 @@
 package com.yxt.supervise.feign.crm.userproject;
 
 import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.system.sysuser.ProjectInformationVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -12,15 +12,16 @@ import java.util.List;
 
 /**
  * @author feikefei
- * @create 2023-09-07-9:06
+ * @create 2023-09-08-14:18
  */
-@Api(tags = "用户项目表")
+@Api(tags = "项目信息")
 @FeignClient(
-        contextId = "supervise-crm-userProject",
+        contextId = "supervise-crm-projectinformation",
         name = "supervise-crm",
-        path = "userproject")
+        path = "v1/projectinformation"
-public interface UserProjectFeign {
+)
+public interface ProjectInformationFeign {
     @ApiOperation("根据userSid查询该人的项目")
     @PostMapping("/getProjectSidByUserSid")
-    ResultBean<List<UserProject>> getProjectSidByUserSid(@RequestParam("userSid") String userSid);
+    ResultBean<List<ProjectInformationVo>> getProjectSidByUserSid(@RequestParam("userSid") String userSid);
 }

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/userproject/UserProject.java

@@ -1,18 +0,0 @@
-package com.yxt.supervise.feign.crm.userproject;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yxt.common.core.domain.EntityWithId;
-import lombok.Data;
-
-/**
- * @author feikefei
- * @create 2023-09-07-9:11
- */
-@Data
-@TableName("user_project")
-public class UserProject extends EntityWithId{
-    private String sid;
-    private String projectSid;
-    private String userSid;
-    private String userType;
-}

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java

@@ -5,8 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.supervise.feign.crm.userproject.UserProject;
+import com.yxt.supervise.feign.crm.userproject.ProjectInformationFeign;
-import com.yxt.supervise.feign.crm.userproject.UserProjectFeign;
 import com.yxt.supervise.system.config.DictCommonType;
 import com.yxt.supervise.system.sysorganization.SysOrganization;
 import com.yxt.supervise.system.sysorganization.SysOrganizationService;
@@ -41,17 +40,13 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.Resource;
 import java.io.File;
 import java.util.*;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
 import static java.util.concurrent.Executors.newScheduledThreadPool;
@@ -118,7 +113,7 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
     @Autowired
     private UserOpenidService userOpenidService;
     @Autowired
-    private UserProjectFeign userProjectFeign;
+    private ProjectInformationFeign projectInformationFeign;
 
 
     public PagerVo<SysUser> listPage(PagerQuery<SysUserQuery> pq) {
@@ -349,13 +344,8 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         userInfoOneVo.setSid(user.getSid());
         userInfoOneVo.setUserName(user.getUserName());
         userInfoOneVo.setIsAdmin(user.getIsAdmin());
-        ResultBean<List<UserProject>> projectSidByUserSid = userProjectFeign.getProjectSidByUserSid(user.getSid());
+        ResultBean<List<ProjectInformationVo>> projectSidByUserSid = projectInformationFeign.getProjectSidByUserSid(user.getSid());
-        List<UserProject> data = projectSidByUserSid.getData();
+        userInfoOneVo.setProjectSidList(projectSidByUserSid.getData());
-        List<String> list = new ArrayList<>();
-        for (UserProject datum : data) {
-            list.add(datum.getProjectSid());
-        }
-        userInfoOneVo.setProjectSidList(list);
         //类型为员工的组织机构信息
         if(user.getUserType().equals("3")){