Commit fe991d43 authored by wzp's avatar wzp

修改bug

parent e0d80fbc
...@@ -172,24 +172,24 @@ public class ChinaMobileRestApiController extends BaseController { ...@@ -172,24 +172,24 @@ public class ChinaMobileRestApiController extends BaseController {
//访问一次,计数一次 //访问一次,计数一次
ValueOperations<String, String> opsForValue = stringRedisTemplate.opsForValue(); ValueOperations<String, String> opsForValue = stringRedisTemplate.opsForValue();
if ("LOCK".equals(opsForValue.get(SHIRO_IS_LOCK + username))) { if ("LOCK".equals(opsForValue.get(SHIRO_IS_LOCK + username))) {
resultMap.put("status", 400); resultMap.put("resultCode", "400");
resultMap.put("message", "由于密码输入错误次数大于5次,12小时内帐号已禁止登录!请您联系相关管理人员,联系电话:13924551212,邮箱:325346534@zh.com。"); resultMap.put("message", "由于密码输入错误次数大于5次,12小时内帐号已禁止登录!请您联系相关管理人员,联系电话:13924551212,邮箱:325346534@zh.com。");
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
} }
user = userService.selectByUsername(username); user = userService.selectByUsername(username);
if (user == null) { if (user == null) {
resultMap.put("status", 500); resultMap.put("resultCode", "500");
resultMap.put("message", "用户名或密码不正确!"); resultMap.put("message", "用户名或密码不正确!");
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
} }
TBoxOperation operation = boxOperationService.getOne(new UpdateWrapper<TBoxOperation>().eq("organ_id", user.getOrgId())); TBoxOperation operation = boxOperationService.getOne(new UpdateWrapper<TBoxOperation>().eq("organ_id", user.getOrgId()));
if (operation == null || "".equals(operation.getMac())) { if (operation == null || "".equals(operation.getMac())) {
resultMap.put("status", 500); resultMap.put("resultCode", "500");
resultMap.put("message", "用户未激活!"); resultMap.put("message", "用户未激活!");
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
} }
if (!mac.equals(operation.getMac())) { if (!mac.equals(operation.getMac())) {
resultMap.put("status", 500); resultMap.put("resultCode", "500");
resultMap.put("message", "mac地址不正确!"); resultMap.put("message", "mac地址不正确!");
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
} }
...@@ -228,12 +228,12 @@ public class ChinaMobileRestApiController extends BaseController { ...@@ -228,12 +228,12 @@ public class ChinaMobileRestApiController extends BaseController {
jsonObject.put("orgCode", user.getOrgId()); jsonObject.put("orgCode", user.getOrgId());
jsonObject.put("orgName", user.getOrgName()); jsonObject.put("orgName", user.getOrgName());
resultMap.put("resultCode", 200); resultMap.put("resultCode", "200");
resultMap.put("message", "登录成功"); resultMap.put("message", "登录成功");
resultMap.put("data", jsonObject); resultMap.put("data", jsonObject);
return ResponseEntity.status(HttpStatus.OK).body(resultMap); return ResponseEntity.status(HttpStatus.OK).body(resultMap);
} catch (Exception e) { } catch (Exception e) {
resultMap.put("resultCode", 500); resultMap.put("resultCode", "500");
resultMap.put("message", e.getMessage()); resultMap.put("message", e.getMessage());
} }
} }
...@@ -249,7 +249,7 @@ public class ChinaMobileRestApiController extends BaseController { ...@@ -249,7 +249,7 @@ public class ChinaMobileRestApiController extends BaseController {
TOrgan organ = organService.getById(user.getOrgId()); TOrgan organ = organService.getById(user.getOrgId());
if (null == user) { if (null == user) {
resultMap.put("resultCode", 500); resultMap.put("resultCode", "500");
resultMap.put("message", "用户不存在"); resultMap.put("message", "用户不存在");
resultMap.put("data", ""); resultMap.put("data", "");
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null); return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null);
...@@ -265,12 +265,12 @@ public class ChinaMobileRestApiController extends BaseController { ...@@ -265,12 +265,12 @@ public class ChinaMobileRestApiController extends BaseController {
jsonObject.put("orgCode", user.getOrgId()); jsonObject.put("orgCode", user.getOrgId());
jsonObject.put("orgName", organ.getName()); jsonObject.put("orgName", organ.getName());
resultMap.put("resultCode", 200); resultMap.put("resultCode", "200");
resultMap.put("message", "成功"); resultMap.put("message", "成功");
resultMap.put("data", jsonObject); resultMap.put("data", jsonObject);
return ResponseEntity.ok(resultMap); return ResponseEntity.ok(resultMap);
} catch (Exception e) { } catch (Exception e) {
resultMap.put("resultCode", 500); resultMap.put("resultCode", "500");
resultMap.put("message", "获取单个成员信息失败!"); resultMap.put("message", "获取单个成员信息失败!");
} }
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
...@@ -285,12 +285,12 @@ public class ChinaMobileRestApiController extends BaseController { ...@@ -285,12 +285,12 @@ public class ChinaMobileRestApiController extends BaseController {
// SecurityUtils.getSubject().logout(); // SecurityUtils.getSubject().logout();
this.stringRedisTemplate.delete(SHIRO_JWT_TOKEN + token); this.stringRedisTemplate.delete(SHIRO_JWT_TOKEN + token);
} }
resultMap.put("resultCode", 200); resultMap.put("resultCode", "200");
resultMap.put("message", "成功"); resultMap.put("message", "成功");
resultMap.put("data", ""); resultMap.put("data", "");
return ResponseEntity.status(HttpStatus.OK).body(resultMap); return ResponseEntity.status(HttpStatus.OK).body(resultMap);
} catch (Exception e) { } catch (Exception e) {
resultMap.put("resultCode", 500); resultMap.put("resultCode", "500");
resultMap.put("message", "注销错误!"); resultMap.put("message", "注销错误!");
} }
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
...@@ -306,12 +306,12 @@ public class ChinaMobileRestApiController extends BaseController { ...@@ -306,12 +306,12 @@ public class ChinaMobileRestApiController extends BaseController {
try { try {
boolean b = runLogService.insertRunLog(runLog); boolean b = runLogService.insertRunLog(runLog);
resultMap.put("resultCode", 200); resultMap.put("resultCode", "200");
resultMap.put("message", "成功"); resultMap.put("message", "成功");
resultMap.put("data", ""); resultMap.put("data", "");
return ResponseEntity.status(HttpStatus.OK).body(resultMap); return ResponseEntity.status(HttpStatus.OK).body(resultMap);
} catch (Exception e) { } catch (Exception e) {
resultMap.put("resultCode", 500); resultMap.put("resultCode", "500");
resultMap.put("message", "失败"); resultMap.put("message", "失败");
resultMap.put("data", ""); resultMap.put("data", "");
} }
...@@ -328,12 +328,12 @@ public class ChinaMobileRestApiController extends BaseController { ...@@ -328,12 +328,12 @@ public class ChinaMobileRestApiController extends BaseController {
try { try {
List<Map<String, String>> list = areaService.languageInfo(); List<Map<String, String>> list = areaService.languageInfo();
resultMap.put("resultCode", 200); resultMap.put("resultCode", "200");
resultMap.put("message", "成功"); resultMap.put("message", "成功");
resultMap.put("data", list); resultMap.put("data", list);
return ResponseEntity.status(HttpStatus.OK).body(resultMap); return ResponseEntity.status(HttpStatus.OK).body(resultMap);
} catch (Exception e) { } catch (Exception e) {
resultMap.put("resultCode", 500); resultMap.put("resultCode", "500");
resultMap.put("message", "失败"); resultMap.put("message", "失败");
resultMap.put("data", ""); resultMap.put("data", "");
} }
......
...@@ -101,6 +101,7 @@ public class TBoardStatisticController extends BaseController { ...@@ -101,6 +101,7 @@ public class TBoardStatisticController extends BaseController {
} }
map.put("dateList",dateList); map.put("dateList",dateList);
map.put("cntList",cntList); map.put("cntList",cntList);
map.put("page",page);
return getResult(map); return getResult(map);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment