Skip to content

C
chnmuseum-party
Commit 608302c3 authored by liqin's avatar liqin 💬
Browse files
Options

Merge branch 'master' of http://111.203.232.171:8888/lee/chnmuseum-party into master

parents b6f26d80 6552c613
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 38 deletions
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ChinaMobileRestApiController.java
View file @ 608302c3
......@@ -162,7 +162,7 @@ public class ChinaMobileRestApiController extends BaseController {
}
@RequestMapping(value = "/user/webLogin", method = RequestMethod.POST)
public ResponseEntity<JSONObject> login(@RequestParam(value = "username") String username,
public Map<String, Object> login(@RequestParam(value = "username") String username,
@RequestParam(value = "password") String password,
@RequestParam(value = "mac") String mac) {
JSONObject resultMap = new JSONObject(true);
......@@ -179,20 +179,20 @@ public class ChinaMobileRestApiController extends BaseController {
// }
user = userService.selectByUsername(username);
if (user == null) {
resultMap.put("resultCode", "500");
resultMap.put("resultCode", "400");
resultMap.put("message", "用户名或密码不正确！");
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
return resultMap;
}
TBoxOperation operation = boxOperationService.getOne(new UpdateWrapper<TBoxOperation>().eq("organ_id", user.getOrgId()));
if (operation == null || "".equals(operation.getMac())) {
resultMap.put("resultCode", "500");
resultMap.put("message", "用户未激活！");
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
return resultMap;
}
if (!mac.equals(operation.getMac())) {
resultMap.put("resultCode", "500");
resultMap.put("resultCode", "400");
resultMap.put("message", "mac地址不正确！");
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
return resultMap;
}
if (AuditOperationEnum.DISABLE.name().equals(user.getStatus())) {
throw new DisabledAccountException("此帐号已禁用，请联系管理员！");
......@@ -232,19 +232,19 @@ public class ChinaMobileRestApiController extends BaseController {
resultMap.put("resultCode", "200");
resultMap.put("message", "登录成功");
resultMap.put("data", jsonObject);
return ResponseEntity.status(HttpStatus.OK).body(resultMap);
return resultMap;
} catch (Exception e) {
resultMap.put("resultCode", "500");
resultMap.put("message", e.getMessage());
}
}
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
return getFailResult(resultMap.get("message"));
}
@ApiOperation(value = "获取单个成员信息")
@GetMapping(value = "/user/getUserInfo")
@RequiresAuthentication
public ResponseEntity<JSONObject> getById(String userId) {
public Map<String, Object> getById(String userId) {
JSONObject resultMap = new JSONObject(true);
try {
TUser user = userService.getById(userId);
......@@ -254,7 +254,7 @@ public class ChinaMobileRestApiController extends BaseController {
resultMap.put("resultCode", "500");
resultMap.put("message", "用户不存在");
resultMap.put("data", "");
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(null);
return resultMap;
}
JSONObject jsonObject = new JSONObject(true);
......@@ -270,17 +270,17 @@ public class ChinaMobileRestApiController extends BaseController {
resultMap.put("resultCode", "200");
resultMap.put("message", "成功");
resultMap.put("data", jsonObject);
return ResponseEntity.ok(resultMap);
return resultMap;
} catch (Exception e) {
resultMap.put("resultCode", "500");
resultMap.put("message", "获取单个成员信息失败！");
}
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
return getFailResult();
}
@RequestMapping(value = "/user/logout", method = RequestMethod.GET)
@RequiresAuthentication
public ResponseEntity<JSONObject> logout() {
public Map<String, Object> logout() {
String token = request.getHeader("Authorization");
JSONObject resultMap = new JSONObject(true);
try {
......@@ -291,12 +291,12 @@ public class ChinaMobileRestApiController extends BaseController {
resultMap.put("resultCode", "200");
resultMap.put("message", "成功");
resultMap.put("data", "");
return ResponseEntity.status(HttpStatus.OK).body(resultMap);
return resultMap;
} catch (Exception e) {
resultMap.put("resultCode", "500");
resultMap.put("message", "注销错误！");
}
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
return getFailResult("注销错误！");
}
/**
......@@ -305,7 +305,7 @@ public class ChinaMobileRestApiController extends BaseController {
@ApiOperation(value = "插入机顶盒日志表", notes = "插入机顶盒日志表")
@PostMapping(value = "/equitment/runLog")
@RequiresAuthentication
public ResponseEntity<JSONObject> insertRunLog(RunLog runLog) {
public Map<String, Object> insertRunLog(RunLog runLog) {
JSONObject resultMap = new JSONObject();
try {
......@@ -313,13 +313,13 @@ public class ChinaMobileRestApiController extends BaseController {
resultMap.put("resultCode", "200");
resultMap.put("message", "成功");
resultMap.put("data", "");
return ResponseEntity.status(HttpStatus.OK).body(resultMap);
return resultMap;
} catch (Exception e) {
resultMap.put("resultCode", "500");
resultMap.put("message", "失败");
resultMap.put("data", "");
}
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
return getFailResult();
}
/**
......@@ -328,7 +328,7 @@ public class ChinaMobileRestApiController extends BaseController {
@ApiOperation(value = "查询语言列表", notes = "查询语言列表")
@PostMapping(value = "/language/info")
@RequiresAuthentication
public ResponseEntity<JSONObject> languageInfo() {
public Map<String, Object> languageInfo() {
JSONObject resultMap = new JSONObject();
try {
......@@ -336,13 +336,13 @@ public class ChinaMobileRestApiController extends BaseController {
resultMap.put("resultCode", "200");
resultMap.put("message", "成功");
resultMap.put("data", list);
return ResponseEntity.status(HttpStatus.OK).body(resultMap);
return resultMap;
} catch (Exception e) {
resultMap.put("resultCode", "500");
resultMap.put("message", "失败");
resultMap.put("data", "");
}
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
return getFailResult();
}
@ApiImplicitParams(value = {
......
src/main/java/cn/wisenergy/chnmuseum/party/web/controller/LoginController.java
View file @ 608302c3
......@@ -84,10 +84,10 @@ public class LoginController extends BaseController {
* @return
*/
@RequestMapping(value = "ajaxLogin", method = RequestMethod.POST)
public ResponseEntity<Map<String, Object>> ajaxLogin(@RequestParam(value = "username", required = true) String username,
@RequestParam(value = "password", required = true) String password,
public Map<String, Object> ajaxLogin(@RequestParam(value = "username", required = true) String username,
@RequestParam(value = "password", required = true) String password,
// @RequestParam(value = "captcha", required = true) String captcha,
HttpServletRequest request) {
HttpServletRequest request) {
Map<String, Object> resultMap = new LinkedHashMap<>();
// String captchaId = request.getHeader("CaptchaId");
// if (StringUtils.isNotBlank(captcha)) {
......@@ -134,22 +134,22 @@ public class LoginController extends BaseController {
user = userService.selectByUsername(username);
if (user == null) {
resultMap.put("resultCode", "500");
resultMap.put("resultCode", "400");
resultMap.put("message", "用户名不正确！");
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
return resultMap;
}
if (AuditOperationEnum.DISABLE.name().equals(user.getStatus())) {
resultMap.put("resultCode", "500");
resultMap.put("message", "此帐号已禁用，请联系管理员！");
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
return resultMap;
}
if (user.getPermanent() != null && !user.getPermanent()) {
if (user.getEffectiveDate().isAfter(LocalDate.now()) || user.getExiredDate().isBefore(LocalDate.now())) {
resultMap.put("resultCode", "500");
resultMap.put("message", "此帐号已失效，请联系管理员！");
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
return resultMap;
}
}
......@@ -168,16 +168,16 @@ public class LoginController extends BaseController {
// stringRedisTemplate.expire(SHIRO_IS_LOCK + username, 12, TimeUnit.HOURS);
// }
// }
resultMap.put("resultCode", "500");
resultMap.put("resultCode", "400");
resultMap.put("message", "密码不正确！");
// resultMap.put("message", "密码不正确,您还有" + (i - Integer.parseInt(s)) + "次机会！");
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
return resultMap;
}
List<Role> roles = roleService.selectRoleByUserId(user.getId());
List<String> list1 = new ArrayList<>();
//获取当前用户角色拥有菜单
List<Menu> userMenuPerms = new ArrayList<>();
if (roles != null &&roles.size()>0 &&roles.get(0) != null) {
if (roles != null && roles.size() > 0 && roles.get(0) != null) {
roles.forEach(r -> list1.add(r.getId()));
user.setRoleList(list1);
userMenuPerms = this.menuService.getUserMenuPerms(list1);
......@@ -198,17 +198,17 @@ public class LoginController extends BaseController {
resultMap.put("menuList", userMenuPerms);
resultMap.put("resultCode", "200");
resultMap.put("message", "登录成功");
return ResponseEntity.ok(resultMap);
return resultMap;
} catch (Exception e) {
resultMap.put("resultCode", "500");
resultMap.put("message", e.getMessage());
resultMap.put("message", "登录失败");
}
}
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
return getFailResult("登录失败");
}
@RequestMapping(value = "logout", method = RequestMethod.GET)
public ResponseEntity<JSONObject> logout() {
public Map<String, Object> logout() {
String token = request.getHeader("Authorization");
try {
if (StringUtils.isNotBlank(token)) {
......@@ -219,11 +219,11 @@ public class LoginController extends BaseController {
resultMap.put("resultCode", "200");
resultMap.put("message", "成功");
resultMap.put("data", "");
return ResponseEntity.ok(resultMap);
return resultMap;
} catch (Exception e) {
LOGGER.error("注销错误！", e);
LOGGER.error("注销错误", e);
}
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
return getFailResult("注销错误");
}
@RequestMapping(value = {"/verifyCode"}, method = {RequestMethod.GET})
......
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