diff --git a/API-Document.md b/API-Document.md index 09ffb0f..d838f9a 100644 --- a/API-Document.md +++ b/API-Document.md @@ -491,7 +491,7 @@ ### 管理员获取待审批注册用户 -- URL路径：`/user/admin/application/query?offset={offset}&limit={limit}&page={page}` +- URL路径：`/user/admin/application/list?offset={offset}&limit={limit}&page={page}` - 方法：`GET` - 请求参数： @@ -528,20 +528,16 @@ "data" : [ { "id": 64888, - "pid": 2333, - "ctdna": 209, - "cpg": 5, - "hcc": true, - "hcc_infer": true, + "uid": "9a6d777c-997d-a7e5-35f4-8471b7582ac0", + "name": "lensfrex2", + "ip": "127.0.0.1", "time": "2022-07-10 08:00:00" }, { - "id": 648888, - "pid": 23333, - "ctdna": 209, - "cpg": 5, - "hcc": true, - "hcc_infer": true, + "id": 64889, + "uid": "9a6d777c-997d-a7e5-35f4-8471b7582ac1", + "name": "lensfrex2", + "ip": "127.0.0.1", "time": "2022-07-10 08:00:00" }, // ... diff --git a/pom.xml b/pom.xml index c58e22d..cc96e0e 100644 --- a/pom.xml +++ b/pom.xml @@ -32,6 +32,18 @@ org.springframework.boot spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + + org.springframework.boot + spring-boot-starter-jetty + compile @@ -63,6 +75,19 @@ gson + + com.fasterxml.jackson.core + jackson-core + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-annotations + + commons-cli commons-cli diff --git a/src/main/java/net/lensfrex/dscape/dao/PatientDataDao.java b/src/main/java/net/lensfrex/dscape/dao/PatientDataDao.java index 1e794c8..8e09942 100644 --- a/src/main/java/net/lensfrex/dscape/dao/PatientDataDao.java +++ b/src/main/java/net/lensfrex/dscape/dao/PatientDataDao.java @@ -1,9 +1,9 @@ /* - * Coded by lensfrex. + * Class created by lensfrex. */ /* - * Coded by lensfrex. + * Class created by lensfrex. */ package net.lensfrex.dscape.dao; diff --git a/src/main/java/net/lensfrex/dscape/dao/mappers/PatientDataMapper.java b/src/main/java/net/lensfrex/dscape/dao/mappers/PatientDataMapper.java index 4573a56..1393111 100644 --- a/src/main/java/net/lensfrex/dscape/dao/mappers/PatientDataMapper.java +++ b/src/main/java/net/lensfrex/dscape/dao/mappers/PatientDataMapper.java @@ -1,5 +1,5 @@ /* - * Coded by lensfrex. + * Class created by lensfrex. */ package net.lensfrex.dscape.dao.mappers; diff --git a/src/main/java/net/lensfrex/dscape/domain/PatientData.java b/src/main/java/net/lensfrex/dscape/domain/PatientData.java index d094b50..04da00b 100644 --- a/src/main/java/net/lensfrex/dscape/domain/PatientData.java +++ b/src/main/java/net/lensfrex/dscape/domain/PatientData.java @@ -1,7 +1,10 @@ package net.lensfrex.dscape.domain; +import com.baomidou.mybatisplus.annotation.TableName; + import java.util.Date; +@TableName("patient_data") public class PatientData { /** diff --git a/src/main/java/net/lensfrex/dscape/domain/response/Response.java b/src/main/java/net/lensfrex/dscape/domain/response/Response.java new file mode 100644 index 0000000..6458ed2 --- /dev/null +++ b/src/main/java/net/lensfrex/dscape/domain/response/Response.java @@ -0,0 +1,48 @@ +/* + * Class created by lensfrex. + */ + +package net.lensfrex.dscape.domain.response; + +//@JsonInclude(JsonInclude.Include.NON_NULL) +public class Response { + private final int code; + private final String message; + private final T data; + + public Response(int code, String message, T data) { + this.code = code; + this.message = message; + this.data = data; + } + + public int getCode() { + return code; + } + + public String getMessage() { + return message; + } + + public T getData() { + return data; + } + + @Override + public String toString() { + final StringBuffer sb = new StringBuffer("Response{"); + sb.append("code=").append(code); + sb.append(", message='").append(message).append('\''); + sb.append(", data=").append(data); + sb.append('}'); + return sb.toString(); + } + + public static Response success(T data) { + return new Response<>(20000, "success", data); + } + + public static Response error(int code, String message) { + return new Response<>(code, message, null); + } +} diff --git a/src/main/java/net/lensfrex/dscape/domain/response/data/admin/CreateUserResponse.java b/src/main/java/net/lensfrex/dscape/domain/response/data/admin/CreateUserResponse.java new file mode 100644 index 0000000..f6ded02 --- /dev/null +++ b/src/main/java/net/lensfrex/dscape/domain/response/data/admin/CreateUserResponse.java @@ -0,0 +1,36 @@ + +/* + * Class created by lensfrex. + */ + +package net.lensfrex.dscape.domain.response.data.admin; + +import javax.annotation.Generated; +import com.google.gson.annotations.Expose; + +@Generated("net.hexar.json2pojo") +@SuppressWarnings("unused") +public class CreateUserResponse { + + @Expose + private long role; + @Expose + private String uid; + + public long getRole() { + return role; + } + + public void setRole(long role) { + this.role = role; + } + + public String getUid() { + return uid; + } + + public void setUid(String uid) { + this.uid = uid; + } + +} diff --git a/src/main/java/net/lensfrex/dscape/domain/response/data/admin/UserRegisterApplicationResponseData.java b/src/main/java/net/lensfrex/dscape/domain/response/data/admin/UserRegisterApplicationResponseData.java new file mode 100644 index 0000000..9877a78 --- /dev/null +++ b/src/main/java/net/lensfrex/dscape/domain/response/data/admin/UserRegisterApplicationResponseData.java @@ -0,0 +1,62 @@ + +package net.lensfrex.dscape.domain.response.data.admin; + +import javax.annotation.Generated; +import com.google.gson.annotations.Expose; + +@Generated("net.hexar.json2pojo") +@SuppressWarnings("unused") +public class UserRegisterApplicationResponseData { + + @Expose + private long id; + @Expose + private String ip; + @Expose + private String name; + @Expose + private String time; + @Expose + private String uid; + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getIp() { + return ip; + } + + public void setIp(String ip) { + this.ip = ip; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + + public String getUid() { + return uid; + } + + public void setUid(String uid) { + this.uid = uid; + } + +} diff --git a/src/main/java/net/lensfrex/dscape/domain/response/data/compute/ComputeHistoryReponseData.java b/src/main/java/net/lensfrex/dscape/domain/response/data/compute/ComputeHistoryReponseData.java new file mode 100644 index 0000000..1caff36 --- /dev/null +++ b/src/main/java/net/lensfrex/dscape/domain/response/data/compute/ComputeHistoryReponseData.java @@ -0,0 +1,87 @@ + +/* + * Class created by lensfrex. + */ + +package net.lensfrex.dscape.domain.response.data.compute; + +import javax.annotation.Generated; +import com.google.gson.annotations.Expose; +import com.google.gson.annotations.SerializedName; + +@Generated("net.hexar.json2pojo") +@SuppressWarnings("unused") +public class ComputeHistoryReponseData { + + @Expose + private long cpg; + @Expose + private long ctdna; + @Expose + private Boolean hcc; + @SerializedName("hcc_infer") + private Boolean hccInfer; + @Expose + private long id; + @Expose + private long pid; + @Expose + private String time; + + public long getCpg() { + return cpg; + } + + public void setCpg(long cpg) { + this.cpg = cpg; + } + + public long getCtdna() { + return ctdna; + } + + public void setCtdna(long ctdna) { + this.ctdna = ctdna; + } + + public Boolean getHcc() { + return hcc; + } + + public void setHcc(Boolean hcc) { + this.hcc = hcc; + } + + public Boolean getHccInfer() { + return hccInfer; + } + + public void setHccInfer(Boolean hccInfer) { + this.hccInfer = hccInfer; + } + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public long getPid() { + return pid; + } + + public void setPid(long pid) { + this.pid = pid; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + +} diff --git a/src/main/java/net/lensfrex/dscape/domain/response/data/compute/ComputeStatusQueryResponse.java b/src/main/java/net/lensfrex/dscape/domain/response/data/compute/ComputeStatusQueryResponse.java new file mode 100644 index 0000000..dba8597 --- /dev/null +++ b/src/main/java/net/lensfrex/dscape/domain/response/data/compute/ComputeStatusQueryResponse.java @@ -0,0 +1,36 @@ + +/* + * Class created by lensfrex. + */ + +package net.lensfrex.dscape.domain.response.data.compute; + +import javax.annotation.Generated; +import com.google.gson.annotations.Expose; + +@Generated("net.hexar.json2pojo") +@SuppressWarnings("unused") +public class ComputeStatusQueryResponse { + + @Expose + private String id; + @Expose + private int status; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public int getStatus() { + return status; + } + + public void setStatus(int status) { + this.status = status; + } + +} diff --git a/src/main/java/net/lensfrex/dscape/domain/response/data/compute/ComputeTaskResponseData.java b/src/main/java/net/lensfrex/dscape/domain/response/data/compute/ComputeTaskResponseData.java new file mode 100644 index 0000000..dd0e2ce --- /dev/null +++ b/src/main/java/net/lensfrex/dscape/domain/response/data/compute/ComputeTaskResponseData.java @@ -0,0 +1,26 @@ + +/* + * Class created by lensfrex. + */ + +package net.lensfrex.dscape.domain.response.data.compute; + +import javax.annotation.Generated; +import com.google.gson.annotations.Expose; + +@Generated("net.hexar.json2pojo") +@SuppressWarnings("unused") +public class ComputeTaskResponseData { + + @Expose + private String id; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + +} diff --git a/src/main/java/net/lensfrex/dscape/domain/response/data/user/LoginResponseData.java b/src/main/java/net/lensfrex/dscape/domain/response/data/user/LoginResponseData.java new file mode 100644 index 0000000..bd48597 --- /dev/null +++ b/src/main/java/net/lensfrex/dscape/domain/response/data/user/LoginResponseData.java @@ -0,0 +1,66 @@ + +/* + * Class created by lensfrex. + */ + +package net.lensfrex.dscape.domain.response.data.user; + +import javax.annotation.Generated; +import com.google.gson.annotations.SerializedName; + +@Generated("net.hexar.json2pojo") +@SuppressWarnings("unused") +public class LoginResponseData { + + @SerializedName("access_token") + private String mAccessToken; + @SerializedName("expired") + private long mExpired; + @SerializedName("refresh_token") + private String mRefreshToken; + @SerializedName("role") + private long mRole; + @SerializedName("uid") + private String mUid; + + public String getAccessToken() { + return mAccessToken; + } + + public void setAccessToken(String accessToken) { + mAccessToken = accessToken; + } + + public long getExpired() { + return mExpired; + } + + public void setExpired(long expired) { + mExpired = expired; + } + + public String getRefreshToken() { + return mRefreshToken; + } + + public void setRefreshToken(String refreshToken) { + mRefreshToken = refreshToken; + } + + public long getRole() { + return mRole; + } + + public void setRole(long role) { + mRole = role; + } + + public String getUid() { + return mUid; + } + + public void setUid(String uid) { + mUid = uid; + } + +} diff --git a/src/main/java/net/lensfrex/dscape/domain/response/data/user/RegisterResponseData.java b/src/main/java/net/lensfrex/dscape/domain/response/data/user/RegisterResponseData.java new file mode 100644 index 0000000..4e69e05 --- /dev/null +++ b/src/main/java/net/lensfrex/dscape/domain/response/data/user/RegisterResponseData.java @@ -0,0 +1,26 @@ + +/* + * Class created by lensfrex. + */ + +package net.lensfrex.dscape.domain.response.data.user; + +import javax.annotation.Generated; +import com.google.gson.annotations.Expose; + +@Generated("net.hexar.json2pojo") +@SuppressWarnings("unused") +public class RegisterResponseData { + + @Expose + private String uid; + + public String getUid() { + return uid; + } + + public void setUid(String uid) { + this.uid = uid; + } + +} diff --git a/src/main/java/net/lensfrex/dscape/web/controllers/Error.java b/src/main/java/net/lensfrex/dscape/web/controllers/Error.java new file mode 100644 index 0000000..e09fe7e --- /dev/null +++ b/src/main/java/net/lensfrex/dscape/web/controllers/Error.java @@ -0,0 +1,19 @@ +/* + * Class created by lensfrex. + */ + +package net.lensfrex.dscape.web.controllers; + +import net.lensfrex.dscape.domain.response.Response; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; + +@ControllerAdvice +public class Error extends AbstractMethodError { + + @ExceptionHandler({ RuntimeException.class }) + public Response error() { + return Response.error(50000, "服务器内部错误...."); + } + +} diff --git a/src/main/java/net/lensfrex/dscape/web/controllers/Index.java b/src/main/java/net/lensfrex/dscape/web/controllers/Index.java index d21d183..27745d5 100644 --- a/src/main/java/net/lensfrex/dscape/web/controllers/Index.java +++ b/src/main/java/net/lensfrex/dscape/web/controllers/Index.java @@ -11,25 +11,8 @@ import javax.annotation.Resource; @RestController public class Index { - - @Resource - private UserBasicMapper userBasicMapper; - - @RequestMapping(value = "/", method = RequestMethod.GET) - public String returnIndexMessage() { - - - System.out.println("------test------"); -// List userBasicList = userBasicMapper.selectList(null); - - UserBasic userBasic = new UserBasic(); - - userBasic.setUserName("lensfrex"); - userBasic.setPassword("passwd"); - userBasic.setUid("uid"); - userBasic.setRole(UserRole.ADMIN); - - System.out.println(userBasicMapper.insert(userBasic)); - return "ヾ(￣▽￣)"; + @RequestMapping("/") + public String index() { + return "Wow~~~~~~~~~~~~~~~~~~~~~~"; } } diff --git a/src/main/java/net/lensfrex/dscape/web/controllers/compute/Compute.java b/src/main/java/net/lensfrex/dscape/web/controllers/compute/Compute.java new file mode 100644 index 0000000..a0724c4 --- /dev/null +++ b/src/main/java/net/lensfrex/dscape/web/controllers/compute/Compute.java @@ -0,0 +1,24 @@ +/* + * Class created by lensfrex. + */ + +package net.lensfrex.dscape.web.controllers.compute; + +import net.lensfrex.dscape.domain.response.Response; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/compute") +public class Compute { + @GetMapping(value = "/status/{tid}", produces = "application/json") + public Response status(@PathVariable String tid, + @RequestHeader String token) { + return Response.error(0, "Not implement"); + } + + @PostMapping(value = "/add", produces = "application/json") + public Response addComputeTask(@RequestBody String body, + @RequestHeader String token) { + return Response.error(0, "Not implement"); + } +} diff --git a/src/main/java/net/lensfrex/dscape/web/controllers/history/History.java b/src/main/java/net/lensfrex/dscape/web/controllers/history/History.java new file mode 100644 index 0000000..57761d5 --- /dev/null +++ b/src/main/java/net/lensfrex/dscape/web/controllers/history/History.java @@ -0,0 +1,26 @@ +/* + * Class created by lensfrex. + */ + +package net.lensfrex.dscape.web.controllers.history; + +import net.lensfrex.dscape.domain.response.Response; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/history") +public class History { + + @GetMapping(value = "/list/{uid}", produces = "application/json") + public Response list(@PathVariable String uid, + @RequestParam int offset, @RequestParam int limit, @RequestParam int page, + @RequestHeader String token) { + return Response.error(0, "Not implement"); + } + + @RequestMapping(value = "/delete/{rid}", method = {RequestMethod.DELETE, RequestMethod.GET}, produces = "application/json") + public Response delete(@PathVariable int rid, + @RequestHeader String token) { + return Response.error(0, "Not implement"); + } +} diff --git a/src/main/java/net/lensfrex/dscape/web/controllers/user/User.java b/src/main/java/net/lensfrex/dscape/web/controllers/user/User.java new file mode 100644 index 0000000..4ccd130 --- /dev/null +++ b/src/main/java/net/lensfrex/dscape/web/controllers/user/User.java @@ -0,0 +1,34 @@ +/* + * Class created by lensfrex. + */ + +package net.lensfrex.dscape.web.controllers.user; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import net.lensfrex.dscape.domain.response.Response; +import net.lensfrex.dscape.domain.response.data.user.LoginResponseData; +import net.lensfrex.dscape.domain.response.data.user.RegisterResponseData; +import org.springframework.web.bind.annotation.*; + +@JsonSerialize(using = ToStringSerializer.class) +@RestController +@RequestMapping("/user") +public class User { + + @PostMapping(value = "/login" , produces = "application/json") + public Response login(@RequestBody String body) { + return Response.error(0, "Not implement"); + } + + @PostMapping(value = "/register", produces = "application/json") + public Response register(@RequestBody String body) { + return Response.error(0, "Not implement"); + } + + @PostMapping(value = "/modifyPassword/{uid}", produces = "application/json") + public Response modifyPassword(@RequestBody String body, @PathVariable String uid, + @RequestHeader String token) { + return Response.error(0, "Not implement"); + } +} diff --git a/src/main/java/net/lensfrex/dscape/web/controllers/user/admin/Admin.java b/src/main/java/net/lensfrex/dscape/web/controllers/user/admin/Admin.java new file mode 100644 index 0000000..abdb048 --- /dev/null +++ b/src/main/java/net/lensfrex/dscape/web/controllers/user/admin/Admin.java @@ -0,0 +1,37 @@ +/* + * Class created by lensfrex. + */ + +package net.lensfrex.dscape.web.controllers.user.admin; + +import net.lensfrex.dscape.domain.response.Response; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequestMapping("/user/admin") +public class Admin { + @PostMapping(value = "/add", produces = "application/json") + public Response addUser(@RequestBody String body, + @RequestHeader String token) { + return Response.error(0, "Not implement"); + } + + @PostMapping(value = "/modifyStatus/{uid}", produces = "application/json") + public Response modifyStatus(@RequestBody String body, @PathVariable String uid, + @RequestHeader String token) { + return Response.error(0, "Not implement"); + } + + @GetMapping(value = "/application/list", produces = "application/json") + public Response listApplication( + @RequestParam String offset, @RequestParam String limit, @RequestParam String page, + @RequestHeader String token) { + return Response.error(0, "Not implement"); + } + + @PostMapping(value = "/application/deal/{uid}", produces = "application/json") + public Response dealApplication(@RequestBody String body, @PathVariable String uid, + @RequestHeader String token) { + return Response.error(0, "Not implement"); + } +} \ No newline at end of file