From 62f53cc6c69c02bbe91a5010ee98f293ae3746bb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 19 九月 2023 17:55:26 +0800
Subject: [PATCH] 修改
---
server/service/src/main/java/com/doumee/service/business/impl/FileRecordServiceImpl.java | 145 ++++++++++++++
server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java | 97 ++++++---
server/service/src/main/resources/mappers/FileRecordMapper.xml | 36 +++
server/service/src/main/java/com/doumee/core/model/LoginUserInfo.java | 3
server/service/src/main/java/com/doumee/dao/business/model/FileRecord.java | 78 +++++++
server/service/src/main/java/com/doumee/dao/business/FileRecordMapper.java | 15 +
server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java | 4
server/company/src/main/java/com/doumee/config/shiro/ShiroRealm.java | 2
server/platform/src/main/java/com/doumee/api/business/FileRecordController.java | 90 +++++++++
server/service/src/main/java/com/doumee/service/business/FileRecordService.java | 97 +++++++++
10 files changed, 536 insertions(+), 31 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/config/shiro/ShiroRealm.java b/server/company/src/main/java/com/doumee/config/shiro/ShiroRealm.java
index c294ef4..657c0e6 100644
--- a/server/company/src/main/java/com/doumee/config/shiro/ShiroRealm.java
+++ b/server/company/src/main/java/com/doumee/config/shiro/ShiroRealm.java
@@ -102,8 +102,8 @@
if(DateUtil.compareDate(new Date(),DateUtil.addDaysToDate(company.getOepnValidDate(),1))<=Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝浼佷笟淇℃伅宸茶繃鏈燂紝濡傛湁鐤戦棶璇疯仈绯荤郴缁熺鐞嗗憳锛�");
}
+ user.setCompany(company);
}
-
// 鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
List<SystemRole> roles = systemRoleService.findByUserId(user.getId());
List<SystemPermission> permissions = systemPermissionService.findByUserId(user.getId());
diff --git a/server/platform/src/main/java/com/doumee/api/business/FileRecordController.java b/server/platform/src/main/java/com/doumee/api/business/FileRecordController.java
new file mode 100644
index 0000000..a7327ce
--- /dev/null
+++ b/server/platform/src/main/java/com/doumee/api/business/FileRecordController.java
@@ -0,0 +1,90 @@
+package com.doumee.api.business;
+
+import com.doumee.api.BaseController;
+import com.doumee.core.annotation.excel.ExcelExporter;
+import com.doumee.core.annotation.pr.PreventRepeat;
+import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.PageWrap;
+import com.doumee.core.model.PageData;
+import com.doumee.dao.business.model.FileRecord;
+import com.doumee.service.business.FileRecordService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/09/19 17:30
+ */
+@Api(tags = "闄勪欢涓婁紶杩涘害琛�")
+@RestController
+@RequestMapping("/business/fileRecord")
+public class FileRecordController extends BaseController {
+
+ @Autowired
+ private FileRecordService fileRecordService;
+
+ @PreventRepeat
+ @ApiOperation("鏂板缓")
+ @PostMapping("/create")
+ @RequiresPermissions("business:filerecord:create")
+ public ApiResponse create(@RequestBody FileRecord fileRecord) {
+ return ApiResponse.success(fileRecordService.create(fileRecord));
+ }
+
+ @ApiOperation("鏍规嵁ID鍒犻櫎")
+ @GetMapping("/delete/{id}")
+ @RequiresPermissions("business:filerecord:delete")
+ public ApiResponse deleteById(@PathVariable Integer id) {
+ fileRecordService.deleteById(id);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鎵归噺鍒犻櫎")
+ @GetMapping("/delete/batch")
+ @RequiresPermissions("business:filerecord:delete")
+ public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
+ String [] idArray = ids.split(",");
+ List<Integer> idList = new ArrayList<>();
+ for (String id : idArray) {
+ idList.add(Integer.valueOf(id));
+ }
+ fileRecordService.deleteByIdInBatch(idList);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鏍规嵁ID淇敼")
+ @PostMapping("/updateById")
+ @RequiresPermissions("business:filerecord:update")
+ public ApiResponse updateById(@RequestBody FileRecord fileRecord) {
+ fileRecordService.updateById(fileRecord);
+ return ApiResponse.success(null);
+ }
+
+ @ApiOperation("鍒嗛〉鏌ヨ")
+ @PostMapping("/page")
+ @RequiresPermissions("business:filerecord:query")
+ public ApiResponse<PageData<FileRecord>> findPage (@RequestBody PageWrap<FileRecord> pageWrap) {
+ return ApiResponse.success(fileRecordService.findPage(pageWrap));
+ }
+
+ @ApiOperation("瀵煎嚭Excel")
+ @PostMapping("/exportExcel")
+ @RequiresPermissions("business:filerecord:exportExcel")
+ public void exportExcel (@RequestBody PageWrap<FileRecord> pageWrap, HttpServletResponse response) {
+ ExcelExporter.build(FileRecord.class).export(fileRecordService.findPage(pageWrap).getRecords(), "闄勪欢涓婁紶杩涘害琛�", response);
+ }
+
+ @ApiOperation("鏍规嵁ID鏌ヨ")
+ @GetMapping("/{id}")
+ @RequiresPermissions("business:filerecord:query")
+ public ApiResponse findById(@PathVariable Integer id) {
+ return ApiResponse.success(fileRecordService.findById(id));
+ }
+}
diff --git a/server/service/src/main/java/com/doumee/core/model/LoginUserInfo.java b/server/service/src/main/java/com/doumee/core/model/LoginUserInfo.java
index 5717054..127f16e 100644
--- a/server/service/src/main/java/com/doumee/core/model/LoginUserInfo.java
+++ b/server/service/src/main/java/com/doumee/core/model/LoginUserInfo.java
@@ -1,5 +1,6 @@
package com.doumee.core.model;
+import com.doumee.dao.business.model.Company;
import com.doumee.dao.system.model.SystemPermission;
import com.doumee.dao.system.model.SystemRole;
import com.doumee.dao.system.model.SystemUser;
@@ -38,6 +39,7 @@
private Integer cityId;
private Integer parentId;
private Integer type;
+ private Company company;
private List<String> roles;
@@ -50,6 +52,7 @@
// 鎷疯礉鐢ㄦ埛淇℃伅
LoginUserInfo loginUserInfo = new LoginUserInfo();
BeanUtils.copyProperties(user, loginUserInfo);
+ loginUserInfo.setCompany(user.getCompany());
// 璁剧疆瑙掕壊淇℃伅
List<String> rs = new ArrayList<>();
for (SystemRole role : roles) {
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
new file mode 100644
index 0000000..b76893f
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/business/FileRecordMapper.java
@@ -0,0 +1,15 @@
+package com.doumee.dao.business;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.doumee.dao.business.model.FileRecord;
+
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/09/19 17:30
+ */
+public interface FileRecordMapper extends BaseMapper<FileRecord> {
+
+ void insertBatch(List<FileRecord> fileRecords);
+}
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
new file mode 100644
index 0000000..cd63787
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/dao/business/model/FileRecord.java
@@ -0,0 +1,78 @@
+package com.doumee.dao.business.model;
+
+import com.doumee.core.annotation.excel.ExcelColumn;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.util.Date;
+
+/**
+ * 闄勪欢涓婁紶杩涘害琛�
+ * @author 姹熻箘韫�
+ * @date 2023/09/19 17:30
+ */
+@Data
+@ApiModel("闄勪欢涓婁紶杩涘害琛�")
+@TableName("`file_record`")
+public class FileRecord {
+
+ @ApiModelProperty(value = "涓婚敭", example = "1")
+ @ExcelColumn(name="涓婚敭")
+ private Integer id;
+
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
+ @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
+ private Integer creator;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @ExcelColumn(name="鍒涘缓鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createDate;
+
+ @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
+ @ExcelColumn(name="鏇存柊浜虹紪鐮�")
+ private Integer editor;
+
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ @ExcelColumn(name="鏇存柊鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date editDate;
+
+ @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
+ @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�")
+ private Integer isdeleted;
+
+ @ApiModelProperty(value = "鏂囦欢鍚�")
+ @ExcelColumn(name="鏂囦欢鍚�")
+ private String name;
+ @ApiModelProperty(value = "缃戠粶鍥惧湴鍧�")
+ @ExcelColumn(name="缃戠粶鍥惧湴鍧�")
+ private String url;
+
+ @ApiModelProperty(value = "澶囨敞")
+ @ExcelColumn(name="澶囨敞")
+ private String info;
+
+ @ApiModelProperty(value = "鍏宠仈瀵硅薄缂栫爜", example = "1")
+ @ExcelColumn(name="鍏宠仈瀵硅薄缂栫爜")
+ private String objId;
+
+ @ApiModelProperty(value = "绫诲瀷0鍥剧墖 1瑙嗛 2鍏朵粬", example = "1")
+ @ExcelColumn(name="绫诲瀷0鍥剧墖 1瑙嗛 2鍏朵粬")
+ private Integer type;
+
+ @ApiModelProperty(value = "鏂囦欢澶瑰悕绉�")
+ @ExcelColumn(name="鏂囦欢澶瑰悕绉�")
+ private String folder;
+ @ApiModelProperty(value = "涓婁紶缁撴灉")
+ @ExcelColumn(name="涓婁紶缁撴灉")
+ private String content;
+
+ @ApiModelProperty(value = "鐘舵�� 0鏈笂浼� 1宸蹭笂浼� 2涓婁紶澶辫触", example = "1")
+ @ExcelColumn(name="鐘舵�� 0鏈笂浼� 1宸蹭笂浼� 2涓婁紶澶辫触")
+ private Integer status;
+}
diff --git a/server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java b/server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java
index 3995cfb..2679ba9 100644
--- a/server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java
+++ b/server/service/src/main/java/com/doumee/dao/system/model/SystemUser.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.doumee.core.constants.OperaType;
+import com.doumee.dao.business.model.Company;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -96,5 +97,8 @@
@ApiModelProperty(value = "0 鍚敤 1 绂佺敤")
private Integer status;
+ @ApiModelProperty(value = "0 鍚敤 1 绂佺敤")
+ @TableField(exist = false)
+ private Company company;
}
diff --git a/server/service/src/main/java/com/doumee/service/business/FileRecordService.java b/server/service/src/main/java/com/doumee/service/business/FileRecordService.java
new file mode 100644
index 0000000..79c51e7
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/service/business/FileRecordService.java
@@ -0,0 +1,97 @@
+package com.doumee.service.business;
+
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.model.FileRecord;
+import java.util.List;
+
+/**
+ * 闄勪欢涓婁紶杩涘害琛⊿ervice瀹氫箟
+ * @author 姹熻箘韫�
+ * @date 2023/09/19 17:30
+ */
+public interface FileRecordService {
+
+ /**
+ * 鍒涘缓
+ *
+ * @param fileRecord 瀹炰綋瀵硅薄
+ * @return Integer
+ */
+ Integer create(FileRecord fileRecord);
+
+ /**
+ * 涓婚敭鍒犻櫎
+ *
+ * @param id 涓婚敭
+ */
+ void deleteById(Integer id);
+
+ /**
+ * 鍒犻櫎
+ *
+ * @param fileRecord 瀹炰綋瀵硅薄
+ */
+ void delete(FileRecord fileRecord);
+
+ /**
+ * 鎵归噺涓婚敭鍒犻櫎
+ *
+ * @param ids 涓婚敭闆�
+ */
+ void deleteByIdInBatch(List<Integer> ids);
+
+ /**
+ * 涓婚敭鏇存柊
+ *
+ * @param fileRecord 瀹炰綋瀵硅薄
+ */
+ void updateById(FileRecord fileRecord);
+
+ /**
+ * 鎵归噺涓婚敭鏇存柊
+ *
+ * @param fileRecords 瀹炰綋闆�
+ */
+ void updateByIdInBatch(List<FileRecord> fileRecords);
+
+ /**
+ * 涓婚敭鏌ヨ
+ *
+ * @param id 涓婚敭
+ * @return FileRecord
+ */
+ FileRecord findById(Integer id);
+
+ /**
+ * 鏉′欢鏌ヨ鍗曟潯璁板綍
+ *
+ * @param fileRecord 瀹炰綋瀵硅薄
+ * @return FileRecord
+ */
+ FileRecord findOne(FileRecord fileRecord);
+
+ /**
+ * 鏉′欢鏌ヨ
+ *
+ * @param fileRecord 瀹炰綋瀵硅薄
+ * @return List<FileRecord>
+ */
+ List<FileRecord> findList(FileRecord fileRecord);
+
+ /**
+ * 鍒嗛〉鏌ヨ
+ *
+ * @param pageWrap 鍒嗛〉瀵硅薄
+ * @return PageData<FileRecord>
+ */
+ PageData<FileRecord> findPage(PageWrap<FileRecord> pageWrap);
+
+ /**
+ * 鏉′欢缁熻
+ *
+ * @param fileRecord 瀹炰綋瀵硅薄
+ * @return long
+ */
+ long count(FileRecord fileRecord);
+}
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 8ea175e..879f6fd 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
@@ -61,6 +61,8 @@
private BaseCateParamMapper baseCateParamMapper;
@Autowired
private BrandMapper brandMapper;
+ @Autowired
+ private FileRecordMapper fileRecordMapper;
@Override
public String create(BaseData baseData) {
@@ -316,7 +318,7 @@
public static boolean IS_RUNNING = false;
@Override
@Async
- @Transactional(isolation = Isolation.READ_UNCOMMITTED)
+ @Transactional
public void dealBaseData() {
if(IS_RUNNING){
return;
@@ -353,6 +355,8 @@
Date date = new Date();
List<BaseCateParam> baseCateParamList = new ArrayList<>();
List<Multifile> fileList = new ArrayList<>();
+ List<Integer> goodsIdList = new ArrayList<>();
+ List<FileRecord> fileRecords = new ArrayList<>();
List<BaseGoodsParam> baseGoodsParamList = new ArrayList<>();
for(BaseData data : allLis){
BaseGoods goods = new BaseGoods();
@@ -374,35 +378,19 @@
goods.setBrandId(bModel.getId());
}
//澶勭悊鍒楄〃鏁版嵁
- BaseCategory cModel = getCateModelFromList(rate,data.getCategory(),ossModel,data.getCategoryImg(), cateList);
+ BaseCategory cModel = getCateModelFromList(rate,data.getCategory(),ossModel,data.getCategoryImg(), cateList,fileRecords);
if(cModel!= null){
goods.setCategoryId(cModel.getId());
}
- goods.setImgurl(getOssImgurl(ossModel,ossModel.getGoodsFolder(), data.getImgurl()));
+// goods.setImgurl(getOssImgurl(ossModel,ossModel.getGoodsFolder(), data.getImgurl()));
+ goods.setImgurl(getOssImgurlFile(ossModel.getGoodsFolder(), data.getImgurl(), data.getId(),Constants.ZERO,fileRecords));
goods.setPrice(Constants.formatBigdecimal(data.getSaleprice()).multiply(Constants.formatBigdecimal(cModel.getPriceRate())));
if(model!=null){
- //濡傛灉宸茬粡瀛樺湪锛岄�昏緫鍒犻櫎鏃х殑鍟嗗搧鏁版嵁
-// UpdateWrapper<BaseGoods> updateModel = new UpdateWrapper<>();
-// updateModel.lambda().set(BaseGoods::getIsdeleted,Constants.ONE);
-// updateModel.lambda().set(BaseGoods::getEditDate, new Date());
-// updateModel.lambda().eq(BaseGoods::getBaseDataId, data.getId());
-// baseGoodsMapper.update(null, updateModel);
+ //濡傛灉宸茬粡瀛樺湪锛屾洿鏂板晢鍝佹暟鎹�
goods.setEditDate(date);
goods.setId(model.getId());
baseGoodsMapper.updateById(goods);
- //鍒犻櫎鍘熸湁闄勪欢澶у浘
- UpdateWrapper<Multifile> updateModel = new UpdateWrapper<>();
- updateModel.lambda().set(Multifile::getIsdeleted,Constants.ONE);
- updateModel.lambda().set(Multifile::getEditDate, new Date());
- updateModel.lambda().eq(Multifile::getObjId, goods.getId());
- updateModel.lambda().eq(Multifile::getObjType, Constants.ZERO);
- multifileMapper.delete(updateModel);
- //鍒犻櫎鍘熸湁鍟嗗搧灞炴��
- UpdateWrapper<BaseGoodsParam> bgModel = new UpdateWrapper<>();
- bgModel.lambda().set(BaseGoodsParam::getIsdeleted,Constants.ONE);
- bgModel.lambda().set(BaseGoodsParam::getEditDate, new Date());
- bgModel.lambda().eq(BaseGoodsParam::getGoodsId, goods.getId());
- baseGoodsParamMapper.delete(bgModel);
+ goodsIdList.add(goods.getId());
}else{
//鎻掑叆鏂板晢鍝佹暟鎹�
goods.setCreateDate(date);
@@ -411,17 +399,36 @@
//澶勭悊鍒嗙被灞炴��
dealCateParamAll(cModel.getId(),goods.getId(),data,paramList, baseGoodsParamList );
//澶勭悊鑳屾櫙鍥�
- dealBgImgAll(ossModel,goods.getId(),data,fileList);
+ dealBgImgAll(ossModel,goods.getId(),data,fileList,fileRecords);
data.setEditDate(new Date());
data.setStatus(Constants.ONE);
//鏇存柊鏁版嵁澶勭悊鐘舵��
baseDataMapper.updateById(data);
}
+ if(goodsIdList.size()>0){
+ //鍒犻櫎鍘熸湁闄勪欢澶у浘
+ UpdateWrapper<Multifile> updateModel = new UpdateWrapper<>();
+ updateModel.lambda().set(Multifile::getIsdeleted,Constants.ONE);
+ updateModel.lambda().set(Multifile::getEditDate, new Date());
+ updateModel.lambda().in(Multifile::getObjId, goodsIdList);
+ updateModel.lambda().eq(Multifile::getObjType, Constants.ZERO);
+ multifileMapper.delete(updateModel);
+ //鍒犻櫎鍘熸湁鍟嗗搧灞炴��
+ UpdateWrapper<BaseGoodsParam> bgModel = new UpdateWrapper<>();
+ bgModel.lambda().set(BaseGoodsParam::getIsdeleted,Constants.ONE);
+ bgModel.lambda().set(BaseGoodsParam::getEditDate, new Date());
+ bgModel.lambda().in(BaseGoodsParam::getGoodsId, goodsIdList);
+ baseGoodsParamMapper.delete(bgModel);
+ }
+
if(fileList.size()>0){
multifileMapper.insertBatch(fileList);
}
if(baseGoodsParamList.size()>0){
baseGoodsParamMapper.insertBatch(baseGoodsParamList);
+ }
+ if(fileRecords.size()>0){
+ fileRecordMapper.insertBatch(fileRecords);
}
log.info("寮�濮嬪鐞嗘簮鏁版嵁=================success================澶勭悊鏁版嵁鍏憋紙"+allLis.size()+"锛変釜===");
}catch (Exception e){
@@ -435,7 +442,7 @@
}
- private void dealBgImgAll(OssModel ossModel, Integer id, BaseData data,List<Multifile> fileList) {
+ private void dealBgImgAll(OssModel ossModel, Integer id, BaseData data,List<Multifile> fileList,List<FileRecord> fileRecords) {
int i =0;
//澶氬浘锛岃嫳鏂囬�楀彿闅斿紑
if(StringUtils.isNotBlank(data.getBgImg())){
@@ -443,7 +450,7 @@
String[] imgs =tImg.split(",");
for (int j = 0; j < imgs.length; j++) {
if(StringUtils.isNotBlank(imgs[j])){
- i += addImg(i,ossModel,id,imgs[j],fileList);
+ i += addImg(i,ossModel,id,imgs[j],fileList,fileRecords);
}
}
}
@@ -452,9 +459,10 @@
// addImg(i,ossModel,id,data.getBgImg3());
}
- private int addImg(int i,OssModel ossModel, Integer id,String bgImg,List<Multifile> fileList) {
+ private int addImg(int i,OssModel ossModel, Integer id,String bgImg,List<Multifile> fileList,List<FileRecord> fileRecords) {
if(StringUtils.isNotBlank(bgImg)){
- String img =getOssImgurl(ossModel, ossModel.getGoodsFolder() ,bgImg);
+// String img =getOssImgurl(ossModel, ossModel.getGoodsFolder() ,bgImg);
+ String img = getOssImgurlFile(ossModel.getGoodsFolder(), bgImg, null,Constants.TWO,fileRecords);
if(StringUtils.isNotBlank(img)){
Multifile f = new Multifile();
f.setFileurl(img);
@@ -627,7 +635,7 @@
* @return
*/
- private BaseCategory getCateModelFromList(BigDecimal dRate,String name, OssModel ossModel, String img, List<BaseCategory> list) {
+ private BaseCategory getCateModelFromList(BigDecimal dRate,String name, OssModel ossModel, String img, List<BaseCategory> list, List<FileRecord> fileRecords) {
if(StringUtils.isBlank(name)){
return null;
}
@@ -645,7 +653,8 @@
model.setIsdeleted(Constants.ZERO);
model.setPinyin(PinYinUtil.getFullSpell(model.getName()));
model.setShortPinyin(PinYinUtil.getFirstSpell(model.getName()));
- model.setImgurl(getOssImgurl(ossModel, ossModel.getCateFolder() ,img));
+// model.setImgurl(getOssImgurl(ossModel, ossModel.getCateFolder() ,img));
+ model.setImgurl(getOssImgurlFile(ossModel.getCateFolder(), img, null,Constants.ONE,fileRecords));
//鎻掑叆鏂扮殑鍝佺墝淇℃伅
baseCategoryMapper.insert(model);
//鍔犲叆闆嗗悎涓�
@@ -654,7 +663,7 @@
}
@Override
- public String getOssImgurl(OssModel ossModel, String folder,String img) {
+ public String getOssImgurl(OssModel ossModel, String folder,String img ) {
if(StringUtils.isBlank(img)){
return null;
}
@@ -666,6 +675,7 @@
String tempFileName = nowDate + "/" + fileName;
String key =folder+ tempFileName;// 鏂囦欢鍚�
+
ALiYunUtil obs = new ALiYunUtil(ossModel.getEndpoint(), ossModel.getAccessId(), ossModel.getAccessKey());
if (obs.uploadOnlineObject(img,ossModel.getBucket(), key,null)) {
return tempFileName;
@@ -675,6 +685,33 @@
}
return null;
}
+ public String getOssImgurlFile(String folder,String img ,String id,Integer objType,List<FileRecord> fileRecords) {
+ if(StringUtils.isBlank(img)){
+ return null;
+ }
+ try {
+ String nowDate = DateUtil.getNowShortDate();// 褰撳墠鏃堕棿锛堝勾鏈堟棩锛�
+ String nfix = img.lastIndexOf(".")>0?img.substring(img.lastIndexOf(".")):null;
+ nfix = StringUtils.defaultString(nfix,".jpg");
+ String fileName = UUID.randomUUID() + nfix;
+ String tempFileName = nowDate + "/" + fileName;
+ String key =folder+ tempFileName;// 鏂囦欢鍚�
+
+ FileRecord model = new FileRecord();
+ model.setIsdeleted(Constants.ZERO);
+ model.setCreateDate(new Date());
+ model.setName(key);
+ model.setInfo(tempFileName);
+ model.setFolder(folder);
+ model.setUrl(img);
+ model.setObjId(id);
+ model.setType(objType);
+ model.setStatus(Constants.ZERO);
+ }catch (Exception e){
+
+ }
+ return null;
+ }
@Override
public String getOssImgurl(OssModel ossModel, String folder, File f) {
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
new file mode 100644
index 0000000..aac434e
--- /dev/null
+++ b/server/service/src/main/java/com/doumee/service/business/impl/FileRecordServiceImpl.java
@@ -0,0 +1,145 @@
+package com.doumee.service.business.impl;
+
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.FileRecordMapper;
+import com.doumee.dao.business.model.FileRecord;
+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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
+
+/**
+ * 闄勪欢涓婁紶杩涘害琛⊿ervice瀹炵幇
+ * @author 姹熻箘韫�
+ * @date 2023/09/19 17:30
+ */
+@Service
+public class FileRecordServiceImpl implements FileRecordService {
+
+ @Autowired
+ private FileRecordMapper fileRecordMapper;
+
+ @Override
+ public Integer create(FileRecord fileRecord) {
+ fileRecordMapper.insert(fileRecord);
+ return fileRecord.getId();
+ }
+
+ @Override
+ public void deleteById(Integer id) {
+ fileRecordMapper.deleteById(id);
+ }
+
+ @Override
+ public void delete(FileRecord fileRecord) {
+ UpdateWrapper<FileRecord> deleteWrapper = new UpdateWrapper<>(fileRecord);
+ fileRecordMapper.delete(deleteWrapper);
+ }
+
+ @Override
+ public void deleteByIdInBatch(List<Integer> ids) {
+ if (CollectionUtils.isEmpty(ids)) {
+ return;
+ }
+ fileRecordMapper.deleteBatchIds(ids);
+ }
+
+ @Override
+ public void updateById(FileRecord fileRecord) {
+ fileRecordMapper.updateById(fileRecord);
+ }
+
+ @Override
+ public void updateByIdInBatch(List<FileRecord> fileRecords) {
+ if (CollectionUtils.isEmpty(fileRecords)) {
+ return;
+ }
+ for (FileRecord fileRecord: fileRecords) {
+ this.updateById(fileRecord);
+ }
+ }
+
+ @Override
+ public FileRecord findById(Integer id) {
+ return fileRecordMapper.selectById(id);
+ }
+
+ @Override
+ public FileRecord findOne(FileRecord fileRecord) {
+ QueryWrapper<FileRecord> wrapper = new QueryWrapper<>(fileRecord);
+ return fileRecordMapper.selectOne(wrapper);
+ }
+
+ @Override
+ public List<FileRecord> findList(FileRecord fileRecord) {
+ QueryWrapper<FileRecord> wrapper = new QueryWrapper<>(fileRecord);
+ return fileRecordMapper.selectList(wrapper);
+ }
+
+ @Override
+ public PageData<FileRecord> findPage(PageWrap<FileRecord> pageWrap) {
+ IPage<FileRecord> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+ QueryWrapper<FileRecord> queryWrapper = new QueryWrapper<>();
+ Utils.MP.blankToNull(pageWrap.getModel());
+ if (pageWrap.getModel().getId() != null) {
+ queryWrapper.lambda().eq(FileRecord::getId, pageWrap.getModel().getId());
+ }
+ if (pageWrap.getModel().getCreator() != null) {
+ queryWrapper.lambda().eq(FileRecord::getCreator, pageWrap.getModel().getCreator());
+ }
+ if (pageWrap.getModel().getCreateDate() != null) {
+ queryWrapper.lambda().ge(FileRecord::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.lambda().le(FileRecord::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ }
+ if (pageWrap.getModel().getEditor() != null) {
+ queryWrapper.lambda().eq(FileRecord::getEditor, pageWrap.getModel().getEditor());
+ }
+ if (pageWrap.getModel().getEditDate() != null) {
+ queryWrapper.lambda().ge(FileRecord::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.lambda().le(FileRecord::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ }
+ if (pageWrap.getModel().getIsdeleted() != null) {
+ queryWrapper.lambda().eq(FileRecord::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ }
+ if (pageWrap.getModel().getName() != null) {
+ queryWrapper.lambda().eq(FileRecord::getName, pageWrap.getModel().getName());
+ }
+ if (pageWrap.getModel().getInfo() != null) {
+ queryWrapper.lambda().eq(FileRecord::getInfo, pageWrap.getModel().getInfo());
+ }
+ if (pageWrap.getModel().getObjId() != null) {
+ queryWrapper.lambda().eq(FileRecord::getObjId, pageWrap.getModel().getObjId());
+ }
+ if (pageWrap.getModel().getType() != null) {
+ queryWrapper.lambda().eq(FileRecord::getType, pageWrap.getModel().getType());
+ }
+ if (pageWrap.getModel().getFolder() != null) {
+ queryWrapper.lambda().eq(FileRecord::getFolder, pageWrap.getModel().getFolder());
+ }
+ if (pageWrap.getModel().getStatus() != null) {
+ queryWrapper.lambda().eq(FileRecord::getStatus, pageWrap.getModel().getStatus());
+ }
+ for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+ if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+ queryWrapper.orderByDesc(sortData.getProperty());
+ } else {
+ queryWrapper.orderByAsc(sortData.getProperty());
+ }
+ }
+ return PageData.from(fileRecordMapper.selectPage(page, queryWrapper));
+ }
+
+ @Override
+ public long count(FileRecord fileRecord) {
+ QueryWrapper<FileRecord> wrapper = new QueryWrapper<>(fileRecord);
+ return fileRecordMapper.selectCount(wrapper);
+ }
+}
diff --git a/server/service/src/main/resources/mappers/FileRecordMapper.xml b/server/service/src/main/resources/mappers/FileRecordMapper.xml
new file mode 100644
index 0000000..d7ea013
--- /dev/null
+++ b/server/service/src/main/resources/mappers/FileRecordMapper.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.doumee.dao.business.FileRecordMapper">
+
+ <insert id="insertBatch" >
+ insert into file_record(
+ `CREATOR`,
+ `CREATE_DATE`,
+ `EDITOR`,
+ `EDIT_DATE`,
+ `ISDELETED`,
+ `NAME`,
+ `INFO`,
+ `STATUS`,
+ `TYPE`,
+ `OBJ_ID`,
+ `FOLDER`,
+ `URL`
+ ) values
+ <foreach collection="list" separator="," item="item">
+ (#{item.creator}
+ ,#{item.createDate}
+ ,#{item.editor}
+ ,#{item.editDate}
+ ,#{item.isdeleted}
+ ,#{item.name}
+ ,#{item.info}
+ ,#{item.status}
+ ,#{item.objId}
+ ,#{item.type}
+ ,#{item.folder}
+ ,#{item.url}
+ </foreach>
+ </insert>
+
+</mapper>
--
Gitblit v1.9.3