8/27 定时更新修改

src/main/java/cn/cslg/pas/common/utils/CronUtil.java

@@ -20,8 +20,8 @@ public class CronUtil {
         }
         switch (cron) {
             case "week":
-//                cron = "0 0 0 ? * 1 *";
-                cron="30 * * * * ?";
+              cron = "0 0 0 ? * 1 *";
+//                cron="30 * * * * ?";
                 break;
             case "month":
                 cron = "0 0 0 1 * ?";

src/main/java/cn/cslg/pas/service/importPatent/GetPatentPDFFromWebThread.java

@@ -61,7 +61,7 @@ public class GetPatentPDFFromWebThread extends Thread {
             try {
                StarPatentVO starPatentVO =uploadPatentWebDTO.getStarPatentVO();
             Integer patentType =   starPatentVO.getPT();
-               if(patentType.equals(3)){
+               if(patentType!=null&&patentType.equals(3)){
                    WebVOTransformService webVOTransformService =applicationContext.getBean(WebVOTransformService.class);
                    webVOTransformService.getCNPatentPicture(uploadPatentWebDTO,importTaskAMVO.getId());
                }

src/main/java/cn/cslg/pas/service/importPatent/GetPatentPictureFromWebThread.java

@@ -72,10 +72,10 @@ public class GetPatentPictureFromWebThread extends Thread {
                     if (pictureUrl != null && !pictureUrl.contains("408")) {
                         File file = FileUtils.getPictureFileByUrl(pictureUrl);
                         FileManagerService fileManagerService = applicationContext.getBean(FileManagerService.class);
-                        String guid = FormatUtil.getPictureFormat(uploadPatentWebDTO.getStarPatentVO().getANO());
+                        String guid = FormatUtil.getPictureFormat(uploadPatentWebDTO.getStarPatentVO().getAN());
                         fileManagerService.uploadFileWithGuid(file, guid);
                     } else {
-                        recordQuestionPatent(uploadPatentWebDTO.getStarPatentVO().getANO());
+                        recordQuestionPatent(uploadPatentWebDTO.getStarPatentVO().getAN());
                     }
 
                 } else {
@@ -84,11 +84,11 @@ public class GetPatentPictureFromWebThread extends Thread {
                     if (bytes != null) {
                         File file = FileUtils.getFileByBytes(bytes, usedNo, "jpg");
                         FileManagerService fileManagerService = applicationContext.getBean(FileManagerService.class);
-                        String guid = FormatUtil.getPictureFormat(uploadPatentWebDTO.getStarPatentVO().getANO());
+                        String guid = FormatUtil.getPictureFormat(uploadPatentWebDTO.getStarPatentVO().getAN());
                         fileManagerService.uploadFileWithGuid(file, guid);
                         file.delete();
                     } else {
-                        recordQuestionPatent(uploadPatentWebDTO.getStarPatentVO().getANO());
+                        recordQuestionPatent(uploadPatentWebDTO.getStarPatentVO().getAN());
 
                     }
 

src/main/java/cn/cslg/pas/service/importPatent/WebVOTransformService.java

@@ -121,7 +121,7 @@ public class WebVOTransformService {
         this.loadAgency(patent, starPatentVO.getAGN());
 
         //装载IPC分类号
-        if (patent.getPatentType().equals("3")) {
+        if (patent.getPatentType()!=null&&patent.getPatentType().equals("3")) {
             this.loadPatentLoc(patent, starPatentVO.getMC(), starPatentVO.getIC());
         } else {
             this.loadPatentIPC(patent, starPatentVO.getMC(), starPatentVO.getIC());
@@ -483,7 +483,7 @@ public class WebVOTransformService {
         if (publicDate != null && !publicDate.equals("")) {
             Date date = DateUtils.strToDate(publicDate);
             patent.setPublicDate(date);
-        } else if (!patent.getPatentType().equals("1") && !patent.getPatentType().equals("8")) {
+        } else if (patent.getPatentType()!=null&&!patent.getPatentType().equals("1") && !patent.getPatentType().equals("8")) {
             if (grantDate != null && !grantDate.trim().equals("")) {
                 Date date = DateUtils.strToDate(grantDate);
                 patent.setPublicDate(date);
@@ -502,7 +502,7 @@ public class WebVOTransformService {
         if (grantDate != null && !grantDate.equals("")) {
             Date date = DateUtils.strToDate(grantDate);
             patent.setGrantDate(date);
-        } else if (!patent.getPatentType().equals("1") && !patent.getPatentType().equals("8")) {
+        } else if (patent.getPatentType()!=null&&!patent.getPatentType().equals("1") && !patent.getPatentType().equals("8")) {
             if (publicDate != null && !publicDate.trim().equals("")) {
                 Date date = DateUtils.strToDate(publicDate);
                 patent.setGrantDate(date);
@@ -520,7 +520,7 @@ public class WebVOTransformService {
         publicNo = publicNo.trim();
         if (publicNo != null && !publicNo.equals("")) {
             patent.setPublicNo(publicNo);
-        } else if (!patent.getPatentType().equals("1") && !patent.getPatentType().equals("8")) {
+        } else if (patent.getPatentType()!=null&&!patent.getPatentType().equals("1") && !patent.getPatentType().equals("8")) {
             if (grantNo != null && !grantNo.equals("")) {
                 patent.setPublicNo(grantNo);
             }