|
@@ -13,11 +13,14 @@ import com.charging.chargingparking.dto.MessageResult;
|
|
|
import com.charging.chargingparking.entity.ParkingInfo;
|
|
|
import com.charging.chargingparking.entity.ParkingMember;
|
|
|
import com.charging.chargingparking.entity.ParkingMemberLog;
|
|
|
+import com.charging.chargingparking.modules.mobileservice.ParkingSiteService;
|
|
|
import com.charging.chargingparking.modules.vo.Discount;
|
|
|
import com.charging.chargingparking.service.EcCouponService;
|
|
|
import com.charging.chargingparking.service.ParkingInfoService;
|
|
|
import com.charging.chargingparking.service.ParkingMemberLogService;
|
|
|
import com.charging.chargingparking.service.ParkingMemberService;
|
|
|
+import com.charging.chargingparking.sys.entity.User;
|
|
|
+import com.charging.chargingparking.sys.service.UserService;
|
|
|
import com.charging.chargingparking.utils.RespThirdVO;
|
|
|
import com.charging.chargingparking.utils.RespVO;
|
|
|
import com.charging.chargingparking.utils.RespVOBuilder;
|
|
@@ -31,6 +34,7 @@ import org.springframework.validation.BindingResult;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.validation.Valid;
|
|
|
+import javax.validation.constraints.NotBlank;
|
|
|
import javax.validation.constraints.NotNull;
|
|
|
import javax.validation.constraints.Pattern;
|
|
|
import java.util.*;
|
|
@@ -51,8 +55,37 @@ public class ParkingMemberController {
|
|
|
|
|
|
@Autowired
|
|
|
private ParkingMemberLogService parkingMemberLogService;
|
|
|
+ @Autowired
|
|
|
+ private ParkingSiteService parkingSiteService;
|
|
|
+ @Autowired
|
|
|
+ private UserService userService;
|
|
|
+ /**
|
|
|
+ *
|
|
|
+ */
|
|
|
+ @RequestMapping("getParkingSiteStatus")
|
|
|
+ public RespVO getParkingSiteStatus(String userName) {
|
|
|
+ User user= userService.findByUserName(userName);
|
|
|
+ if(user!=null){
|
|
|
+ List<Map<String, Object>> listMapAll = new ArrayList<>();
|
|
|
+ List<Map<String, Object>> listMap =parkingSiteService.loadMyParkingSites(user.getId());
|
|
|
+ for(Map<String, Object> map:listMap){
|
|
|
+ Map<String, Object> mapSig= new HashMap<>();
|
|
|
+ mapSig.put("parking_name",map.get("parking_name").toString());
|
|
|
+
|
|
|
+ String parkingId= map.get("park_id").toString();
|
|
|
+ List<Map<String, Object>> devs=parkingSiteService.loadParkSitDevs(parkingId);
|
|
|
+ mapSig.put("list",devs);
|
|
|
+ System.out.println(parkingId);
|
|
|
+ listMapAll.add(mapSig);
|
|
|
+ }
|
|
|
+ return RespVOBuilder.ok(listMapAll);
|
|
|
+ }else{
|
|
|
+ return RespVOBuilder.error("用户不存在");
|
|
|
+ }
|
|
|
|
|
|
|
|
|
+ }
|
|
|
+
|
|
|
@PostMapping("createDiscount")
|
|
|
public RespThirdVO createDiscount
|
|
|
(@RequestHeader(name = "Appid", defaultValue = "") String Appid,//停车场ID
|