diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationFeign.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationFeign.java index 271820d1..b47331b8 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/projectinformation/ProjectInformationFeign.java +++ b/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> getProjectSidByUserSid(@RequestParam("userSid") String userSid); } diff --git a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/userproject/UserProjectFeign.java b/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/userproject/UserProjectFeign.java deleted file mode 100644 index 6aa3562a..00000000 --- a/yxt_supervise/supervise-crm/supervise-crm-api/src/main/java/com/yxt/supervise/crm/api/userproject/UserProjectFeign.java +++ /dev/null @@ -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 { -} diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java index 9f2e1a2d..0824513e 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.java +++ b/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 @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 getProjectByUser( @Param("sid") String sid); void insertFiles(List> maps); - + List getProjectListByUserSid(@Param("userSid") String userSid); } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.xml index ea5f04ec..83c3025c 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.xml +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationMapper.xml @@ -61,4 +61,8 @@ ) + + \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java index f2caed05..fe07dd51 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationRest.java +++ b/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> getProjectSidByUserSid(@RequestParam("userSid") String userSid){ + ResultBean rb = ResultBean.fireFail(); + List projectSidListByUserSid = ProjectInformationService.getProjectListByUserSid(userSid); + return rb.success().setData(projectSidListByUserSid); + } } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java index 5d58d09e..d1dcabfd 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/projectinformation/ProjectInformationService.java +++ b/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 getProjectListByUserSid(String sid){ + List projectByUserSid = baseMapper.getProjectListByUserSid(sid); + return projectByUserSid; + } } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectRest.java index 943d81a1..b6774868 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectRest.java +++ b/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> getProjectSidByUserSid(@RequestParam("userSid") String userSid){ - ResultBean rb = ResultBean.fireFail(); - System.out.println(userSid); - List projectSidListByUserSid = UserProjectService.getProjectSidListByUserSid(userSid); - return rb.success().setData(projectSidListByUserSid); - } } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectService.java index 078cc4c2..0dd5f5e9 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectService.java +++ b/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 getProjectSidListByUserSid(String sid){ return baseMapper.selectList(new QueryWrapper().eq("userSid",sid)); } + } diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/ProjectInformationVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/ProjectInformationVo.java new file mode 100644 index 00000000..5a15233c --- /dev/null +++ b/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; +} diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserVo.java index 95697a3f..0c749448 100644 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysuser/SysUserVo.java +++ b/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(门户建设)
@@ -92,5 +93,5 @@ public class SysUserVo implements Vo { private String jobNumber; private String openid; @ApiModelProperty("项目sid集合") - private List projectSidList; + private List projectSidList; } diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/userproject/UserProjectFeign.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/userproject/ProjectInformationFeign.java similarity index 60% rename from yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/userproject/UserProjectFeign.java rename to yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/userproject/ProjectInformationFeign.java index 8090cba4..c8745437 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/userproject/UserProjectFeign.java +++ b/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") -public interface UserProjectFeign { + path = "v1/projectinformation" +) +public interface ProjectInformationFeign { @ApiOperation("根据userSid查询该人的项目") @PostMapping("/getProjectSidByUserSid") - ResultBean> getProjectSidByUserSid(@RequestParam("userSid") String userSid); + ResultBean> getProjectSidByUserSid(@RequestParam("userSid") String userSid); } diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/userproject/UserProject.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/userproject/UserProject.java deleted file mode 100644 index 8c78689d..00000000 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/userproject/UserProject.java +++ /dev/null @@ -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; -} \ No newline at end of file diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java index 2fb0e9ec..a294fab8 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java +++ b/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.UserProjectFeign; +import com.yxt.supervise.feign.crm.userproject.ProjectInformationFeign; 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 { @Autowired private UserOpenidService userOpenidService; @Autowired - private UserProjectFeign userProjectFeign; + private ProjectInformationFeign projectInformationFeign; public PagerVo listPage(PagerQuery pq) { @@ -349,13 +344,8 @@ public class SysUserService extends MybatisBaseService { userInfoOneVo.setSid(user.getSid()); userInfoOneVo.setUserName(user.getUserName()); userInfoOneVo.setIsAdmin(user.getIsAdmin()); - ResultBean> projectSidByUserSid = userProjectFeign.getProjectSidByUserSid(user.getSid()); - List data = projectSidByUserSid.getData(); - List list = new ArrayList<>(); - for (UserProject datum : data) { - list.add(datum.getProjectSid()); - } - userInfoOneVo.setProjectSidList(list); + ResultBean> projectSidByUserSid = projectInformationFeign.getProjectSidByUserSid(user.getSid()); + userInfoOneVo.setProjectSidList(projectSidByUserSid.getData()); //类型为员工的组织机构信息 if(user.getUserType().equals("3")){