接口整理

jiangping

2023-10-11 04a319eb80c1556af1aa726b6b89a882b14641e0

接口整理

 server/platform/src/main/java/com/doumee/api/business/BikesController.java

@@ -73,6 +73,12 @@
    public ApiResponse<PageData<Bikes>> findPage (@RequestBody PageWrap<Bikes> pageWrap) {
        return ApiResponse.success(bikesService.findPage(pageWrap));
    }
    @ApiOperation("实时车位信息-分页查询")
    @PostMapping("/pageCurrent")
    @RequiresPermissions("business:bikes:query")
    public ApiResponse<PageData<Bikes>> pageCurrent (@RequestBody PageWrap<Bikes> pageWrap) {
        return ApiResponse.success(bikesService.findJoinPage(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")

 server/platform/src/main/java/com/doumee/api/business/MemberController.java

@@ -83,7 +83,7 @@
        return ApiResponse.success(null);
    }

    @ApiOperation("分页查询")
    @ApiOperation("会员/管理员配置列表_分页查询")
    @PostMapping("/page")
    @RequiresPermissions("business:member:query")
    public ApiResponse<PageData<Member>> findPage (@RequestBody PageWrap<Member> pageWrap) {

 server/platform/src/main/java/com/doumee/api/system/SystemDictDataController.java

@@ -81,16 +81,15 @@
        return ApiResponse.success(systemDictDataService.findPage(pageWrap));
    }

    @ApiOperation("分页查询小程序基础配置")
    @ApiOperation("小程序配置——查詢")
    @PostMapping("/getMiniProgrammeDTO")
//    @RequiresPermissions("system:dict:update")
    public ApiResponse<MiniProgrammeDTO> getMiniProgrammeDTO(){
        return ApiResponse.success(systemDictDataService.getMiniProgrammeDTO());
    }

    @ApiOperation("修改小程序基础配置")
    @ApiOperation("小程序配置——更新")
    @PostMapping("/updateMiniProgrammeDTO")
//    @RequiresPermissions("system:dict:update")
//    @RequiresPermissions("system:dict:updateMiniProgrammeDTO")
    public ApiResponse updateMiniProgrammeDTO(@RequestBody MiniProgrammeDTO miniProgrammeDTO){
        systemDictDataService.updateMiniProgrammeDTO(miniProgrammeDTO);
        return ApiResponse.success(null);

 server/services/src/main/java/com/doumee/dao/business/join/BikesJoinMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,12 @@
package com.doumee.dao.business.join;

import com.doumee.dao.business.model.Bikes;
import com.github.yulichang.base.mapper.MPJJoinMapper;
import org.springframework.stereotype.Repository;

/**
 * @author T14
 */
@Repository
public interface BikesJoinMapper extends MPJJoinMapper<Bikes> {
}

 server/services/src/main/java/com/doumee/dao/business/model/Bikes.java

@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;

import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -57,6 +58,12 @@
    @ApiModelProperty(value = "车辆类型编码（关联base_param)")
    @ExcelColumn(name="车辆类型编码（关联base_param)")
    private String paramId;
    @ApiModelProperty(value = "车辆类型")
    @TableField(exist = false)
    private String paramName;
    @ApiModelProperty(value = "站点名称")
    @TableField(exist = false)
    private String siteName;

    @ApiModelProperty(value = "编号")
    @ExcelColumn(name="编号")
@@ -65,6 +72,9 @@
    @ApiModelProperty(value = "状态 0停车可出借 1出借中 3禁用 ", example = "1")
    @ExcelColumn(name="状态 0停车可出借 1出借中 3禁用 ")
    private Integer status;
    @ApiModelProperty(value = "是否有车 0全部 1无车 2有车 null为全部", example = "1")
    @TableField(exist = false)
    private Integer hasBike;

    @ApiModelProperty(value = "当前站点编码（关联sites)")
    @ExcelColumn(name="当前站点编码（关联sites)")

 server/services/src/main/java/com/doumee/dao/business/model/Sites.java

@@ -75,8 +75,6 @@
    @ExcelColumn(name="版本号")
    private String clientVersion;



    @ApiModelProperty(value = "在架车辆数")
    @TableField(exist = false)
    private Integer bikeCount;

 server/services/src/main/java/com/doumee/dao/business/web/response/MiniProgrammeDTO.java

@@ -21,7 +21,7 @@
    @ApiModelProperty("服务电话")
    private String serverPhone = "";

    @ApiModelProperty("押金金额")
    @ApiModelProperty("押金金额(元）")
    private String rentDeposit = "";

    @ApiModelProperty("营业时间起始")

 server/services/src/main/java/com/doumee/service/business/BikesService.java

@@ -94,4 +94,6 @@
     * @return long
     */
    long count(Bikes bikes);

    PageData<Bikes> findJoinPage(PageWrap<Bikes> pageWrap);
}

 server/services/src/main/java/com/doumee/service/business/impl/BikesServiceImpl.java

@@ -1,15 +1,21 @@
package com.doumee.service.business.impl;

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.dao.business.BikesMapper;
import com.doumee.dao.business.model.Bikes;
import com.doumee.dao.business.join.BikesJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.web.response.BikeLogDTO;
import com.doumee.dao.business.web.response.MemberRidesDTO;
import com.doumee.service.business.BikesService;
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 com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -26,6 +32,8 @@

    @Autowired
    private BikesMapper bikesMapper;
    @Autowired
    private BikesJoinMapper bikesJoinMapper;

    @Override
    public String create(Bikes bikes) {
@@ -85,6 +93,24 @@
    }
  
    @Override
    public PageData<Bikes> findJoinPage(PageWrap<Bikes> pageWrap) {
        IPage<Bikes> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<Bikes> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        queryWrapper.orderByAsc(Bikes::getSiteId,Bikes::getLockId);
        queryWrapper.leftJoin(BaseParam.class,BaseParam::getId,Bikes::getParamId)
                .leftJoin(Sites.class,Sites::getId,Bikes::getSiteId)
                .like(StringUtils.isNotBlank(pageWrap.getModel().getSiteId()),Bikes::getSiteId,pageWrap.getModel().getSiteId())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getSiteName()), Sites::getName,pageWrap.getModel().getSiteName())
                .like(StringUtils.isNotBlank(pageWrap.getModel().getLockId()),Bikes::getLockId,pageWrap.getModel().getLockId())
                .isNull(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.ONE,Bikes::getCode)
                .isNotNull(Constants.formatIntegerNum(pageWrap.getModel().getHasBike()) == Constants.TWO,Bikes::getCode);
        queryWrapper.selectAll(Bikes.class)
                .selectAs(BaseParam::getName,Bikes::getParamName)
                .selectAs(Sites::getName,Bikes::getSiteName) ;
        return  PageData.from(bikesJoinMapper.selectJoinPage(page, Bikes.class, queryWrapper));
    }
    @Override
    public PageData<Bikes> findPage(PageWrap<Bikes> pageWrap) {
        IPage<Bikes> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        QueryWrapper<Bikes> queryWrapper = new QueryWrapper<>();

 server/services/src/main/java/com/doumee/service/system/impl/SystemDictDataServiceImpl.java

@@ -5,6 +5,8 @@
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.dao.business.web.response.MiniProgrammeDTO;
import com.doumee.dao.system.SystemDictMapper;
import com.doumee.dao.system.model.SystemDict;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
@@ -39,6 +41,8 @@

    @Autowired
    private SystemDictDataMapper systemDictDataMapper;
    @Autowired
    private SystemDictMapper systemDictMapper;

    @Override
    public String create(SystemDictData systemDictData) {
@@ -110,7 +114,6 @@
    @Override
    public MiniProgrammeDTO getMiniProgrammeDTO() {
        try {

            String jasonStr = MiniProgrammeDTO.toUnderlineJSONString(new MiniProgrammeDTO());
            JSONObject parse = (JSONObject) JSONObject.parse(jasonStr);
            List<String> collect = parse.entrySet().stream().map(s -> s.getKey().toUpperCase()).collect(Collectors.toList());
@@ -139,7 +142,7 @@
            String jasonStr = MiniProgrammeDTO.toUnderlineJSONString(miniProgrammeDTO);
            JSONObject parse = (JSONObject) JSONObject.parse(jasonStr);
            parse.entrySet().forEach(s->{
                if (StringUtils.isEmpty((String)s.getValue())){
                if (StringUtils.isNotBlank((String)s.getValue())){
                    UpdateWrapper<SystemDictData> wrapper = new UpdateWrapper<>();
                    wrapper.lambda()
                            .eq(SystemDictData::getLabel,s.getKey().toUpperCase())