From ee407941b36584d05160429cc0331feec5763541 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Wed, 11 Oct 2023 16:06:09 +0800 Subject: [PATCH] 10/11 --- .../biz/userproject/UserProjectMapper.java | 3 + .../crm/biz/userproject/UserProjectRest.java | 13 +- .../biz/userproject/UserProjectService.java | 50 +++--- .../sysorganization/SysOrganizationVo.java | 2 + .../supervise/feign/crm/UserProjectVo.java | 74 +++++++++ .../crm/userproject/UserProjectFeign.java | 30 ++++ .../sysorganization/SysOrganizationMapper.xml | 6 +- .../sysorganization/SysOrganizationRest.java | 17 ++- .../SysOrganizationService.java | 142 +++++++++++++++--- 9 files changed, 290 insertions(+), 47 deletions(-) create mode 100644 yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/UserProjectVo.java create mode 100644 yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/userproject/UserProjectFeign.java diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectMapper.java index 5561f85e..cb4523ca 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectMapper.java +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectMapper.java @@ -8,6 +8,7 @@ import com.yxt.supervise.crm.api.userproject.UserProject; import com.yxt.supervise.crm.api.userproject.UserProjectVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -21,6 +22,8 @@ public interface UserProjectMapper extends BaseMapper { List userProjectList(); List getUserProjectBySid( @Param("projectSid") String projectSid); List getUsersByProjectSid( @Param("projectSid") String projectSid); + @Select("select sid from user_project where projectSid=#{projectSid} and userSid =#{userSid}") + UserProjectVo getSidByUserSid( @Param("projectSid") String projectSid,@Param("userSid") String userSid); } 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 7b46adcc..cdbcfe5a 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 @@ -48,11 +48,16 @@ public class UserProjectRest { List pv = UserProjectService.userProjectList(); return rb.success().setData(pv); } - @ApiOperation("保存") + @ApiOperation("关联") @PostMapping("/save") public ResultBean save(@RequestBody UserProjectDto dto) { return UserProjectService.save(dto); } + @ApiOperation("取消关联") + @PostMapping("/cancellation") + public ResultBean cancellation(@RequestBody UserProjectDto dto) { + return UserProjectService.cancellation(dto); + } @ApiOperation("修改") @PostMapping("/update") public ResultBean update(@RequestBody UserProjectDto dto) { @@ -86,6 +91,12 @@ public class UserProjectRest { ResultBean rb = ResultBean.fireFail(); return UserProjectService.getUsersByProjectSid(projectSid); } + @ApiOperation("根据usersid查询") + @GetMapping("/getSidByUserSid/{projectSid}/{userSid}") + public ResultBean getSidByUserSid(@PathVariable("projectSid") String projectSid,@PathVariable("userSid") String userSid){ + ResultBean rb = ResultBean.fireFail(); + return UserProjectService.getSidByUserSid(projectSid,userSid); + } // @ApiOperation("根据项目sid查询") // @GetMapping("/getAllByProjectSid") // public ResultBean getAllByProjectSid(@RequestParam("projectSid") String projectSid){ 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 74fef688..d208986d 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 @@ -49,18 +49,6 @@ public class UserProjectService extends MybatisBaseService().eq("projectSid",dto.getProjectSid())); - //银行人员 -// for(String bankUser:dto.getBankUsers()){ -// UserProject entity=new UserProject(); -// BeanUtil.copyProperties(dto, entity, "id", "sid"); -// entity.setSid(UUID.randomUUID().toString()); -// entity.setUserSid(bankUser); -// entity.setUserType("3"); -// baseMapper.insert(entity); -// } - //监管人员 for(String user:dto.getUsers()){ UserProject entity=new UserProject(); BeanUtil.copyProperties(dto, entity, "id", "sid"); @@ -71,6 +59,14 @@ public class UserProjectService extends MybatisBaseService().eq("userSid",user).eq("projectSid",dto.getProjectSid())); + } + return rb.success().setMsg("取消关联成功"); + } + public ResultBean update(UserProjectDto dto) { ResultBean rb=new ResultBean(); String dtoSid = dto.getSid(); @@ -82,20 +78,19 @@ public class UserProjectService extends MybatisBaseService map =new HashMap<>(); List banks=baseMapper.getUserProjectBySid(projectSid); - for(UserProjectVo userProjectVo:banks){ - Listlist= sysUserFeign.getUserOrgBySid(userProjectVo.getUserSid()).getData(); - if(list.size()>0){ - userProjectVo.setOrgName(list.get(0).getOrganizationName()); - userProjectVo.setName(list.get(0).getName()); - if(StrUtil.isNotEmpty(list.get(0).getOpenid())){ - userProjectVo.setIsOpenId("2"); - }else{ - userProjectVo.setIsOpenId("1"); - } - } - } +// for(UserProjectVo userProjectVo:banks){ +// Listlist= sysUserFeign.getUserOrgBySid(userProjectVo.getUserSid()).getData(); +// if(list.size()>0){ +// userProjectVo.setOrgName(list.get(0).getOrganizationName()); +// userProjectVo.setName(list.get(0).getName()); +// if(StrUtil.isNotEmpty(list.get(0).getOpenid())){ +// userProjectVo.setIsOpenId("2"); +// }else{ +// userProjectVo.setIsOpenId("1"); +// } +// } +// } return rb.success().setData(banks); } public ResultBean> getUsersByProjectSid(String projectSid){ @@ -103,6 +98,11 @@ public class UserProjectService extends MybatisBaseService banks=baseMapper.getUsersByProjectSid(projectSid); return rb.success().setData(banks); } + public ResultBean getSidByUserSid(String projectSid,String userSid){ + ResultBean rb=new ResultBean(); + UserProjectVo banks=baseMapper.getSidByUserSid(projectSid,userSid); + return rb.success().setData(banks); + } // public ResultBean> getAllByProjectSid(String projectSid){ // ResultBean rb=new ResultBean(); // List banks=baseMapper.getAllByProjectSid(projectSid); diff --git a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationVo.java b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationVo.java index 49461047..24862db6 100644 --- a/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationVo.java +++ b/yxt_supervise/supervise-system/supervise-system-api/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationVo.java @@ -87,4 +87,6 @@ public class SysOrganizationVo implements Vo { @ApiModelProperty("其他编码") private String otherCode; private String mobile; + private String isOpenId; + private String userProjectSid; } diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/UserProjectVo.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/UserProjectVo.java new file mode 100644 index 00000000..c9e24fe3 --- /dev/null +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/UserProjectVo.java @@ -0,0 +1,74 @@ +package com.yxt.supervise.feign.crm; + +import com.yxt.common.core.query.Query; + +/** + * @author wangpengfei + * @date 2023/8/6 11:35 + */ +public class UserProjectVo implements Query { + private String id; + private String sid; + private String projectSid; + private String userSid; + private String name; + private String orgName; + //是否绑定openid;1 未绑定 2绑定 + private String isOpenId; + + public String getIsOpenId() { + return isOpenId; + } + + public void setIsOpenId(String isOpenId) { + this.isOpenId = isOpenId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getOrgName() { + return orgName; + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getSid() { + return sid; + } + + public void setSid(String sid) { + this.sid = sid; + } + + public String getProjectSid() { + return projectSid; + } + + public void setProjectSid(String projectSid) { + this.projectSid = projectSid; + } + + public String getUserSid() { + return userSid; + } + + public void setUserSid(String userSid) { + this.userSid = userSid; + } +} 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/UserProjectFeign.java new file mode 100644 index 00000000..411b8605 --- /dev/null +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/feign/crm/userproject/UserProjectFeign.java @@ -0,0 +1,30 @@ +package com.yxt.supervise.feign.crm.userproject; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.supervise.feign.crm.UserProjectVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; + +import java.util.List; + +/** + * @author wangpengfei + * @date 2023/10/10 11:35 + */ +@Api(tags = "用户项目关联信息") +@FeignClient( + contextId = "supervise-crm-userproject", + name = "supervise-crm", + path = "userproject" +) +public interface UserProjectFeign { + @ApiOperation("根据项目sid查询不同类人") + @GetMapping("/getUserProjectBySid/{projectSid}") + public ResultBean> getWarehouse(@PathVariable("projectSid") String projectSid); + @ApiOperation("根据usersid查询") + @GetMapping("/getSidByUserSid/{projectSid}/{userSid}") + public ResultBean getSidByUserSid(@PathVariable("projectSid") String projectSid,@PathVariable("userSid") String userSid); +} diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationMapper.xml b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationMapper.xml index 790c9900..370c680b 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationMapper.xml +++ b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysorganization/SysOrganizationMapper.xml @@ -131,7 +131,11 @@ ORDER BY so.sort ASC