Commit 9f3e1d35 authored by 竹天卫's avatar 竹天卫

邦业部署

parent bddcb55e
...@@ -23,10 +23,10 @@ public class SampleManageQuery { ...@@ -23,10 +23,10 @@ public class SampleManageQuery {
@ApiModelProperty("处理提醒时间") @ApiModelProperty("处理提醒时间")
private LocalDate handleDate; private LocalDate handleDate;
@ApiModelProperty("小样位置") @ApiModelProperty("小样位置 扫码获取的文件柜信息")
private String littlePosition; private String littlePosition;
@ApiModelProperty("原样位置") @ApiModelProperty("原样位置 样品的原始位置信息")
private String originalPosition; private String originalPosition;
@ApiModelProperty("备注") @ApiModelProperty("备注")
......
...@@ -89,7 +89,7 @@ public class SampleVo { ...@@ -89,7 +89,7 @@ public class SampleVo {
@ApiModelProperty("原样位置") @ApiModelProperty("原样位置")
private String originalPosition; private String originalPosition;
@ApiModelProperty("(0未领用,1已领用,2已销毁)") @ApiModelProperty("(0未领用,1已领用,2已销毁,3复查)")
private Integer status; private Integer status;
@ApiModelProperty("销毁时间") @ApiModelProperty("销毁时间")
......
...@@ -462,6 +462,7 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i ...@@ -462,6 +462,7 @@ public class StandardServiceImpl extends ServiceImpl<StandardMapper, Standard> i
if(stockNum.compareTo(new BigDecimal(0)) == -1){ if(stockNum.compareTo(new BigDecimal(0)) == -1){
return BaseResponse.errorMsg("库存不足!"); return BaseResponse.errorMsg("库存不足!");
} }
System.out.println("当前登录用户"+userService.getLoginUser());
StandardOut out = new StandardOut(); StandardOut out = new StandardOut();
out.setStandardId(standard.getId()) out.setStandardId(standard.getId())
.setUserId(userService.getLoginUser().getId()) .setUserId(userService.getLoginUser().getId())
......
...@@ -73,8 +73,8 @@ public class UserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impleme ...@@ -73,8 +73,8 @@ public class UserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impleme
public LoginUser getLoginUser() { public LoginUser getLoginUser() {
try { try {
String token = request.getHeader("Authorization"); String token = request.getHeader("Authorization");
// System.out.println("==================Authorization==================="); System.out.println("==================当前登录用户的Authorization===================");
// System.out.println(token); System.out.println(token);
Map map = JwtUtil.parserToken(token); Map map = JwtUtil.parserToken(token);
Object obj = redisUtil.getString(map.get("id").toString()); Object obj = redisUtil.getString(map.get("id").toString());
BusinessExceptionEnum.CACHE_NOT_FOUND.assertNotNull(obj); BusinessExceptionEnum.CACHE_NOT_FOUND.assertNotNull(obj);
......
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