Merge remote-tracking branch 'origin/master'

张洋洋

2025-02-20 5ec04f09b1569a3cc566657684a647f467b1e608

 src/main/java/com/se/simu/service/Impl/SwwFilesDealServiceImpl.java

@@ -5,8 +5,10 @@
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.se.simu.config.PropertiesConfig;
import com.se.simu.domain.po.DataPo;
import com.se.simu.domain.po.SimuPo;
import com.se.simu.helper.StringHelper;
import com.se.simu.service.ResultService;
import com.se.simu.service.SwwFilesDealService;
import com.se.simu.service.UwService;
@@ -16,6 +18,7 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.io.File;
import java.util.Date;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -23,6 +26,9 @@
@Slf4j
@Service
public class SwwFilesDealServiceImpl implements SwwFilesDealService {

    @Resource
    private PropertiesConfig config;

    @Resource
    private UwService uwService;
@@ -122,13 +128,15 @@
    private void copeDeal(DataPo data) {
        try {
            uwService.callExe(data);
            uwService.copeWaterFiles();
            uwService.copeDrainFiles(data);
            resultService.process(data);
//            uwService.copeWaterFiles();
//            uwService.copeDrainFiles(data);
            uwService.copeSwwDrainFiles(data);
//            resultService.process(data);
        } catch (Exception ex) {
            log.error(ex.getMessage(), ex);
        }
    }



}