fg重构项目
parent: d2ac45fa | 补丁 | 提交 | ignore whitespace
whycxzp
2021-11-19 1b3985d76ad9b657c69b0bcdd3757f185ef26f3e 
包机组管理:查询包机组添加的所有电池/电源机房,未添加的所有电池/电源机房
1个文件已删除
2 文件已重命名
1个文件已添加
3个文件已修改
153 ■■■■■ 已修改文件
src/main/java/com/whyc/controller/BaoJiGroupBattGroupController.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/BaoJiGroupBattGroupMapper.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/BaoJiGroupUser.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/BaoJiGroupBattGroupService.java 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/BaoJiGroupService.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/BaojiGroupBattGroupService.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/BaojiGroupBattGroupMapper.xml 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 src/main/java/com/whyc/controller/BaoJiGroupBattGroupController.java


File was renamed from src/main/java/com/whyc/controller/BaojiGroupBattGroupController.java


@@ -3,24 +3,22 @@


import com.whyc.dto.Response;


import com.whyc.pojo.Battinf;


import com.whyc.pojo.UserInf;


import com.whyc.service.BaojiGroupBattGroupService;


import com.whyc.service.BaoJiGroupBattGroupService;


import io.swagger.annotations.Api;


import io.swagger.annotations.ApiOperation;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.web.bind.annotation.PostMapping;


import org.springframework.web.bind.annotation.RequestBody;


import org.springframework.web.bind.annotation.RequestMapping;


import org.springframework.web.bind.annotation.RestController;


import org.springframework.web.bind.annotation.*;




import java.util.List;


import java.util.Map;




@RequestMapping("baojiGroupBattGroup")


@RequestMapping("baoJiGroupBattGroup")


@RestController


@Api(tags = "报表统计")


public class BaojiGroupBattGroupController {


@Api(tags = "包机组-电池组|站点")


public class BaoJiGroupBattGroupController {




    @Autowired


    private BaojiGroupBattGroupService service;


    private BaoJiGroupBattGroupService service;






    /**


@@ -62,5 +60,11 @@


        return service.searchBattGroupIdInGroup(userInf);


    }




    @GetMapping("stationList")


    @ApiOperation(value = "已添加机房和未添加机房")


    public Response<Map<String,List<Battinf>>> getStationList(@RequestParam int baoJiGroupId){


        Map<String,List<Battinf>> resultMap = service.getStationList(baoJiGroupId);


        return new Response<Map<String, List<Battinf>>>().set(1,resultMap);


    }




}




 src/main/java/com/whyc/mapper/BaoJiGroupBattGroupMapper.java


File was renamed from src/main/java/com/whyc/mapper/BaojiGroupBattGroupMapper.java


@@ -6,7 +6,7 @@




import java.util.List;




public interface BaojiGroupBattGroupMapper extends CustomMapper<BaojiGroupBattGroup>{


public interface BaoJiGroupBattGroupMapper extends CustomMapper<BaojiGroupBattGroup>{


    int deleteByPrimaryKey(Long num);




    int insert(BaojiGroupBattGroup record);


@@ -24,4 +24,7 @@


    List<Battinf> searchStationByStationName1(UserInf userInf);




    List<Battinf> searchBattGroupIdInGroup(UserInf userInf);




    List<Battinf> getStationList(int baoJiGroupId);




}




 src/main/java/com/whyc/pojo/BaoJiGroupUser.java


@@ -47,7 +47,7 @@


        return uId;


    }




    public void setUId(Integer uId) {


    public void setuId(Integer uId) {


        this.uId = uId;


    }






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


New file


@@ -0,0 +1,67 @@


package com.whyc.service;




import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.baomidou.mybatisplus.core.toolkit.Wrappers;


import com.whyc.dto.Response;


import com.whyc.mapper.BaoJiGroupBattGroupMapper;


import com.whyc.mapper.BattInfMapper;


import com.whyc.pojo.Battinf;


import com.whyc.pojo.UserInf;


import org.springframework.stereotype.Service;


import org.springframework.transaction.annotation.Transactional;




import javax.annotation.Resource;


import java.sql.Wrapper;


import java.util.LinkedHashMap;


import java.util.List;


import java.util.Map;


import java.util.stream.Collectors;




@Service


@Transactional


public class BaoJiGroupBattGroupService {




    @Resource


    private BaoJiGroupBattGroupMapper mapper;




    @Resource


    private BattInfMapper battInfMapper;




    public Response<List<String>> searchStationName1InGroup(UserInf userInf) {




        List<String> list = mapper.searchStationName1InGroup(userInf);




        return new Response<List<String>>().set(1, list);


    }




    public Response<List<Battinf>> searchStationByStationName1(UserInf userInf) {




        List<Battinf> list = mapper.searchStationByStationName1(userInf);




        return new Response<List<Battinf>>().set(1, list);


    }




    public Response<List<Battinf>> searchBattGroupIdInGroup(UserInf userInf) {




        List<Battinf> list = mapper.searchBattGroupIdInGroup(userInf);




        return new Response<List<Battinf>>().set(1, list);


    }




    public Map<String, List<Battinf>> getStationList(int baoJiGroupId) {


        Map<String,List<Battinf>> resultMap = new LinkedHashMap<>();


        //查询已添加的机房站点列表


        List<Battinf> stationList = mapper.getStationList(baoJiGroupId);


        //查询未添加的机房站点列表


        QueryWrapper<Battinf> wrapper = Wrappers.query();


        //TODO 查找全部需要从电池表和电源表中查找


        wrapper.select("distinct StationId,StationName");


        List<Battinf> allStationList = battInfMapper.selectList(wrapper);


        List<Battinf> notRelatedStationList = allStationList.stream().filter(station -> !stationList.contains(station)).collect(Collectors.toList());




        resultMap.put("stationsAdded",stationList);


        resultMap.put("stationsNotAdded",notRelatedStationList);




        return resultMap;


    }


}




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


@@ -4,7 +4,7 @@


import com.baomidou.mybatisplus.core.toolkit.Wrappers;


import com.whyc.mapper.BaoJiGroupMapper;


import com.whyc.mapper.BaoJiGroupUserMapper;


import com.whyc.mapper.BaojiGroupBattGroupMapper;


import com.whyc.mapper.BaoJiGroupBattGroupMapper;


import com.whyc.mapper.CommonMapper;


import com.whyc.pojo.BaoJiGroup;


import com.whyc.pojo.BaoJiGroupUser;


@@ -24,7 +24,7 @@


    private BaoJiGroupUserMapper baoJiGroupUserMapper;




    @Resource


    private BaojiGroupBattGroupMapper baojiGroupBattGroupMapper;


    private BaoJiGroupBattGroupMapper BaoJiGroupBattGroupMapper;




    @Resource


    private CommonMapper commonMapper;


@@ -50,7 +50,7 @@


        //删除关联的站点/电池组


        UpdateWrapper<BaojiGroupBattGroup> battGroupWrapper = Wrappers.update();


        battGroupWrapper.eq("baoji_group_id",baoJiGroupId);


        baojiGroupBattGroupMapper.delete(battGroupWrapper);


        BaoJiGroupBattGroupMapper.delete(battGroupWrapper);


    }




    public List<BaoJiGroup> getBaoJiGroup() {




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


File was deleted




 src/main/resources/mapper/BaojiGroupBattGroupMapper.xml


@@ -1,6 +1,6 @@


<?xml version="1.0" encoding="UTF-8"?>


<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">


<mapper namespace="com.whyc.mapper.BaojiGroupBattGroupMapper">


<mapper namespace="com.whyc.mapper.BaoJiGroupBattGroupMapper">


  <resultMap id="BaseResultMap" type="com.whyc.pojo.BaojiGroupBattGroup">


    <id column="num" jdbcType="BIGINT" property="num" />


    <result column="baoji_group_id" jdbcType="INTEGER" property="baojiGroupId" />


@@ -49,7 +49,16 @@




  </select>




  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">


    <select id="getStationList" resultType="com.whyc.pojo.Battinf">


        select distinct b.StationId,b.StationName


        from


          db_user.tb_user_battgroup_baojigroup_battgroup bb,


          (select distinct StationId,StationName from (select StationId,StationName from db_battinf.tb_battinf) union (select StationId,StationName from db_pwrdev_inf.tb_pwrdev_inf))temp) b


        where bb.StationId = b.StationId


        and bb.baoji_group_id = #{baoJiGroupId}


    </select>




    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">


    delete from tb_user_battgroup_baojigroup_battgroup


    where num = #{num,jdbcType=BIGINT}


  </delete>