exit

liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/constant/SmileRedisConst.java

@@ -7,4 +7,8 @@ public class SmileRedisConst {
 
     public static final String SMILE_USER = PREFIX.concat("user");  //用户key
 
+    public static final String SMILE_SCHOOL = PREFIX.concat("school");  //校园key
+
+
+
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileOrganizationController.java

 package com.liquidnet.client.admin.web.controller.zhengzai.smile;
 
 
+import com.liquidnet.client.admin.common.core.domain.AjaxResult;
+import com.liquidnet.client.admin.zhengzai.smile.service.ISmileOrganizationService;
+import com.liquidnet.client.admin.zhengzai.smile.vo.SmileOrganizationVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
  *  前端控制器
@@ -13,8 +22,20 @@ import org.springframework.web.bind.annotation.RestController;
  * @author liquidnet
  * @since 2022-03-14
  */
+@Api(tags = "组织管理")
 @RestController
-@RequestMapping("/smile-organization")
+@RequestMapping("/smile/organization")
 public class SmileOrganizationController {
 
+    @Autowired
+    ISmileOrganizationService imsOrganizationService;
+
+    @GetMapping("/organizationList")
+    @ApiOperation("获取组织列表")
+    @ResponseBody
+    public AjaxResult organizationList(){
+        List<SmileOrganizationVo> organizationList = imsOrganizationService.organizationList();
+        return AjaxResult.success(organizationList);
+    }
+
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileSchoolController.java

@@ -2,6 +2,7 @@ package com.liquidnet.client.admin.web.controller.zhengzai.smile;
 
 
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileSchoolService;
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author liquidnet
  * @since 2022-03-14
  */
+@Api(tags = "学校管理")
 @RestController
 @RequestMapping("/smile/school")
 public class SmileSchoolController {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileUserController.java

@@ -13,9 +13,17 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-03-14
+ */
 @Api(tags = "用户管理")
 @Controller
-@RequestMapping("smile/user")
+@RequestMapping("/smile/user")
 public class SmileUserController extends BaseController {
 
     @Autowired
@@ -44,4 +52,21 @@ public class SmileUserController extends BaseController {
         int id = iSmileUserService.create(smileUser);
         return AjaxResult.success(id);
     }
+
+    @GetMapping("/getUserListByOrgId")
+    @ApiOperation(value = "根据组织ID查询相人员信息")
+    @ResponseBody
+    public AjaxResult getUserListByOrgId(@RequestParam(name = "orgId",required = true)Long orgId,@RequestParam(name = "agentId",required =true)Long agentId){
+        logger.info("orgId:{},agentId:{}",orgId,agentId);
+        List<SmileUserVo> smileUserVos = iSmileUserService.getUserListByOrgId(orgId,agentId);
+        return AjaxResult.success(smileUserVos);
+    }
+
+    @GetMapping("/getUserByPhone")
+    @ApiOperation(value = "根据手机号返回用户")
+    @ResponseBody
+    public AjaxResult getUserByPhone(@RequestParam(name = "phone" ,required = true)String phone){
+        SmileUserVo smileUserVo = iSmileUserService.getUserByPhone(phone);
+        return AjaxResult.success(smileUserVo);
+    }
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileOrganizationService.java

@@ -2,8 +2,11 @@ package com.liquidnet.client.admin.zhengzai.smile.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.client.admin.zhengzai.smile.vo.SmileOrganizationVo;
 import com.liquidnet.service.smile.entity.SmileOrganization;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -14,4 +17,5 @@ import com.liquidnet.service.smile.entity.SmileOrganization;
  */
 public interface ISmileOrganizationService extends IService<SmileOrganization> {
 
+    List<SmileOrganizationVo> organizationList();
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileUserService.java

@@ -3,6 +3,7 @@ package com.liquidnet.client.admin.zhengzai.smile.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.client.admin.zhengzai.smile.vo.SmileUserVo;
+import com.liquidnet.client.admin.zhengzai.smile.vo.SmileUserVoOrg;
 import com.liquidnet.service.smile.entity.SmileUser;
 
 import java.util.List;
@@ -14,4 +15,8 @@ public interface ISmileUserService  extends IService<SmileUser> {
     SmileUser getUserById(Long uid);
 
     int create(SmileUser smileUser);
+
+    List<SmileUserVoOrg> getUserListByOrgId(Long orgId, Long agentId);
+
+    SmileUserVo getUserByPhone(String phone);
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileOrganizationServiceImpl.java

 package com.liquidnet.client.admin.zhengzai.smile.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.client.admin.common.utils.bean.BeanUtils;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileOrganizationService;
+import com.liquidnet.client.admin.zhengzai.smile.vo.SmileOrganizationVo;
 import com.liquidnet.service.smile.entity.SmileOrganization;
 import com.liquidnet.service.smile.mapper.SmileOrganizationMapper;
+import com.liquidnet.service.smile.mapper.SmileUserMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  *  服务实现类
@@ -15,7 +25,32 @@ import org.springframework.stereotype.Service;
  * @author liquidnet
  * @since 2022-03-14
  */
+@Slf4j
 @Service
 public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationMapper, SmileOrganization> implements ISmileOrganizationService {
 
+    @Autowired
+    SmileOrganizationMapper smileOrganizationMapper;
+
+    @Autowired
+    SmileUserMapper smileUserMapper;
+
+    @Override
+    public List<SmileOrganizationVo> organizationList() {
+        LambdaQueryWrapper<SmileOrganization> queryWrapper = Wrappers.lambdaQuery(SmileOrganization.class);
+        queryWrapper.eq(SmileOrganization::getDelTag,1);
+        List<SmileOrganization> smileOrganizations = smileOrganizationMapper.selectList(queryWrapper);
+        return smileOrganizations.stream().map(smileOrganization -> {
+            SmileOrganizationVo smileOrganizationVo = new SmileOrganizationVo();
+            BeanUtils.copyBeanProp(smileOrganization,smileOrganizationVo);
+            log.info("organizationList orgId:{}", smileOrganization.getId());
+            //关联查询人数
+            smileOrganizationVo.setProper(smileUserMapper.strip(smileOrganization.getId()));
+            return smileOrganizationVo;
+        }).collect(Collectors.toList());
+    }
+
+
+
+
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileUserServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileUserService;
 import com.liquidnet.client.admin.zhengzai.smile.vo.SmileUserVo;
+import com.liquidnet.client.admin.zhengzai.smile.vo.SmileUserVoOrg;
 import com.liquidnet.service.smile.entity.SmileUser;
 import com.liquidnet.service.smile.mapper.SmileUserMapper;
 import lombok.extern.slf4j.Slf4j;
@@ -28,8 +29,8 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
     public List<SmileUserVo> userList() {
         //查询未删除，未通过审核的用户
         LambdaQueryWrapper<SmileUser> queryWrapper = Wrappers.lambdaQuery(SmileUser.class);
-        queryWrapper.ne(SmileUser::getDelTag,1);
-        queryWrapper.ne(false,SmileUser::getType,0);
+        queryWrapper.eq(SmileUser::getDelTag,1);
+        queryWrapper.eq(false,SmileUser::getType,0);
         List<SmileUser> smileUsers = smileUserMapper.selectList(queryWrapper);
         return smileUsers.stream().map(smileUser -> {
             SmileUserVo smileUserVo = new SmileUserVo();
@@ -43,9 +44,9 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
         log.info("查询用户id:{}",uid);
         //查询未删除，未通过审核的用户,id=uid
         LambdaQueryWrapper<SmileUser> queryWrapper = Wrappers.lambdaQuery(SmileUser.class);
-        queryWrapper.ne(SmileUser::getDelTag,1);
-        queryWrapper.ne(false,SmileUser::getType,0);
-        queryWrapper.ne(SmileUser::getId,uid);
+        queryWrapper.eq(SmileUser::getDelTag,1);
+        queryWrapper.eq(false,SmileUser::getType,0);
+        queryWrapper.eq(SmileUser::getId,uid);
         SmileUser smileUser = smileUserMapper.selectById(queryWrapper);
         log.info("smileUser:{}",smileUser);
         return smileUser;
@@ -61,7 +62,30 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
         return id;
     }
 
+    @Override
+    public List<SmileUserVoOrg> getUserListByOrgId(Long orgId,Long agentId) {
+        //查询根据组织ID查询人员信息
+        LambdaQueryWrapper<SmileUser> queryWrapper = Wrappers.lambdaQuery(SmileUser.class);
+        queryWrapper.eq(SmileUser::getOrgId,orgId);
+        List<SmileUserVoOrg> smileUserVos = smileUserMapper.selectList(queryWrapper).stream().map(smileUser -> {
+            SmileUserVoOrg smileUserVo = new SmileUserVoOrg();
+            BeanUtils.copyProperties(smileUser, smileUserVo);
+
+            return smileUserVo;
+        }).collect(Collectors.toList());
+        return smileUserVos;
+    }
 
+    @Override
+    public SmileUserVo getUserByPhone(String phone) {
+        log.info("getUserByPhone phone:{}",phone);
+        LambdaQueryWrapper<SmileUser> queryWrapper = Wrappers.lambdaQuery(SmileUser.class);
+        queryWrapper.eq(SmileUser::getPhone,phone);
+        SmileUser smileUser = smileUserMapper.selectOne(queryWrapper);
+        SmileUserVo userVo = new SmileUserVo();
+        BeanUtils.copyProperties(smileUser, userVo);
+        return userVo;
+    }
 
 
 }
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/vo/SmileOrganizationVo.java

+package com.liquidnet.client.admin.zhengzai.smile.vo;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-03-14
+ */
+@Data
+public class SmileOrganizationVo{
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    /**
+     * 组织名称
+     */
+    private String name;
+
+    /**
+     * 省key
+     */
+    private Integer provinceKey;
+
+    /**
+     * 省
+     */
+    private String province;
+
+    /**
+     * 市key
+     */
+    private Integer cityKey;
+
+    /**
+     * 市
+     */
+    private String city;
+
+    /**
+     * 区key
+     */
+    private Integer areaKey;
+
+    /**
+     * 区
+     */
+    private String area;
+
+    /**
+     * 地区(省份/地区/详细地址)
+     */
+    private String address;
+
+    /**
+     * 总代理
+     */
+    private Long agentId;
+
+    /**
+     * 人数
+     */
+    private Integer proper;
+
+    /**
+     * 总代理名称
+     */
+    private String agentName;
+
+    /**
+     * 0：删除，1正常
+     */
+    private Integer delTag;
+
+    private LocalDateTime createdDate;
+
+    private LocalDateTime updatedDate;
+
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/vo/SmileUserVoOrg.java

+package com.liquidnet.client.admin.zhengzai.smile.vo;
+
+public class SmileUserVoOrg {
+
+    private Long id;
+
+    /**
+     * 真实姓名
+     */
+    private String name;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 代理类型（0：未审核，1：总代，2：普代）
+     */
+    private Integer type;
+}

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/SmileOrganization.java

@@ -2,10 +2,12 @@ package com.liquidnet.service.smile.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 
@@ -61,12 +63,25 @@ public class SmileOrganization implements Serializable {
     /**
      * 地区(省份/地区/详细地址)
      */
-    private String addewss;
+    private String address;
 
     /**
      * 总代理
      */
     private Long agentId;
 
+    /**
+     * 总代理名称
+     */
+    private Long agentName;
+
+    /**
+     * 0：删除，1正常
+     */
+    private Integer delTag;
+
+    private LocalDateTime createdDate;
+
+    private LocalDateTime updatedDate;
 
 }

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/SmileUser.java

@@ -58,7 +58,7 @@ public class SmileUser implements Serializable {
     /**
      * 省key
      */
-    private Integer provinceKey;
+    private String provinceKey;
 
     /**
      * 省
@@ -68,7 +68,7 @@ public class SmileUser implements Serializable {
     /**
      * 市key
      */
-    private Integer cityKey;
+    private String cityKey;
 
     /**
      * 市
@@ -78,7 +78,7 @@ public class SmileUser implements Serializable {
     /**
      * 区key
      */
-    private Integer areaKey;
+    private String areaKey;
 
     /**
      * 区
@@ -108,7 +108,7 @@ public class SmileUser implements Serializable {
     /**
      * 身份证号
      */
-    private Long idCard;
+    private String idCard;
 
     /**
      * 学校名称
@@ -131,7 +131,7 @@ public class SmileUser implements Serializable {
     private Integer tag;
 
     /**
-     * 认证标识（1：通过，0：未通过）
+     * 认证标识（0:未审核，1：通过，2：未通过）
      */
     private Integer authTag;
 

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/mapper/SmileUserMapper.java

@@ -2,7 +2,21 @@ package com.liquidnet.service.smile.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.liquidnet.service.smile.entity.SmileUser;
+import org.apache.ibatis.annotations.Param;
 
 public interface SmileUserMapper extends BaseMapper<SmileUser> {
 
+    /**
+     * 根据org_id返回符合条件的条数
+     * @param id : 组织ID
+     * @return
+     */
+    Integer strip(@Param("orgId")Long id);
+
+    /**
+     * 根据id返回用户名
+     * @param agentId : 用户id
+     * @return
+     */
+    String selectUserNameById(@Param("id") Long agentId);
 }

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileUserMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.liquidnet.service.smile.mapper.SmileUserMapper">
+    <select id="strip" resultType="Integer">
+        select count from smile_user where org_id = #{orgId};
+    </select>
 
+    <select id="selectUserNameById" resultType="String">
+        select name from  smile_user where id = #{id};
+    </select>
 </mapper>