From df698fb979db6f1d571f548f40744a19e8c21ac2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 21 九月 2023 17:48:12 +0800
Subject: [PATCH] 属性对比
---
server/service/src/main/java/com/doumee/service/business/impl/FileRecordServiceImpl.java | 13 +++++++++++++
server/zhubo/src/main/resources/application.yml | 2 +-
server/service/src/main/java/com/doumee/dao/business/model/FileRecord.java | 4 ++--
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 8 ++++----
server/platform/src/main/resources/application.yml | 2 +-
server/company/src/main/resources/application.yml | 2 +-
6 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/server/company/src/main/resources/application.yml b/server/company/src/main/resources/application.yml
index 6787c56..ac52ad2 100644
--- a/server/company/src/main/resources/application.yml
+++ b/server/company/src/main/resources/application.yml
@@ -11,7 +11,7 @@
# application:
# name: doumeemes
profiles:
- active: dev
+ active: pro
# JSON杩斿洖閰嶇疆
jackson:
diff --git a/server/platform/src/main/resources/application.yml b/server/platform/src/main/resources/application.yml
index bf924e8..91e823b 100644
--- a/server/platform/src/main/resources/application.yml
+++ b/server/platform/src/main/resources/application.yml
@@ -11,7 +11,7 @@
# application:
# name: doumeemes
profiles:
- active: dev
+ active: pro
# JSON杩斿洖閰嶇疆
jackson:
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/FileRecord.java b/server/service/src/main/java/com/doumee/dao/business/model/FileRecord.java
index 0621e34..b7c64b7 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/FileRecord.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/FileRecord.java
@@ -31,7 +31,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+// @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +40,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+// @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index f1427f5..e1dd820 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -292,10 +292,10 @@
.selectAs(SystemUser::getUsername,Company::getManagerUserName);
queryWrapper.select(
"(select su1.USERNAME from system_user su1 where su1.id = t.MANAGER_ID) as managerUserName," +
- "(select su2.REALNAME from system_user su2 where su2.id = t.SALESMAN_ID) as salesmanRealName," +
- "(select count(su3.id) from system_user su3 where su3.COMPANY_ID = t.ID and su3.TYPE = 2) as anchorUserNum," +
- "(select count(su4.id) from system_user su4 where su4.COMPANY_ID = t.ID and su4.TYPE = 1) as empUserNum," +
- "(select count(g.id) from goods g where g.COMPANY_ID = t.ID )goodsNum");
+ "(select su2.REALNAME from system_user su2 where su2.isdeleted=0 and su2.id = t.SALESMAN_ID) as salesmanRealName," +
+ "(select count(su3.id) from system_user su3 where su3.isdeleted=0 and su3.COMPANY_ID = t.ID and su3.TYPE = 2) as anchorUserNum," +
+ "(select count(su4.id) from system_user su4 where su4.isdeleted=0 and su4.COMPANY_ID = t.ID and su4.TYPE = 1) as empUserNum," +
+ "(select count(g.id) from goods g where g.isdeleted=0 and g.COMPANY_ID = t.ID )goodsNum");
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Company::getName,pageWrap.getModel().getName())
.like(StringUtils.isNotBlank(pageWrap.getModel().getManagerUserName()),SystemUser::getUsername,pageWrap.getModel().getManagerUserName())
.eq(Objects.nonNull(pageWrap.getModel().getStatus()),Company::getStatus,pageWrap.getModel().getStatus())
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/FileRecordServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/FileRecordServiceImpl.java
index 29f8cc1..4f8656e 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/FileRecordServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/FileRecordServiceImpl.java
@@ -21,6 +21,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -58,10 +59,21 @@
log.info("寮�濮嬩笂浼犻檮浠朵俊鎭�=================end========鏃犲緟澶勭悊鏁版嵁===========");
return 0;
}
+ List<String > keyList = new ArrayList<>();
+ for(FileRecord model:allLis){
+ keyList.add(model.getKeyval());
+ }
+ try {
+ ALiYunUtil obs = new ALiYunUtil(ossModel.getEndpoint(), ossModel.getAccessId(), ossModel.getAccessKey());
+ obs.deleteObjects(ossModel.getBucket(),keyList);
+ }catch (Exception e){
+ }
+
Date date = new Date();
for(FileRecord model:allLis){
try {
ALiYunUtil obs = new ALiYunUtil(ossModel.getEndpoint(), ossModel.getAccessId(), ossModel.getAccessKey());
+ obs.deleteObjects(ossModel.getBucket(),keyList);
obs.uploadOnlineObject(model.getUrl(),ossModel.getBucket(), model.getKeyval(),null);
model.setStatus(Constants.ONE);
model.setContent("涓婁紶鎴愬姛");
@@ -72,6 +84,7 @@
model.setEditDate(date);
fileRecordMapper.updateById(model);
}
+
return 0;
}
diff --git a/server/zhubo/src/main/resources/application.yml b/server/zhubo/src/main/resources/application.yml
index cfb19a6..4fb560e 100644
--- a/server/zhubo/src/main/resources/application.yml
+++ b/server/zhubo/src/main/resources/application.yml
@@ -11,7 +11,7 @@
# application:
# name: doumeemes
profiles:
- active: dev
+ active: pro
# JSON杩斿洖閰嶇疆
jackson:
--
Gitblit v1.9.3