客户端bug修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ClientPrintTaskDto.java

@@ -34,7 +34,7 @@ public class ClientPrintTaskDto {
     @ExcelProperty(name = "是否校验", width = 30, index = 13)
     private Boolean validate;
     @ExcelProperty(name = "是否缓存", width = 30, index = 12)
-    private Boolean isDownload;
+    private Boolean download;
     private Boolean isTry;
     private Boolean isPass;
     @ExcelProperty(name = "印刷员", width = 30, index = 14)
@@ -169,11 +169,11 @@ public class ClientPrintTaskDto {
     }
 
     public Boolean getDownload() {
-        return isDownload;
+        return download;
     }
 
     public void setDownload(Boolean download) {
-        isDownload = download;
+        this.download = download;
     }
 
     public Boolean getTry() {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/LoginResult.java

@@ -47,6 +47,9 @@ public class LoginResult implements Serializable {
     @ApiModelProperty(name = "角色集合")
     private Set<RoleTypeEnum> roleList;
 
+    @ApiModelProperty(name = "服务器时间戳")
+    private long time;
+
     public LoginResult() {
 
     }
@@ -134,6 +137,14 @@ public class LoginResult implements Serializable {
         this.schoolInfo = schoolInfo;
     }
 
+    public long getTime() {
+        return time;
+    }
+
+    public void setTime(long time) {
+        this.time = time;
+    }
+
     public class SchoolNativeBean implements Serializable {
 
         @ApiModelProperty(value = "id")

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ClientPrintData.java

@@ -20,7 +20,7 @@ import java.io.Serializable;
  * @since 2021-03-23
  */
 @TableName("client_print_data")
-public class ClientPrintData extends BaseEntity implements Serializable {
+public class ClientPrintData implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -67,12 +67,11 @@ public class ClientPrintData extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private Long createTime;
 
-    @Override
+
     public Long getId() {
         return id;
     }
 
-    @Override
     public void setId(Long id) {
         this.id = id;
     }
@@ -117,22 +116,18 @@ public class ClientPrintData extends BaseEntity implements Serializable {
         this.pagesA3 = pagesA3;
     }
 
-    @Override
     public Long getCreateId() {
         return createId;
     }
 
-    @Override
     public void setCreateId(Long createId) {
         this.createId = createId;
     }
 
-    @Override
     public Long getCreateTime() {
         return createTime;
     }
 
-    @Override
     public void setCreateTime(Long createTime) {
         this.createTime = createTime;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ClientServiceImpl.java

@@ -505,7 +505,9 @@ public class ClientServiceImpl implements ClientService {
                 vMap.put("pdfMd5", path.get("pdfMd5"));
             }
         }
-        otherList.add(vMap);
+        if(vMap.size() > 1) {
+            otherList.add(vMap);
+        }
     }
 
     /**

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/CommonServiceImpl.java

@@ -687,6 +687,7 @@ public class CommonServiceImpl implements CommonService {
         LoginResult loginResult = new LoginResult(sysUser, sessionId, token, roleType);
         loginResult.setSchoolInfo(Objects.nonNull(authBean.getSchool()) ? loginResult.new SchoolNativeBean(authBean.getSchool()) : null);
         loginResult.setOrgInfo(Objects.nonNull(authBean.getOrg()) ? loginResult.new OrgNativeBean(authBean.getOrg()) : null);
+        loginResult.setTime(System.currentTimeMillis());
         return loginResult;
     }
 

distributed-print-business/src/main/resources/mapper/ExamPrintPlanMapper.xml

@@ -115,7 +115,7 @@
             c.singlePagesA3,
             b.status,
             ifnull(b.validate, false) validate,
-            case c.isDownload when 0 then true else false end isDownload,
+            case c.isDownload when 0 then true else false end download,
             b.print_user printUser,
             e.real_name printUserName,
             b.print_start_time printStartTime,