From 9c9f756145fcf2d71d4e0a15817a87192c7fca84 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 17 七月 2024 11:41:26 +0800
Subject: [PATCH] 提交
---
server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java | 4 ++++
/dev/null | 13 -------------
server/zbomyoujia.iml | 4 +++-
server/pom.xml | 2 +-
server/service/service.iml | 4 +++-
server/service/src/main/java/com/doumee/biz/zbom/model/crm/CrmCustomerPostRequest.java | 4 ++++
server/service/src/main/java/com/doumee/service/business/impl/CrmInterfaceLogServiceImpl.java | 9 ++-------
server/admin/admin.iml | 4 +++-
server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTBasePageResponse.java | 9 +++++----
server/web/web.iml | 4 +++-
10 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_70.xml b/.idea/libraries/Maven__com_alibaba_fastjson_1_2_70.xml
deleted file mode 100644
index 11a9ec6..0000000
--- a/.idea/libraries/Maven__com_alibaba_fastjson_1_2_70.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component name="libraryTable">
- <library name="Maven: com.alibaba:fastjson:1.2.70">
- <CLASSES>
- <root url="jar://$PROJECT_DIR$/../../../maven/repository/com/alibaba/fastjson/1.2.70/fastjson-1.2.70.jar!/" />
- </CLASSES>
- <JAVADOC>
- <root url="jar://$PROJECT_DIR$/../../../maven/repository/com/alibaba/fastjson/1.2.70/fastjson-1.2.70-javadoc.jar!/" />
- </JAVADOC>
- <SOURCES>
- <root url="jar://$PROJECT_DIR$/../../../maven/repository/com/alibaba/fastjson/1.2.70/fastjson-1.2.70-sources.jar!/" />
- </SOURCES>
- </library>
-</component>
\ No newline at end of file
diff --git a/server/admin/admin.iml b/server/admin/admin.iml
index 3f494ce..c22228b 100644
--- a/server/admin/admin.iml
+++ b/server/admin/admin.iml
@@ -140,7 +140,9 @@
<orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
<orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.70" level="project" />
+ <orderEntry type="library" name="Maven: com.alibaba:fastjson:2.0.52" level="project" />
+ <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2-extension:2.0.52" level="project" />
+ <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.52" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi:5.0.0" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" />
diff --git a/server/pom.xml b/server/pom.xml
index 64ea08a..b3e7fc4 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -29,7 +29,7 @@
<java.version>1.8</java.version>
<swagger.version>2.9.2</swagger.version>
<swagger.bootstrap-ui.version>1.9.6</swagger.bootstrap-ui.version>
- <fastjson.version>1.2.70</fastjson.version>
+ <fastjson.version>2.0.52</fastjson.version>
<druid.version>1.2.0</druid.version>
<mybatis.plus.version>3.5.7</mybatis.plus.version>
<apache.shiro.version>1.7.0</apache.shiro.version>
diff --git a/server/service/service.iml b/server/service/service.iml
index 057983d..9e1bb2f 100644
--- a/server/service/service.iml
+++ b/server/service/service.iml
@@ -139,7 +139,9 @@
<orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
<orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.70" level="project" />
+ <orderEntry type="library" name="Maven: com.alibaba:fastjson:2.0.52" level="project" />
+ <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2-extension:2.0.52" level="project" />
+ <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.52" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi:5.0.0" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" />
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/crm/CrmCustomerPostRequest.java b/server/service/src/main/java/com/doumee/biz/zbom/model/crm/CrmCustomerPostRequest.java
index 8088b51..9dcab74 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/crm/CrmCustomerPostRequest.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/crm/CrmCustomerPostRequest.java
@@ -1,6 +1,8 @@
package com.doumee.biz.zbom.model.crm;
+import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.google.gson.annotations.SerializedName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -10,9 +12,11 @@
import java.util.List;
@Data
+@JsonSerialize
@ApiModel("蹇楅偊CRM瀹㈡埛鐣欒祫鎻愪氦澶栧眰鍙傛暟")
public class CrmCustomerPostRequest extends CRMBaseRequst implements Serializable {
@JsonProperty("cus_info")
@SerializedName("cus_info")
+ @JSONField(name = "cus_info")
private List< CrmCustomerInfoRequest > cusInfo;
}
\ No newline at end of file
diff --git a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTBasePageResponse.java b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTBasePageResponse.java
index 8cd7b87..e9907d4 100644
--- a/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTBasePageResponse.java
+++ b/server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/response/ZTBasePageResponse.java
@@ -1,5 +1,6 @@
package com.doumee.biz.zbom.model.zhongtai.response;
+import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonAlias;
import lombok.Data;
@@ -11,21 +12,21 @@
/**
* 璁板綍鍒楄〃
*/
- @JsonAlias( {"data","records","userFavoriteList","userBehaviorList","customerFavoritesList"})
+ @JSONField(name="records",alternateNames = {"data","records","userFavoriteList","userBehaviorList","customerFavoritesList"})
private List<T> records;
/**
* 褰撳墠椤�
*/
- @JsonAlias( {"pageCount","pageNum"})
+ @JSONField(name="pageNum",alternateNames = {"pageCount","pageNum"})
private String pageNum;
/**
* 姣忛〉鏉℃暟
*/
- @JsonAlias( {"pageSize",})
+ @JSONField(name="pageSize",alternateNames = {"pageSize"})
private String pageSize;
/**
* 鎬绘暟
*/
- @JsonAlias( {"totalCount","total"})
+ @JSONField(name="total",alternateNames = {"totalCount","total"})
private String total;
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CrmInterfaceLogServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CrmInterfaceLogServiceImpl.java
index bc518e9..4189d77 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CrmInterfaceLogServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CrmInterfaceLogServiceImpl.java
@@ -5,6 +5,7 @@
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.CrmInterfaceLogMapper;
import com.doumee.dao.business.model.CrmInterfaceLog;
+import com.doumee.dao.business.model.IamInterfaceLog;
import com.doumee.service.business.CrmInterfaceLogService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -139,13 +140,7 @@
if (pageWrap.getModel().getObjId() != null) {
queryWrapper.lambda().eq(CrmInterfaceLog::getObjId, pageWrap.getModel().getObjId());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
+ queryWrapper.lambda().orderByDesc(CrmInterfaceLog::getCreateDate);
return PageData.from(crmInterfaceLogMapper.selectPage(page, queryWrapper));
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java
index a166c77..d24c684 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CustomerUserServiceImpl.java
@@ -210,6 +210,7 @@
|| response.getData() ==null
|| response.getData().size() ==0){
hasMore = false;
+ }else{
allList.addAll(response.getData());
currentNum += response.getTotal();
}
@@ -224,6 +225,9 @@
}
private void dealSyncDataBiz(Date date,List<CRMDaogouBindListResponse> list) {
+ if(list ==null && list.size()==0){
+ return;
+ }
List<CustomerUser> addList = new ArrayList<>();
List<String> phoneList = new ArrayList<>();
for(CRMDaogouBindListResponse data : list){
diff --git a/server/web/web.iml b/server/web/web.iml
index 3f494ce..c22228b 100644
--- a/server/web/web.iml
+++ b/server/web/web.iml
@@ -140,7 +140,9 @@
<orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
<orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.70" level="project" />
+ <orderEntry type="library" name="Maven: com.alibaba:fastjson:2.0.52" level="project" />
+ <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2-extension:2.0.52" level="project" />
+ <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.52" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi:5.0.0" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" />
diff --git a/server/zbomyoujia.iml b/server/zbomyoujia.iml
index 8de2d75..6a48115 100644
--- a/server/zbomyoujia.iml
+++ b/server/zbomyoujia.iml
@@ -128,7 +128,9 @@
<orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:4.0.1" level="project" />
<orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235-1" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.9" level="project" />
- <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.70" level="project" />
+ <orderEntry type="library" name="Maven: com.alibaba:fastjson:2.0.52" level="project" />
+ <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2-extension:2.0.52" level="project" />
+ <orderEntry type="library" name="Maven: com.alibaba.fastjson2:fastjson2:2.0.52" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi:5.0.0" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.30" level="project" />
--
Gitblit v1.9.3