#
vincent
2020-06-02 03ac47becf21a56071fd97bc9f7599eef2ca90da
#
2 文件已重命名
4个文件已修改
21 ■■■■ 已修改文件
src/main/java/com/zy/Boot.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/client/controller/ConsoleController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/client/controller/SiteController.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/client/domain/SiteLatestDataVo.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/client/domain/enums/CrnStatusType.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/client/domain/enums/SiteStatusType.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/Boot.java
@@ -1,5 +1,6 @@
package com.zy;
import com.zy.common.utils.RandomValidateCodeUtil;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
@@ -8,6 +9,7 @@
public class Boot extends SpringBootServletInitializer {
    public static void main(String[] args) {
        RandomValidateCodeUtil.init();
        SpringApplication.run(Boot.class, args);
    }
src/main/java/com/zy/client/controller/ConsoleController.java
@@ -4,7 +4,7 @@
import com.core.common.R;
import com.zy.client.domain.CrnLatestDataVo;
import com.zy.client.domain.SiteLatestDataVo;
import com.zy.client.entity.SiteStatusType;
import com.zy.client.domain.enums.SiteStatusType;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
src/main/java/com/zy/client/controller/SiteController.java
@@ -19,9 +19,18 @@
@RequestMapping("/site")
public class SiteController {
    @PostMapping("/table/site")
    @ManagerAuth(memo = "站点信息表")
    public R siteTable(){
        return R.ok();
    }
    @PostMapping("/table/plc/errors")
    @ManagerAuth(memo = "输送设备plc异常信息表")
    public R crnLatestData(){
    public R plcErrorTable(){
        List<PlcErrorTable> list = new ArrayList<>();
        for (int i = 0; i<new Random().nextInt(13); i++){
            PlcErrorTable table = new PlcErrorTable();
src/main/java/com/zy/client/domain/SiteLatestDataVo.java
@@ -1,6 +1,6 @@
package com.zy.client.domain;
import com.zy.client.entity.SiteStatusType;
import com.zy.client.domain.enums.SiteStatusType;
/**
 * 站点最新数据视图对象
src/main/java/com/zy/client/domain/enums/CrnStatusType.java
File was renamed from src/main/java/com/zy/client/entity/CrnStatusType.java
@@ -1,4 +1,4 @@
package com.zy.client.entity;
package com.zy.client.domain.enums;
/**
 * 堆垛机状态枚举
src/main/java/com/zy/client/domain/enums/SiteStatusType.java
File was renamed from src/main/java/com/zy/client/entity/SiteStatusType.java
@@ -1,4 +1,4 @@
package com.zy.client.entity;
package com.zy.client.domain.enums;
/**