From 8d6e5b78fc08c66a913badc9b9863ded208e186b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 14 三月 2026 13:53:06 +0800
Subject: [PATCH] 同步宜搭客户信息(定时任务)
---
src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java | 236 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 227 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
index 899e21f..080314c 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/CustomerServiceImpl.java
@@ -1,33 +1,54 @@
package com.ruoyi.basic.service.impl;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.basic.dto.CustomerDto;
+import com.ruoyi.basic.dto.CustomerFollowUpDto;
import com.ruoyi.basic.mapper.CustomerMapper;
import com.ruoyi.basic.pojo.Customer;
+import com.ruoyi.basic.pojo.CustomerFollowUp;
+import com.ruoyi.basic.pojo.CustomerFollowUpFile;
+import com.ruoyi.basic.service.CustomerFollowUpFileService;
+import com.ruoyi.basic.service.CustomerFollowUpService;
+import com.ruoyi.basic.service.CustomerReturnVisitService;
import com.ruoyi.basic.service.ICustomerService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.config.AliDingConfig;
import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.framework.util.AliDingUtils;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.production.enums.MaterialConfigTypeEnum;
+import com.ruoyi.production.pojo.ProductMaterial;
+import com.ruoyi.production.pojo.ProductMaterialSku;
+import com.ruoyi.productionPlan.enums.DataSourceTypeEnum;
+import com.ruoyi.productionPlan.pojo.ProductionPlan;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.pojo.SalesLedger;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.*;
+import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;
@@ -44,6 +65,19 @@
private final SalesLedgerMapper salesLedgerMapper;
private CustomerMapper customerMapper;
+ private CustomerFollowUpService customerFollowUpService;
+
+ private CustomerFollowUpFileService customerFollowUpFileService;
+
+ private CustomerReturnVisitService customerReturnVisitService;
+
+ private AliDingConfig aliDingConfig;
+
+ /**
+ * 鍚屾閿侊紝闃叉鎵嬪姩鍜屽畾鏃朵换鍔″悓鏃舵墽琛�
+ */
+ private final ReentrantLock syncLock = new ReentrantLock();
+
/**
* 鏌ヨ瀹㈡埛妗ｆ
*
@@ -56,13 +90,57 @@
}
/**
+ * 鏌ヨ瀹㈡埛璇︽儏锛堝惈璺熻繘璁板綍鍜岄檮浠讹級
+ *
+ * @param id 瀹㈡埛妗ｆ涓婚敭
+ * @return 瀹㈡埛璇︽儏DTO
+ */
+ @Override
+ public CustomerDto selectCustomerDetailById(Long id) {
+ Customer customer = customerMapper.selectById(id);
+ if (customer == null) {
+ return null;
+ }
+
+ CustomerDto dto = new CustomerDto();
+ BeanUtils.copyProperties(customer, dto);
+
+ // 鏌ヨ璺熻繘璁板綍
+ List<CustomerFollowUp> followUpList = customerFollowUpService.list(
+ new LambdaQueryWrapper<CustomerFollowUp>()
+ .eq(CustomerFollowUp::getCustomerId, id)
+ .orderByDesc(CustomerFollowUp::getFollowUpTime)
+ );
+
+ if (!CollectionUtils.isEmpty(followUpList)) {
+ List<CustomerFollowUpDto> followUpDtoList = followUpList.stream().map(followUp -> {
+ CustomerFollowUpDto followUpDto = new CustomerFollowUpDto();
+ BeanUtils.copyProperties(followUp, followUpDto);
+
+ // 鏌ヨ闄勪欢
+ List<CustomerFollowUpFile> fileList = customerFollowUpFileService.list(
+ new LambdaQueryWrapper<CustomerFollowUpFile>()
+ .eq(CustomerFollowUpFile::getFollowUpId, followUp.getId())
+ );
+ followUpDto.setFileList(fileList);
+
+ return followUpDto;
+ }).collect(Collectors.toList());
+
+ dto.setFollowUpList(followUpDtoList);
+ }
+
+ return dto;
+ }
+
+ /**
* 鏌ヨ瀹㈡埛妗ｆ鍒楄〃
*
* @param customer 瀹㈡埛妗ｆ
* @return 瀹㈡埛妗ｆ
*/
@Override
- public IPage<Customer> selectCustomerList(Page page, Customer customer) {
+ public IPage<Customer> selectCustomerList(Page<Customer> page, Customer customer) {
// 1. 澶勭悊绌哄�煎満鏅紙鍙傛暟鏍￠獙锛�
if (page == null) {
page = Page.of(1, 10); // 榛樿绗�1椤碉紝姣忛〉10鏉℃暟鎹�
@@ -74,8 +152,12 @@
// 2. 鏋勫缓鏌ヨ鏉′欢锛堝寮虹┖鍊煎畨鍏級
LambdaQueryWrapper<Customer> queryWrapper = new LambdaQueryWrapper<>();
String customerName = customer.getCustomerName();
+ String customerType = customer.getCustomerType();
if (StringUtils.isNotBlank(customerName)) {
queryWrapper.like(Customer::getCustomerName, customerName);
+ }
+ if (StringUtils.isNotBlank(customerType)) {
+ queryWrapper.like(Customer::getCustomerType, customerType);
}
// 3. 鎵ц鍒嗛〉鏌ヨ锛堜繚鐣欏垎椤靛厓鏁版嵁锛�
@@ -88,12 +170,26 @@
// 瀹夊叏鑾峰彇瀛楁锛岄伩鍏峮ull鍊兼嫾鎺�
String address = StringUtils.defaultString(c.getCompanyAddress(), "");
String phone = StringUtils.defaultString(c.getCompanyPhone(), "");
- c.setAddressPhone(address + "(" + phone + ")"); // 浼樺寲瀛楃涓叉嫾鎺�
+ c.setAddressPhone(address + "(" + phone + ")");
+
+ // 鏌ヨ鏈�鏂扮殑璺熻繘璁板綍
+ CustomerFollowUp followUp = customerFollowUpService.getOne(
+ new LambdaQueryWrapper<CustomerFollowUp>()
+ .eq(CustomerFollowUp::getCustomerId, c.getId())
+ .orderByDesc(CustomerFollowUp::getFollowUpTime)
+ .last("LIMIT 1")
+ );
+
+ if (followUp != null) {
+ c.setFollowUpLevel(followUp.getFollowUpLevel());
+ c.setFollowUpTime(followUp.getFollowUpTime());
+ }
})
.collect(Collectors.toList());
// 5. 鏇存柊鍒嗛〉缁撴灉涓殑鏁版嵁锛堜繚鎸佸垎椤典俊鎭畬鏁达級
- customerPage.setRecords(processedList);
+ IPage<Customer> resultPage = new Page<>(customerPage.getCurrent(), customerPage.getSize(), customerPage.getTotal());
+ resultPage.setRecords(processedList);
return customerPage; // 杩斿洖鍖呭惈鍒嗛〉淇℃伅鐨処Page瀵硅薄
}
@@ -133,12 +229,19 @@
* @return 缁撴灉
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public int deleteCustomerByIds(Long[] ids) {
List<Long> idList = Arrays.asList(ids);
List<SalesLedger> salesLedgers = salesLedgerMapper.selectList(new QueryWrapper<SalesLedger>().lambda().in(SalesLedger::getCustomerId, idList));
if (!salesLedgers.isEmpty()) {
throw new RuntimeException("瀹㈡埛妗ｆ涓嬫湁閿�鍞悎鍚岋紝璇峰厛鍒犻櫎閿�鍞悎鍚�");
}
+ // 鍒犻櫎瀹㈡埛鐨勫悓鏃朵篃闇�瑕佸垹闄ゅ搴旂殑瀹㈡埛璺熼殢銆侀檮浠跺拰鍥炶鎻愰啋
+ for (Long id : ids) {
+ customerFollowUpService.deleteByCustomerId(id);
+ customerReturnVisitService.deleteByCustomerId(id);
+ }
+
return customerMapper.deleteBatchIds(idList);
}
@@ -159,16 +262,21 @@
try {
ExcelUtil<Customer> util = new ExcelUtil<Customer>(Customer.class);
List<Customer> userList = util.importExcel(file.getInputStream());
- if(CollectionUtils.isEmpty(userList)){
+ if (CollectionUtils.isEmpty(userList)) {
return AjaxResult.warn("妯℃澘閿欒鎴栧鍏ユ暟鎹负绌�");
}
this.saveOrUpdateBatch(userList);
return AjaxResult.success(true);
- }catch (Exception e){
+ } catch (Exception e) {
e.printStackTrace();
return AjaxResult.error("瀵煎叆澶辫触");
}
+ }
+
+ @Override
+ public void syncCustomerJob() {
+ syncCustomerData(2);
}
@Override
@@ -208,4 +316,114 @@
}
return sb.toString();
}
+
+
+ /**
+ * 鍚屾鏁版嵁
+ */
+ @Transactional(rollbackFor = Exception.class)
+ public void syncCustomerData(Integer dataSyncType) {
+ if (!syncLock.tryLock()) {
+ log.warn("鍚屾姝ｅ湪杩涜涓紝鏈 {} 鍚屾璇锋眰琚烦杩�", dataSyncType == 1 ? "鎵嬪姩" : "瀹氭椂浠诲姟");
+ return;
+ }
+ try {
+ JSONArray searchConditions = new JSONArray();
+ JSONObject statusCondition = new JSONObject();
+ statusCondition.put("key", "processInstanceStatus");
+ JSONArray statusValueArray = new JSONArray();
+ statusValueArray.add("COMPLETED");
+ statusCondition.put("value", statusValueArray);
+ statusCondition.put("type", "ARRAY");
+ statusCondition.put("operator", "in");
+ statusCondition.put("componentName", "SelectField");
+ searchConditions.add(statusCondition);
+
+ JSONObject resultCondition = new JSONObject();
+ resultCondition.put("key", "processApprovedResult");
+ JSONArray resultValueArray = new JSONArray();
+ resultValueArray.add("agree");
+ resultCondition.put("value", resultValueArray);
+ resultCondition.put("type", "ARRAY");
+ resultCondition.put("operator", "in");
+ resultCondition.put("componentName", "SelectField");
+ searchConditions.add(resultCondition);
+
+ String searchFieldJson = searchConditions.toJSONString();
+
+ JSONArray dataArr = AliDingUtils.getFormDataList(aliDingConfig, aliDingConfig.getCustomerCodeFormUuid(), searchFieldJson, this, Customer::getFormModifiedTime);
+
+ if (dataArr.isEmpty()) {
+ log.info("娌℃湁鏇村鏂版暟鎹渶瑕佸悓姝�");
+ return;
+ }
+
+ // 瑙ｆ瀽骞朵繚瀛樻暟鎹�
+ List<Customer> list = parseCustomer(dataArr);
+ if (!list.isEmpty()) {
+ // 澶勭悊鏇存柊鎴栨柊澧�
+ int affected = processSaveOrUpdate(list);
+ log.info("瀹㈡埛鏁版嵁鍚屾瀹屾垚锛屽叡鍚屾 {} 鏉℃暟鎹�", affected);
+ }
+
+ } catch (Exception e) {
+ log.error("鍚屾瀹㈡埛淇℃伅寮傚父", e);
+ } finally {
+ // 閲婃斁閿�
+ syncLock.unlock();
+ }
+ }
+
+ private List<Customer> parseCustomer(JSONArray dataArr) {
+ List<Customer> list = new ArrayList<>();
+ for (int i = 0; i < dataArr.size(); i++) {
+ JSONObject item = dataArr.getJSONObject(i);
+ String formInstanceId = item.getString("formInstanceId");
+ JSONObject formData = item.getJSONObject("formData");
+ Customer customer = new Customer();
+ customer.setCustomerName(formData.getString("textField_l7fwg8uh"));
+ customer.setTaxpayerIdentificationNumber(formData.getString("textField_l88df8ae"));
+ customer.setCompanyAddress(formData.getString("textField_l7fwg8uj"));
+ customer.setCompanyPhone(formData.getString("textField_lb38bng2"));
+ customer.setContactPerson(formData.getString("textField_l7fwg8ut"));
+ customer.setContactPhone(formData.getString("textField_l7fwg8uu"));
+ customer.setMaintainer("绠＄悊鍛樿处鍙�");
+ LocalDateTime dateTime = AliDingUtils.parseUtcTime(item.getString("modifiedTimeGMT"));
+ ZoneId zoneId = ZoneId.of("Asia/Shanghai");
+ Date date = Date.from(dateTime.atZone(zoneId).toInstant());
+ customer.setMaintenanceTime(date);
+ customer.setFormInstanceId(formInstanceId);
+ customer.setFormModifiedTime(dateTime);
+ list.add(customer);
+ }
+ return list;
+ }
+
+ private int processSaveOrUpdate(List<Customer> list) {
+ if (list == null || list.isEmpty()) {
+ return 0;
+ }
+ int affected = 0;
+
+ for (Customer customer : list) {
+
+ LambdaQueryWrapper<Customer> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(Customer::getFormInstanceId, customer.getFormInstanceId());
+
+ Customer exist = this.getOne(wrapper);
+ if (exist == null) {
+ this.save(customer);
+ affected++;
+ log.info("鏂板瀹㈡埛淇℃伅 {}", customer.getCustomerName());
+ } else {
+ if (exist.getFormModifiedTime() == null || !exist.getFormModifiedTime().equals(customer.getFormModifiedTime())) {
+ customer.setId(exist.getId());
+ this.updateById(customer);
+ affected++;
+ log.info("鏇存柊瀹㈡埛淇℃伅 {}", customer.getCustomerName());
+ }
+ }
+ }
+ return affected;
+ }
}
--
Gitblit v1.9.3