diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpController.java index 4efef5174..a6389e8e4 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/JumpController.java @@ -9,6 +9,8 @@ import com.jsowell.common.exception.BusinessException; import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.util.file.AliyunOssUploadUtils; import com.jsowell.common.util.file.FileUtils; +import com.jsowell.pile.service.IPileBasicInfoService; +import com.jsowell.pile.vo.uniapp.GroundLockInfoVO; import com.jsowell.pile.vo.uniapp.PileConnectorVO; import com.jsowell.service.PileService; import org.springframework.beans.factory.annotation.Autowired; @@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; +import java.util.List; @Anonymous @@ -26,6 +29,9 @@ public class JumpController extends BaseController { @Autowired private PileService pileService; + @Autowired + private IPileBasicInfoService pileBasicInfoService; + /** * 查询充电桩详情 * http://localhost:8080/app-xcx-h5/pile/pileDetail/{pileSn} @@ -94,4 +100,24 @@ public class JumpController extends BaseController { } } + /** + * 获取地锁列表信息 + * http://localhost:8080/app-xcx-h5/getGroundLockInfo/{stationId} + * @param stationId + * @return + */ + @GetMapping("/getGroundLockInfo/{stationId}") + public RestApiResponse getGroundLockInfo(@PathVariable("stationId") String stationId) { + logger.info("获取地锁列表信息 params:{}", stationId); + RestApiResponse response = null; + try { + List list = pileBasicInfoService.getGroundLockInfo(stationId); + response = new RestApiResponse<>(list); + } catch (Exception e) { + logger.error("获取地锁列表信息 error, ", e); + response = new RestApiResponse<>(e); + } + logger.info("获取地锁列表信息 result:{}", response); + return response; + } } diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java index 265f66c8b..9512d672a 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/PileController.java @@ -38,9 +38,6 @@ public class PileController extends BaseController { @Autowired private IPileConnectorInfoService pileConnectorInfoService; - @Autowired - private IPileBasicInfoService pileBasicInfoService; - @Autowired private IPileBillingTemplateService pileBillingTemplateService; @@ -152,24 +149,4 @@ public class PileController extends BaseController { return response; } - /** - * 获取地锁列表信息 - * @param stationId - * @return - */ - @GetMapping("/getGroundLockInfo/{stationId}") - public RestApiResponse getGroundLockInfo(@PathVariable("stationId") String stationId) { - logger.info("获取地锁列表信息 params:{}", stationId); - RestApiResponse response = null; - try { - List list = pileBasicInfoService.getGroundLockInfo(stationId); - response = new RestApiResponse<>(list); - } catch (Exception e) { - logger.error("获取地锁列表信息 error, ", e); - response = new RestApiResponse<>(e); - } - logger.info("获取地锁列表信息 result:{}", response); - return response; - } - } diff --git a/jsowell-ui/src/views/pile/station/detail.vue b/jsowell-ui/src/views/pile/station/detail.vue index 2d20141af..8eb1cb5af 100644 --- a/jsowell-ui/src/views/pile/station/detail.vue +++ b/jsowell-ui/src/views/pile/station/detail.vue @@ -1,161 +1,193 @@