diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java index 276fcc7ea..b524805a9 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -444,6 +444,8 @@ public class MemberService { // 不为空说明该用户绑定过此车牌号 throw new BusinessException(ReturnCodeEnum.CODE_THIS_CARNO_HAS_BEEN_BINDING); } + // 校验该车牌号是否为新能源车牌 + relation.setPhoneNumber(dto.getPhoneNumber()); if (StringUtils.isNotBlank(dto.getVinCode())) { // 判断当前vin是否被绑定 diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java index 5e88c03b5..7aaea0d84 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileConnectorInfoController.java @@ -5,10 +5,12 @@ import com.jsowell.common.annotation.Log; import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.core.page.TableDataInfo; import com.jsowell.common.enums.BusinessType; +import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.pile.domain.PileConnectorInfo; import com.jsowell.pile.dto.QueryConnectorDTO; import com.jsowell.pile.dto.QueryConnectorListDTO; +import com.jsowell.pile.dto.UpdateConnectorParkNoDTO; import com.jsowell.pile.service.IPileConnectorInfoService; import com.jsowell.pile.vo.web.PileConnectorInfoVO; import org.springframework.beans.factory.annotation.Autowired; @@ -70,6 +72,26 @@ public class PileConnectorInfoController extends BaseController { return getDataTable(list); } + /** + * 修改车位号 + * @param dto + * @return + */ + @PreAuthorize("@ss.hasPermi('pile:connector:edit')") + @Log(title = "充电桩枪口信息", businessType = BusinessType.UPDATE) + @PostMapping("/updateParkNo") + public RestApiResponse updateParkNo(@RequestBody UpdateConnectorParkNoDTO dto) { + RestApiResponse response = null; + try { + int i = pileConnectorInfoService.updateConnectorParkNo(dto); + response = new RestApiResponse<>(i); + } catch (Exception e) { + logger.error("修改车位号 error,", e); + response = new RestApiResponse<>(e); + } + return response; + } + /** * 获取充电桩枪口信息详细信息 */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/UpdateConnectorParkNoDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/UpdateConnectorParkNoDTO.java new file mode 100644 index 000000000..75f777422 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/UpdateConnectorParkNoDTO.java @@ -0,0 +1,16 @@ +package com.jsowell.pile.dto; + +import lombok.Data; + +/** + * 修改车位号DTO + * + * @author Lemon + * @Date 2023/8/9 11:25 + */ +@Data +public class UpdateConnectorParkNoDTO { + private String connectorId; + private String stationId; + private String parkNo; +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileConnectorInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileConnectorInfoService.java index 2f9cd7762..58b4e09c6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileConnectorInfoService.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IPileConnectorInfoService.java @@ -4,6 +4,7 @@ import com.jsowell.common.core.page.PageResponse; import com.jsowell.pile.domain.PileConnectorInfo; import com.jsowell.pile.dto.QueryConnectorDTO; import com.jsowell.pile.dto.QueryConnectorListDTO; +import com.jsowell.pile.dto.UpdateConnectorParkNoDTO; import com.jsowell.pile.vo.base.ConnectorInfoVO; import com.jsowell.pile.vo.web.PileConnectorInfoVO; @@ -124,4 +125,10 @@ public interface IPileConnectorInfoService { * @return */ Map getPileTypeNum(Long stationId); + + /** + * 修改车位号 + * @param pileConnectorInfo + */ + int updateConnectorParkNo(UpdateConnectorParkNoDTO dto); } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java index 0d3346947..fd9a82e4d 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileConnectorInfoServiceImpl.java @@ -21,6 +21,7 @@ import com.jsowell.pile.domain.PileBasicInfo; import com.jsowell.pile.domain.PileConnectorInfo; import com.jsowell.pile.dto.QueryConnectorDTO; import com.jsowell.pile.dto.QueryConnectorListDTO; +import com.jsowell.pile.dto.UpdateConnectorParkNoDTO; import com.jsowell.pile.mapper.PileBasicInfoMapper; import com.jsowell.pile.mapper.PileConnectorInfoMapper; import com.jsowell.pile.service.*; @@ -706,4 +707,19 @@ public class PileConnectorInfoServiceImpl implements IPileConnectorInfoService { List connectorList = getUniAppConnectorList(stationId); return getPileTypeNum(connectorList); } + + /** + * 修改车位号 + * @param dto + * @return + */ + @Override + public int updateConnectorParkNo(UpdateConnectorParkNoDTO dto) { + // TODO 先查询该车位号在该站点下是否已被使用 + + PileConnectorInfo info = new PileConnectorInfo(); + info.setId(Integer.parseInt(dto.getConnectorId())); + info.setParkNo(dto.getParkNo()); + return pileConnectorInfoMapper.updatePileConnectorInfo(info); + } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileConnectorInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileConnectorInfoVO.java index c7a6bcad2..52a527d73 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileConnectorInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileConnectorInfoVO.java @@ -44,6 +44,11 @@ public class PileConnectorInfoVO { */ private Integer status; + /** + * 车位号 + */ + private String parkNo; + /** * 站点id */ diff --git a/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberAccountMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberAccountMapper.xml index 3cd1e67e4..057cb442d 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberAccountMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/AdapayMemberAccountMapper.xml @@ -124,7 +124,6 @@ from adapay_member_account where del_flag = '0' - and status = '1' and merchant_id = #{merchantId,jdbcType=VARCHAR} diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileConnectorInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileConnectorInfoMapper.xml index dab811679..a9b69f251 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileConnectorInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileConnectorInfoMapper.xml @@ -166,6 +166,7 @@ t1.id as connectorId, t1.pile_connector_code as pileConnectorCode, t1.status as status, + t1.park_no as parkNo, t1.pile_sn as pileSn, t2.station_id as stationId, t2.merchant_id as merchantId, diff --git a/jsowell-ui/src/api/pile/connector.js b/jsowell-ui/src/api/pile/connector.js index f8fa22a59..ad123b546 100644 --- a/jsowell-ui/src/api/pile/connector.js +++ b/jsowell-ui/src/api/pile/connector.js @@ -2,53 +2,61 @@ import request from '@/utils/request' // 查询充电桩枪口信息列表 export function listConnector(query) { - return request({ - url: '/pile/connector/list', - method: 'get', - params: query - }) + return request({ + url: '/pile/connector/list', + method: 'get', + params: query + }) } // 查询充电桩枪口信息详细 export function getConnector(id) { - return request({ - url: '/pile/connector/' + id, - method: 'get' - }) + return request({ + url: '/pile/connector/' + id, + method: 'get' + }) } // 新增充电桩枪口信息 export function addConnector(data) { - return request({ - url: '/pile/connector', - method: 'post', - data: data - }) + return request({ + url: '/pile/connector', + method: 'post', + data: data + }) } // 修改充电桩枪口信息 export function updateConnector(data) { - return request({ - url: '/pile/connector', - method: 'put', - data: data - }) + return request({ + url: '/pile/connector', + method: 'put', + data: data + }) } // 删除充电桩枪口信息 export function delConnector(id) { - return request({ - url: '/pile/connector/' + id, - method: 'delete' - }) + return request({ + url: '/pile/connector/' + id, + method: 'delete' + }) } // 通过入参查询接口列表 export function queryConnectorListByParams(data) { - console.log("通过入参查询接口列表", data); - return request({ - url: '/pile/connector/getConnectorInfoListByParams', - method: 'post', - data: data - }) + console.log("通过入参查询接口列表", data); + return request({ + url: '/pile/connector/getConnectorInfoListByParams', + method: 'post', + data: data + }) +} +// 修改车位号 +export function updateParkNo(data) { + return request({ + url: '/pile/connector/updateParkNo', + method: 'post', + data: data + }) } diff --git a/jsowell-ui/src/views/pile/station/connectorList.vue b/jsowell-ui/src/views/pile/station/connectorList.vue index 994f41321..1e6997a4c 100644 --- a/jsowell-ui/src/views/pile/station/connectorList.vue +++ b/jsowell-ui/src/views/pile/station/connectorList.vue @@ -1,106 +1,153 @@