上报、审核、批复过程中添加文件校验，仅在检验正确的情况下才生产文件

Forms/MainFrm.pas

@@ -549,7 +549,12 @@ begin
   try
     CurProjectFrame.ProjectData.Save;
     {$O-}
-      CurProjectFrame.ProjectData.ReplyProject;
+      // 失败后重复一次
+      if not CurProjectFrame.ProjectData.ReplyProject then
+      begin
+        if not CurProjectFrame.ProjectData.ReplyProject then
+          ErrorMessage('批复项目失败！');
+      end;
     {$O+}
   finally
     Screen.Cursor := crDefault;
@@ -564,7 +569,12 @@ begin
   try
     CurProjectFrame.ProjectData.Save;
     {$O-}
-      CurProjectFrame.ProjectData.SubmitProject;
+      // 失败后重复一次
+      if not CurProjectFrame.ProjectData.SubmitProject then
+      begin
+        if not CurProjectFrame.ProjectData.SubmitProject then
+          ErrorMessage('上报项目失败！');
+      end;
     {$O+}
   finally
     Screen.Cursor := crDefault;

Frames/ProjectManagerFme.pas

@@ -328,10 +328,11 @@ var
               // 导入更新-------------------------------------------------------
 
               // 导入前须检测无锁文件中仅含有原报数据
-              vFileCheck := TTenderFileChecker.Create(sLocalFile);
+              vFileCheck := TTenderFileChecker.Create;
               try
                 // 有一期以上数据，且最新期数据审核状态为原报
-                bCanImp := (vFileCheck.PhaseCount > 0) and (vFileCheck.AuditStatus = 0);
+                bCanImp := vFileCheck.CheckFileValid(sLocalFile)
+                    and (vFileCheck.PhaseCount > 0) and (vFileCheck.AuditStatus = 0);
                 if not bCanImp then
                 begin
                   Application.MessageBox(PChar('已从云端下载原报上传的无锁文件到本地，但文件有错误，禁止导入！请致电纵横服务人员以获取帮助。'), '警告', MB_OK + MB_ICONWARNING);

Units/ProjectCommands.pas

@@ -36,6 +36,8 @@ type
     procedure SaveInfoToXmlDocument(AXmlNode: IXMLNode);
     procedure ExportXmlInfo;
     function GetNewOutputFileName: string;
+
+    function CheckFile(const AFileName: string): Boolean;
   protected
     procedure OpenProject; virtual;
     procedure SaveProject; virtual;
@@ -43,8 +45,8 @@ type
     constructor Create(const AProjectName, AFileName: string; AProjectID: Integer);
     destructor Destroy; override;
 
-    procedure Execute; virtual;
-    procedure ExportTo(AFileName: string); virtual;
+    function Execute: Boolean; virtual;
+    function ExportTo(AFileName: string): Boolean; virtual;
   end;
 
   TSubmitProject = class(TReportBase)
@@ -52,8 +54,8 @@ type
     procedure OpenProject; override;
     procedure SaveProject; override;
   public
-    procedure Execute; override;
-    procedure ExportTo(AFileName: string); override;
+    function Execute: Boolean; override;
+    function ExportTo(AFileName: string): Boolean; override;
   end;
 
   TReplyProject = class(TReportBase)
@@ -61,8 +63,8 @@ type
     procedure OpenProject; override;
     procedure SaveProject; override;
   public
-    procedure Execute; override;
-    procedure ExportTo(AFileName: string); override;
+    function Execute: Boolean; override;
+    function ExportTo(AFileName: string): Boolean; override;
   end;
 
   {1. 生成临时文件夹
@@ -224,10 +226,27 @@ type
     procedure Execute;
   end;
 
+  // 文件检验
+  {
+    检验分为两部分：
+    1. 一致性检验：检验文件中的xml记录数据，与数据库中数据是否一致，以检验文件是否可用
+    2. 主动检验：  提供xml记录的部分数据，用户主动检验是否为所需文件
+
+    流程：
+    1. 解压文件，得到xml文件，项目文件
+    2. 读取xml文件，得到主要数据，与项目文件名
+    3. 读取项目文件，并检验基本数据是否与xml文件中描述一致
+    PS：用于主动检验的数据，在第2步中同步进行。要求，如果进行主动检验，必须先通过一致性检验。
+  }
   TTenderFileChecker = class
   private
-    FTempFolder: string;
     FFileName: string;
+    FTempFolder: string;
+    FTenderFileName: string;
+    FTenderTempFolder: string;
+
+    FValid: Boolean;
+
     FPhaseCount: Integer;
     FAuditStatus: Integer;
     FProjectName: string;
@@ -236,11 +255,14 @@ type
     procedure LoadInfoFromXmlDocument(AXmlNode: IXMLNode);
     procedure LoadInfoFromXml;
     procedure LoadInfo;
+
+    function DecryptFile(const AFileName: string): Boolean;
+    function CheckFileMatchXml: Boolean;
   public
-    constructor Create(AFileName: string);
-    destructor Destroy; override;
+    // 检验项目数据库数据与xml文件中主要数据是否吻合
+    function CheckFileValid(const AFileName: string): Boolean;
 
-    property ProjectName: string read FProjectName;
+    // xml文件中记录的信息，用于主动检验
     property PhaseCount: Integer read FPhaseCount;
     property AuditStatus: Integer read FAuditStatus;
   end;
@@ -253,19 +275,19 @@ uses
 
 { TSubmitProject }
 
-procedure TSubmitProject.Execute;
+function TSubmitProject.Execute: Boolean;
 begin
   FFileType := '.rmf';
   FNeedUpdate := True;
   FProjectData.LockedDataForSubmit;
-  inherited;
+  Result := inherited Execute;
 end;
 
-procedure TSubmitProject.ExportTo(AFileName: string);
+function TSubmitProject.ExportTo(AFileName: string): Boolean;
 begin
   FNeedUpdate := True;
   FProjectData.LockedDataForSubmit;
-  inherited;
+  Result := inherited ExportTo(AFileName);
 end;
 
 procedure TSubmitProject.OpenProject;
@@ -303,24 +325,35 @@ begin
   inherited;
 end;
 
-procedure TReportBase.Execute;
+function TReportBase.Execute: Boolean;
 var
   sFileName: string;
 begin
+  Result := False;
   ExportXmlInfo;
   SaveProject;
   ZipFolder(FTempFolder, FResultFile);
-  sFileName := GetNewOutputFileName;
-  if SaveFile(sFileName, FFileType) then
-    CopyFileOrFolder(FResultFile, sFileName);
+  // 检验导出文件
+  if CheckFile(FResultFile) then
+  begin
+    Result := True;
+    sFileName := GetNewOutputFileName;
+    if SaveFile(sFileName, FFileType) then
+      CopyFileOrFolder(FResultFile, sFileName);
+  end;
 end;
 
-procedure TReportBase.ExportTo(AFileName: string);
+function TReportBase.ExportTo(AFileName: string): Boolean;
 begin
+  Result := False;
   ExportXmlInfo;
   FProjectData.SimpleSaveAs(FTempFolder + '\' + ExtractSimpleFileName(FFileName));
   ZipFolder(FTempFolder, FResultFile);
-  CopyFileOrFolder(FResultFile, AFileName);
+  if CheckFile(FResultFile) then
+  begin
+    Result := True;
+    CopyFileOrFolder(FResultFile, AFileName);
+  end;
 end;
 
 procedure TReportBase.ExportXmlInfo;
@@ -402,19 +435,32 @@ begin
   vProp := AXmlNode.AddChild('TenderProperty');
 end;
 
+function TReportBase.CheckFile(const AFileName: string): Boolean;
+var
+  vChecker: TTenderFileChecker;
+begin
+  Result := False;
+  vChecker := TTenderFileChecker.Create;
+  try
+    Result := vChecker.CheckFileValid(AFileName);
+  finally
+    vChecker.Free;
+  end;
+end;
+
 { TReplyProject }
 
-procedure TReplyProject.Execute;
+function TReplyProject.Execute: Boolean;
 begin
   FFileType := '.arf';
   FProjectData.LockedDataForReply;
-  inherited;
+  Result := inherited Execute;
 end;
 
-procedure TReplyProject.ExportTo(AFileName: string);
+function TReplyProject.ExportTo(AFileName: string): Boolean;
 begin
   FProjectData.LockedDataForReply;
-  inherited;
+  Result := inherited ExportTo(AFileName);
 end;
 
 procedure TReplyProject.OpenProject;
@@ -986,18 +1032,41 @@ end;
 
 { TTenderFileChecker }
 
-constructor TTenderFileChecker.Create(AFileName: string);
+function TTenderFileChecker.CheckFileMatchXml: Boolean;
+var
+  FProjectData: TProjectData;
+begin
+  FProjectData := TProjectData.Create;
+  try
+    try
+      FProjectData.SimpleOpen(FTenderFileName);
+      Result := FProjectData.CheckDataBaseInfo(FPhaseCount, FAuditStatus);
+    except
+      Result := False;
+    end;
+  finally
+    FProjectData.Free;
+  end;
+end;
+
+function TTenderFileChecker.CheckFileValid(const AFileName: string): Boolean;
 begin
-  FFileName := AFileName;
   FTempFolder := GenerateTempFolder(GetTempFilePath);
-  UnZipFile(FFileName, FTempFolder);
-  LoadInfo;
+  FTenderTempFolder := FTempFolder + '\Tender';
+  CreateDirectoryInDeep(FTenderTempFolder);
+  try
+    Result := DecryptFile(AFileName) and CheckFileMatchXml;
+  finally
+    DeleteFileOrFolder(FTempFolder);
+  end;
 end;
 
-destructor TTenderFileChecker.Destroy;
+function TTenderFileChecker.DecryptFile(const AFileName: string): Boolean;
 begin
-  DeleteFileOrFolder(FTempFolder);
-  inherited;
+  Result := UnZipFile(AFileName, FTempFolder);
+  if not Result then Exit;
+  LoadInfo;
+  Result := UnZipFile(FTenderFileName, FTenderTempFolder);
 end;
 
 procedure TTenderFileChecker.LoadInfo;
@@ -1036,6 +1105,7 @@ begin
   FProjectName := AXmlNode.Attributes['ProjectName'];
   FPhaseCount := AXmlNode.Attributes['PhaseCount'];
   FAuditStatus := AXmlNode.Attributes['AuditStatus'];
+  FTenderFileName := FTempFolder + '\' + AXmlNode.Attributes['FileName'];
 end;
 
 end.

Units/ProjectData.pas

@@ -132,10 +132,13 @@ type
     {创建审核数据}
     procedure UpdateDataForReceive;
 
-    // 上报文件
-    procedure SubmitProject(const AFileName: string = '');
-    // 批复文件
-    procedure ReplyProject(const AFileName: string = '');
+    // 上报文件:
+    { 返回值：
+      1. True 文件检验结果正确，生成文件
+      2. False 文件检验结果错误，不生成文件}
+    function SubmitProject(const AFileName: string = ''): Boolean;
+    // 批复文件: 返回值含义同上报
+    function ReplyProject(const AFileName: string = ''): Boolean;
     // json文件：清单
     procedure ExportJson_Bills(const AFileName: string);
     procedure ExportJson_Common(const AFileName: string);
@@ -150,6 +153,8 @@ type
 
     procedure CalculateAll;
 
+    function CheckDataBaseInfo(APhaseCount, AAuditStatus: Integer): Boolean;
+
     procedure ImportCloudTenderFile(const AFileName: string);
 
     function CheckPassword: Boolean;
@@ -540,31 +545,31 @@ begin
   end;
 end;
 
-procedure TProjectData.ReplyProject(const AFileName: string = '');
+function TProjectData.ReplyProject(const AFileName: string = ''): Boolean;
 var
   Replyor: TReplyProject;
 begin
   Replyor := TReplyProject.Create(FProjectName, FFileName, FProjectID);
   try
     if AFileName = '' then
-      Replyor.Execute
+      Result := Replyor.Execute
     else
-      Replyor.ExportTo(AFileName);
+      Result := Replyor.ExportTo(AFileName);
   finally
     Replyor.Free;
   end;
 end;
 
-procedure TProjectData.SubmitProject(const AFileName: string = '');
+function TProjectData.SubmitProject(const AFileName: string = ''): Boolean;
 var
   Submitor :TSubmitProject;
 begin
   Submitor := TSubmitProject.Create(FProjectName, FFileName, FProjectID);
   try
     if AFileName = '' then
-      Submitor.Execute
+      Result := Submitor.Execute
     else
-      Submitor.ExportTo(AFileName);
+      Result := Submitor.ExportTo(AFileName);
   finally
     Submitor.Free;
   end;
@@ -1487,4 +1492,12 @@ begin
   end;
 end;
 
+function TProjectData.CheckDataBaseInfo(APhaseCount, AAuditStatus: Integer): Boolean;
+begin
+  Result := (FProjProperties.PhaseCount = APhaseCount)
+         and (FProjProperties.AuditStatus = AAuditStatus);
+  if Result and (APhaseCount > 0) and (AAuditStatus <> -1) then
+    Result := PhaseData.AuditCount = AAuditStatus;
+end;
+
 end.

Units/UtilMethods.pas

@@ -87,7 +87,7 @@ type
 
   {Zip}
   procedure ZipFolder(AFileFolder, AFileName: string);
-  procedure UnZipFile(AFileName, AFileFolder: string);
+  function UnZipFile(AFileName, AFileFolder: string): Boolean;
 
   {Copy By Stream}
   procedure CopyFileByStream(const ASourceFile, ADestFile: string);
@@ -771,10 +771,11 @@ begin
   end;
 end;
 
-procedure UnZipFile(AFileName, AFileFolder: string);
+function UnZipFile(AFileName, AFileFolder: string): Boolean;
 var
   vUnZip: TVCLZip;
 begin
+  Result := True;
   vUnZip := TVCLZip.Create(nil);
   try
     vUnZip.FilesList.Clear;
@@ -786,7 +787,11 @@ begin
     vUnZip.RelativePaths := True;
     vUnZip.DoAll := True;
     vUnZip.FilesList.Add('*.*');
-    vUnZip.UnZip;
+    try
+      vUnZip.UnZip;
+    except
+      Result := False;
+    end;
   finally
     vUnZip.Free;
   end;