【数据中心】文件解析BUG修复

src/main/java/com/uas/eis/serviceImpl/FileParseServiceImpl.java

@@ -112,7 +112,7 @@ public class FileParseServiceImpl implements FileParseService {
                 StringBuilder endBuilder = new StringBuilder().append("BEGIN ").append("UPDATE DATACENTER$MESFILE SET DEALSTATE_=1,DEALTIME_=SYSDATE WHERE DBID_=").
                         append(dataChipTestLog.getDbid_()).append("; ");
                 endBuilder.append("INSERT INTO  chip$file (WAFER_ID,LOT_ID,PASS_QTY,FAIL_QTY,PASS_YFIELD,EQUIP_ID,STATUS,COUNTER_PATH,DATA_PATH,TEST_LOT,CREATETIME_,DEALSTATE_,DEALTIME_,DBID_) SELECT WAFER_ID,LOT_ID,PASS_QTY,FAIL_QTY,PASS_YFIELD,EQUIP_ID,STATUS,TRIM(COUNTER_PATH),trim(DATA_PATH),TEST_LOT,CREATETIME_,DEALSTATE_,DEALTIME_,DBID_ " +
-                        "FROM DATACENTER$MESFILE WHERE DBID_="+dataChipTestLog.getDbid_()+" AND DATACENTER$MESFILE.DBID_ NOT IN (SELECT DBID_ FROM chip$file WHERE DBID_="+dataChipTestLog.getDbid_()+" ); END;");
+                        "FROM DATACENTER$MESFILE WHERE DBID_="+dataChipTestLog.getDbid_()+" AND DATACENTER$MESFILE.WAFER_ID NOT IN (SELECT WAFER_ID FROM chip$file WHERE WAFER_ID='"+dataChipTestLog.getWafer_id()+"' ); END;");
                 this.baseDao.execute(endBuilder.toString());
             }
         } catch (Exception e) {

src/main/java/com/uas/eis/task/FileParseTask.java

@@ -33,10 +33,9 @@ public class FileParseTask {
     private TableCreator tableCreator;
     @Scheduled(fixedRate = 600000)
     public void dataDeal(){
-        //wafer_id='BF241002603#01' AND
         logger.info("开始解析文件");
         List<DataChipTestLog> dataChipTestLogs = baseDao.getJdbcTemplate().query("select wafer_id,lot_id,status,data_path,counter_path,dbid_ from (select wafer_id,lot_id,status,data_path,counter_path,dbid_ from " +
-                        " DATACENTER$MESFILE WHERE DEALSTATE_=0 ORDER BY DBID_ ASC ) where " +
+                        " DATACENTER$MESFILE WHERE DEALSTATE_=0  ORDER BY DBID_ ASC ) where " +
                 " rownum<=100", new BeanPropertyRowMapper<>(DataChipTestLog.class));
         List<String> distinctLotIds = dataChipTestLogs.stream().map(DataChipTestLog::getLot_id).distinct()
                 .collect(Collectors.toList());