From 0b9c144b5110a7e2a85b2e5581ef304bb81a3ebc Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 19 九月 2023 19:24:35 +0800
Subject: [PATCH] 修改
---
server/service/src/main/java/com/doumee/service/business/impl/FileRecordServiceImpl.java | 35 +++++++++++++++++
server/service/src/main/java/com/doumee/service/impl/CateParamSelectServiceImpl.java | 4 +
server/platform/src/main/java/com/doumee/task/ScheduleTool.java | 11 +++++
server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java | 10 ++--
server/service/src/main/resources/mappers/FileRecordMapper.xml | 7 ++-
server/service/src/main/java/com/doumee/dao/business/model/FileRecord.java | 3 +
server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java | 12 +++++-
server/service/src/main/java/com/doumee/dao/business/FileRecordMapper.java | 2
8 files changed, 72 insertions(+), 12 deletions(-)
diff --git a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
index 377de60..00d40f0 100644
--- a/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
+++ b/server/platform/src/main/java/com/doumee/task/ScheduleTool.java
@@ -2,6 +2,7 @@
import com.doumee.service.business.BaseDataService;
+import com.doumee.service.business.FileRecordService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
@@ -19,6 +20,8 @@
@Autowired
private BaseDataService baseDataService;
+ @Autowired
+ private FileRecordService fileRecordService;
/**
* 瀹氭椂澶勭悊鐖櫕婧愭暟鎹紝鐢熸垚绱犳潗搴撴暟鎹�
@@ -28,5 +31,13 @@
public void dealBaseData() throws Exception {
baseDataService.dealBaseData();
}
+ /**
+ * 瀹氭椂澶勭悊鐖櫕婧愭暟鎹紝鐢熸垚绱犳潗搴撴暟鎹�
+ * @throws Exception
+ */
+ @Scheduled(fixedDelay=30*60*1000,initialDelay = 30000)
+ public void dealOploadEvent() throws Exception {
+ fileRecordService.dealOploadEvent();
+ }
}
diff --git a/server/service/src/main/java/com/doumee/dao/business/FileRecordMapper.java b/server/service/src/main/java/com/doumee/dao/business/FileRecordMapper.java
index b76893f..1e4da3f 100644
--- a/server/service/src/main/java/com/doumee/dao/business/FileRecordMapper.java
+++ b/server/service/src/main/java/com/doumee/dao/business/FileRecordMapper.java
@@ -11,5 +11,5 @@
*/
public interface FileRecordMapper extends BaseMapper<FileRecord> {
- void insertBatch(List<FileRecord> fileRecords);
+ void insertBatch(List<FileRecord> list);
}
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 0d0fa8b..0621e34 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
@@ -72,6 +72,9 @@
@ApiModelProperty(value = "涓婁紶缁撴灉")
@ExcelColumn(name="涓婁紶缁撴灉")
private String content;
+ @ApiModelProperty(value = "osskey")
+ @ExcelColumn(name="imgurl")
+ private String keyval;
@ApiModelProperty(value = "鐘舵�� 0鏈笂浼� 1宸蹭笂浼� 2涓婁紶澶辫触", example = "1")
@ExcelColumn(name="鐘舵�� 0鏈笂浼� 1宸蹭笂浼� 2涓婁紶澶辫触")
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
index 13ca622..d826fc3 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java
@@ -319,7 +319,7 @@
@Override
@Async
@Transactional
- public void dealBaseData() {
+ public synchronized void dealBaseData() {
if(IS_RUNNING){
return;
}
@@ -700,17 +700,17 @@
FileRecord model = new FileRecord();
model.setIsdeleted(Constants.ZERO);
model.setCreateDate(new Date());
- model.setName(key);
- model.setInfo(tempFileName);
+ model.setName(tempFileName);
+ model.setInfo(null);
model.setFolder(folder);
model.setUrl(img);
model.setObjId(id);
model.setType(objType);
model.setStatus(Constants.ZERO);
-
+ model.setKeyval(key);
fileRecords.add(model);
- return key;
+ return tempFileName;
}catch (Exception e){
}
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java
index 853942b..cea3ada 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java
@@ -150,7 +150,12 @@
@Override
public void deleteById(Integer id) {
- baseGoodsMapper.deleteById(id);
+ BaseGoods model = new BaseGoods();
+ model.setId(id);
+ model.setEditDate(new Date());
+ model.setIsdeleted(Constants.ZERO);
+ updateById(model);
+// baseGoodsMapper.deleteById(id);
}
@Override
@@ -164,7 +169,10 @@
if (CollectionUtils.isEmpty(ids)) {
return;
}
- baseGoodsMapper.deleteBatchIds(ids);
+ for(Integer id : ids){
+ deleteById(id);
+ }
+// baseGoodsMapper.deleteBatchIds(ids);
}
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 489438d..7926562 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
@@ -2,20 +2,26 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
+import com.doumee.core.utils.aliyun.ALiYunUtil;
import com.doumee.dao.business.FileRecordMapper;
import com.doumee.dao.business.model.FileRecord;
+import com.doumee.dao.business.model.dto.OssModel;
import com.doumee.service.business.BaseDataService;
import com.doumee.service.business.FileRecordService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.Date;
import java.util.List;
/**
@@ -24,6 +30,7 @@
* @date 2023/09/19 17:30
*/
@Service
+@Slf4j
public class FileRecordServiceImpl implements FileRecordService {
@Autowired
@@ -33,12 +40,38 @@
private BaseDataService baseDataService;
@Override
+ @Async
public Integer create(FileRecord fileRecord) {
fileRecordMapper.insert(fileRecord);
return fileRecord.getId();
}
@Override
- public Integer dealOploadEvent() {
+ @Async
+ public synchronized Integer dealOploadEvent() {
+ log.info("寮�濮嬩笂浼犻檮浠朵俊鎭�=================start==================");
+ OssModel ossModel = baseDataService.initOssModel();
+ FileRecord fileRecord = new FileRecord();
+ fileRecord.setStatus(Constants.ZERO);
+ fileRecord.setIsdeleted(Constants.ZERO);
+ List<FileRecord> allLis = findList(fileRecord);
+ if(allLis==null || allLis.size() ==0){
+ log.info("寮�濮嬩笂浼犻檮浠朵俊鎭�=================end========鏃犲緟澶勭悊鏁版嵁===========");
+ return 0;
+ }
+ Date date = new Date();
+ for(FileRecord model:allLis){
+ try {
+ ALiYunUtil obs = new ALiYunUtil(ossModel.getEndpoint(), ossModel.getAccessId(), ossModel.getAccessKey());
+ obs.uploadOnlineObject(model.getUrl(),ossModel.getBucket(), model.getKeyval(),null);
+ model.setStatus(Constants.ONE);
+ model.setContent("涓婁紶鎴愬姛");
+ }catch (Exception e){
+ model.setStatus(Constants.TWO);
+ model.setContent(e.getMessage());
+ }
+ model.setEditDate(date);
+ fileRecordMapper.updateById(model);
+ }
return 0;
}
diff --git a/server/service/src/main/java/com/doumee/service/impl/CateParamSelectServiceImpl.java b/server/service/src/main/java/com/doumee/service/impl/CateParamSelectServiceImpl.java
index 0f3717a..71e7cfa 100644
--- a/server/service/src/main/java/com/doumee/service/impl/CateParamSelectServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/impl/CateParamSelectServiceImpl.java
@@ -17,6 +17,7 @@
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.List;
@@ -153,7 +154,8 @@
@Override
@Async
- public void dealCateParamSelect() {
+ @Transactional
+ public void dealCateParamSelect() {
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
Boolean isGrouping = (Boolean)redisTemplate.opsForValue().get(loginUserInfo.getCompanyId()+Constants.CATE_PARAM_OPEN);
if(isGrouping!=null && isGrouping ){
diff --git a/server/service/src/main/resources/mappers/FileRecordMapper.xml b/server/service/src/main/resources/mappers/FileRecordMapper.xml
index d7ea013..aa1ac53 100644
--- a/server/service/src/main/resources/mappers/FileRecordMapper.xml
+++ b/server/service/src/main/resources/mappers/FileRecordMapper.xml
@@ -15,7 +15,8 @@
`TYPE`,
`OBJ_ID`,
`FOLDER`,
- `URL`
+ `URL`,
+ `KEYVAL`
) values
<foreach collection="list" separator="," item="item">
(#{item.creator}
@@ -26,10 +27,12 @@
,#{item.name}
,#{item.info}
,#{item.status}
- ,#{item.objId}
,#{item.type}
+ ,#{item.objId}
,#{item.folder}
,#{item.url}
+ ,#{item.keyval}
+ )
</foreach>
</insert>
--
Gitblit v1.9.3