Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging...

puzhibing

2026-01-30 4153aa22cebb597a1f7da3a6a3d3683d4c6194cc

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/tulaidian/controller/ChargingPileInfoController.java

@@ -499,6 +499,7 @@
                chargingPile.setEquipmentPurpose(1);
                chargingPile.setNewNationalStandard(1);
                chargingPile.setVinFlag(1);
                chargingPile.setName(site.getName()+chargingPile.getNumber()+"号桩");
                chargingPileService.save(chargingPile);
                piles.add(chargingPile);
                i++;
@@ -535,7 +536,8 @@
                    gun.setConstantCurrentUpperLimits(new BigDecimal("32"));
                    gun.setConstantCurrentLowerLimits(new BigDecimal("7"));
                    gun.setAuxPower(3);
                    gun.setOpreateStatus(0);
                    gun.setOpreateStatus(50);
                    gun.setChargeMode(2);
//                    gun.setOpreateHours();
                    guns.add(gun);
                    chargingGunService.save(gun);
@@ -561,12 +563,17 @@
        if(itemSize>199){
            result.addAll(pageInfo.getStationInfos());
            int i = itemSize / 199;
//            int k =1;
            for (int j = 2; j < i + 2; j++) {
                s = chargePileHttpUtil.queryStationsInfo(j, 199);
                // 将s字符串转化为json 然后转化为实体类PageInfo
                jsonObject = JSONObject.parseObject(s);
                pageInfo = JSON.parseObject(jsonObject.toJSONString(), PageInfo.class);
                result.addAll(pageInfo.getStationInfos());
//                if (k==10){
//                    break;
//                }
//                k++;
            }
        }else {
            result.addAll(pageInfo.getStationInfos());