diff --git a/src/main/java/com/xkrs/controller/FirePointController.java b/src/main/java/com/xkrs/controller/FirePointController.java index e4abf37..ec1bb93 100644 --- a/src/main/java/com/xkrs/controller/FirePointController.java +++ b/src/main/java/com/xkrs/controller/FirePointController.java @@ -1,7 +1,7 @@ package com.xkrs.controller; import com.xkrs.common.encapsulation.PromptMessageEnum; -import com.xkrs.common.tool.TokenUtil; +import com.xkrs.utils.TokenUtil; import com.xkrs.dao.FirePointDao; import com.xkrs.straw.dao.SysUserDao; import com.xkrs.model.entity.FirePointEntity; diff --git a/src/main/java/com/xkrs/controller/SysUserController.java b/src/main/java/com/xkrs/controller/SysUserController.java index 3b18655..4b0f8da 100644 --- a/src/main/java/com/xkrs/controller/SysUserController.java +++ b/src/main/java/com/xkrs/controller/SysUserController.java @@ -2,7 +2,7 @@ package com.xkrs.controller; import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse; import com.xkrs.common.encapsulation.PromptMessageEnum; -import com.xkrs.common.tool.TokenUtil; +import com.xkrs.utils.TokenUtil; import com.xkrs.model.qo.SysUserQo; import com.xkrs.model.qo.SysUserReceiveSmsQo; import com.xkrs.model.qo.SysUserRemarkQo; diff --git a/src/main/java/com/xkrs/model/vo/AppPhotoVo.java b/src/main/java/com/xkrs/model/vo/AppPhotoVo.java deleted file mode 100644 index 3bd4dd2..0000000 --- a/src/main/java/com/xkrs/model/vo/AppPhotoVo.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.xkrs.model.vo; - -import java.io.Serializable; - -/** - * @author xkrs - */ -public class AppPhotoVo implements Serializable { - - private String taskPhoto; - - public AppPhotoVo() { - } - - public AppPhotoVo(String taskPhoto) { - this.taskPhoto = taskPhoto; - } - - public String getTaskPhoto() { - return taskPhoto; - } - - public void setTaskPhoto(String taskPhoto) { - this.taskPhoto = taskPhoto; - } - - @Override - public String toString() { - return "AppPhotoVo{" + - "taskPhoto='" + taskPhoto + '\'' + - '}'; - } -} diff --git a/src/main/java/com/xkrs/model/vo/AppTaskBodyVo.java b/src/main/java/com/xkrs/model/vo/AppTaskBodyVo.java deleted file mode 100644 index bf7eb64..0000000 --- a/src/main/java/com/xkrs/model/vo/AppTaskBodyVo.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.xkrs.model.vo; - -import java.io.Serializable; -import java.util.List; - -/** - * @author xkrs - */ -public class AppTaskBodyVo implements Serializable { - - private String fireCode; - - private String taskInformation; - - private String taskTime; - - private List taskFirePhoto; - - public AppTaskBodyVo() { - } - - public AppTaskBodyVo(String fireCode, String taskInformation, String taskTime, List taskFirePhoto) { - this.fireCode = fireCode; - this.taskInformation = taskInformation; - this.taskTime = taskTime; - this.taskFirePhoto = taskFirePhoto; - } - - public String getFireCode() { - return fireCode; - } - - public void setFireCode(String fireCode) { - this.fireCode = fireCode; - } - - public String getTaskInformation() { - return taskInformation; - } - - public void setTaskInformation(String taskInformation) { - this.taskInformation = taskInformation; - } - - public String getTaskTime() { - return taskTime; - } - - public void setTaskTime(String taskTime) { - this.taskTime = taskTime; - } - - public List getTaskFirePhoto() { - return taskFirePhoto; - } - - public void setTaskFirePhoto(List taskFirePhoto) { - this.taskFirePhoto = taskFirePhoto; - } - - @Override - public String toString() { - return "AppTaskBodyVo{" + - "fireCode='" + fireCode + '\'' + - ", taskInformation='" + taskInformation + '\'' + - ", taskTime='" + taskTime + '\'' + - ", taskFirePhoto=" + taskFirePhoto + - '}'; - } -} diff --git a/src/main/java/com/xkrs/model/vo/FileServerResultVo.java b/src/main/java/com/xkrs/model/vo/FileServerResultVo.java deleted file mode 100644 index 77fb534..0000000 --- a/src/main/java/com/xkrs/model/vo/FileServerResultVo.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.xkrs.model.vo; - -import java.io.Serializable; - -/** - * FileServerResultVo 文件服务器查询结果 - * @author tajochen - */ -public class FileServerResultVo implements Serializable { - - /** - * 状态信息 - */ - String status; - - /** - * 提示信息 - */ - String message; - - /** - * 数据 - */ - T data; - - public FileServerResultVo() { - } - - public FileServerResultVo(String status, String msg, T data) { - this.status = status; - this.message = msg; - this.data = data; - } - - public String getStatus() { - return status; - } - - public void setStatus(String status) { - this.status = status; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public T getData() { - return data; - } - - public void setData(T data) { - this.data = data; - } - - @Override - public String toString() { - return "FileServerResultVo{" + - "status='" + status + '\'' + - ", message='" + message + '\'' + - ", data=" + data + - '}'; - } -} diff --git a/src/main/java/com/xkrs/common/tool/TokenUtil.java b/src/main/java/com/xkrs/utils/TokenUtil.java similarity index 98% rename from src/main/java/com/xkrs/common/tool/TokenUtil.java rename to src/main/java/com/xkrs/utils/TokenUtil.java index 0862cec..b34f023 100644 --- a/src/main/java/com/xkrs/common/tool/TokenUtil.java +++ b/src/main/java/com/xkrs/utils/TokenUtil.java @@ -1,4 +1,4 @@ -package com.xkrs.common.tool; +package com.xkrs.utils; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts;