查询分机号列表

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/platform/service/impl/OrganizeServiceImpl.java

@@ -121,7 +121,7 @@ public class OrganizeServiceImpl implements OrganizeService {
             // 替换组长-资源替换
             ResponseEntity<Object> response = sourceClueClient.updateMember(organizeUser.getUserId(), organize.getUserId());
             if (response.getStatusCode().value() != 200) throw new BadRequestException("组长修改失败");
-            extensionUserRepository.updateByNumber(organizeUser.getUserId(), organize.getUserId());
+            extensionUserRepository.updateByMember(organizeUser.getUserId(), organize.getUserId());
         }
         //添加(删除)分机号
         if (organize.getCallMode() != null && !organize.getCallMode().equals(updateOrganize.getCallMode())) {

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/report/api/ReportController.java

@@ -27,13 +27,13 @@ public class ReportController {
     private QueryReportService queryReportService;
 
     @GetMapping("/report/all")
-    @ApiOperation("所有任务的统计信息(暂时放弃)")
+    @ApiOperation("所有任务的统计信息(放弃)")
     public CommonResponse<Object> getReportByAll() {
         return queryReportService.getReportByAll();
     }
 
     @PostMapping("/report/task")
-    @ApiOperation("按任务的统计信息")
+    @ApiOperation("按任务的统计信息(放弃)")
     public CommonResponse<Object> getReportByTask(@RequestBody StatisticalReportDTO s) {
         s.setCompanyId(SecurityUtils.getCompanyId());
         return queryReportService.getReportByTask(s);
@@ -41,7 +41,7 @@ public class ReportController {
 
 
     @PostMapping("/download/task")
-    @ApiOperation("导出任务统计信息")
+    @ApiOperation("导出任务统计信息(放弃)")
     public void downloadTaskReport(HttpServletResponse response, @RequestBody StatisticalReportDTO s) {
         s.setCompanyId(SecurityUtils.getCompanyId());
         queryReportService.downloadTaskReport(response, s);

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/api/ExtensionNumberController.java

@@ -2,14 +2,21 @@ package com.baiye.modules.telemarkting.api;
 
 import com.baiye.annotation.Inner;
 import com.baiye.http.CommonResponse;
+import com.baiye.modules.telemarkting.entity.ExtensionNumber;
+import com.baiye.modules.telemarkting.entity.dto.ExtensionNumberCriteria;
 import com.baiye.modules.telemarkting.service.ExtensionNumberService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Pageable;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.Map;
+
 /**
  * @author wujingtao
  * @date 2022/02/14
@@ -55,9 +62,20 @@ public class ExtensionNumberController {
     @GetMapping("/sip")
     @Inner(value = false)
     public CommonResponse<Object> sip(@RequestParam("number") String number,
-                                      @RequestParam("name") String name)
+                                      @RequestParam("name") String name) {
-
-    {
         return CommonResponse.createBySuccess(extensionNumberService.sip(number, name));
     }
+
+    @GetMapping("/query/number")
+    @Inner(value = false)
+    public ResponseEntity<Object> queryNumber(ExtensionNumberCriteria extensionNumberCriteria, Pageable pageable) {
+        return new ResponseEntity<>(extensionNumberService.queryNumber(extensionNumberCriteria, pageable), HttpStatus.OK);
+    }
+
+    @GetMapping("/update/number")
+    @Inner(value = false)
+    public CommonResponse<Object> updateNumber(@RequestParam("oldNumber") Integer oldNumber, @RequestParam("newNumber") Integer newNumber) {
+        extensionNumberService.updateNumber(oldNumber, newNumber);
+        return CommonResponse.createBySuccess();
+    }
 }

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/dao/ExtensionNumberRepository.java

@@ -16,6 +16,7 @@ import java.util.List;
 @Repository
 public interface ExtensionNumberRepository extends JpaRepository<ExtensionNumber, Long>, JpaSpecificationExecutor<ExtensionNumber> {
 
+    ExtensionNumber findByNumber(Integer number);
     /**
      * 根据状态和公司id查询分机号
      *

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/dao/ExtensionUserRepository.java

@@ -32,6 +32,7 @@ public interface ExtensionUserRepository extends JpaRepository<ExtensionUser, Lo
     @Modifying
     @Query(value = "delete from tb_extension_user where member_id in ?1", nativeQuery = true)
     int deleteByMemberId(List<Long> userIds);
+
     /**
      * 用户分机号删除用户和分机号关联
      *
@@ -41,6 +42,7 @@ public interface ExtensionUserRepository extends JpaRepository<ExtensionUser, Lo
     @Modifying
     @Query(value = "delete from tb_extension_user where number in ?1", nativeQuery = true)
     int deleteByNumbers(List<Integer> numbers);
+
     /**
      * 用户id删除用户和分机号关联
      *
@@ -53,7 +55,7 @@ public interface ExtensionUserRepository extends JpaRepository<ExtensionUser, Lo
 
     @Modifying
     @Query(value = "update ExtensionUser c set c.memberId =?2 where c.memberId = ?1")
-    void updateByNumber(Long userId, Long replaceUserId);
+    void updateByMember(Long userId, Long replaceUserId);
 
     /**
      * 删除公司。所有关联分机号
@@ -65,4 +67,9 @@ public interface ExtensionUserRepository extends JpaRepository<ExtensionUser, Lo
     void deleteByCompanyId(Long companyId);
 
     ExtensionUser findByMemberId(Long userId);
+
+    @Modifying
+    @Query(value = "update ExtensionUser c set c.number =?1 where c.number = ?2")
+    void updateByNumber(Integer newNumber, Integer oldNumber);
+
 }

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/entity/dto/ExtensionNumberCriteria.java

@@ -0,0 +1,20 @@
+package com.baiye.modules.telemarkting.entity.dto;
+
+import com.baiye.annotation.Query;
+import lombok.Data;
+
+/**
+ * @author wjt
+ * @date 2023/4/6
+ */
+@Data
+public class ExtensionNumberCriteria {
+    @Query
+    private Long companyId;
+
+    @Query
+    private Integer number;
+
+    @Query
+    private Integer status;
+}

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/httpRequest/RollCallReq.java

@@ -102,11 +102,11 @@ public class RollCallReq {
             jsonObject.putOpt("bsname", "aibot");
             jsonObject.putOpt("body", json);
             HttpResponse httpResponse = HttpRequest.post(stopUrl).body(JSONUtil.toJsonPrettyStr(jsonObject)).execute();
+            log.info("请求挂断,session={},{}", telephoneCallStopDTO.getSessionid(), httpResponse.body());
             if (httpResponse.isOk()) {
                 return Boolean.TRUE;
             } else {
                 count++;
-                log.error("请求失败,response==={}", httpResponse.body());
             }
         }
         return Boolean.FALSE;

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/service/ExtensionNumberService.java

@@ -4,6 +4,10 @@ package com.baiye.modules.telemarkting.service;
 import com.baiye.http.CommonResponse;
 import com.baiye.modules.telemarkting.entity.ExtensionDisplay;
 import com.baiye.modules.telemarkting.entity.ExtensionNumber;
+import com.baiye.modules.telemarkting.entity.dto.ExtensionNumberCriteria;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
@@ -18,6 +22,10 @@ public interface ExtensionNumberService {
 
     String sip(String number, String name);
 
+    Page<ExtensionNumber> queryNumber(ExtensionNumberCriteria extensionNumberCriteria, Pageable pageable);
+
+    void updateNumber(Integer oldNumber, Integer newNumber);
+
     /**
      * 分配分机号
      *

ad-platform-manage/ad-platform-management/src/main/java/com/baiye/modules/telemarkting/service/impl/ExtensionNumberServiceImpl.java

@@ -1,7 +1,9 @@
 package com.baiye.modules.telemarkting.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.SerializeUtil;
 import cn.hutool.poi.excel.ExcelReader;
@@ -21,10 +23,14 @@ import com.baiye.modules.telemarkting.dao.ExtensionUserRepository;
 import com.baiye.modules.telemarkting.entity.ExtensionDisplay;
 import com.baiye.modules.telemarkting.entity.ExtensionNumber;
 import com.baiye.modules.telemarkting.entity.ExtensionUser;
+import com.baiye.modules.telemarkting.entity.dto.ExtensionNumberCriteria;
 import com.baiye.modules.telemarkting.httpRequest.NumberSipReq;
 import com.baiye.modules.telemarkting.service.ExtensionNumberService;
+import com.baiye.util.QueryHelp;
 import com.baiye.util.SecurityUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -58,11 +64,36 @@ public class ExtensionNumberServiceImpl implements ExtensionNumberService {
     private CompanyService companyService;
 
     @Override
-    public String sip(String number,String name) {
+    public String sip(String number, String name) {
-        String sip = numberSipReq.req(number,name);
+        String sip = numberSipReq.req(number, name);
         return sip;
     }
 
+    @Override
+    public Page<ExtensionNumber> queryNumber(ExtensionNumberCriteria extensionNumberCriteria, Pageable pageable) {
+        return extensionNumberRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, extensionNumberCriteria, criteriaBuilder), pageable);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateNumber(Integer oldNumber, Integer newNumber) {
+        ExtensionNumber extensionNumber = extensionNumberRepository.findByNumber(oldNumber);
+        if (extensionNumber.getStatus() != 0) {
+            //修改绑定关系
+            extensionUserRepository.updateByNumber(newNumber, oldNumber);
+        }
+        //获取密码
+        Company company = companyService.findById(extensionNumber.getCompanyId());
+        String sip = numberSipReq.req(String.valueOf(newNumber), company.getCompanyName());
+        ExtensionNumber extensionNumberNew = new ExtensionNumber();
+        BeanUtil.copyProperties(extensionNumber, extensionNumberNew);
+        extensionNumberNew.setNumber(newNumber);
+        extensionNumberNew.setCreateTime(DateUtil.date());
+        extensionNumberNew.setSip(sip);
+        extensionNumberRepository.delete(extensionNumber);
+        extensionNumberRepository.save(extensionNumberNew);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public CommonResponse<String> addNumbers(MultipartFile file, Long display, Long dyDisplay, Long deliveryDisplay, Long tokerDisplay, Long companyId) {
@@ -105,11 +136,15 @@ public class ExtensionNumberServiceImpl implements ExtensionNumberService {
 
                     for (List<Object> objects : read) {
                         String number = String.valueOf(objects.get(0));
-                        ExtensionNumber extensionNumber = new ExtensionNumber();
+                        //去重
+                        ExtensionNumber extensionNumber = extensionNumberRepository.findByNumber(Integer.valueOf(number));
+                        if (ObjectUtil.isNotEmpty(extensionNumber)) {
+                            continue;
+                        }
                         extensionNumber.setNumber(Integer.valueOf(number));
                         extensionNumber.setCompanyId(companyId);
 
-                        String sip = numberSipReq.req(number,company.getCompanyName());
+                        String sip = numberSipReq.req(number, company.getCompanyName());
                         extensionNumber.setSip(sip);
                         list.add(extensionNumber);
                         numbers.add(Integer.valueOf(number));
@@ -208,7 +243,7 @@ public class ExtensionNumberServiceImpl implements ExtensionNumberService {
             if (i > 0) {
                 extensionNumberRepository.updateExtensionNumber(0, replaceUserId);
             }
-            extensionUserRepository.updateByNumber(userId, replaceUserId);
+            extensionUserRepository.updateByMember(userId, replaceUserId);
         }
     }