Merge remote-tracking branch 'origin/dev/inside_address' into dev/inside_address

src/main/java/com/sqx/modules/address/controller/AdminInsideAddressController.java

@@ -8,6 +8,7 @@ import com.sqx.modules.address.dto.InsideAddressDTO;
 import com.sqx.modules.address.query.InsideAddressQuery;
 import com.sqx.modules.address.service.InsideAddressService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -37,14 +38,15 @@ public class AdminInsideAddressController {
         return Result.success().put("data", pageUtils);
     }
 
-    @PostMapping
+    @PostMapping("add")
     @ApiOperation("新增内部地址")
     public Result add(@Valid InsideAddressDTO insideAddressDTO) {
         insideAddressService.addInsideAddress(insideAddressDTO);
         return Result.success();
     }
 
-    @PutMapping
+
+    @PostMapping("update")
     @ApiOperation("更新内部地址")
     public Result update(@Valid InsideAddressDTO insideAddressDTO) {
         if (ObjectUtil.isNull(insideAddressDTO.getId())) {
@@ -54,7 +56,7 @@ public class AdminInsideAddressController {
         return Result.success();
     }
 
-    @DeleteMapping
+    @PostMapping("delete")
     @ApiOperation("删除内部地址")
     public Result delete(@RequestBody List<Long> ids) {
         insideAddressService.deleteByIds(ids);

src/main/java/com/sqx/modules/address/controller/app/InsideAddressController.java

@@ -1,6 +1,7 @@
 package com.sqx.modules.address.controller.app;
 
 import com.sqx.common.utils.Result;
+import com.sqx.modules.address.entity.InsideAddress;
 import com.sqx.modules.address.service.InsideAddressService;
 import com.sqx.modules.address.vo.InsideAddressShortVO;
 import io.swagger.annotations.Api;
@@ -24,7 +25,7 @@ public class InsideAddressController {
     @ApiOperation("根据站点id查询内部地址列表")
     @GetMapping("list/{stationId}")
     public Result listByStationId(@PathVariable("stationId") Long stationId) {
-        List<InsideAddressShortVO> list = insideAddressService.listByStationId(stationId);
+        List<InsideAddress> list = insideAddressService.listByStationId(stationId);
         return Result.success().put("data", list);
     }
 }

src/main/java/com/sqx/modules/address/service/InsideAddressService.java

@@ -46,7 +46,7 @@ public interface InsideAddressService extends IService<InsideAddress> {
      * @param stationId 站点id
      * @return 内部地址列表(精简信息)
      */
-    List<InsideAddressShortVO> listByStationId(Long stationId);
+    List<InsideAddress> listByStationId(Long stationId);
 
     /**
      * 从内部地址添加地址

src/main/java/com/sqx/modules/address/service/impl/InsideAddressServiceImpl.java

@@ -72,19 +72,20 @@ public class InsideAddressServiceImpl extends ServiceImpl<InsideAddressDao, Insi
     }
 
     @Override
-    public List<InsideAddressShortVO> listByStationId(Long stationId) {
+    public List<InsideAddress> listByStationId(Long stationId) {
         List<InsideAddress> list = baseMapper.selectList(new LambdaQueryWrapper<InsideAddress>()
                 .eq(InsideAddress::getStationId, stationId)
                 .eq(InsideAddress::getStatus, Constant.YES)
                 .orderByAsc(InsideAddress::getSort));
 
-        List<InsideAddressShortVO> vos = list.stream().map(item -> {
-            InsideAddressShortVO vo = new InsideAddressShortVO();
-            BeanUtil.copyProperties(item, vo);
-            return vo;
-        }).collect(Collectors.toList());
+//        精简数据缺少
+//        List<InsideAddressShortVO> vos = list.stream().map(item -> {
+//            InsideAddressShortVO vo = new InsideAddressShortVO();
+//            BeanUtil.copyProperties(item, vo);
+//            return vo;
+//        }).collect(Collectors.toList());
 
-        return vos;
+        return list;
     }
 
     @Override

src/main/java/com/sqx/modules/riderStation/controller/app/RiderStationController.java

@@ -0,0 +1,25 @@
+package com.sqx.modules.riderStation.controller.app;
+
+import com.sqx.common.utils.Result;
+import com.sqx.modules.riderStation.service.RiderStationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@Api(value = "用户端-骑手站点", tags = {"用户端-骑手站点"})
+@RequestMapping(value = "/app/riderStation")
+public class RiderStationController {
+
+    @Autowired
+    private RiderStationService riderStationService;
+
+    @ApiOperation("站点下拉框")
+    @GetMapping(value = "/stationList")
+    public Result stationList(){
+        return riderStationService.stationList();
+    }
+}