#

Junjie

5 天以前 030a1abd26f8588c121ec47d53473e64a1e4f343

 src/main/java/com/zy/core/thread/impl/ZySiemensDualCrnThread.java

@@ -9,7 +9,6 @@
import com.zy.asrs.entity.*;
import com.zy.asrs.service.BasDualCrnpOptService;
import com.zy.asrs.service.BasDualCrnpService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.utils.Utils;
import com.zy.common.utils.RedisUtil;
import com.zy.core.News;
@@ -257,6 +256,27 @@
        crnProtocol.setYDistance(0);
        crnProtocol.setXDuration(0);
        crnProtocol.setYDuration(0);

        BasDualCrnpService basDualCrnpService = null;
        try {
            basDualCrnpService = SpringUtils.getBean(BasDualCrnpService.class);
        }catch (Exception e){

        }
        if (basDualCrnpService != null) {
            BasDualCrnp basDualCrnp = basDualCrnpService.selectOne(new EntityWrapper<BasDualCrnp>().eq("crn_no", deviceConfig.getDeviceNo()));
            if(basDualCrnp == null) {
                basDualCrnp = new BasDualCrnp();
                basDualCrnp.setCrnNo(deviceConfig.getDeviceNo());
                basDualCrnp.setStatus(1);
                basDualCrnp.setInEnable("N");
                basDualCrnp.setOutEnable("N");
                basDualCrnp.setMaxInTask(5);
                basDualCrnp.setMaxOutTask(5);
                basDualCrnp.setCreateTime(new Date());
                basDualCrnpService.insert(basDualCrnp);
            }
        }
    }

    @Override
@@ -333,27 +353,6 @@
            redisUtil.set(RedisKeyType.DEVICE_LOG_KEY.key + System.currentTimeMillis(), deviceDataLog, 60 * 60 * 24);
            //更新采集时间
            crnProtocol.setDeviceDataLog(System.currentTimeMillis());
        }

        BasDualCrnpService basDualCrnpService = null;
        try {
            basDualCrnpService = SpringUtils.getBean(BasDualCrnpService.class);
        }catch (Exception e){

        }
        if (basDualCrnpService != null) {
            BasDualCrnp basDualCrnp = basDualCrnpService.selectOne(new EntityWrapper<BasDualCrnp>().eq("crn_no", deviceConfig.getDeviceNo()));
            if(basDualCrnp == null) {
                basDualCrnp = new BasDualCrnp();
                basDualCrnp.setCrnNo(deviceConfig.getDeviceNo());
                basDualCrnp.setStatus(1);
                basDualCrnp.setInEnable("N");
                basDualCrnp.setOutEnable("N");
                basDualCrnp.setMaxInTask(5);
                basDualCrnp.setMaxOutTask(5);
                basDualCrnp.setCreateTime(new Date());
                basDualCrnpService.insert(basDualCrnp);
            }
        }
    }