diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBasicInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBasicInfoMapper.java index a676cf177..ec8a49e6a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBasicInfoMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/PileBasicInfoMapper.java @@ -156,7 +156,6 @@ public interface PileBasicInfoMapper { /** * 批量修改充电桩运营商 - * @param oldMerchantId */ - void updatePileMerchantBatch(@Param("oldMerchantId") String oldMerchantId, @Param("newMerchantId") String newMerchantId); + void updatePileMerchantBatch(@Param("pileIdList") List pileIdList, @Param("newMerchantId") String newMerchantId); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileBasicInfoService.java index 9d60204de..3fd212556 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileBasicInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileBasicInfoService.java @@ -10,7 +10,6 @@ import com.jsowell.pile.vo.uniapp.PersonalPileInfoVO; import com.jsowell.pile.vo.uniapp.PileConnectorDetailVO; import com.jsowell.pile.vo.web.IndexGeneralSituationVO; import com.jsowell.pile.vo.web.PileDetailVO; -import org.apache.ibatis.annotations.Param; import java.util.List; @@ -168,7 +167,6 @@ public interface IPileBasicInfoService { /** * 批量修改充电桩运营商 - * @param oldMerchantId */ - void updatePileMerchantBatch(String oldMerchantId, String newMerchantId); + void updatePileMerchantBatch(List pileIdList, String newMerchantId); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java index 123e5d6af..f05aef702 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java @@ -40,7 +40,6 @@ import com.jsowell.pile.vo.web.PileModelInfoVO; import com.jsowell.pile.vo.web.SimCardVO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; -import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -662,10 +661,12 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService { /** * 批量修改充电桩运营商 - * @param oldMerchantId */ @Override - public void updatePileMerchantBatch(String oldMerchantId, String newMerchantId) { - pileBasicInfoMapper.updatePileMerchantBatch(oldMerchantId, newMerchantId); + public void updatePileMerchantBatch(List pileIdList, String newMerchantId) { + if (CollectionUtils.isEmpty(pileIdList) || StringUtils.isBlank(newMerchantId)) { + return; + } + pileBasicInfoMapper.updatePileMerchantBatch(pileIdList, newMerchantId); } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java index 3580d5bfc..169d98c53 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java @@ -264,4 +264,9 @@ public class PileMerchantInfoServiceImpl implements IPileMerchantInfoService { } return pileMerchantInfoMapper.queryInfoListByIds(deptIds); } + + public List getLoginUserMerchantIds() { + AuthorizedDeptVO authorizedMap = SecurityUtils.getAuthorizedMap(); + return null; + } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java index e1042a345..3a11fa3df 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java @@ -23,7 +23,6 @@ import com.jsowell.pile.vo.base.MerchantInfoVO; import com.jsowell.pile.vo.base.PileInfoVO; import com.jsowell.pile.vo.base.StationInfoVO; import com.jsowell.pile.vo.uniapp.CurrentTimePriceDetails; -import com.jsowell.pile.vo.web.PileDetailVO; import com.jsowell.pile.vo.web.PileStationVO; import com.jsowell.system.service.SysDeptService; import lombok.extern.slf4j.Slf4j; @@ -268,8 +267,9 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService { // 先查出桩基本信息 List pileInfoList = pileBasicInfoService.getPileListByStationId(String.valueOf(pileStationInfo.getId())); if (CollectionUtils.isNotEmpty(pileInfoList)) { + List pileIdList = pileInfoList.stream().map(PileBasicInfo::getId).collect(Collectors.toList()); // 修改桩基本信息 - pileBasicInfoService.updatePileMerchantBatch(String.valueOf(pileInfoList.get(0).getMerchantId()), String.valueOf(pileStationInfo.getMerchantId())); + pileBasicInfoService.updatePileMerchantBatch(pileIdList, String.valueOf(pileStationInfo.getMerchantId())); } } // 同步组织中的名称,联系人,电话 diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml index 332df82b9..0d0735ce3 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileBasicInfoMapper.xml @@ -403,6 +403,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" set merchant_id = #{newMerchantId,jdbcType=VARCHAR} where - merchant_id = #{oldMerchantId,jdbcType=VARCHAR} + id in + + #{item,jdbcType=BIGINT} + \ No newline at end of file