Commit 9b6536ff authored by fangxinjiang's avatar fangxinjiang

B端服务添加

parent a0380bea
...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yifu.cloud.plus.v1.yifu.archives.entity.MSetttleCustomerUser; import com.yifu.cloud.plus.v1.yifu.archives.entity.MSetttleCustomerUser;
import com.yifu.cloud.plus.v1.yifu.archives.vo.MSetttleCustomerUserVo; import com.yifu.cloud.plus.v1.yifu.archives.vo.MSetttleCustomerUserVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
...@@ -15,6 +16,7 @@ import java.util.List; ...@@ -15,6 +16,7 @@ import java.util.List;
* @author pwang * @author pwang
* @date 2020-08-26 12:00:12 * @date 2020-08-26 12:00:12
*/ */
@Mapper
public interface MSetttleCustomerUserMapper extends BaseMapper<MSetttleCustomerUser> { public interface MSetttleCustomerUserMapper extends BaseMapper<MSetttleCustomerUser> {
/** /**
* b端用户客户关系表简单分页查询 * b端用户客户关系表简单分页查询
......
package com.yifu.cloud.plus.v1.job; package com.yifu.cloud.plus.v1.business;
import com.yifu.cloud.plus.v1.yifu.common.security.annotation.EnableYifuResourceServer; import com.yifu.cloud.plus.v1.yifu.common.security.annotation.EnableYifuResourceServer;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
...@@ -11,10 +11,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; ...@@ -11,10 +11,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
*/ */
@EnableYifuResourceServer @EnableYifuResourceServer
@SpringBootApplication @SpringBootApplication
public class JobApplication { public class BusinessApplication {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(JobApplication.class, args); SpringApplication.run(BusinessApplication.class, args);
} }
} }
...@@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode; ...@@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class MenuTreeForVue extends TreeNode { public class MenuTreeForVue extends TreeNode {
private Integer id; private String id;
private String icon; private String icon;
private String name; private String name;
private String path; private String path;
...@@ -31,7 +31,7 @@ public class MenuTreeForVue extends TreeNode { ...@@ -31,7 +31,7 @@ public class MenuTreeForVue extends TreeNode {
} }
public MenuTreeForVue(int id, String name, int parentId) { public MenuTreeForVue(int id, String name, int parentId) {
this.id = id; this.id = String.valueOf(id);
this.parentId = Common.isNotNullToStr(parentId); this.parentId = Common.isNotNullToStr(parentId);
this.name = name; this.name = name;
/*this.meta=new Meta(name,null,null);*/ /*this.meta=new Meta(name,null,null);*/
...@@ -40,8 +40,8 @@ public class MenuTreeForVue extends TreeNode { ...@@ -40,8 +40,8 @@ public class MenuTreeForVue extends TreeNode {
} }
public MenuTreeForVue(int id, String name, MenuTreeForVue parent) { public MenuTreeForVue(int id, String name, MenuTreeForVue parent) {
this.id = id; this.id = String.valueOf(id);
this.parentId = Common.isNotNullToStr(parent.getId()); this.parentId = parent.getId();
this.name = name; this.name = name;
/*this.meta=new Meta(name,null,null);*/ /*this.meta=new Meta(name,null,null);*/
this.meta =new JSONObject(); this.meta =new JSONObject();
...@@ -49,7 +49,7 @@ public class MenuTreeForVue extends TreeNode { ...@@ -49,7 +49,7 @@ public class MenuTreeForVue extends TreeNode {
} }
public MenuTreeForVue(MenuVO menuVo) { public MenuTreeForVue(MenuVO menuVo) {
this.id = menuVo.getMenuId(); this.id = Common.isNotNullToStr(menuVo.getMenuId());
this.parentId = Common.isNotNullToStr(menuVo.getParentId()); this.parentId = Common.isNotNullToStr(menuVo.getParentId());
this.icon = menuVo.getIcon(); this.icon = menuVo.getIcon();
this.name = menuVo.getName(); this.name = menuVo.getName();
...@@ -80,7 +80,7 @@ public class MenuTreeForVue extends TreeNode { ...@@ -80,7 +80,7 @@ public class MenuTreeForVue extends TreeNode {
} }
public MenuTreeForVue(SysMenu menuVo) { public MenuTreeForVue(SysMenu menuVo) {
this.id = menuVo.getMenuId().intValue(); this.id = Common.isNotNullToStr(menuVo.getMenuId());
this.parentId = Common.isNotNullToStr(menuVo.getParentId()); this.parentId = Common.isNotNullToStr(menuVo.getParentId());
this.icon = menuVo.getIcon(); this.icon = menuVo.getIcon();
this.name = menuVo.getName(); this.name = menuVo.getName();
......
...@@ -11,6 +11,7 @@ import com.yifu.cloud.plus.v1.yifu.admin.api.vo.BusinessUserVo; ...@@ -11,6 +11,7 @@ import com.yifu.cloud.plus.v1.yifu.admin.api.vo.BusinessUserVo;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.MenuTreeForVue; import com.yifu.cloud.plus.v1.yifu.admin.api.vo.MenuTreeForVue;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.RoleMenuR; import com.yifu.cloud.plus.v1.yifu.admin.api.vo.RoleMenuR;
import com.yifu.cloud.plus.v1.yifu.admin.service.*; import com.yifu.cloud.plus.v1.yifu.admin.service.*;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CacheConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.CommonConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ServiceNameConstants; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ServiceNameConstants;
import com.yifu.cloud.plus.v1.yifu.common.core.util.Common; import com.yifu.cloud.plus.v1.yifu.common.core.util.Common;
...@@ -121,7 +122,6 @@ public class BusinessUserController { ...@@ -121,7 +122,6 @@ public class BusinessUserController {
user.setDelFlag(CommonConstants.ZERO_STRING); user.setDelFlag(CommonConstants.ZERO_STRING);
user.setCreateTime(LocalDateTime.now()); user.setCreateTime(LocalDateTime.now());
user.setDeptName("客户单位"); user.setDeptName("客户单位");
user.setDeptId(CommonConstants.HR_B_ORG_ID);
//使用根节点 //使用根节点
user.setDeptId(CommonConstants.HR_B_ORG_ID); user.setDeptId(CommonConstants.HR_B_ORG_ID);
if (Common.isNotNull(user.getPassword())){ if (Common.isNotNull(user.getPassword())){
...@@ -273,9 +273,9 @@ public class BusinessUserController { ...@@ -273,9 +273,9 @@ public class BusinessUserController {
//清除用户缓存 //清除用户缓存
SysUser user = userService.getById(userId); SysUser user = userService.getById(userId);
if(null != user){ if(null != user){
redisUtil.remove(ServiceNameConstants.UMPS_SERVICE + "_user_details::" + user.getUsername()); redisUtil.remove(CacheConstants.USER_DETAILS +"::"+ user.getUsername());
if( Common.isNotNull(user.getPhone())){ if( Common.isNotNull(user.getPhone())){
redisUtil.remove(ServiceNameConstants.UMPS_SERVICE + "_user_details_phone::" + user.getPhone()); redisUtil.remove(CacheConstants.USER_DETAILS + "_phone::"+ user.getPhone());
} }
} }
return R.ok(CommonConstants.RESULT_DATA_SUCESS); return R.ok(CommonConstants.RESULT_DATA_SUCESS);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment