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

car-reptiles-system/src/main/java/me/zhengjie/modules/system/domain/Dept.java

@@ -72,11 +72,11 @@ public class Dept extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "关联的环保系统密码")
     @ApiModelProperty(value = "关联的环保系统密码")
     private String epPassword;
     private String epPassword;
 
 
-    @ApiModelProperty(value = "检测站秘钥盘符")
+    /*@ApiModelProperty(value = "检测站秘钥盘符")
     private String secretKey;
     private String secretKey;
 
 
     @ApiModelProperty(value = "检验章名称")
     @ApiModelProperty(value = "检验章名称")
-    private String snName;
+    private String snName;*/
 
 
     @Override
     @Override
     public boolean equals(Object o) {
     public boolean equals(Object o) {
@@ -95,4 +95,4 @@ public class Dept extends BaseEntity implements Serializable {
     public int hashCode() {
     public int hashCode() {
         return Objects.hash(id, name);
         return Objects.hash(id, name);
     }
     }
-}
+}
\ No newline at end of file

car-reptiles-system/src/main/java/me/zhengjie/modules/system/domain/User.java

@@ -107,7 +107,7 @@ public class User extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "站点ID", hidden = true)
     @ApiModelProperty(value = "站点ID", hidden = true)
     private Integer siteId;
     private Integer siteId;
 
 
-    @Column(name = "sn_key")
+    /*@Column(name = "sn_key")
     @ApiModelProperty("签章服务key")
     @ApiModelProperty("签章服务key")
     private String snKey;
     private String snKey;
 
 
@@ -117,7 +117,7 @@ public class User extends BaseEntity implements Serializable {
 
 
     @Column(name = "sn_signature")
     @Column(name = "sn_signature")
     @ApiModelProperty("签章服务签名")
     @ApiModelProperty("签章服务签名")
-    private String snSignature;
+    private String snSignature;*/
 
 
     @Transient
     @Transient
     @ApiModelProperty(value = "站点名称",hidden = false)
     @ApiModelProperty(value = "站点名称",hidden = false)
@@ -142,4 +142,4 @@ public class User extends BaseEntity implements Serializable {
     public int hashCode() {
     public int hashCode() {
         return Objects.hash(id, username);
         return Objects.hash(id, username);
     }
     }
-}
+}
\ No newline at end of file

car-reptiles-system/src/main/java/me/zhengjie/modules/system/domain/vo/DeptVo.java

@@ -42,10 +42,10 @@ public class DeptVo {
     @ApiModelProperty(value = "关联的环保系统密码")
     @ApiModelProperty(value = "关联的环保系统密码")
     private String epPassword;
     private String epPassword;
 
 
-    @ApiModelProperty(value = "检测站秘钥盘符")
+    /*@ApiModelProperty(value = "检测站秘钥盘符")
     private String secretKey;
     private String secretKey;
 
 
     @ApiModelProperty(value = "检验章名称")
     @ApiModelProperty(value = "检验章名称")
-    private String snName;
+    private String snName;*/
 
 
 }
 }

car-reptiles-system/src/main/java/me/zhengjie/modules/system/service/ReportService.java

@@ -214,9 +214,9 @@ public class ReportService {
                 .lambda().eq(ReportPdfVo::getReportNum, detailsReqVo.getReportNum()));
                 .lambda().eq(ReportPdfVo::getReportNum, detailsReqVo.getReportNum()));
 
 
         //如果已经下载保存过PDF了则删除旧的pdf 再去抓取新的pdf
         //如果已经下载保存过PDF了则删除旧的pdf 再去抓取新的pdf
-        /*if(reportPdfVo != null && StrUtil.isNotBlank(reportPdfVo.getPath())){
+        if(reportPdfVo != null && StrUtil.isNotBlank(reportPdfVo.getPath())){
             FileUtil.del(reportPdfVo.getPath());
             FileUtil.del(reportPdfVo.getPath());
-        }*/
+        }
 
 
         //测试用
         //测试用
         if(reportPdfVo != null && StrUtil.isNotBlank(reportPdfVo.getPath())){
         if(reportPdfVo != null && StrUtil.isNotBlank(reportPdfVo.getPath())){
@@ -263,14 +263,14 @@ public class ReportService {
         AssertUtil.isNotNull(deptVo,"列表获取失败,未找到当前账号所属部门");
         AssertUtil.isNotNull(deptVo,"列表获取失败,未找到当前账号所属部门");
 
 
         IPage<TestReportVo> page = new Page<>(pageQueryVo.getCurrNo(),pageQueryVo.getSize());
         IPage<TestReportVo> page = new Page<>(pageQueryVo.getCurrNo(),pageQueryVo.getSize());
-        /*try {
+        try {
             page = carReportUtil.reportPageList(deptVo.getEpAccount(),deptVo.getEpPassword(),pageQueryVo);
             page = carReportUtil.reportPageList(deptVo.getEpAccount(),deptVo.getEpPassword(),pageQueryVo);
         } catch (InterruptedException e) {
         } catch (InterruptedException e) {
             e.printStackTrace();
             e.printStackTrace();
-        }*/
+        }
 
 
         //测试用
         //测试用
-        page.setTotal(1).setRecords(reportVoList);
+        //page.setTotal(1).setRecords(reportVoList);
         return page;
         return page;
     }
     }
 
 

car-reptiles-system/src/main/java/me/zhengjie/modules/system/service/dto/UserDto.java

@@ -55,9 +55,9 @@ public class UserDto extends BaseDTO implements Serializable {
 
 
     private String avatarPath;
     private String avatarPath;
 
 
-    private String snKey;
+    /*private String snKey;
 
 
-    private String snPassword;
+    private String snPassword;*/
 
 
     @JsonIgnore
     @JsonIgnore
     private String password;
     private String password;

car-reptiles-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java

@@ -154,9 +154,9 @@ public class UserServiceImpl implements UserService {
         User user = userRepository.findById(resources.getId()).orElseGet(User::new);
         User user = userRepository.findById(resources.getId()).orElseGet(User::new);
         user.setNickName(resources.getNickName());
         user.setNickName(resources.getNickName());
         user.setPhone(resources.getPhone());
         user.setPhone(resources.getPhone());
-        user.setSnKey(resources.getSnKey());
+        /*user.setSnKey(resources.getSnKey());
         user.setSnPassword(resources.getSnPassword());
         user.setSnPassword(resources.getSnPassword());
-        user.setSnSignature(resources.getSnSignature());
+        user.setSnSignature(resources.getSnSignature());*/
         user.setGender(resources.getGender());
         user.setGender(resources.getGender());
         userRepository.save(user);
         userRepository.save(user);
         // 清理缓存
         // 清理缓存