diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcTerminalMapper.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcTerminalMapper.java index 97129efb..3a0b47b0 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcTerminalMapper.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcTerminalMapper.java @@ -52,7 +52,7 @@ public interface XhpcTerminalMapper { * @param xhpcTerminal 终端 * @return 结果 */ - int updateXhpcTerminal(XhpcTerminal xhpcTerminal); + int updateXhpcTerminal(@Param("name") String name,@Param("serialNumber") String serialNumber,@Param("connectorType") Integer connectorType,@Param("status") Integer status,@Param("terminalId") Long terminalId); /** * 添加终端 diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcTerminalService.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcTerminalService.java index 10613b3a..f7d6bac7 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcTerminalService.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcTerminalService.java @@ -31,7 +31,7 @@ public interface IXhpcTerminalService { * 停用 * @return */ - AjaxResult updateStatus(Long terminalId,Integer Status); + AjaxResult updateStatus(Long terminalId,Integer status); /** * 查询 diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTerminalServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTerminalServiceImpl.java index 05b740d7..3855e72c 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTerminalServiceImpl.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcTerminalServiceImpl.java @@ -61,12 +61,11 @@ public class XhpcTerminalServiceImpl extends BaseService implements IXhpcTermina } @Override - public AjaxResult updateStatus(Long terminalId, Integer Status) { + public AjaxResult updateStatus(Long terminalId, Integer status) { - XhpcTerminal xhpcTerminal = new XhpcTerminal(); - xhpcTerminal.setTerminalId(terminalId); - xhpcTerminal.setStatus(Status); - xhpcTerminalMapper.updateXhpcTerminal(xhpcTerminal); + System.out.println(">>>>>>>>>>terminalId>>>>>>>>>"+terminalId); + System.out.println(">>>>>>>>>>status>>>>>>>>>"+status); + xhpcTerminalMapper.updateXhpcTerminal(null,null,null,status,terminalId); return AjaxResult.success(); } @@ -80,12 +79,8 @@ public class XhpcTerminalServiceImpl extends BaseService implements IXhpcTermina @Override public AjaxResult updateXhpcTerminalName(Long terminalId, String name, String serialNumber,int connectorType) { - XhpcTerminal xhpcTerminal = xhpcTerminalMapper.selectXhpcTerminalById(terminalId); - xhpcTerminal.setName(name); - xhpcTerminal.setSerialNumber(serialNumber); - xhpcTerminal.setConnectorType(connectorType); - xhpcTerminalMapper.updateXhpcTerminal(xhpcTerminal); - return AjaxResult.success(null); + xhpcTerminalMapper.updateXhpcTerminal(name,serialNumber,connectorType,null,terminalId); + return AjaxResult.success(); } @Override diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml index 5bdbb73c..670328c0 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml +++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcTerminalMapper.xml @@ -118,26 +118,22 @@ where terminal_id = #{terminalId} - + update xhpc_terminal - - charging_pile_id = #{chargingPileId}, - charging_station_id = #{chargingStationId}, - name = #{name}, - serial_number = #{serialNumber}, - pile_serial_number = #{pileSerialNumber}, - gun_status = #{gunStatus}, - work_status = #{workStatus}, - status = #{status}, - del_flag = #{delFlag}, - create_time = #{createTime}, - create_by = #{createBy}, - update_time = #{updateTime}, - update_by = #{updateBy}, - remark = #{remark}, - operator_id_evcs = #{operatorIdEvcs} - connector_type = #{connectorType} - + + + name = #{name}, + + + serial_number = #{serialNumber}, + + + status = #{status}, + + + connector_type = #{connectorType}, + + where terminal_id = #{terminalId} diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTerminal.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTerminal.java index 375eaf79..b7f871a9 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTerminal.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcTerminal.java @@ -10,73 +10,67 @@ import javax.persistence.*; * @author yuyang * @date 2021-07-20 */ -@Table(name = "xhpc_terminal") @Entity +@Table(name = "xhpc_terminal") public class XhpcTerminal extends BaseEntity { private static final long serialVersionUID = 1L; - /** - * 终端id - */ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "terminal_id", nullable = false) private Long terminalId; /** 电桩id */ - @Column(name = "charging_pile_id") + private Long chargingPileId; /** 电站id */ - @Column(name = "charging_station_id") + private Long chargingStationId; /** 名称 */ - @Column(name = "name") + private String name; /** 编号 */ - @Column(name = "serial_number") + private String serialNumber; /** 电桩编号 */ - @Column(name = "pile_serial_number") + private String pileSerialNumber; /** 插枪状态 */ - @Column(name = "gun_status", nullable = true) + private Integer gunStatus; /** 工作状态(0离线 1故障 2空闲 3充电) */ - @Column(name = "work_status", nullable = true) + private Integer workStatus; /** 状态(0正常 1停用) */ - @Column(name = "status", nullable = true) + private Integer status; /** 删除标志(0代表存在 2代表删除) */ - @Column(name = "del_flag", nullable = true) + private Integer delFlag; /** 费率模型id */ - @Column(name = "rate_model_id") + private Long rateModelId; - @Column(name = "operator_id_evcs", nullable = true) + private String operatorIdEvcs; /** * 充电设备类型 */ - @Column(name = "connector_type", nullable = true) + private Integer connectorType; /** * 电桩统计数量 */ - @Column(name = "number", nullable = true) + private Integer number; public int getConnectorType() { @@ -103,12 +97,10 @@ public class XhpcTerminal extends BaseEntity { } public Long getTerminalId() { - return terminalId; } public void setTerminalId(Long terminalId) { - this.terminalId = terminalId; } @@ -222,4 +214,23 @@ public class XhpcTerminal extends BaseEntity { this.number = number; } + @Override + public String toString() { + return "XhpcTerminal{" + + "terminalId=" + terminalId + + ", chargingPileId=" + chargingPileId + + ", chargingStationId=" + chargingStationId + + ", name='" + name + '\'' + + ", serialNumber='" + serialNumber + '\'' + + ", pileSerialNumber='" + pileSerialNumber + '\'' + + ", gunStatus=" + gunStatus + + ", workStatus=" + workStatus + + ", status=" + status + + ", delFlag=" + delFlag + + ", rateModelId=" + rateModelId + + ", operatorIdEvcs='" + operatorIdEvcs + '\'' + + ", connectorType=" + connectorType + + ", number=" + number + + '}'; + } }