Merge remote-tracking branch 'origin/dev' into dev

bsoft-api/src/main/java/com/bsoft/api/common/Result.java

@@ -68,10 +68,12 @@ public class Result<T> {
         return new Result(errorCode.getCode(), errorCode.getEnMessage(), null);
     }
 
+
     public static enum ErrorCode{
         SUCCESS(1, "成功", "success"),
         INVALID_TOKEN(401, "无效的TOKEN", "invalid token"),
-        ERROR(400, "错误", "error");
+        ERROR(400, "错误", "error"),
+        USERERROR(2,"账号或密码错误","wrong account or password");
         private int code;
         private String cnMessage;
         private String enMessage;

bsoft-api/src/main/java/com/bsoft/api/controller/BlockValuesController.java

@@ -16,6 +16,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.util.List;
+import java.util.Map;
+
 @Api(tags = "板块数值Api")
 @RestController
 public class BlockValuesController {
@@ -30,11 +33,12 @@ public class BlockValuesController {
      * @throws Exception
      */
     @GetMapping("blockValues")
-//    @Token
+    @Token
     @ApiOperation("根据Page查询板块数值")
     public  Object getBlockValuesByPageID(@RequestBody BlockValues blockValues){
 
-        return Result.success(blockValuesService.getBlockValuesByPageID(blockValues.getPageId(),blockValues.getDisease(),
-                blockValues.getDoctor(),blockValues.getDepartment(),blockValues.getTime()));
+        List<Map<String,Object>> list= blockValuesService.getBlockValuesByPageID(blockValues.getPageId(),blockValues.getDisease(),
+                blockValues.getDoctor(),blockValues.getDepartment(),blockValues.getTime());
+        return Result.success(list);
     }
 }
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/controller/LoginController.java

@@ -21,13 +21,13 @@ public class LoginController {
 
     @PostMapping("login")
     @ApiOperation("登录")
-    @ApiImplicitParams({
-        @ApiImplicitParam(value = "登录名", name="loginName", required=true,paramType="query"),
-        @ApiImplicitParam(value = "密码", name="password", required = true,paramType="query")})
     public Result<LoginService.LoginInfo> login(@RequestBody CodeAndPwd codeAndPwd,HttpServletRequest request){
         String ip = HttpUtil.getIP(request);
         LoginService.LoginInfo loginInfo = loginServiceImpl.login(
                 codeAndPwd.getLoginName(),codeAndPwd.getPassword(),ip);
+        if(loginInfo==null){
+            return Result.error(Result.ErrorCode.USERERROR);
+        }
         return Result.success(loginInfo);
     }
 

bsoft-api/src/main/java/com/bsoft/api/controller/UserController.java

@@ -27,6 +27,7 @@ public class UserController {
 
 
     @GetMapping()
+    @ApiIgnore
     public Object user(@CurrentUser@ApiIgnore SysUser user){
         return Result.success(user);
     }

bsoft-api/src/main/java/com/bsoft/api/model/reqmodel/CodeAndPwd.java

@@ -5,9 +5,9 @@ import io.swagger.annotations.ApiModelProperty;
 
 @ApiModel("账号密码")
 public class CodeAndPwd {
-    @ApiModelProperty(name="账号",required = true)
+    @ApiModelProperty(value="账号",required = true)
     String loginName;
-    @ApiModelProperty(name="密码",required = true)
+    @ApiModelProperty(value="密码",required = true)
     String password;
 
     public String getLoginName() {