skyline hai 1 ano
pai
achega
3d330b5511

+ 4 - 9
car-wash-entity/src/main/java/com/kym/entity/miniapp/WashStation.java

@@ -47,14 +47,14 @@ public class WashStation extends BaseEntity {
     private String serviceTel;
 
     /**
-     * 站点类型:1:公共站 2:内部站(不对外开放)
+     * 站点类型:Public:公共站 2:Private:内部站(不对外开放)
      */
-    private Integer stationType;
+    private String stationType;
 
     /**
-     * 站点状态:0:未知 1:建设中 2:关闭下线 3:维护中 4:维护中
+     * 站点状态:Unknown:未知,Normal:正常运营,Offline:关闭下线,Repair:维护中
      */
-    private Integer stationStatus;
+    private String stationStatus;
 
     /**
      * 工位数量
@@ -76,11 +76,6 @@ public class WashStation extends BaseEntity {
      */
     private String siteGuide;
 
-    /**
-     * 建设场所:1:居民区 2:公共机构 3:企事业单位 4:写字楼 5:工业园区 6:交通枢纽 7:大型文体设施 8:城市绿地 9:大型建筑配建停车场 10:路边停车位 11:城际高速服务区 255:其他
-     */
-    private Integer construction;
-
     /**
      * 站点照片
      */

+ 12 - 0
car-wash-entity/src/main/java/com/kym/entity/miniapp/queryParams/StationQueryParams.java

@@ -0,0 +1,12 @@
+package com.kym.entity.miniapp.queryParams;
+
+import com.kym.entity.common.PageParams;
+import lombok.Data;
+
+/**
+ * 站点查询参数
+ */
+@Data
+public class StationQueryParams extends PageParams {
+    private String stationName;
+}

+ 1 - 2
car-wash-mapper/src/main/resources/mappers/miniapp/WashStationMapper.xml

@@ -15,7 +15,6 @@
         <result column="parking_fee" property="parkingFee" />
         <result column="location" property="location" />
         <result column="site_guide" property="siteGuide" />
-        <result column="construction" property="construction" />
         <result column="pictures" property="pictures" />
         <result column="business_hours" property="businessHours" />
         <result column="remark" property="remark" />
@@ -23,7 +22,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        station_id, station_name, address, station_tel, service_tel, station_type, station_status, parking_num, parking_fee, location, site_guide, construction, pictures, business_hours, remark
+        station_id, station_name, address, station_tel, service_tel, station_type, station_status, parking_num, parking_fee, location, site_guide, pictures, business_hours, remark
     </sql>
 
 </mapper>

+ 21 - 0
car-wash-miniapp/src/main/java/com/kym/miniapp/controller/WashStationController.java

@@ -1,5 +1,9 @@
 package com.kym.miniapp.controller;
 
+import com.kym.common.R;
+import com.kym.entity.miniapp.queryParams.StationQueryParams;
+import com.kym.service.miniapp.WashStationService;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -15,4 +19,21 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("/wash-station")
 public class WashStationController {
 
+    private final WashStationService washStationService;
+
+    public WashStationController(WashStationService washStationService) {
+        this.washStationService = washStationService;
+    }
+
+    /**
+     * 获取洗车站点列表
+     *
+     * @param params
+     * @return
+     */
+    @PostMapping("/listStation")
+    public R<?> listStationForApp(StationQueryParams params) {
+        return R.success(washStationService.listStationForApp(params));
+    }
+
 }

+ 4 - 1
car-wash-service/src/main/java/com/kym/service/admin/impl/StationServiceImpl.java

@@ -3,8 +3,8 @@ package com.kym.service.admin.impl;
 import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
 import com.kym.common.annotation.DynamicCache;
 import com.kym.common.enums.EnPlusApi;
 import com.kym.common.exception.BusinessException;
@@ -14,8 +14,11 @@ import com.kym.entity.admin.*;
 import com.kym.entity.admin.queryParams.StationQueryParam;
 import com.kym.entity.admin.vo.LocalStationVo;
 import com.kym.entity.admin.vo.StationVo;
+import com.kym.entity.common.PageBean;
 import com.kym.entity.enplus.EnStationStatsInfo;
 import com.kym.entity.enplus.EnStationStatusInfo;
+import com.kym.entity.miniapp.WashStation;
+import com.kym.entity.miniapp.queryParams.StationQueryParams;
 import com.kym.mapper.admin.StationMapper;
 import com.kym.service.admin.*;
 import com.kym.service.cache.KymCache;

+ 4 - 0
car-wash-service/src/main/java/com/kym/service/miniapp/WashStationService.java

@@ -1,6 +1,8 @@
 package com.kym.service.miniapp;
 
+import com.kym.entity.common.PageBean;
 import com.kym.entity.miniapp.WashStation;
+import com.kym.entity.miniapp.queryParams.StationQueryParams;
 import com.kym.service.mybatisplus.MyBaseService;
 
 /**
@@ -13,4 +15,6 @@ import com.kym.service.mybatisplus.MyBaseService;
  */
 public interface WashStationService extends MyBaseService<WashStation> {
 
+    // ====================================================== 小程序接口 Start ===========================================================
+    PageBean<WashStation> listStationForApp(StationQueryParams params);
 }

+ 25 - 0
car-wash-service/src/main/java/com/kym/service/miniapp/impl/WashStationServiceImpl.java

@@ -1,6 +1,10 @@
 package com.kym.service.miniapp.impl;
 
+import com.github.pagehelper.PageHelper;
+import com.kym.common.utils.CommUtil;
+import com.kym.entity.common.PageBean;
 import com.kym.entity.miniapp.WashStation;
+import com.kym.entity.miniapp.queryParams.StationQueryParams;
 import com.kym.mapper.miniapp.WashStationMapper;
 import com.kym.service.miniapp.WashStationService;
 import com.kym.service.mybatisplus.MyBaseServiceImpl;
@@ -17,4 +21,25 @@ import org.springframework.stereotype.Service;
 @Service
 public class WashStationServiceImpl extends MyBaseServiceImpl<WashStationMapper, WashStation> implements WashStationService {
 
+
+    // ====================================================== 运营平台接口 Start ===========================================================
+
+    // ====================================================== 运营平台接口 Start ===========================================================
+
+
+
+
+
+    // ====================================================== 小程序接口 Start ===========================================================
+    @Override
+    public PageBean<WashStation> listStationForApp(StationQueryParams params) {
+        PageHelper.startPage(params.getPageNum(), params.getPageSize());
+        var res = lambdaQuery()
+                .like(CommUtil.isNotEmptyAndNull(params.getStationName()), WashStation::getStationName, params.getStationName())
+                .list();
+        return new PageBean<>(res);
+
+    }
+    // ====================================================== 小程序接口 End ===========================================================
+
 }