diff --git a/neuray-pm-base-server/base-auth/auth-server/src/main/java/com/gitee/neuray/security/auth/controller/AuthController.java b/neuray-pm-base-server/base-auth/auth-server/src/main/java/com/gitee/neuray/security/auth/controller/AuthController.java index 21dc8fd1bc05d8ed66736a551cd2e4915d52e0ba..59d141232db98bef0f94aeee6f0c39debbe41332 100644 --- a/neuray-pm-base-server/base-auth/auth-server/src/main/java/com/gitee/neuray/security/auth/controller/AuthController.java +++ b/neuray-pm-base-server/base-auth/auth-server/src/main/java/com/gitee/neuray/security/auth/controller/AuthController.java @@ -47,6 +47,7 @@ public class AuthController { String orgName = map.get("orgName"); String position = map.get("position"); String avatar = map.get("avatar"); + //String roles = map.get("roles"); return new ObjectRestResponse().data(new JwtWeAuthenticationResponse(token,name,avatar,orgName,position)).msg("获取token成功"); } diff --git a/neuray-pm-base-server/base-auth/auth-server/src/main/java/com/gitee/neuray/security/auth/service/impl/AuthServiceImpl.java b/neuray-pm-base-server/base-auth/auth-server/src/main/java/com/gitee/neuray/security/auth/service/impl/AuthServiceImpl.java index c6f2ca97e8b36653b15029bb48eb9144b7f6b3f4..9ea633e986b619f1786ce0f5b34ce42af2412972 100644 --- a/neuray-pm-base-server/base-auth/auth-server/src/main/java/com/gitee/neuray/security/auth/service/impl/AuthServiceImpl.java +++ b/neuray-pm-base-server/base-auth/auth-server/src/main/java/com/gitee/neuray/security/auth/service/impl/AuthServiceImpl.java @@ -12,7 +12,6 @@ import com.gitee.neuray.security.auth.util.user.JwtTokenUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; -import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -59,6 +58,7 @@ public class AuthServiceImpl implements AuthService { pmUserEntity.setOrgName(ret.get("orgName").toString()); pmUserEntity.setWxUserId(wxUserId); pmUserEntity.setAccessToken(wxToken); + /*response.setHeader("name", ret.get("name").toString()); response.setHeader("avatar", ret.get("avatar").toString()); response.setHeader("position", ret.get("position").toString());*/ diff --git a/neuray-pm-provider-api/neuray-pm-admin-api/src/main/java/com/gitee/neuray/security/admin/dto/PmUserDto.java b/neuray-pm-provider-api/neuray-pm-admin-api/src/main/java/com/gitee/neuray/security/admin/dto/PmUserDto.java index ceb611505769035d5d7d7791bef1029e7d1e90f0..fec0c3c00408f8c789fca1aa1bbe5b7604f4a8cd 100644 --- a/neuray-pm-provider-api/neuray-pm-admin-api/src/main/java/com/gitee/neuray/security/admin/dto/PmUserDto.java +++ b/neuray-pm-provider-api/neuray-pm-admin-api/src/main/java/com/gitee/neuray/security/admin/dto/PmUserDto.java @@ -2,6 +2,9 @@ package com.gitee.neuray.security.admin.dto; import lombok.Data; +import java.util.List; +import java.util.Map; + /** * @author: zhhongyu * @description: pm系统用户dto @@ -20,4 +23,5 @@ public class PmUserDto { private String orgName; private String wxUserId; private String accessToken; + private List roles; } diff --git a/neuray-pm-provider/neuray-pm-provider-admin/src/main/java/com/gitee/neuray/security/admin/constant/AdminCommonConstant.java b/neuray-pm-provider/neuray-pm-provider-admin/src/main/java/com/gitee/neuray/security/admin/constant/AdminCommonConstant.java index 88559ffc4586cc144b8cd6933ae2b47cbd2fe2ab..d20bdaa26298351191ffa01a802f03330ac19a0a 100644 --- a/neuray-pm-provider/neuray-pm-provider-admin/src/main/java/com/gitee/neuray/security/admin/constant/AdminCommonConstant.java +++ b/neuray-pm-provider/neuray-pm-provider-admin/src/main/java/com/gitee/neuray/security/admin/constant/AdminCommonConstant.java @@ -24,4 +24,6 @@ public class AdminCommonConstant { * 可配置的第一级组织 */ public static final String FIRST_ORG_CODE = "1"; + + public static final String WB_ADDRESS = "neuray-pm-wb"; } diff --git a/neuray-pm-provider/neuray-pm-provider-admin/src/main/java/com/gitee/neuray/security/admin/feign/WbFeign.java b/neuray-pm-provider/neuray-pm-provider-admin/src/main/java/com/gitee/neuray/security/admin/feign/WbFeign.java new file mode 100644 index 0000000000000000000000000000000000000000..0605927c557bd3494f2f8dce9896d61485ca802c --- /dev/null +++ b/neuray-pm-provider/neuray-pm-provider-admin/src/main/java/com/gitee/neuray/security/admin/feign/WbFeign.java @@ -0,0 +1,19 @@ +package com.gitee.neuray.security.admin.feign; + +import com.gitee.neuray.security.admin.constant.AdminCommonConstant; +import com.gitee.neuray.security.common.msg.TableResultResponse; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; +import java.util.Map; + +@FeignClient(value = AdminCommonConstant.WB_ADDRESS,configuration = {}) +public interface WbFeign { + + @RequestMapping(value = "/ribs/findRole",method = RequestMethod.GET) + List findRole(@RequestParam Map map); + +} \ No newline at end of file diff --git a/neuray-pm-provider/neuray-pm-provider-admin/src/main/java/com/gitee/neuray/security/admin/staff/biz/StaffBiz.java b/neuray-pm-provider/neuray-pm-provider-admin/src/main/java/com/gitee/neuray/security/admin/staff/biz/StaffBiz.java index 41362670f2d67906f1fb6aa7c16f60d5fa9b8ffd..9643cc121534fe19df89cac0d022594ada1d3320 100644 --- a/neuray-pm-provider/neuray-pm-provider-admin/src/main/java/com/gitee/neuray/security/admin/staff/biz/StaffBiz.java +++ b/neuray-pm-provider/neuray-pm-provider-admin/src/main/java/com/gitee/neuray/security/admin/staff/biz/StaffBiz.java @@ -147,6 +147,7 @@ public class StaffBiz extends BaseBiz { map.put("msg","error"); return map; } + //微信企业号人员详情 UserInfoDetail userInfoDetail = wechatBiz.getUserInfoDetail(userId,token); @@ -161,7 +162,10 @@ public class StaffBiz extends BaseBiz { StaffVo staffVo = staffVos.get(0); - Map staffInfo = new HashMap<>(); + Map maprole = new HashMap(); + maprole.put("userId",staffVo.getId()); + + Map staffInfo = new HashMap<>(); staffInfo.put("phone",phone); staffInfo.put("name",staffVo.getName()); staffInfo.put("deptCode",staffVo.getDeptCode()); diff --git a/neuray-pm-provider/neuray-pm-provider-admin/src/main/java/com/gitee/neuray/security/admin/user/biz/AdminStaffBiz.java b/neuray-pm-provider/neuray-pm-provider-admin/src/main/java/com/gitee/neuray/security/admin/user/biz/AdminStaffBiz.java index aa34aac430a209a9909b1742a156b5785d7a33d8..0a06a27904a524b1a5d1c45a7ba4f9673ae8d2a0 100644 --- a/neuray-pm-provider/neuray-pm-provider-admin/src/main/java/com/gitee/neuray/security/admin/user/biz/AdminStaffBiz.java +++ b/neuray-pm-provider/neuray-pm-provider-admin/src/main/java/com/gitee/neuray/security/admin/user/biz/AdminStaffBiz.java @@ -9,6 +9,7 @@ import com.gitee.neuray.security.admin.constant.AdminCommonConstant; import com.gitee.neuray.security.admin.dto.AdminUser; import com.gitee.neuray.security.admin.dto.PmUserDto; import com.gitee.neuray.security.admin.exception.AdminException; +import com.gitee.neuray.security.admin.feign.WbFeign; import com.gitee.neuray.security.admin.org.biz.AdminOrgBiz; import com.gitee.neuray.security.admin.org.entity.AdminOrgEntity; import com.gitee.neuray.security.admin.role.biz.AdminRoleBiz; @@ -35,6 +36,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; import java.lang.reflect.ParameterizedType; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; @@ -67,6 +69,8 @@ public class AdminStaffBiz extends BaseBiz { private UserAuthUtil userAuthUtil; @Autowired private AdminRoleBiz roleBiz; + @Autowired + private WbFeign wbFeign; @Override protected String getPageName() { @@ -272,6 +276,11 @@ public class AdminStaffBiz extends BaseBiz { } UserRole userRole = this.getUserRoleByUserId(userId); frontUser.setUserRole(userRole); + + Map param = new HashMap<>(); + param.put("userId",frontUser.getId()); + List roles = wbFeign.findRole(param); + frontUser.setRoles(roles); return frontUser; } diff --git a/neuray-pm-provider/neuray-pm-provider-admin/src/main/java/com/gitee/neuray/security/admin/vo/FrontUser.java b/neuray-pm-provider/neuray-pm-provider-admin/src/main/java/com/gitee/neuray/security/admin/vo/FrontUser.java index f7884f5cf7e8dadc411589de4dd7b4d4b9852132..4b344036bfbc7fd779ee2fca9489d8bf02d014d1 100644 --- a/neuray-pm-provider/neuray-pm-provider-admin/src/main/java/com/gitee/neuray/security/admin/vo/FrontUser.java +++ b/neuray-pm-provider/neuray-pm-provider-admin/src/main/java/com/gitee/neuray/security/admin/vo/FrontUser.java @@ -2,6 +2,9 @@ package com.gitee.neuray.security.admin.vo; import lombok.Data; +import java.util.List; +import java.util.Map; + /** * 业务对象：前端获取用户信息 * @author 协同设计小组 @@ -64,4 +67,6 @@ public class FrontUser { private UserRole userRole; + private List roles; + } diff --git a/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/biz/WechatBiz.java b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/biz/WechatBiz.java index 09f73e51925307e1dac489c48fc104ad933c3f86..5ca2f3cf85dc4f7e9ffc51ac7f71bfebb74d9094 100644 --- a/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/biz/WechatBiz.java +++ b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/biz/WechatBiz.java @@ -115,7 +115,7 @@ public class WechatBiz { String name = staff.get("name").toString(); SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); //name = java.net.URLEncoder.encode(name + "报销", "UTF-8"); - File fileTemp = new File(savePath + File.separator + name + df.format(new Date()) + ".xlsx"); + File fileTemp = new File(savePath + File.separator + name + "-"+ type +"-" + df.format(new Date()) + ".xlsx"); FileOutputStream fileOutputStream = new FileOutputStream(fileTemp); //将 下载wb的inputStream 通过FileOutputStream写入临时文件 byte[] b = new byte[1024]; diff --git a/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/controller/RibsController.java b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/controller/RibsController.java index b71827648b4360b1ba46687b83254a07a026c3d8..f1f80f29af4601b82e353af2dd870cae56ea3f61 100644 --- a/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/controller/RibsController.java +++ b/neuray-pm-provider/neuray-pm-provider-wb/src/main/java/com/gitee/neuray/security/wb/ribs/controller/RibsController.java @@ -153,7 +153,7 @@ public class RibsController { public void test(@RequestBody Map map, HttpServletRequest request) { try { Map wechatInfo = JSONObject.parseObject(JSONObject.toJSONString(map.get("wechatInfo")),Map.class); - wechatBiz.excelAndSend(wechatInfo,"clf",null,null,request); + wechatBiz.excelAndSend(wechatInfo,"外阜差旅费",null,null,request); } catch (IOException e) { e.printStackTrace(); } @@ -231,7 +231,7 @@ public class RibsController { ribsBiz.commitBXD(ribsVo,bxdh,userId); try { - wechatBiz.excelAndSend(wechatInfo,"cyf",ribsVo,staffInfo,request); + wechatBiz.excelAndSend(wechatInfo,"餐饮费",ribsVo,staffInfo,request); } catch (IOException e) { e.printStackTrace(); } @@ -309,7 +309,7 @@ public class RibsController { ribsBiz.commitBXD(ribsVo,bxdh,userId); try { - wechatBiz.excelAndSend(wechatInfo,"jtf",ribsVo,staffInfo,request); + wechatBiz.excelAndSend(wechatInfo,"市内交通费",ribsVo,staffInfo,request); } catch (IOException e) { e.printStackTrace(); } @@ -364,16 +364,19 @@ public class RibsController { /** * 查询当前登陆人审批角色 - * @param request + * @param map * @return */ @RequestMapping(value = "findRole", method = RequestMethod.GET) - public ListRestResponse> findRole(HttpServletRequest request){ - String userId = request.getHeader("userId"); + public List findRole(@RequestParam Map map){ + + // String userId = request.getHeader("userId"); + String userId = map.get("userId").toString(); ApproveRoleVo roleVo = new ApproveRoleVo(); roleVo.setStaffId(userId); List roleVos = approveRoleBiz.selectList(roleVo); - return new ListRestResponse>("角色列表",roleVos.size(),roleVos); + //return new ListRestResponse>("角色列表",roleVos.size(),roleVos); + return roleVos; } /**