exit

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

@@ -41,21 +41,15 @@ public class SmileOrganizationController {
     @ApiOperation("新增组织")
     @ResponseBody
     public AjaxResult create(@RequestBody SmileOrganizationVo smileOrganizationVo){
-        if (smileOrganizationService.create(smileOrganizationVo)){
-            return AjaxResult.success();
-        }
-        return AjaxResult.warn("组织已添加");
+        return smileOrganizationService.create(smileOrganizationVo);
     }
 
     @PostMapping("/updateOrg")
     @ApiOperation("修改组织")
     @ResponseBody
     public AjaxResult updateOrg(@RequestBody SmileOrganization smileOrganization){
-        if (smileOrganizationService.update(smileOrganization)){
-            return AjaxResult.success();
-        }else {
-            return AjaxResult.error();
-        }
+        return smileOrganizationService.update(smileOrganization);
+
     }
 
     @PostMapping("/getOrgById")

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

@@ -47,21 +47,13 @@ public class SmileSchoolController {
     @ApiOperation("新建学校")
     @ResponseBody
     public AjaxResult create(@RequestBody SmileSchool smileSchool){
-        if (iSmileSchoolService.create(smileSchool)){
-            return AjaxResult.success();
-        }else {
-            return AjaxResult.warn("学校已存在");
-        }
+        return iSmileSchoolService.create(smileSchool);
     }
 
     @PostMapping("/updateById")
     @ApiOperation("更具id修改学校")
     @ResponseBody
     public AjaxResult updateSchoolById(@RequestBody SmileSchool smileSchool){
-        if (iSmileSchoolService.updateSchoolById(smileSchool)) {
-            return AjaxResult.success();
-        } else {
-            return AjaxResult.error();
-        }
+         return iSmileSchoolService.updateSchoolById(smileSchool);
     }
 }

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

@@ -30,7 +30,7 @@ public class SmileShowController {
     @ResponseBody
     public AjaxResult schoolList(SmileShowParam smileShowParam) {
         List<SmileShowParam> list = smileShowService.listShow(smileShowParam);
-        return AjaxResult.success();
+        return AjaxResult.success(list);
     }
 
 }

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

@@ -43,8 +43,8 @@ public class SmileUserController extends BaseController {
     @GetMapping("/getUserById")
     @ApiOperation(value = "根据ID查询单个用户完整信息")
     @ResponseBody
-    public AjaxResult getUserById(@RequestParam(name = "id",required = true) Long id){
-        SmileUser smileUser = iSmileUserService.getUserById(id);
+    public AjaxResult getUserById(@RequestParam(name = "uid",required = true) String uid){
+        SmileUser smileUser = iSmileUserService.getUserById(uid);
         return AjaxResult.success(smileUser);
     }
 
@@ -65,4 +65,11 @@ public class SmileUserController extends BaseController {
         List<SmileUserVoOrg> userListByOrgId = iSmileUserService.getUserListByOrgId(orgId, agentId);
         return AjaxResult.success(userListByOrgId);
     }
+
+    @PostMapping("/updateUserStateByUid")
+    @ApiOperation(value = "根据uid修改用户状态")
+    @ResponseBody
+    public AjaxResult updateUserById(){
+        return null;
+    }
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/SmileUserParam.java

@@ -11,6 +11,8 @@ import javax.validation.constraints.NotNull;
 @Data
 public class SmileUserParam {
 
+    @ApiModelProperty(value = "用户id", example = "")
+    private String uid;
 
     @ApiModelProperty(value = "手机号", example = "")
     private String phone;
@@ -18,6 +20,9 @@ public class SmileUserParam {
     @ApiModelProperty(value = "代理类型", example = "")
     private Integer type;
 
+    @ApiModelProperty(value = "用户状态0：正常，1：黑名单", example = "")
+    private Integer state;
+
     @ApiModelProperty(value = "页数", example = "0")
     @NotNull(message = "页数不能为空")
     private Integer pageSize;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/SmileUserStateByUidParam.java

+package com.liquidnet.client.admin.zhengzai.smile.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author TT
+ */
+@Data
+public class SmileUserStateByUidParam {
+
+    @ApiModelProperty(value = "用户id", example = "")
+    private String uid;
+
+    @ApiModelProperty(value = "手机号", example = "")
+    private String phone;
+
+    @ApiModelProperty(value = "代理类型", example = "")
+    private Integer type;
+
+    @ApiModelProperty(value = "用户状态0：正常，1：黑名单", example = "")
+    private Integer state;
+
+    @ApiModelProperty(value = "页数", example = "0")
+    @NotNull(message = "页数不能为空")
+    private Integer pageSize;
+
+    @ApiModelProperty(value = "数量", example = "20")
+    @NotNull(message = "数量不能为空")
+    private Integer pageNum;
+
+    @ApiModelProperty(value = "排序字段", hidden = true)
+    private String orderItem;
+
+    @ApiModelProperty(value = "排序方式", hidden = true)
+    private String orderSc;
+}

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

@@ -3,6 +3,7 @@ package com.liquidnet.client.admin.zhengzai.smile.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
+import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrgAndUserVo;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrganizationParam;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrganizationVo;
@@ -20,9 +21,9 @@ public interface ISmileOrganizationService extends IService<SmileOrganization> {
 
     PageInfo<SmileOrganizationVo> organizationList(SmileOrganizationParam smileOrganizationParam);
 
-    Boolean create(SmileOrganizationVo smileOrganizationVo);
+    AjaxResult create(SmileOrganizationVo smileOrganizationVo);
 
-    Boolean update(SmileOrganization smileOrganization);
+    AjaxResult update(SmileOrganization smileOrganization);
 
     SmileOrgAndUserVo getOrgById(Long id);
 }

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

@@ -3,6 +3,7 @@ package com.liquidnet.client.admin.zhengzai.smile.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.pagehelper.PageInfo;
+import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileSchoolParam;
 import com.liquidnet.service.smile.entity.SmileSchool;
 
@@ -20,7 +21,7 @@ public interface ISmileSchoolService extends IService<SmileSchool> {
 
     SmileSchool getSchoolById(Long id);
 
-    Boolean create(SmileSchool smileSchool);
+    AjaxResult create(SmileSchool smileSchool);
 
-    boolean updateSchoolById(SmileSchool smileSchool);
+    AjaxResult updateSchoolById(SmileSchool smileSchool);
 }

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

@@ -14,7 +14,7 @@ public interface ISmileUserService  extends IService<SmileUser> {
 
     PageInfo<SmileUserVo> userList(SmileUserParam smileUserParam);
 
-    SmileUser getUserById(Long id);
+    SmileUser getUserById(String id);
 
     Boolean create(SmileUser smileUser);
 

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

@@ -5,6 +5,7 @@ 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.github.pagehelper.PageInfo;
+import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.utils.bean.BeanUtils;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrgAndUserVo;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrganizationParam;
@@ -67,7 +68,7 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
     }
 
     @Override
-    public Boolean create(SmileOrganizationVo smileOrganizationVo) {
+    public AjaxResult create(SmileOrganizationVo smileOrganizationVo) {
         log.info("smileOrganizationVo:{}", smileOrganizationVo);
         LambdaQueryWrapper<SmileOrganization> queryWrapper = Wrappers.lambdaQuery(SmileOrganization.class);
         queryWrapper.eq(SmileOrganization::getName, smileOrganizationVo.getName());
@@ -77,16 +78,17 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
             smileOrganization.setCreatedDate(LocalDateTime.now());
             smileOrganization.setUpdatedDate(LocalDateTime.now());
             smileOrganization.setDelTag(0);
-            return smileOrganizationMapper.insert(smileOrganization) > 0;
+            smileOrganizationMapper.insert(smileOrganization);
+            return  AjaxResult.success();
         }
-        return false;
+        return AjaxResult.warn("已添加");
     }
 
     @Override
-    public Boolean update(SmileOrganization smileOrganization) {
+    public AjaxResult update(SmileOrganization smileOrganization) {
         smileOrganization.setUpdatedDate(LocalDateTime.now());
         smileOrganizationMapper.updateById(smileOrganization);
-        return true;
+        return AjaxResult.success();
     }
 
     @Override
@@ -105,13 +107,12 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
             List<SmileUser> smileUsers = smileUserMapper.selectList(userQueryWrapper);
             List<SmileUserVoOrg> smileUserVoOrgList = new ArrayList<>();
             smileUsers.forEach(smileUser -> {
-               if (smileOrganization.getAgentId().equals(smileUser.getId())){
-                   SmileUserVoOrg smileUserVoOrg = new SmileUserVoOrg();
-                   BeanUtils.copyProperties(smileUser,smileUserVoOrg);
+                SmileUserVoOrg smileUserVoOrg = new SmileUserVoOrg();
+                BeanUtils.copyProperties(smileUser,smileUserVoOrg);
+                //关联组织id筛选
+                if (smileOrganization.getAgentId().equals(smileUser.getUid())){
                    smileOrgAndUserVo.setSmileUserVoOrgListTotal(smileUserVoOrg);
                }else {
-                   SmileUserVoOrg smileUserVoOrg = new SmileUserVoOrg();
-                   BeanUtils.copyProperties(smileUser,smileUserVoOrg);
                    smileUserVoOrgList.add(smileUserVoOrg);
                }
             });

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

@@ -5,22 +5,24 @@ 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.github.pagehelper.PageInfo;
-import com.liquidnet.client.admin.zhengzai.smile.dto.SchoolVo;
+import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileSchoolParam;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileSchoolService;
 import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
 import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.service.goblin.constant.SmileRedisConst;
+import com.liquidnet.service.goblin.dto.vo.SmileSchoolVo;
 import com.liquidnet.service.smile.entity.SmileSchool;
 import com.liquidnet.service.smile.mapper.SmileSchoolMapper;
 import com.liquidnet.service.smile.mapper.SmileUserMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -65,7 +67,7 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
     }
 
     @Override
-    public Boolean create(SmileSchool smileSchool) {
+    public AjaxResult create(SmileSchool smileSchool) {
         log.debug("smileSchool:{}", smileSchool);
         LambdaQueryWrapper<SmileSchool> queryWrapper = Wrappers.lambdaQuery(SmileSchool.class);
         queryWrapper.eq(SmileSchool::getName, smileSchool.getName());
@@ -75,14 +77,14 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
                 //查询二十个学校放入redis中
                 updateSchoolRedis();
             }
-            return true;
+            return AjaxResult.success();
         }
-        return false;
+        return AjaxResult.warn("学校已存在");
     }
 
 
     @Override
-    public boolean updateSchoolById(SmileSchool smileSchool) {
+    public AjaxResult updateSchoolById(SmileSchool smileSchool) {
         LambdaQueryWrapper<SmileSchool> queryWrapper = Wrappers.lambdaQuery(SmileSchool.class);
         queryWrapper.eq(SmileSchool::getId, smileSchool.getId());
         if (smileSchoolMapper.update(smileSchool, queryWrapper) > 0) {
@@ -90,19 +92,26 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
             smileUserMapper.updateUserSchoolBySchoolId(smileSchool.getId().toString(), smileSchool.getName());
             //更新redis
             updateSchoolRedis();
-            return true;
+            return AjaxResult.success();
         }
-        return false;
+        return AjaxResult.error();
     }
 
 
     private void updateSchoolRedis() {
         //查询20条学校数据
-        List<SchoolVo> schoolVos = smileSchoolMapper.selectListLimit().stream().map(smileSchool -> {
-            return new SchoolVo(smileSchool.getId().toString(), smileSchool.getName());
-        }).collect(Collectors.toList());
-        smileRedisUtils.set(SmileRedisConst.SMILE_SCHOOL, schoolVos);
-        if (schoolVos.size() > 20) {
+        List<SmileSchoolVo> smileSchoolVos = new ArrayList<>();
+        smileSchoolMapper.selectListLimit().forEach(smileSchool -> {
+            SmileSchoolVo smileSchoolVo = new SmileSchoolVo();
+            try {
+                BeanUtils.copyProperties(smileSchool,smileSchoolVo);
+                smileSchoolVos.add(smileSchoolVo);
+            }catch (Exception e) {
+                e.printStackTrace();
+            }
+        });
+        smileRedisUtils.set(SmileRedisConst.SMILE_SCHOOL, smileSchoolVos);
+        if (smileSchoolVos.size() >= 20) {
             redisSchoolTag = false;
         }
     }

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

@@ -39,6 +39,7 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
     public PageInfo<SmileUserVo> userList(SmileUserParam smileUserParam) {
         PageInfo<SmileUserVo> pageInfo;
         try {
+            //查询通过审核通过的用户 type！=0、1   未删除用户
             Map<String, Object> map = BeanUtil.convertBeanToMap(smileUserParam);
             List<SmileUserVo> smileUserVos = smileUserMapper.selectUserList(map).stream().map(smileUser -> {
                 SmileUserVo smileUserVo = new SmileUserVo();
@@ -54,13 +55,12 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
     }
 
     @Override
-    public SmileUser getUserById(Long id) {
-        log.info("查询用户id:{}", id);
-        //查询未删除，未通过审核的用户,id=uid
+    public SmileUser getUserById(String uid) {
+        log.info("查询用户uid:{}", uid);
+        //查询未删除,id=uid
         LambdaQueryWrapper<SmileUser> queryWrapper = Wrappers.lambdaQuery(SmileUser.class);
         queryWrapper.eq(SmileUser::getDelTag, 0);
-        queryWrapper.eq(false, SmileUser::getType, 0);
-        queryWrapper.eq(SmileUser::getId,id);
+        queryWrapper.eq(SmileUser::getUid,uid);
         SmileUser smileUser = smileUserMapper.selectOne(queryWrapper);
         log.info("smileUser:{}", smileUser);
         return smileUser;