From 1147614053efae0314a36c15293a6a5ed4e6d737 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 21 二月 2025 11:28:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 115 insertions(+), 3 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java
index 7dc07a0..59f4148 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java
@@ -2,6 +2,8 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
+import com.doumee.core.wx.WxMiniConfig;
+import com.doumee.dao.business.BikesMapper;
import com.google.common.collect.Lists;
import com.doumee.biz.system.SystemDictDataBiz;
@@ -24,6 +26,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.service.business.SitesService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import io.swagger.models.auth.In;
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
import org.apache.commons.lang3.StringUtils;
@@ -66,6 +69,8 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private BikesMapper bikesMapper;
@Override
public String create(Locks locks) {
@@ -139,8 +144,11 @@
if (!CollectionUtils.isEmpty(locksList)){
// 妫�鏌ユ槸鍚︽湁鍥剧墖淇℃伅娌℃湁鏇存柊淇濆瓨鍥剧墖
locksList.forEach(s-> {
- if (StringUtils.isBlank(s.getInfo())){
- wxMiniUtilService.generateWXMiniCode(s,systemDictData,prePath,code);
+ if (Constants.equalsInteger(locks.getFource(),Constants.ONE) ||StringUtils.isBlank(s.getInfo())){
+ try {
+ wxMiniUtilService.generateWXMiniCode(s, WxMiniConfig.wxMaService.getAccessToken(),prePath,code);
+ }catch (Exception e){
+ }
s.setEditor(loginUserInfo.getId());
s.setEditDate(new Date());
updateById(s);
@@ -150,6 +158,76 @@
return locksList;
}
return new ArrayList<>();
+ }
+
+ /**
+ * 鑾峰彇鎵�鏈夌數娴嬪皬绋嬪簭浜岀淮鐮�
+ * @param force 0涓嶅己鍒跺埛鏂� 1寮哄埗鍒锋柊
+ * @return
+ */
+ @Override
+ public List<Bikes> findAllBikeBase(Integer force) {
+ List<Bikes> bikesList = bikesMapper.selectList(new QueryWrapper<Bikes>().lambda()
+ .eq(Bikes::getIsdeleted,Constants.ZERO)
+ .eq(Bikes::getType,Constants.ONE)
+ );
+ if(bikesList!=null && bikesList.size()>0){
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ String fullPath = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FILE_DIR).getCode() +
+ systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PROJECTS).getCode() ;
+ String code = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
+ String prePath = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.IMG_DIR).getCode();
+ for(Bikes bikes : bikesList){
+ if (Constants.equalsInteger(force,Constants.ONE) || StringUtils.isBlank(bikes.getImgurl())){
+ try {
+ wxMiniUtilService.generateEbikeWXMiniCode(bikes, WxMiniConfig.wxMaService.getAccessToken(),prePath,code);
+ }catch (Exception e){
+ }
+ if (StringUtils.isNotBlank(bikes.getImgurl())){
+ bikes.setEditor(loginUserInfo.getId());
+ bikes.setEditDate(new Date());
+ bikesMapper.updateById(bikes);
+ }
+ }
+ if (StringUtils.isNotBlank(bikes.getImgurl())){
+ bikes.setImgurl(fullPath+bikes.getImgurl());
+ }
+ }
+
+ }
+
+ return bikesList;
+ }
+ @Override
+ public Bikes findBikeBase(String bikeId, Integer force) {
+ Bikes bikes = bikesMapper.selectById(bikeId);
+ if(bikes == null
+ || Constants.equalsInteger(bikes.getIsdeleted(),Constants.ONE)
+ || !Constants.equalsInteger(bikes.getType(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ String fullPath = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FILE_DIR).getCode() +
+ systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PROJECTS).getCode() ;
+ String code = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
+ String prePath = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.IMG_DIR).getCode();
+ // 妫�鏌ユ槸鍚︽湁鍥剧墖淇℃伅娌℃湁鏇存柊淇濆瓨鍥剧墖
+ if (Constants.equalsInteger(force,Constants.ONE) || StringUtils.isBlank(bikes.getImgurl())){
+ try {
+ wxMiniUtilService.generateEbikeWXMiniCode(bikes, WxMiniConfig.wxMaService.getAccessToken(),prePath,code);
+ }catch (Exception e){
+ }
+ if (StringUtils.isNotBlank(bikes.getImgurl())){
+ bikes.setEditor(loginUserInfo.getId());
+ bikes.setEditDate(new Date());
+ bikesMapper.updateById(bikes);
+ }
+ }
+ if (StringUtils.isBlank(bikes.getImgurl())){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"鑾峰彇灏忕▼搴忕爜澶辫触锛岃绋嶅悗閲嶈瘯锛�");
+ }
+ bikes.setImgurl(fullPath+bikes.getImgurl());
+ return bikes;
}
@@ -230,6 +308,40 @@
throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
}
}
-
+ @Override
+ public void exportEbikeImages(String bikeid, HttpServletResponse response){
+ try {
+ List<File> fileList = new ArrayList<>();
+ List<Bikes> bikesList = bikesMapper.selectList(new QueryWrapper<Bikes>().lambda()
+ .eq(Bikes::getIsdeleted,Constants.ZERO)
+ .eq(StringUtils.isNotBlank(bikeid) ,Bikes::getId,bikeid)
+ .eq(Bikes::getType,Constants.ONE)
+ );
+ if(bikesList== null || bikesList.size() == 0){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ String path = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.IMG_DIR).getCode()+systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PROJECTS).getCode();
+ for(Bikes l : bikesList){
+ if(StringUtils.isNotBlank(l.getImgurl())){
+ File file = new File(path + l.getImgurl());
+ if(file!=null && file.isFile()){
+ fileList.add(file);
+ }
+ }
+ }
+ if(fileList == null || fileList.size() == 0){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ String fileName = "鐢佃溅灏忕▼搴忕爜鎵归噺瀵煎嚭_"+System.currentTimeMillis()+".zip" ;
+ String encodeFileName = URLEncoder.encode(fileName);
+ response.setHeader("Content-Disposition","attachment;filename=" + encodeFileName);
+ response.setContentType("application/octet-stream");
+ response.setHeader("eva-opera-type", "download");
+ response.setHeader("eva-download-filename", encodeFileName);
+ packFilesToZip(fileList,response.getOutputStream());
+ } catch (IOException e) {
+ throw new BusinessException(ResponseStatus.EXPORT_EXCEL_ERROR, e);
+ }
+ }
}
--
Gitblit v1.9.3