diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBasicInfoController.java index 6a4e50bd3..dbb9a079c 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileBasicInfoController.java @@ -18,6 +18,7 @@ import com.jsowell.pile.dto.ReplaceMerchantStationDTO; import com.jsowell.pile.dto.ThirdPartySnRelationDTO; import com.jsowell.pile.service.IThirdpartySnRelationService; import com.jsowell.pile.service.PileBasicInfoService; +import com.jsowell.pile.service.PileMemberRelationService; import com.jsowell.pile.service.PileMsgRecordService; import com.jsowell.pile.vo.web.PileDetailVO; import com.jsowell.pile.vo.web.ThirdPartySnRelationVO; @@ -57,6 +58,9 @@ public class PileBasicInfoController extends BaseController { @Autowired private IThirdpartySnRelationService thirdpartySnRelationService; + @Autowired + private PileMemberRelationService pileMemberRelationService; + /** * 查询设备管理列表 */ @@ -225,4 +229,16 @@ public class PileBasicInfoController extends BaseController { return response; } + + /** + * 获取该桩绑定的用户(查询个人桩) + * @param dto + * @return + */ + @PostMapping("/getPersonalPileList") + public TableDataInfo getPersonalPileList(@RequestBody ThirdPartySnRelationDTO dto) { + return getDataTable(pileMemberRelationService.selectPileMemberRelationByPileSn(dto.getPileSn())); + } + + } diff --git a/jsowell-ui/src/api/pile/basic.js b/jsowell-ui/src/api/pile/basic.js index 7d0af3d07..137b9e0ff 100644 --- a/jsowell-ui/src/api/pile/basic.js +++ b/jsowell-ui/src/api/pile/basic.js @@ -113,3 +113,12 @@ export function updateThirdPartySnRelation(data) { data: data }) } + +// 查询该桩绑定用户信息(查询个人桩) +export function getPersonalPileList(data) { + return request({ + url: '/pile/basic/getPersonalPileList', + method: 'post', + data: data + }) +} diff --git a/jsowell-ui/src/views/pile/basic/detail.vue b/jsowell-ui/src/views/pile/basic/detail.vue index acd10537a..a2378accf 100644 --- a/jsowell-ui/src/views/pile/basic/detail.vue +++ b/jsowell-ui/src/views/pile/basic/detail.vue @@ -94,8 +94,29 @@ + + + +
+ +
+ 个人桩信息 +
+ +
+ + + {{personalPileInfo.memberId}} + + + {{personalPileInfo.type}} + + +
+
+
@@ -204,6 +225,7 @@