更新

whyczh

2022-04-26 d0b151e77c735167bfc1b29a3d34f8019d0a9885

更新

 src/main/java/com/whyc/controller/A059StationInfController.java

@@ -1,16 +1,19 @@
package com.whyc.controller;

import com.whyc.dto.A059StationInfDTO;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.whyc.dto.Response;
import com.whyc.mapper.BattInfMapper;
import com.whyc.pojo.Battinf;
import com.whyc.pojo.UserInf;
import com.whyc.service.A059StationInfService;
import com.whyc.service.BattInfService;
import com.whyc.util.ActionUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;

@RestController
@Api(tags = "配置信息-A059")
@@ -18,11 +21,29 @@
public class A059StationInfController {
    @Resource
    private A059StationInfService service;
    @Resource
    private BattInfService battInfService;
    @Resource
    private BattInfMapper battInfMapper;

    @GetMapping("/getAll")
    @ApiOperation("获取A059配置信息")
    public Response<A059StationInfDTO> getA059StationInfList(@RequestParam int pageNum, @RequestParam int pageSize){
        return service.getA059StationInfListAndBattInf(pageNum,pageSize);
    public Response getA059StationInfList(@RequestParam int pageNum, @RequestParam int pageSize,@RequestParam String province,@RequestParam String city,@RequestParam String county){
        return service.getA059StationInfListAndBattInf(pageNum,pageSize,province,city,county);
    }

    @PostMapping("/importBatt")
    @ApiOperation("新增电池组并更新原先对应设备编号为0")
    public Response addBattAndUpdateDevNum(@RequestBody Battinf battinf){
        UserInf userInf = (UserInf) ActionUtil.getUser();
        QueryWrapper<Battinf> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("dev_num",battinf.getDevNum());
        List<Battinf> list = battInfMapper.selectList(queryWrapper);
        for (Battinf batt:list) {
            batt.setDevNum(0+"");
            battInfMapper.updateById(batt);
        }
        return battInfService.add(battinf,userInf.getUId().intValue());
    }

}

 src/main/java/com/whyc/service/A059StationInfService.java

@@ -24,10 +24,13 @@
    private BattInfMapper battInfMapper;


    public Response getA059StationInfListAndBattInf(int pageNum,int pageSize){
    public Response getA059StationInfListAndBattInf(int pageNum,int pageSize,String province,String city,String county){
        PageHelper.startPage(pageNum,pageSize);
        List<A059StationInfDTO> list = new ArrayList<>();
        QueryWrapper<A059StationInf> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("station_province",province);
        queryWrapper.eq("station_city",city);
        queryWrapper.eq("station_county",county);
        queryWrapper.orderByDesc("last_update_time");
        List<A059StationInf> stationInfs = mapper.selectList(null);
        QueryWrapper<Battinf> battinfQueryWrapper = new QueryWrapper<>();