客服悠

xx-im/xx-im-api/src/main/java/com/xxfc/platform/im/dto/CustomerServiceDTO.java

@@ -18,7 +18,7 @@ import lombok.NoArgsConstructor;
 public class CustomerServiceDTO {
     private static final long serialVersionUID = 1L;
 
-    private String id;
+    private Long id;
 
     /**
      * 客服名称

xx-im/xx-im-api/src/main/java/com/xxfc/platform/im/entity/CustomerService.java

@@ -31,7 +31,7 @@ public class CustomerService {
     @Id
     @javax.persistence.Id
     @GeneratedValue(generator = "JDBC")
-    private String id;
+    private Long id;
     /**
      * 客服名称
      */
@@ -76,6 +76,10 @@ public class CustomerService {
      * 客服电话
      */
     private String telphone;
+    /**
+     * 登录密码
+     */
+    private String password;
     /**
      * 是事删除 true：删除状态 1：正常
      */

xx-im/xx-im-api/src/main/java/com/xxfc/platform/im/vo/CustomerServiceVO.java

@@ -20,7 +20,7 @@ import java.io.Serializable;
 public class CustomerServiceVO implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    private String id;
+    private Long id;
 
     /**
      * 客服名称

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/CustomerServiceBiz.java

@@ -5,30 +5,21 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.BaseResponse;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.im.dto.CustomerServiceDTO;
 import com.xxfc.platform.im.entity.CustomerService;
 import com.xxfc.platform.im.mapper.CustomerServiceMapper;
-import com.xxfc.platform.im.model.User;
-import com.xxfc.platform.im.repos.CustomerServiceRepository;
 import com.xxfc.platform.im.vo.CustomerServiceVO;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Example;
-import org.springframework.data.domain.ExampleMatcher;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import tk.mybatis.mapper.entity.Example;
 
 import java.time.Instant;
 import java.util.*;
-import java.util.stream.Collectors;
-
-import static org.springframework.data.mongodb.core.query.Query.query;
-import static org.springframework.data.mongodb.core.query.Update.update;
 
 /**
  * @author libin
@@ -38,95 +29,139 @@ import static org.springframework.data.mongodb.core.query.Update.update;
  */
 @Service
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
-public class CustomerServiceBiz extends BaseBiz<CustomerServiceMapper,CustomerService> {
-
-    private final static String INIT_PASSWORD="12345678";
+public class CustomerServiceBiz extends BaseBiz<CustomerServiceMapper, CustomerService> {
 
-    private final static String NICK_PRE_NAME="XXKF";
+    private final static String INIT_PASSWORD = "12345678";
 
-    private final CustomerServiceRepository customerServiceRepository;
+    private final static String NICK_PRE_NAME = "XXKF";
 
-    private final MongoTemplate mongoTemplate;
 
     private final UserBiz userBiz;
 
-     public CustomerServiceVO findById(String id){
-         CustomerServiceVO customerServiceVO = new CustomerServiceVO();
-         customerServiceRepository.findById(id).ifPresent(customerService -> {
-             BeanUtils.copyProperties(customerService,customerServiceVO);
-         });
-         Map<Integer, User> imMap = userBiz.findAllByImUserIds(Arrays.asList(customerServiceVO.getImUserId()));
-         User user = imMap.get(customerServiceVO.getImUserId());
-         customerServiceVO.setPassword(user.getPassword());
-         return customerServiceVO;
-     }
+    public CustomerServiceVO findById(Long id) {
+        CustomerServiceVO customerServiceVO = new CustomerServiceVO();
+        CustomerService customerService = mapper.selectByPrimaryKey(id);
+        BeanUtils.copyProperties(customerService, customerServiceVO);
+        return customerServiceVO;
+    }
 
     /**
      * 添加客服
+     *
      * @param customerServiceDTO
      */
-     public void addCustomerService(CustomerServiceDTO customerServiceDTO){
-         CustomerService customerService = new CustomerService();
-         BeanUtils.copyProperties(customerServiceDTO,customerService);
-         customerService.setCreateTime(Instant.now().toEpochMilli());
-         customerService.setName(String.format("%s%s",NICK_PRE_NAME,customerServiceDTO.getTelphone()));
-         customerService.setIsDel(false);
-
-         Map<String,Object> imMap  = new HashMap<>(2);
-         imMap.put("telephone",customerServiceDTO.getTelphone());
-         imMap.put("password",INIT_PASSWORD);
-         imMap.put("nickname",customerService.getName());
-         BaseResponse imResponse = userBiz.register(imMap);
-         String imResult = imResponse.getMessage();
-         JSONObject jsonObject = JSON.parseObject(imResult);
-         Map<String,Object> data = (Map<String, Object>) jsonObject.get("data");
-         Object userId = data.get("userId");
-         if (Objects.isNull(userId)){
-             throw new BaseException("注册失败");
+    public void addCustomerService(CustomerServiceDTO customerServiceDTO) {
+        CustomerService customerService = new CustomerService();
+        BeanUtils.copyProperties(customerServiceDTO, customerService);
+
+         if (Objects.isNull(customerServiceDTO.getId())){
+             customerService.setCreateTime(Instant.now().toEpochMilli());
+             customerService.setName(String.format("%s%s", NICK_PRE_NAME, customerServiceDTO.getTelphone()));
+             customerService.setIsDel(false);
+             customerService.setPassword(INIT_PASSWORD);
+             Map<String, Object> imMap = new HashMap<>(2);
+             imMap.put("telephone", customerServiceDTO.getTelphone());
+             imMap.put("password", INIT_PASSWORD);
+             imMap.put("nickname", customerService.getName());
+             BaseResponse imResponse = userBiz.register(imMap);
+             String imResult = imResponse.getMessage();
+             JSONObject jsonObject = JSON.parseObject(imResult);
+             Map<String, Object> data = (Map<String, Object>) jsonObject.get("data");
+             Object userId = data.get("userId");
+             if (Objects.isNull(userId)) {
+                 throw new BaseException("注册失败");
+             }
+             customerService.setImUserId((Integer) userId);
+             mapper.insertSelective(customerService);
+         }else {
+             customerService.setUpdateTime(Instant.now().toEpochMilli());
+             if (!StringUtils.isEmpty(customerServiceDTO.getPassword())){
+                 userBiz.updatePasswordByPhone(customerServiceDTO.getTelphone(),customerServiceDTO.getPassword());
+             }
+             mapper.updateByPrimaryKeySelective(customerService);
          }
-         customerService.setImUserId((Integer)userId);
-         customerServiceRepository.save(customerService);
-     }
 
-    /**
-     *  1: mongoTemplate.find(Query.query(Criteria.where("isDel").is(false)), CustomerService.class);
-     *
-     *  2. customerServiceRepository.findByIsDelEquals(false);
-     * @return
-     */
+
+    }
+
     public List<CustomerServiceVO> findAll() {
-          List<CustomerServiceVO> customerServiceVOS = new ArrayList<>();
-
-        CustomerService customer_service = new CustomerService();
-        Example<CustomerService> customerServiceExample = Example.of(customer_service, ExampleMatcher.matchingAll());
-        List<CustomerService> customerServices = customerServiceRepository.findAll(customerServiceExample);
-
-          CustomerServiceVO customerServiceVO;
-         if (CollectionUtils.isNotEmpty(customerServices)){
-             List<Integer> imUserIds = customerServices.stream().map(CustomerService::getImUserId).collect(Collectors.toList());
-             Map<Integer, User> imMap = userBiz.findAllByImUserIds(imUserIds);
-             for (CustomerService customerService : customerServices) {
-                  customerServiceVO = new CustomerServiceVO();
-                  BeanUtils.copyProperties(customerService,customerServiceVO);
-                  User user = imMap.get(customerService.getImUserId());
-                   if (Objects.nonNull(user)){
-                       customerServiceVO.setPassword(user.getPassword());
-                   }
-                  customerServiceVOS.add(customerServiceVO);
-             }
-         }
+        List<CustomerServiceVO> customerServiceVOS = new ArrayList<>();
+
+        Example example = new Example(CustomerService.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("isDel", 0);
+        List<CustomerService> customerServices = mapper.selectByExample(example);
+
+        if (CollectionUtils.isNotEmpty(customerServices)) {
+            CustomerServiceVO customerServiceVO;
+            for (CustomerService customerService : customerServices) {
+                customerServiceVO = new CustomerServiceVO();
+                BeanUtils.copyProperties(customerService, customerServiceVO);
+                customerServiceVOS.add(customerServiceVO);
+            }
+        }
         return customerServiceVOS;
     }
 
     /**
      * 删除客服
+     *
      * @param id
      * @param imUserId
      */
-    public void updateCustomerServiceIsDelToTrue(String id,Integer imUserId){
-        Query query = query(Criteria.where("_id").is(id));
-        Update update = update("is_del", true).set("update_time",Instant.now().toEpochMilli());
-        mongoTemplate.updateFirst(query, update, Map.class, "customer_service");
+    public void updateCustomerServiceIsDelToTrue(Long id, Integer imUserId) {
+        CustomerService customerService = new CustomerService();
+        customerService.setId(id);
+        customerService.setIsDel(true);
+        customerService.setUpdateTime(Instant.now().toEpochMilli());
+        mapper.updateByPrimaryKeySelective(customerService);
         userBiz.deleteById(imUserId);
     }
+
+    public void updatePasswordByPhone(String telphone, String password) {
+        Example example = new Example(CustomerService.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("telphone",telphone);
+
+        CustomerService customerService = new CustomerService();
+        customerService.setPassword(password);
+        customerService.setUpdateTime(Instant.now().toEpochMilli());
+        mapper.updateByExampleSelective(customerService,example);
+    }
+
+    public PageDataVO<CustomerServiceVO> findCustomerServiceWithPage(Integer page, Integer limit) {
+         PageDataVO<CustomerServiceVO> dataVO = new PageDataVO<>();
+
+        Example example = new Example(CustomerService.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("is_del",false);
+
+      PageDataVO<CustomerService> pageDataVO = PageDataVO.pageInfo(page,limit,()->mapper.selectByExample(example));
+        List<CustomerService> data = pageDataVO.getData();
+        if (CollectionUtils.isEmpty(data)){
+            return dataVO;
+        }
+
+        List<CustomerServiceVO> customerServiceVOS = new ArrayList<>();
+        CustomerServiceVO customerServiceVO;
+        for (CustomerService customerService : data) {
+            customerServiceVO = new CustomerServiceVO();
+            BeanUtils.copyProperties(customerService,customerServiceVO);
+            customerServiceVOS.add(customerServiceVO);
+        }
+
+         dataVO.setPageSize(pageDataVO.getPageSize());
+         dataVO.setPageNum(pageDataVO.getPageNum());
+         dataVO.setTotalPage(pageDataVO.getTotalPage());
+         dataVO.setTotalCount(pageDataVO.getTotalCount());
+         dataVO.setData(customerServiceVOS);
+        return dataVO;
+    }
+
+    public CustomerServiceDTO findCustomerServiceById(Long id) {
+         CustomerServiceDTO customerServiceDTO = new CustomerServiceDTO();
+        CustomerService customerService = mapper.selectByPrimaryKey(id);
+        BeanUtils.copyProperties(customerService,customerService);
+        return customerServiceDTO;
+    }
 }

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/rest/CustomerServiceController.java

 package com.xxfc.platform.im.rest;
 
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.im.biz.CustomerServiceBiz;
 import com.xxfc.platform.im.biz.CustomerServiceMGBiz;
 import com.xxfc.platform.im.vo.CustomerServiceVO;
 import lombok.RequiredArgsConstructor;
@@ -23,16 +24,19 @@ import java.util.List;
 @RequestMapping("/app/unauth/customer_service")
 public class CustomerServiceController {
      private final CustomerServiceMGBiz customerServiceMGBiz;
+     private final CustomerServiceBiz customerServiceBiz;
 
      @GetMapping("/list")
      public ObjectRestResponse<List<CustomerServiceVO>> findAll(){
-           List<CustomerServiceVO> customerServiceVOS = customerServiceMGBiz.findAll();
+//           List<CustomerServiceVO> customerServiceVOS = customerServiceMGBiz.findAll();
+           List<CustomerServiceVO> customerServiceVOS = customerServiceBiz.findAll();
          return ObjectRestResponse.succ(customerServiceVOS);
      }
 
      @GetMapping("/{id}")
-     public ObjectRestResponse<CustomerServiceVO> findById(@PathVariable(value = "id") String id){
-         CustomerServiceVO customerServiceVO = customerServiceMGBiz.findById(id);
+     public ObjectRestResponse<CustomerServiceVO> findById(@PathVariable(value = "id") Long id){
+//         CustomerServiceVO customerServiceVO = customerServiceMGBiz.findById(id);
+         CustomerServiceVO customerServiceVO = customerServiceBiz.findById(id);
          return ObjectRestResponse.succ(customerServiceVO);
      }
 

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/rest/admin/CustomerServiceAdminController.java

 package com.xxfc.platform.im.rest.admin;
 
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.im.biz.CustomerServiceBiz;
 import com.xxfc.platform.im.biz.CustomerServiceMGBiz;
 import com.xxfc.platform.im.biz.UserBiz;
 import com.xxfc.platform.im.dto.CustomerServiceDTO;
+import com.xxfc.platform.im.vo.CustomerServiceVO;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -21,12 +24,27 @@ public class CustomerServiceAdminController {
 
      private final CustomerServiceMGBiz customerServiceMGBiz;
 
+     private final CustomerServiceBiz customerServiceBiz;
+
      private final UserBiz userBiz;
 
+     @GetMapping("/page")
+     public ObjectRestResponse<PageDataVO<CustomerServiceVO>> findCustomerServiceWithPage(@RequestParam(value = "page") Integer page,
+                                                                                          @RequestParam(value = "limit") Integer limit) {
+        PageDataVO<CustomerServiceVO> pageDataVO =  customerServiceBiz.findCustomerServiceWithPage(page,limit);
+        return ObjectRestResponse.succ(pageDataVO);
+     }
+
+     @GetMapping("/{id}")
+     public ObjectRestResponse<CustomerServiceDTO> findCustomerService(@PathVariable(value = "id") Long id){
+         CustomerServiceDTO customerServiceDTO = customerServiceBiz.findCustomerServiceById(id);
+         return ObjectRestResponse.succ(customerServiceDTO);
+     }
 
      @PostMapping("/add")
      public ObjectRestResponse<Void> addCustomerService(@RequestBody CustomerServiceDTO customerServiceDTO){
-          customerServiceMGBiz.addCustomerService(customerServiceDTO);
+//          customerServiceMGBiz.addCustomerService(customerServiceDTO);
+          customerServiceBiz.addCustomerService(customerServiceDTO);
           return ObjectRestResponse.succ();
      }
 
@@ -34,13 +52,15 @@ public class CustomerServiceAdminController {
      public ObjectRestResponse<Void> updateCustomerService(@PathVariable(value = "telphone") String telphone,
                                                            @PathVariable(value = "password") String password){
           userBiz.updatePasswordByPhone(telphone,password);
+          customerServiceBiz.updatePasswordByPhone(telphone,password);
           return ObjectRestResponse.succ();
      }
 
      @DeleteMapping("/delete/{id}/{imUserId}")
-     public ObjectRestResponse<Void> deleteCustomerService(@PathVariable(value = "id") String id,
+     public ObjectRestResponse<Void> deleteCustomerService(@PathVariable(value = "id") Long id,
                                                            @PathVariable(value = "imUserId") Integer imUserId){
-          customerServiceMGBiz.updateCustomerServiceIsDelToTrue(id,imUserId);
+//          customerServiceMGBiz.updateCustomerServiceIsDelToTrue(id,imUserId);
+          customerServiceBiz.updateCustomerServiceIsDelToTrue(id,imUserId);
           return ObjectRestResponse.succ();
      }
 }