server/platform/src/main/java/com/doumee/api/business/LocksController.java
@@ -96,4 +96,10 @@ public ApiResponse testMqtt(@RequestBody Locks locks) { return ApiResponse.success(deviceService.openLock(locks)); } @ApiOperation("获取锁止器小程序二维码") @GetMapping("/findLockBase") public ApiResponse<List<Locks>> findLockBase64List(Locks locks){ return ApiResponse.success(locksService.findLockBase64List(locks)); } } server/services/src/main/java/com/doumee/dao/business/model/Sites.java
@@ -93,4 +93,8 @@ @TableField(exist = false) private BigDecimal rate; @ApiModelProperty(value = "图片base64") @TableField(exist = false) private String base64; } server/services/src/main/java/com/doumee/service/business/LocksService.java
@@ -79,6 +79,15 @@ */ List<Locks> findList(Locks locks); /** * 条件查询 * * @param locks 实体对象 * @return List<Locks> */ List<Locks> findLockBase64List(Locks locks); /** * 分页查询 * 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; /** * 锁头信息表Service实现 @@ -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<>(); server/services/src/main/java/com/doumee/service/business/impl/SitesServiceImpl.java
@@ -10,6 +10,7 @@ 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.SitesMapper; import com.doumee.dao.business.model.Locks; @@ -53,6 +54,7 @@ @Autowired private SystemDictDataBiz systemDictDataBiz; @Override public String create(Sites sites) { LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); server/services/src/main/java/com/doumee/service/business/impl/WxBillDetailServiceImpl.java
@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; import java.util.Arrays; import java.util.List; /** @@ -126,9 +127,9 @@ if (pageWrap.getModel().getBillType() != null) { queryWrapper.lambda().eq(WxBillDetail::getBillType, pageWrap.getModel().getBillType()); } if (pageWrap.getModel().getBillStatus() != null) { queryWrapper.lambda().eq(WxBillDetail::getBillStatus, pageWrap.getModel().getBillStatus()); } // if (pageWrap.getModel().getBillStatus() != null) { // queryWrapper.lambda().eq(WxBillDetail::getBillStatus, pageWrap.getModel().getBillStatus()); // } if (pageWrap.getModel().getBankType() != null) { queryWrapper.lambda().eq(WxBillDetail::getBankType, pageWrap.getModel().getBankType()); } @@ -188,6 +189,7 @@ if (pageWrap.getModel().getRateRemark() != null) { queryWrapper.lambda().eq(WxBillDetail::getRateRemark, pageWrap.getModel().getRateRemark()); } queryWrapper.lambda().in(WxBillDetail::getBillStatus, Arrays.asList("SUCCESS","REFUND")); queryWrapper.lambda().ge(pageWrap.getModel().getStartDate() !=null, WxBillDetail::getPid,DateUtil.getShortDateStr(pageWrap.getModel().getStartDate())); queryWrapper.lambda().le(pageWrap.getModel().getEndDate() !=null,WxBillDetail::getPid, DateUtil.getShortDateStr(pageWrap.getModel().getEndDate())); //自行车交易
