From 68c299b6eec83a05e398ec85614b584cb5d7b690 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 09 十一月 2023 15:49:44 +0800
Subject: [PATCH] # 修改自行车明细 排除撤销 lock 图片base64
---
server/services/src/main/java/com/doumee/service/business/impl/LocksServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 insertions(+), 0 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 22f6c64..b8b7008 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
@@ -1,14 +1,20 @@
package com.doumee.service.business.impl;
+import com.doumee.core.model.LoginUserInfo;
+import com.google.common.collect.Lists;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.constants.Constants;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Utils;
+import com.doumee.core.wx.WxMiniUtilService;
import com.doumee.dao.business.LocksMapper;
import com.doumee.dao.business.join.LocksJoinMapper;
import com.doumee.dao.business.model.BaseParam;
import com.doumee.dao.business.model.Bikes;
import com.doumee.dao.business.model.Locks;
import com.doumee.dao.business.model.Sites;
+import com.doumee.dao.system.model.SystemDictData;
import com.doumee.service.business.LocksService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -16,11 +22,16 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.doumee.service.business.SitesService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 閿佸ご淇℃伅琛⊿ervice瀹炵幇
@@ -35,6 +46,14 @@
@Autowired
private LocksJoinMapper locksJoinMapper;
+
+
+ @Autowired
+ private WxMiniUtilService wxMiniUtilService;
+
+
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
@Override
public String create(Locks locks) {
@@ -94,6 +113,29 @@
}
@Override
+ public List<Locks> findLockBase64List(Locks locks) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+
+ QueryWrapper<Locks> wrapper = new QueryWrapper<>(locks);
+ wrapper.lambda().orderByAsc(Locks::getCode);
+ List<Locks> locksList = locksMapper.selectList(wrapper);
+ SystemDictData systemDictData = systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.ACCESS_TOKEN);
+ if (!CollectionUtils.isEmpty(locksList)){
+ // 妫�鏌ユ槸鍚︽湁鍥剧墖淇℃伅娌℃湁鏇存柊淇濆瓨鍥剧墖
+ locksList.forEach(s-> {
+ if (StringUtils.isBlank(s.getInfo())){
+ wxMiniUtilService.generateWXMiniCode(s, systemDictData);
+ s.setEditor(loginUserInfo.getId());
+ s.setEditDate(new Date());
+ updateById(s);
+ }
+ });
+ return locksList;
+ }
+ return new ArrayList<>();
+ }
+
+ @Override
public PageData<Locks> findPage(PageWrap<Locks> pageWrap) {
IPage<Locks> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Locks> queryWrapper = new MPJLambdaWrapper<>();
--
Gitblit v1.9.3