Merge remote-tracking branch 'origin/dev' into dev

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/biz/CampsiteShopBiz.java

@@ -96,6 +96,10 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
         PageDataVO<CampsiteShopPageDTO> pageDataVO = PageDataVO.pageInfo(campsiteShopFindDTO.getPage(), campsiteShopFindDTO.getLimit(), () -> mapper.findAllCampsiteShopsByTypeOrCode(campsiteShopFindDTO.getType(),campsiteShopFindDTO.getAddrProvince(),campsiteShopFindDTO.getAddrCity()));
         List<CampsiteShopPageDTO> campsiteShopPageDTOS = pageDataVO.getData();
         if (CollectionUtils.isEmpty(campsiteShopPageDTOS)) {
+            campsiteShopPageDataVO.setPageNum(campsiteShopFindDTO.getPage());
+            campsiteShopPageDataVO.setTotalCount(0L);
+            campsiteShopPageDataVO.setTotalPage(0);
+            campsiteShopPageDataVO.setPageSize(campsiteShopFindDTO.getLimit());
             campsiteShopPageDataVO.setData(Collections.EMPTY_LIST);
             return campsiteShopPageDataVO;
         }

xx-campsite/xx-campsite-server/src/main/resources/mapper/CampsiteShopMapper.xml

@@ -37,12 +37,28 @@
 
     <!--根据类型查询全部-->
     <select id="findAllCampsiteShopsByTypeOrCode" resultType="com.xxfc.platform.campsite.dto.CampsiteShopPageDTO">
-        select cs.id as `id`,cs.name as `name`,cs.logo as `logo`,cs.url as `url`,cs.province_name as `provinceName`,cs.city_name as `cityName`,cs.service_phone as `phone`,cs.alt
-        cs.longitude as `longitude`,cs.latitude as `latitude`,`address` as `address`,cs.hot as `hot`,cs.crt_time as `crtTime`,cs.concat as `concat`,ct.id as `storeId`,ct.name as `storeTypeName`
-        FROM `campsite_shop_tag`  cst
-        left JOIN `campsite_shop` cs on cst.shop_id=cs.id
-        left JOIN `campsite_tag` ct on cst.tag_id=ct.id
-        where cs.sale_state=1 and cs.is_del=0
+        SELECT
+        cs.id AS `id`,
+        cs. NAME AS `name`,
+        cs.logo AS `logo`,
+        cs.url AS `url`,
+        cs.province_name AS `provinceName`,
+        cs.city_name AS `cityName`,
+        cs.service_phone AS `phone`,
+        cs.longitude AS `longitude`,
+        cs.latitude AS `latitude`,
+        cs.`address` AS `address`,
+        cs.hot AS `hot`,
+        cs.crt_time AS `crtTime`,
+        cs.concat AS `concat`,
+        REPLACE(GROUP_CONCAT( DISTINCT ct.`name` ),',','|') AS `storeTypeName`
+        FROM campsite_shop cs
+        LEFT JOIN campsite_shop_tag cst ON cs.id = cst.shop_id
+        LEFT JOIN campsite_tag ct ON cst.tag_id = ct.id
+        WHERE
+        cs.sale_state = 1
+        AND cs.is_del = 0
+
         <if test="typeId!=null">
             and cst.tag_id=#{typeId}
         </if>
@@ -52,6 +68,7 @@
         <if test="cityCode != null">
             and `city`=#{cityCode}
         </if>
+        GROUP BY cs.id
          order by `crtTime`  DESC
     </select>
 

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/model/CustomerService.java → xx-im/xx-im-api/src/main/java/com/xxfc/platform/im/entity/CustomerService.java

-package com.xxfc.platform.im.model;
+package com.xxfc.platform.im.entity;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import org.mongodb.morphia.annotations.Id;
+import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.Field;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Table;
+
 /**
  * @author libin
  * @version 1.0
@@ -18,11 +23,15 @@ import org.springframework.data.mongodb.core.mapping.Field;
 @Builder(toBuilder = true)
 @AllArgsConstructor
 @NoArgsConstructor
+@Entity
+@Table(name = "customer_service")
 @Document(collection = "customer_service")
 public class CustomerService {
     private static final long serialVersionUID = 1L;
     @Id
-    private String id;
+    @javax.persistence.Id
+    @GeneratedValue(generator = "JDBC")
+    private Long id;
     /**
      * 客服名称
      */
@@ -35,21 +44,25 @@ public class CustomerService {
      * App id
      */
     @Field("app_user_id")
+    @Column(name = "app_user_id")
     private Integer appUserId;
     /**
      * im id
      */
     @Field("im_user_id")
+    @Column(name = "im_user_id")
     private Integer imUserId;
     /**
      * 区域id
      */
     @Field("area_id")
+    @Column(name = "area_id")
     private Integer areaId;
     /**
      * 区域名称
      */
     @Field("area_name")
+    @Column(name = "area_name")
     private String areaName;
     /**
      * 问候语句
@@ -63,16 +76,23 @@ public class CustomerService {
      * 客服电话
      */
     private String telphone;
+    /**
+     * 登录密码
+     */
+    private String password;
     /**
      * 是事删除 true：删除状态 1：正常
      */
     @Field("is_del")
+    @Column(name = "is_del")
     private Boolean isDel;
 
     @Field("create_time")
+    @Column(name = "create_time")
     private Long createTime;
 
     @Field("update_time")
+    @Column(name = "update_time")
     private Long updateTime;
 
 }

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/CustomerServiceMGBiz.java

+package com.xxfc.platform.im.biz;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.msg.BaseResponse;
+import com.xxfc.platform.im.dto.CustomerServiceDTO;
+import com.xxfc.platform.im.entity.CustomerService;
+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 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
+ * @version 1.0
+ * @description
+ * @data 2019/9/5 9:49
+ */
+@Service
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class CustomerServiceMGBiz {
+
+    private final static String INIT_PASSWORD="12345678";
+
+    private final static String NICK_PRE_NAME="XXKF";
+
+    private final CustomerServiceRepository customerServiceRepository;
+
+    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;
+     }
+
+    /**
+     * 添加客服
+     * @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("注册失败");
+         }
+         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);
+             }
+         }
+        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");
+        userBiz.deleteById(imUserId);
+    }
+}

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/mapper/CustomerServiceMapper.java

+package com.xxfc.platform.im.mapper;
+
+import com.xxfc.platform.im.entity.CustomerService;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description 
+ * @data 2019/9/9 9:55
+ */
+public interface CustomerServiceMapper extends Mapper<CustomerService> {
+}

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/repos/CustomerServiceRepository.java

 package com.xxfc.platform.im.repos;
 
-        import com.xxfc.platform.im.model.CustomerService;
+        import com.xxfc.platform.im.entity.CustomerService;
         import org.springframework.data.mongodb.repository.MongoRepository;
         import org.springframework.data.mongodb.repository.Query;
-        import org.springframework.data.repository.query.Param;
         import org.springframework.stereotype.Repository;
 
         import java.util.List;

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

@@ -2,6 +2,7 @@ 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;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -22,16 +23,19 @@ import java.util.List;
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 @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 = customerServiceBiz.findAll();
          return ObjectRestResponse.succ(customerServiceVOS);
      }
 
      @GetMapping("/{id}")
-     public ObjectRestResponse<CustomerServiceVO> findById(@PathVariable(value = "id") String 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.*;
@@ -19,13 +22,28 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/admin/customer_service")
 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);
           customerServiceBiz.addCustomerService(customerServiceDTO);
           return ObjectRestResponse.succ();
      }
@@ -34,12 +52,14 @@ 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);
           customerServiceBiz.updateCustomerServiceIsDelToTrue(id,imUserId);
           return ObjectRestResponse.succ();
      }