whyclxw
2025-05-16 98680dbc7facfcfcd5ef0c00deb2f172929a34bd
标记包机组是否为班组
5个文件已修改
43 ■■■■■ 已修改文件
src/main/java/com/whyc/controller/BaojiGroupController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/mapper/BattInfMapper.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/BaojigroupService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/BattInfService.java 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/BattInfMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/controller/BaojiGroupController.java
@@ -21,6 +21,12 @@
public class BaojiGroupController {
    @Autowired
    private BaojigroupService service;
    @ApiOperation("标记包机组是否为班组")
    @GetMapping("setBaojiTeam")
    public Response setBaojiTeam(@RequestParam Integer  id, @RequestParam Integer teamFalg) {
        return service.setBaojiTeam(id,teamFalg);
    }
    @ApiOperation("添加包机组")
    @GetMapping("addBaoji")
    public Response addBaoji(@RequestParam String baojiName) {
src/main/java/com/whyc/mapper/BattInfMapper.java
@@ -2,6 +2,7 @@
import com.whyc.dto.BattDto;
import com.whyc.pojo.db_station.BattInf;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -12,4 +13,6 @@
    Integer getMaxBattGroupId();
    //查询电池
    List<BattInf> getBatt(BattDto dto);
    //检测电源下是否存在设备
    Integer getMaxDevNum(@Param("powerId") Integer powerId);
}
src/main/java/com/whyc/service/BaojigroupService.java
@@ -201,4 +201,12 @@
        List<BaojigroupUsr> list=bjUsrmapper.selectList(wrapper);
        return list.size()>0?1:0 ;
    }
    //标记包机组是否为班组
    public Response setBaojiTeam(Integer id, Integer teamFalg) {
        UpdateWrapper wrapper=new UpdateWrapper();
        wrapper.eq("baoji_group_id",id);
        wrapper.set("team_flag",teamFalg);
        int bl=mapper.update(null,wrapper);
        return new Response().set(1,bl>0,"修改包机组班组成功");
    }
}
src/main/java/com/whyc/service/BattInfService.java
@@ -30,9 +30,25 @@
     * 1.在电源下新建设备,记录设备编号,devNum,设备名称为设备类型+devNum
     */
    public Response addDev(BattInf adddinf) {
        QueryWrapper wrapper=new QueryWrapper();
        wrapper.eq("station_id",adddinf.getStationId());
        wrapper.eq("power_id",adddinf.getPowerId());
        //检测电源下是否存在设备
        int devNum=mapper.getMaxDevNum(adddinf.getPowerId());
        if(devNum==0){
            devNum=1;
        }else{
            devNum+=1;
        }
        adddinf.setDevNum(devNum);
        adddinf.setDevName(adddinf.getDevType()+devNum);
        //获取对应的设备id,电池组
        int devId = mapper.getMaxdevId();
        int battGroupId=mapper.getMaxBattGroupId();
        if (devId == 0) {//数据库中没有站点
            devId = 10001;
        } else {
            devId += 1;
        }
        adddinf.setDevId(devId);
        adddinf.setBattgroupId(battGroupId);
        return new Response().set(1, true, "新建电池组(新的设备新的电池组)");
    }
    //设备下添加电源
src/main/resources/mapper/BattInfMapper.xml
@@ -5,6 +5,9 @@
    <select id="getMaxdevId" resultType="java.lang.Integer">
        select ifnull(max(dev_id),0) from  db_station.tb_batt_inf where dev_id>0;
    </select>
    <select id="getMaxDevNum" resultType="java.lang.Integer">
        select ifnull(max(dev_num),0) from  db_station.tb_batt_inf where power_id=#{powerId};
    </select>
    <select id="getMaxBattGroupId" resultType="java.lang.Integer">
        select ifnull(max(battgroup_id),0) from  db_station.tb_batt_inf where battgroup_id>0;
    </select>
@@ -39,4 +42,5 @@
            )
        </if>
    </select>
</mapper>