Просмотр исходного кода

停车场管理手机端,部分接口微调

chenwen 3 лет назад
Родитель
Сommit
04214a110e

+ 3 - 2
src/main/java/com/charging/chargingparking/modules/mobileController/MobileAuthController.java

@@ -64,6 +64,7 @@ public class MobileAuthController {
 		if(us==null||us.size()==0) {
 			return RespVOBuilder.error("非系统内的用户");
 		}
+		
 		String refVerifyCode=verifyCoder.getFromSession(phoneNum);
 		if(refVerifyCode==null) {
 			return RespVOBuilder.error("验证码已失效,请重新获取");
@@ -72,7 +73,7 @@ public class MobileAuthController {
 			return RespVOBuilder.error("验证码输入错误");
 		}
 		//验证通过后,清除验证码缓存
-		verifyCoder.clear(phoneNum);
-		return RespVOBuilder.ok("验证通过");
+		verifyCoder.clear(phoneNum);  //测试时屏蔽,发布时启用
+		return RespVOBuilder.ok(us);
 	}
 }

+ 3 - 3
src/main/java/com/charging/chargingparking/modules/mobileController/ParkingSiteController.java

@@ -207,10 +207,10 @@ public class ParkingSiteController {
 		List<Object> seriesOut=new ArrayList<Object>(hour);
 		String hkey=null;
 		for(int i=0;i<=hour;i++) {
-			hkey=String.format("%2d", i);
+			hkey=String.format("%02d", i);
 			categories.add(String.valueOf(i));
-			seriesIn.add(inMap.containsKey(hkey)?inMap.get(hkey):generateFlow());   //测试时用随机数
-			seriesOut.add(outMap.containsKey(hkey)?outMap.get(hkey):generateFlow());
+			seriesIn.add(inMap.containsKey(hkey)?inMap.get(hkey):0);   //测试时用随机数 generateFlow()
+			seriesOut.add(outMap.containsKey(hkey)?outMap.get(hkey):0);
 		}
 		
 		return MapUtils.build("categories",categories,"seriesIn",seriesIn,"seriesOut",seriesOut);

+ 6 - 1
src/main/java/com/charging/chargingparking/utils/RequestValidateExceptionHandler.java

@@ -14,7 +14,12 @@ import org.springframework.web.HttpRequestMethodNotSupportedException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
-@RestControllerAdvice
+import com.charging.chargingparking.modules.mobileController.MobileAuthController;
+import com.charging.chargingparking.modules.mobileController.ParkingChargeController;
+import com.charging.chargingparking.modules.mobileController.ParkingLogController;
+import com.charging.chargingparking.modules.mobileController.ParkingSiteController;
+
+@RestControllerAdvice(assignableTypes= {MobileAuthController.class,ParkingChargeController.class,ParkingLogController.class,ParkingSiteController.class})
 public class RequestValidateExceptionHandler {
 	
 	private static final Logger logger=LoggerFactory.getLogger(RequestValidateExceptionHandler.class);

+ 2 - 2
src/main/resources/mapper/api/ParkingSiteMapper.xml

@@ -21,13 +21,13 @@
     
     
     <!-- 获取指定停车场车位使用信息.设备在线状态 可传多个停车场id参数,根据放行状态(1:放行,0:未放行)判断是否占用车位 -->
-    <!-- 设备在线状态判断,离线=离线状态或在线但更新时间已滞后30分钟-->
+    <!-- 设备在线状态判断,离线=离线状态或在线但更新时间已滞后30分钟,目前只需要状态判断,不需要时间了or (channel_status='1' and TIMESTAMPDIFF(MINUTE,update_time,sysdate())>30 )-->
     <select id="getCrtSeatInfo" resultType="java.util.HashMap">
     	
 	    	select p.parking_name,prtab.using_seat,p.id park_id,p.total_parking_number total_seat,
 	    	(p.total_parking_number-prtab.using_seat)  idle_seat,
 	    	<![CDATA[
-		    	(select sum((case when channel_status='2' or (channel_status='1' and TIMESTAMPDIFF(MINUTE,update_time,sysdate())>30 ) then 1 else 0 end))  
+		    	(select sum((case when channel_status='2' then 1 else 0 end))  
 		    	from base_parking_channel pc where pc.del_flag=false and pc.park_id=p.id) offline_count
 	    	]]>
 	    	from base_parking_info  p