更新文件 WechatScanLoginController.java

src/main/java/com/template/controller/WechatScanLoginController.java

@@ -107,7 +107,7 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
 	@Override
 	public String bindUserMac(String cardNo) throws UnsupportedEncodingException {
 		if (StringUtils.isBlank(cardNo)){
-			return "redirect:"+HttpParame.FRONT_URI+"pc/#/pages/404/404/?message=" + URLEncoder.encode("请输入卡号", "UTF-8");
+			return "redirect:"+HttpParame.FRONT_URI+"/#/login?message=" + URLEncoder.encode("请绑定信息", "UTF-8");
 		}
 		Map<String, String> wechatLoginUrl = wechatScanLoginService.wechatBindUrl(cardNo);
 		String url = wechatLoginUrl.get("url");
@@ -122,37 +122,39 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
 			// 验证state为了用于防止跨站请求伪造攻击
 			String decrypt = AesUtil.decrypt(AesUtil.parseHexStr2Byte(state), AesUtil.PASSWORD_SECRET_KEY, 16);
 			if (!decrypt.equals(Constanst.PWD_MD5 + DateUtils.getYYYYMMdd())) {
-				return "redirect:"+HttpParame.FRONT_URI+"pc/#/pages/404/404/?message=" + URLEncoder.encode("请勿非法进入", "UTF-8");
+				return "redirect:"+HttpParame.FRONT_URI+"/#/login?message=" + URLEncoder.encode("请勿非法进入", "UTF-8");
 			}
 			AccessToken access = wechatScanLoginService.getAccessToken(code);
 			if (access != null) {
 				String openid = access.getOpenid();
-				SmartUser user = wechatScanLoginService.selectByOpenid(openid);
-				// 我只是给个例子
-				if (user!=null) {		/*不存在*/
-					return "redirect:"+HttpParame.FRONT_URI+"pc/#/pages/404/404/?message=" + URLEncoder.encode("请勿重复绑定", "UTF-8");
-				}
+				/*SmartUser user = wechatScanLoginService.selectByOpenid(openid);
+				if (user!=null) {		*//*不存在*//*
+					return "redirect:"+HttpParame.FRONT_URI+"/#/login?message=" + URLEncoder.encode("该卡号已绑定其他用户", "UTF-8");
+				}*/
 				SmartUser userc = wechatScanLoginService.selectByCardNo(cardNo);
 				if (userc==null){
-					return "redirect:"+HttpParame.FRONT_URI+"pc/#/pages/404/404/?message=" + URLEncoder.encode("未查询到用户信息", "UTF-8");
+					return "redirect:"+HttpParame.FRONT_URI+"/#/login?message=" + URLEncoder.encode("卡号信息错误", "UTF-8");
 				}
 				if (userc.getOpenId()!=null){
-					return "redirect:"+HttpParame.FRONT_URI+"pc/#/pages/404/404/?message=" + URLEncoder.encode("请勿重复绑定", "UTF-8");
+					return "redirect:"+HttpParame.FRONT_URI+"/#/login?message=" + URLEncoder.encode("该卡号已绑定其他用户", "UTF-8");
 				}
 				userc.setOpenId(openid);
 				int m = wechatScanLoginService.updateSmartUser(userc);
 				if (m>0){
 					String token = JWTUtil.getToken(userc);
-					return "redirect:"+HttpParame.FRONT_URI+"pc/#/pages/index/?token=" + token;
+					return "redirect:"+HttpParame.FRONT_URI+"/#/wanzai/home?token=" + token;
 				}
 			}
 		}
-		return "redirect:"+HttpParame.FRONT_URI+"pc/#/pages/404/404/?message=" + URLEncoder.encode("绑定失败", "UTF-8");
+		return "redirect:"+HttpParame.FRONT_URI+"/#/login?message=" + URLEncoder.encode("系统异常", "UTF-8");
 	}
 
 	@Override
 	@PassToken
     public String insertMonthMeter(String month){
+		if (month==null){
+			month=TimeExchange2.getMonth();
+		}
 		wechatScanLoginService.insertMonthMeter(month);
 		return "插入完毕";
 	}
@@ -160,6 +162,9 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
 	@Override
 	@PassToken
 	public String insertDayMeter(String day){
+		if (day==null){
+			day=TimeExchange2.getDateStr();
+		}
 		wechatScanLoginService.insertDayMeter(day);
 		return "插入完毕";
 	}
@@ -225,7 +230,7 @@ public class WechatScanLoginController implements WechatScanLoginControllerAPI {
 	}
 
 	/**
-	 * Description: 实时抄表
+	 * Description: 区域能耗统计
 	 */
 	@Override
 	@PassToken