diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java index 74836ef6..9ac6ffdf 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcChargingPileController.java @@ -100,7 +100,10 @@ public class XhpcChargingPileController extends BaseController { @Log(title = "桩-停用", businessType = BusinessType.UPDATE) @PostMapping(value = "/updateStatus") public AjaxResult updateStatus(@RequestBody XhpcChargingPile xhpcChargingPile) { - return xhpcChargingPileService.updateStatus(xhpcChargingPile.getChargingPileId(), xhpcChargingPile.getStatus()); + if(null==xhpcChargingPile.getPrompt() || xhpcChargingPile.getPrompt().length()>50){ + return AjaxResult.error("桩提示语为空且50字之内"); + } + return xhpcChargingPileService.updateStatus(xhpcChargingPile.getChargingPileId(), xhpcChargingPile.getStatus(),xhpcChargingPile.getPrompt()); } /** diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcTerminalController.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcTerminalController.java index 6dc06bd7..2987e97c 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcTerminalController.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcTerminalController.java @@ -58,7 +58,10 @@ public class XhpcTerminalController extends BaseController { if(null==xhpcTerminal.getStatus()){ return AjaxResult.error("桩数据状态为空"); } - return xhpcTerminalService.updateStatus(xhpcTerminal.getTerminalId(), xhpcTerminal.getStatus()); + if(null==xhpcTerminal.getPrompt() || xhpcTerminal.getPrompt().length()>50){ + return AjaxResult.error("桩提示语为空且50字之内"); + } + return xhpcTerminalService.updateStatus(xhpcTerminal.getTerminalId(), xhpcTerminal.getStatus(),xhpcTerminal.getPrompt()); } /** diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcChargingPileMapper.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcChargingPileMapper.java index d7e64557..b23d6370 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcChargingPileMapper.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/mapper/XhpcChargingPileMapper.java @@ -126,5 +126,5 @@ public interface XhpcChargingPileMapper { * @param chargingPileId * @return */ - int xhpcTerminalSataus(@Param("chargingPileId") Long chargingPileId,@Param("status") Integer status); + int xhpcTerminalSataus(@Param("chargingPileId") Long chargingPileId,@Param("status") Integer status,@Param("prompt")String prompt); } 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 3a0b47b0..9ac7c9d8 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(@Param("name") String name,@Param("serialNumber") String serialNumber,@Param("connectorType") Integer connectorType,@Param("status") Integer status,@Param("terminalId") Long terminalId); + int updateXhpcTerminal(@Param("name") String name,@Param("serialNumber") String serialNumber,@Param("connectorType") Integer connectorType,@Param("status") Integer status,@Param("terminalId") Long terminalId,@Param("prompt")String prompt); /** * 添加终端 diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingPileService.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingPileService.java index 55c3a066..2f5ab0ec 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingPileService.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/IXhpcChargingPileService.java @@ -53,7 +53,7 @@ public interface IXhpcChargingPileService { * * @return */ - AjaxResult updateStatus(Long chargingPileId, Integer status); + AjaxResult updateStatus(Long chargingPileId, Integer status,String prompt); /** 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 f7d6bac7..eb5fbf8c 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,String prompt); /** * 查询 diff --git a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java index 36ad9fb7..57861cce 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java +++ b/xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/service/XhpcChargingPileServiceImpl.java @@ -314,13 +314,13 @@ public class XhpcChargingPileServiceImpl extends BaseService implements IXhpcCha @Override @Transactional - public AjaxResult updateStatus(Long chargingPileId, Integer status) { + public AjaxResult updateStatus(Long chargingPileId, Integer status,String prompt) { if(status ==0 || status ==1){ XhpcChargingPile xhpc = xhpcChargingPileMapper.selectXhpcChargingPileById(chargingPileId); xhpc.setStatus(status); xhpcChargingPileMapper.updaeXhpcChargingPile(xhpc); //修改枪状态 0正常 1停用 - xhpcChargingPileMapper.xhpcTerminalSataus(chargingPileId,status); + xhpcChargingPileMapper.xhpcTerminalSataus(chargingPileId,status,prompt); return AjaxResult.success(); } return AjaxResult.error("修改状态不对请重新编辑"); 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 61610feb..44348bea 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 @@ -66,11 +66,11 @@ public class XhpcTerminalServiceImpl extends BaseService implements IXhpcTermina } @Override - public AjaxResult updateStatus(Long terminalId, Integer status) { + public AjaxResult updateStatus(Long terminalId, Integer status,String prompt) { System.out.println(">>>>>>>>>>terminalId>>>>>>>>>"+terminalId); System.out.println(">>>>>>>>>>status>>>>>>>>>"+status); - xhpcTerminalMapper.updateXhpcTerminal(null,null,null,status,terminalId); + xhpcTerminalMapper.updateXhpcTerminal(null,null,null,status,terminalId,prompt); return AjaxResult.success(); } @@ -84,7 +84,7 @@ public class XhpcTerminalServiceImpl extends BaseService implements IXhpcTermina @Override public AjaxResult updateXhpcTerminalName(Long terminalId, String name, String serialNumber,int connectorType) { - xhpcTerminalMapper.updateXhpcTerminal(name,serialNumber,connectorType,null,terminalId); + xhpcTerminalMapper.updateXhpcTerminal(name,serialNumber,connectorType,null,terminalId,null); return AjaxResult.success(); } diff --git a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingPileMapper.xml b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingPileMapper.xml index 5149d7e0..80050653 100644 --- a/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingPileMapper.xml +++ b/xhpc-modules/xhpc-charging-station/src/main/resources/mapper/XhpcChargingPileMapper.xml @@ -520,7 +520,7 @@ update xhpc_terminal - set status = #{status} + set status = #{status} and prompt=#{prompt} where charging_pile_id = #{chargingPileId} 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 0849007e..7cf418a8 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 @@ -23,7 +23,7 @@ - + @@ -133,6 +133,9 @@ connector_type = #{connectorType}, + + prompt = #{prompt}, + where terminal_id = #{terminalId} diff --git a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingPile.java b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingPile.java index f706d715..ec0d6f9e 100644 --- a/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingPile.java +++ b/xhpc-modules/xhpc-common/src/main/java/com/xhpc/common/domain/XhpcChargingPile.java @@ -123,6 +123,9 @@ public class XhpcChargingPile extends BaseEntity { @Excel(name = "设备类型") private String equipmentTypeName; + //桩停用提示语 + private String prompt; + public String getTypeName() { return typeName; @@ -441,4 +444,11 @@ public class XhpcChargingPile extends BaseEntity { this.chargingStationName = chargingStationName; } + public String getPrompt() { + return prompt; + } + + public void setPrompt(String prompt) { + this.prompt = prompt; + } } 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 1b4fe4e3..dc8cbf03 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 @@ -89,6 +89,9 @@ public class XhpcTerminal extends BaseEntity { @Column(name = "number", nullable = true) private Integer number; + private String prompt; + + public int getConnectorType() { return connectorType; @@ -230,6 +233,14 @@ public class XhpcTerminal extends BaseEntity { this.number = number; } + public String getPrompt() { + return prompt; + } + + public void setPrompt(String prompt) { + this.prompt = prompt; + } + @Override public String toString() { return "XhpcTerminal{" + @@ -247,6 +258,7 @@ public class XhpcTerminal extends BaseEntity { ", operatorIdEvcs='" + operatorIdEvcs + '\'' + ", connectorType=" + connectorType + ", number=" + number + + ", prompt='" + prompt + '\'' + '}'; } }