Commit 6db08f06 by 梁辉

去掉了部门和用户的签章信息(已经有签章管理了,后面再自行CRUD)

parent 944ce84a
......@@ -72,11 +72,11 @@ public class Dept extends BaseEntity implements Serializable {
@ApiModelProperty(value = "关联的环保系统密码")
private String epPassword;
@ApiModelProperty(value = "检测站秘钥盘符")
/*@ApiModelProperty(value = "检测站秘钥盘符")
private String secretKey;
@ApiModelProperty(value = "检验章名称")
private String snName;
private String snName;*/
@Override
public boolean equals(Object o) {
......
......@@ -107,7 +107,7 @@ public class User extends BaseEntity implements Serializable {
@ApiModelProperty(value = "站点ID", hidden = true)
private Integer siteId;
@Column(name = "sn_key")
/*@Column(name = "sn_key")
@ApiModelProperty("签章服务key")
private String snKey;
......@@ -117,7 +117,7 @@ public class User extends BaseEntity implements Serializable {
@Column(name = "sn_signature")
@ApiModelProperty("签章服务签名")
private String snSignature;
private String snSignature;*/
@Transient
@ApiModelProperty(value = "站点名称",hidden = false)
......
......@@ -42,10 +42,10 @@ public class DeptVo {
@ApiModelProperty(value = "关联的环保系统密码")
private String epPassword;
@ApiModelProperty(value = "检测站秘钥盘符")
/*@ApiModelProperty(value = "检测站秘钥盘符")
private String secretKey;
@ApiModelProperty(value = "检验章名称")
private String snName;
private String snName;*/
}
......@@ -214,9 +214,9 @@ public class ReportService {
.lambda().eq(ReportPdfVo::getReportNum, detailsReqVo.getReportNum()));
//如果已经下载保存过PDF了则删除旧的pdf 再去抓取新的pdf
/*if(reportPdfVo != null && StrUtil.isNotBlank(reportPdfVo.getPath())){
if(reportPdfVo != null && StrUtil.isNotBlank(reportPdfVo.getPath())){
FileUtil.del(reportPdfVo.getPath());
}*/
}
//测试用
if(reportPdfVo != null && StrUtil.isNotBlank(reportPdfVo.getPath())){
......@@ -263,14 +263,14 @@ public class ReportService {
AssertUtil.isNotNull(deptVo,"列表获取失败,未找到当前账号所属部门");
IPage<TestReportVo> page = new Page<>(pageQueryVo.getCurrNo(),pageQueryVo.getSize());
/*try {
try {
page = carReportUtil.reportPageList(deptVo.getEpAccount(),deptVo.getEpPassword(),pageQueryVo);
} catch (InterruptedException e) {
e.printStackTrace();
}*/
}
//测试用
page.setTotal(1).setRecords(reportVoList);
//page.setTotal(1).setRecords(reportVoList);
return page;
}
......
......@@ -55,9 +55,9 @@ public class UserDto extends BaseDTO implements Serializable {
private String avatarPath;
private String snKey;
/*private String snKey;
private String snPassword;
private String snPassword;*/
@JsonIgnore
private String password;
......
......@@ -154,9 +154,9 @@ public class UserServiceImpl implements UserService {
User user = userRepository.findById(resources.getId()).orElseGet(User::new);
user.setNickName(resources.getNickName());
user.setPhone(resources.getPhone());
user.setSnKey(resources.getSnKey());
/*user.setSnKey(resources.getSnKey());
user.setSnPassword(resources.getSnPassword());
user.setSnSignature(resources.getSnSignature());
user.setSnSignature(resources.getSnSignature());*/
user.setGender(resources.getGender());
userRepository.save(user);
// 清理缓存
......
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