yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改--》运维-桩管理：搜索和操作

Browse Source
This commit is contained in:
yuyang 2022-03-28 11:20:11 +08:00
parent f254e65d99
commit e0b2dcca81
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xhpc-modules/xhpc-workorder/src/main/java/com/xhpc/workorder/controller/WorkStationController.java
View File

@ -38,7 +38,7 @@ public class WorkStationController extends BaseController {
@GetMapping("/getPage") @GetMapping("/getPage")
public TableDataInfo getPage(HttpServletRequest request, String stationName, public TableDataInfo getPage(HttpServletRequest request, String stationName,
String terminalName) { String terminalName,String stationId) {
startPage(); startPage();
LoginUser logUser = logUserUtils.getLogUser(request); LoginUser logUser = logUserUtils.getLogUser(request);
@ -47,7 +47,7 @@ public class WorkStationController extends BaseController {
params.put("stationName", stationName); params.put("stationName", stationName);
params.put("terminalName", terminalName); params.put("terminalName", terminalName);
params.put("tenantId", logUser.getTenantId()); params.put("tenantId", logUser.getTenantId());
params.put("stationId", stationId);
return getDataTable(stationService.getStationDevice(params)); return getDataTable(stationService.getStationDevice(params));
} }
@ -122,7 +122,6 @@ public class WorkStationController extends BaseController {
return R.ok(stationService.getDeviceDetail(deviceId)); return R.ok(stationService.getDeviceDetail(deviceId));
} }
@Log(title = "场站设备-新增设备", businessType = BusinessType.INSERT) @Log(title = "场站设备-新增设备", businessType = BusinessType.INSERT)
@PostMapping("/") @PostMapping("/")
public R insertNewDevice(HttpServletRequest request, @RequestBody XhpcStationDeviceDomain domain) throws Exception { public R insertNewDevice(HttpServletRequest request, @RequestBody XhpcStationDeviceDomain domain) throws Exception {

1
xhpc-modules/xhpc-workorder/src/main/resources/mapper/XhpcStationDeviceMapper.xml
View File

@ -46,6 +46,7 @@
d2.brand_model as 'gunBrandModel', d2.brand_model as 'gunBrandModel',
d2.current_type as 'gunCurrentType', d2.current_type as 'gunCurrentType',
d2.sorted as 'gunSorted', d2.sorted as 'gunSorted',
t.terminal_id as 'terminalId',
t.status as 'status', t.status as 'status',
t.work_status as 'workStatus', t.work_status as 'workStatus',
t.charging_pile_id as 'chargingPileId' t.charging_pile_id as 'chargingPileId'