From dcaf10d235a41b60e7ec54b4ce0d894f44a2d05a Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Fri, 11 Mar 2022 08:51:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=82=E5=B8=B8=E8=BF=94?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/ptos_tall/bean/dto/UserDto.java | 2 +- .../ccsens/ptos_tall/service/UserService.java | 2 +- .../ccsens/ptos_tall/util/PtOsCodeError.java | 2 +- .../main/java/com/ccsens/util/CodeEnum.java | 2 +- .../java/com/ccsens/util/ExportPoiUtil.java | 24 ------------------- .../main/java/com/ccsens/util/PoiUtil.java | 4 ++-- 6 files changed, 6 insertions(+), 30 deletions(-) delete mode 100644 util/src/main/java/com/ccsens/util/ExportPoiUtil.java diff --git a/ptos_tall/src/main/java/com/ccsens/ptos_tall/bean/dto/UserDto.java b/ptos_tall/src/main/java/com/ccsens/ptos_tall/bean/dto/UserDto.java index 88de3f0..2b35822 100644 --- a/ptos_tall/src/main/java/com/ccsens/ptos_tall/bean/dto/UserDto.java +++ b/ptos_tall/src/main/java/com/ccsens/ptos_tall/bean/dto/UserDto.java @@ -21,7 +21,7 @@ public class UserDto { @ApiModelProperty("登录客户端：0-H5,1-APP") @NotNull(message = "客户端类型异常") private Integer client; - @ApiModelProperty("登录类型：0-wxmp(小程序),1-phone(手机),2-email(邮箱),3-accounts(账号),4-OAUTH2_Wx（微信）,5-Wx_H5（网页微信）,6-OAUTH2_WeiBo, 7-Wx_Enterprise（企业微信）") + @ApiModelProperty("登录类型：0-wxmp(小程序),1-phone(手机),2-email(邮箱),3-accounts(账号),4-OAUTH2_Wx（微信）,5-Wx_H5（网页微信）,6-OAUTH2_WeiBo, 7-Wx_Enterprise（企业微信）,8-公众号登录（关注公众号）") @NotNull(message = "登录类型异常") private Integer type; @ApiModelProperty("登录信息") diff --git a/ptos_tall/src/main/java/com/ccsens/ptos_tall/service/UserService.java b/ptos_tall/src/main/java/com/ccsens/ptos_tall/service/UserService.java index 2afbce0..c128d18 100644 --- a/ptos_tall/src/main/java/com/ccsens/ptos_tall/service/UserService.java +++ b/ptos_tall/src/main/java/com/ccsens/ptos_tall/service/UserService.java @@ -216,7 +216,7 @@ public class UserService implements IUserService { private UserVo.UserSign phoneLogin(String phone, String smsVerifyCode, String deviceId) { UserVo.UserSign userSignVo; if (!isSmsCodeCorrect(phone, smsVerifyCode)) { - throw new BaseException(CodeEnum.SMS_CODE_CORRECT); + throw new BaseException(PtOsCodeError.SMS_CODE_CORRECT); } //1.查找对应账户,不存在则注册 SysAuth theAuth = sysAuthDao.getByPhone(phone); diff --git a/ptos_tall/src/main/java/com/ccsens/ptos_tall/util/PtOsCodeError.java b/ptos_tall/src/main/java/com/ccsens/ptos_tall/util/PtOsCodeError.java index 09d3bd8..54bbc6c 100644 --- a/ptos_tall/src/main/java/com/ccsens/ptos_tall/util/PtOsCodeError.java +++ b/ptos_tall/src/main/java/com/ccsens/ptos_tall/util/PtOsCodeError.java @@ -6,7 +6,7 @@ import com.ccsens.util.CodeError; * @author 逗 */ public class PtOsCodeError extends CodeError { - + public static final Code SMS_CODE_CORRECT = new Code(46,"请输入正确验证码",true); public static final Code ILLEGAL_LOG_IN = new Code(400,"非法登录",true); public static final Code NOT_REFRESH_TOKEN = new Code(401,"refreshToken过期，请重新登录",true); public static final Code CLIENT_ERROR = new Code(501,"客户端类型异常",true); diff --git a/util/src/main/java/com/ccsens/util/CodeEnum.java b/util/src/main/java/com/ccsens/util/CodeEnum.java index 45653dc..2f8f6f3 100644 --- a/util/src/main/java/com/ccsens/util/CodeEnum.java +++ b/util/src/main/java/com/ccsens/util/CodeEnum.java @@ -60,7 +60,7 @@ public enum CodeEnum { SUB_TASK_IS_NOT_FINISH(43,"分组内任务未全部完成,无法完成任务",true), IS_NOT_CHECKER(44,"您不是该交付物的检查人",true), NOT_POWER(45,"对不起，您的权限不足，无法进行此操作",true), - SMS_CODE_CORRECT(46,"请输入正确验证码",true), + SMS_CODE_CORRECT(46,"请输入正确验证码",false), QUESTION_RULE_NOT_FOUND(47,"该评测规则未知，请联系开发人员。", true), REPORT_DOCTOR_ERROR(48, "对不起，您没有修改报告单结果的权限。", true), diff --git a/util/src/main/java/com/ccsens/util/ExportPoiUtil.java b/util/src/main/java/com/ccsens/util/ExportPoiUtil.java deleted file mode 100644 index 396d879..0000000 --- a/util/src/main/java/com/ccsens/util/ExportPoiUtil.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.ccsens.util; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * @author 逗 - */ -@Slf4j -@Component -public class ExportPoiUtil { - - - - public static void main(String[] args) { - - //生成一个单元格 - //将单元格加到行内 - //将行添加至sheet内 - //将sheet加到表格内 - //生成文件 - } - -} diff --git a/util/src/main/java/com/ccsens/util/PoiUtil.java b/util/src/main/java/com/ccsens/util/PoiUtil.java index fd1ff7b..bffd1d0 100644 --- a/util/src/main/java/com/ccsens/util/PoiUtil.java +++ b/util/src/main/java/com/ccsens/util/PoiUtil.java @@ -165,7 +165,7 @@ public class PoiUtil { if (ObjectUtil.isNotNull(cell.wight)) { sheet.setColumnWidth(j, cell.wight * 256); } - mergedRegion(sheet, i, j, cells.get(j)); + mergedRegion(sheet, i + rowIndex, j, cells.get(j)); } } @@ -608,7 +608,7 @@ public class PoiUtil { tmpFile.getParentFile().mkdirs(); } Workbook workbook = new XSSFWorkbook(); - Workbook wbs = exportWB("Sheet1", list, workbook); + Workbook wbs = exportWB("Sheet1", 10,list, workbook); OutputStream stream = new FileOutputStream(tmpFile); wbs.write(stream); stream.close();