#

luxiaotao1123

2020-08-06 d766cbaa2d4e92db03bd213093fb817ce3400ba3

#

 src/main/java/com/zy/client/controller/ConsoleController.java

@@ -3,7 +3,7 @@
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.client.constant.WcsSystemPropety;
import com.zy.core.properties.SystemProperties;
import com.zy.client.domain.enums.SiteStatusType;
import com.zy.client.domain.param.SystemSwitchParam;
import com.zy.client.domain.vo.*;
@@ -31,7 +31,7 @@
    @PostMapping("/system/running/status")
    @ManagerAuth(memo = "系统运行状态")
    public R systemRunningStatus(){
        return R.ok().add(Cools.add("status", WcsSystemPropety.WCS_RUNNING_STATUS.get()));
        return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
    }

    @PostMapping("/system/switch")
@@ -44,13 +44,13 @@
            if (Cools.isEmpty(param.getPassword())){
                return R.error("请输入口令");
            }
            if (!param.getPassword().equals(WcsSystemPropety.WCS_PASSWORD)){
            if (!param.getPassword().equals(SystemProperties.WCS_PASSWORD)){
                return R.error("口令错误");
            }
        }
        Thread.sleep(2000L);
        WcsSystemPropety.WCS_RUNNING_STATUS.set(param.getOperatorType()==1?Boolean.TRUE:Boolean.FALSE);
        return R.ok().add(Cools.add("status", WcsSystemPropety.WCS_RUNNING_STATUS.get()));
        SystemProperties.WCS_RUNNING_STATUS.set(param.getOperatorType()==1?Boolean.TRUE:Boolean.FALSE);
        return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
    }

    @PostMapping("/site/detail")

 src/main/java/com/zy/core/MainProcess.java

New file
@@ -0,0 +1,61 @@
package com.zy.core;

import com.zy.core.properties.SystemProperties;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;

import javax.annotation.PreDestroy;

/**
 * WCS主流程
 * Created by vincent on 2020/8/6
 */
@Data
@Slf4j
@Component
public class MainProcess {

    // 所属线程
    private Thread thread;

    /**
     * =====>>  开始工作
     */
    public void start(){
        thread = new Thread(() -> {
            while (!Thread.currentThread().isInterrupted()) {
                try {
                    // 系统运行状态判断
                    if (SystemProperties.WCS_RUNNING_STATUS.get()) {
                        continue;
                    }












                    // 间隔
                    Thread.sleep(1500);
                    log.info("WCS 工作中 .....................");
                } catch (Exception e) {
                    e.printStackTrace();
                }
            }
        });
        thread.start();
    }

    @PreDestroy
    public void shutDown(){
        if (thread != null) thread.interrupt();
    }

}

 src/main/java/com/zy/core/ServerBootstrap.java

@@ -23,6 +23,8 @@

    @Autowired
    private SlaveProperties slaveProperties;
    @Autowired
    private MainProcess mainProcess;


    @PostConstruct
@@ -31,6 +33,8 @@
        initMq();
        // 初始化下位机线程
        initThread();
        // 开始主流程进程
        mainProcess.start();
    }

    private void initMq(){

 src/main/java/com/zy/core/properties/SystemProperties.java

File was renamed from src/main/java/com/zy/client/constant/WcsSystemPropety.java
@@ -1,11 +1,11 @@
package com.zy.client.constant;
package com.zy.core.properties;

import java.util.concurrent.atomic.AtomicBoolean;

/**
 * Created by vincent on 2020-06-03
 */
public class WcsSystemPropety {
public class SystemProperties {

    public static final String WCS_PASSWORD = "root";