Merge branch 'master' of ssh://10.153.19.150:29418/CanadaMes

wu

2023-09-07 477b4071ccf45b6d15280d37a4a002307aa2271c

Merge branch 'master' of ssh://10.153.19.150:29418/CanadaMes

 CanadaMes-ui/src/api/home.js

@@ -43,9 +43,17 @@
    })

}



export function UpdateTask(types,shelf_rack) {

export function UpdateTask(types,shelfrack) {

    return request({

        url: '/home/UpdateTask?types=' + types + '&shelf_rack'+shelf_rack,

        url: '/home/UpdateTask?types=' + types + '&shelfrack='+shelfrack,

        method: 'get',

        data :""

    })

}



export function SelectAlarmmgInfo() {

    return request({

        url: '/home/SelectAlarmmgInfo',

        method: 'get',

        data :""

    })


 CanadaMes-ui/src/lang/locales/en-US.json

@@ -121,5 +121,53 @@
    "添加角色成功": "Successfully added role",

    "更新状态成功": "Successfully updated status",

    "修改角色成功": "Successfully modified role",

    "删除角色成功": "Successfully deleted role"

  "删除角色成功": "Successfully deleted role",

  "translation": {

    "D01 VFD error": "D01 VFD error",

    "D02 VFD error": "D02 VFD error",

    "D03 VFD error": "D03 VFD erro",

    "D04 VFD error": "D04 VFD error",

    "D05 VFD error": "D05 VFD error",

    "D06 VFD error": "D06 VFD error",

    "B01 VFD error": "B01 VFD error",

    "B02 VFD error": "B02 VFD error",

    "A01 VFD error": "A01 VFD error",

    "A02 VFD error": "A02 VFD error",

    "A01 servo turn error": "A01 servo turn error",

    "A02 servo turn error": "A02 servo turn error",

    "A01 servo travel error": "A01 servo travel error",

    "A02 servo travel error": "A02 servo travel error",

    "B01 servo travel error": "B01 servo travel error",

    "B02 servo travel error": "B02 servo travel error",

    "D01 DEC error": "D01 DEC error",

    "D01 pos error": "D01 pos error",

    "D02 DEC error": "D02 DEC error",

    "D02 pos error": "D02 pos error",

    "D03 DEC error": "D03 DEC error",

    "D03 pos error": "D03 pos error",

    "D04 DEC error": "D04 DEC error",

    "D04 pos error": "D04 pos error",

    "D05 DEC error": "D05 DEC error",

    "D05 pos error": "D05 pos error",

    "D06 DEC error": "D06 DEC error",

    "D06 pos error": "D06 pos error",

    "A01 DEC error": "A01 DEC error",

    "A01 pos error": "A01 pos error",

    "A02 DEC error": "A02 DEC error",

    "A02 pos error": "A02 pos error",

    "B01 IN DEC error": "B01 IN DEC error",

    "B01 IN pos error": "B01 IN pos error",

    "B01 OUT DEC error": "B01 OUT DEC error",

    "B01 OUT pos error": "B01 OUT pos error",

    "B02 IN DEC error": "B02 IN DEC error",

    "B02 IN pos error": "B02 IN pos error",

    "B02 OUT DEC error": "B02 OUT DEC error",

    "B02 OUT pos error": "B02 OUT pos error"

  },

  "Parameter": "Parameter",

  "Action": "Action",

  "Sign": "Sign",

  "State": "State",

  "Alarm": "Alarm",

  "Distribute": "Distribute"

  }

 CanadaMes-ui/src/lang/locales/zh-CN.json

@@ -1,4 +1,3 @@


  {

    "systemTitle": "登录系统",

    "usernamePlaceholder": "请输入用户名",

@@ -31,8 +30,6 @@
  "langPassword": "密码",

  "langState": "状态",

  "langSelect": "请选择",





  "langEditUserTitle": "修改用户",

  "northglassMESsystem":"北玻MES系统",

  "exit":"退出",

@@ -124,6 +121,53 @@
    "添加角色成功": "添加角色成功",

    "更新状态成功": "更新状态成功",

    "修改角色成功": "修改角色成功",

    "删除角色成功": "删除角色成功"

  "删除角色成功": "删除角色成功",

  "translation": {

    "D01 VFD error": "D01 VFD 错误",

    "D02 VFD error": "D02 VFD 错误",

    "D03 VFD error": "D03 VFD 错误",

    "D04 VFD error": "D04 VFD 错误",

    "D05 VFD error": "D05 VFD 错误",

    "D06 VFD error": "D06 VFD 错误",

    "B01 VFD error": "B01 VFD 错误",

    "B02 VFD error": "B02 VFD 错误",

    "A01 VFD error": "A01 VFD 错误",

    "A02 VFD error": "A02 VFD 错误",

    "A01 servo turn error": "A01 servo turn 错误",

    "A02 servo turn error": "A02 servo turn 错误",

    "A01 servo travel error": "A01 servo travel 错误",

    "A02 servo travel error": "A02 servo travel 错误",

    "B01 servo travel error": "B01 servo travel 错误",

    "B02 servo travel error": "B02 servo travel 错误",

    "D01 DEC error": "D01 DEC 错误",

    "D01 pos error": "D01 pos 错误",

    "D02 DEC error": "D02 DEC 错误",

    "D02 pos error": "D02 pos 错误",

    "D03 DEC error": "D03 DEC 错误",

    "D03 pos error": "D03 pos 错误",

    "D04 DEC error": "D04 DEC 错误",

    "D04 pos error": "D04 pos 错误",

    "D05 DEC error": "D05 DEC 错误",

    "D05 pos error": "D05 pos 错误",

    "D06 DEC error": "D06 DEC 错误",

    "D06 pos error": "D06 pos 错误",

    "A01 DEC error": "A01 DEC 错误",

    "A01 pos error": "A01 pos 错误",

    "A02 DEC error": "A02 DEC 错误",

    "A02 pos error": "A02 pos 错误",

    "B01 IN DEC error": "B01 IN DEC 错误",

    "B01 IN pos error": "B01 IN pos 错误",

    "B01 OUT DEC error": "B01 OUT DEC 错误",

    "B01 OUT pos error": "B01 OUT pos 错误",

    "B02 IN DEC error": "B02 IN DEC 错误",

    "B02 IN pos error": "B02 IN pos 错误",

    "B02 OUT DEC error": "B02 OUT DEC 错误",

    "B02 OUT pos error": "B02 OUT pos 错误"

  },

  "Parameter": "参数下发",

  "Action": "开关控制",

  "Sign": "IO状态",

  "State": "State",

  "Alarm": "报警信息",

  "Distribute": "下发"

  }

  

 CanadaMes-ui/src/views/Electrical/Action.vue

@@ -3,7 +3,7 @@
    <!--面包屑导航区域-->

    <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">

      <router-link to="/home" tag="el-button" type="text">{{ $t('langHome') }}</router-link>

      <el-button type="text">设备管理</el-button>

      <el-button type="text">Electrical</el-button>

      <router-link to="/Electrical/Parameter" tag="el-button" type="text">Parameter</router-link>

      <router-link to="/Electrical/Action" tag="el-button" type="text">Action</router-link>

      <router-link to="/Electrical/Sign" tag="el-button" type="text">Sign</router-link>

@@ -28,10 +28,11 @@
</template>



<script >



import LanguageMixin from '../../lang/LanguageMixin'

let socket;

export default {

  name: "action",

  mixins: [LanguageMixin],

  data () {

    return {

      record: {

@@ -192,13 +193,13 @@




}



.el-input__inner {

    border: 1 solid black;

  }



.in_mc {

.in_mc {}

 

}

.el-input__inner {

    border: none;

  }


 CanadaMes-ui/src/views/Electrical/Parameter.vue

@@ -3,7 +3,7 @@
  <!--面包屑导航区域-->

  <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">

  <router-link to="/home" tag="el-button" type="text">{{ $t('langHome') }}</router-link>

  <el-button type="text">设备管理</el-button>

      <el-button type="text">{{ $t('Distribute') }}</el-button>

  <router-link to="/Electrical/Parameter" tag="el-button" type="text">Parameter</router-link>

  <router-link to="/Electrical/Action" tag="el-button" type="text">Action</router-link>

  <router-link to="/Electrical/Sign" tag="el-button" type="text">Sign</router-link>

@@ -14,21 +14,25 @@
  

  <el-form label-width="100px" style="display: flex;flex-wrap: wrap;" :model="messagepack.data">

    <div id="btn_div">

      <el-button type="primary" @click="send()">下发参数</el-button>

        <el-button type="primary" @click="send()">{{ $t('Distribute') }}</el-button>

    </div>

    <div class="kuai_div" v-for="(item, index) in record.xyData" :key="index">

      <el-input style="width: 280px;" class="in_mc" v-model="item.name" readonly></el-input>

      <el-input v-model.number="item.value" style="width: 80px;" @input="handleChange(index, $event.target.value)"></el-input>

        <el-input v-model.number="item.value" style="width: 80px;"

          @input="handleChange(index, $event.target.value)"></el-input>

    </div>

  </el-form>

  </div>

  </template>

  

  <script>



import LanguageMixin from '../../lang/LanguageMixin'

  let socket;

  

  export default {

  name: "Parameter",

  mixins: [LanguageMixin],

  data() {

  return {

  record: {


 CanadaMes-ui/src/views/Electrical/Sign.vue

@@ -3,7 +3,7 @@
    <!--面包屑导航区域-->

    <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">

      <router-link to="/home" tag="el-button" type="text">{{ $t('langHome') }}</router-link>

      <el-button type="text">设备管理</el-button>

      <el-button type="text">Electrical</el-button>

      <router-link to="/Electrical/Parameter" tag="el-button" type="text">Parameter</router-link>

      <router-link to="/Electrical/Action" tag="el-button" type="text">Action</router-link>

      <router-link to="/Electrical/Sign" tag="el-button" type="text">Sign</router-link>


 CanadaMes-ui/src/views/Electrical/State.vue

@@ -3,7 +3,7 @@
    <!--面包屑导航区域-->

    <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">

      <router-link to="/home" tag="el-button" type="text">{{ $t('langHome') }}</router-link>

      <el-button type="text">设备管理</el-button>

      <el-button type="text">Electrical</el-button>

      <router-link to="/Electrical/Parameter" tag="el-button" type="text">Parameter</router-link>

      <router-link to="/Electrical/Action" tag="el-button" type="text">Action</router-link>

      <router-link to="/Electrical/Sign" tag="el-button" type="text">Sign</router-link>


 CanadaMes-ui/src/views/Electrical/alarm.vue

@@ -3,7 +3,7 @@
    <!--面包屑导航区域-->
    <el-breadcrumb separator-class="el-icon-arrow-right" class="el-breadcrumb">
      <router-link to="/home" tag="el-button" type="text">{{ $t('langHome') }}</router-link>
      <el-button type="text">设备管理</el-button>
      <el-button type="text">Electrical</el-button>
      <router-link to="/Electrical/Parameter" tag="el-button" type="text">Parameter</router-link>
      <router-link to="/Electrical/Action" tag="el-button" type="text">Action</router-link>
      <router-link to="/Electrical/Sign" tag="el-button" type="text">Sign</router-link>
@@ -18,7 +18,7 @@
        </div>
      </el-form> -->

    <el-table :data="tableData" style="width: 100%;" height="590">
    <el-table :data="localizedRoles" style="width: 100%;" height="590">
      <el-table-column prop="id" label="id" width="80">
      </el-table-column>
      <el-table-column prop="content" label="content">
@@ -33,9 +33,11 @@

<script >
import { setAll } from "../../api/alarm";
import LanguageMixin from '../../lang/LanguageMixin'
let socket;
export default {
  name: "alarm",
  mixins: [LanguageMixin],
  data () {
    return {
      record: {
@@ -44,8 +46,8 @@
        // xyData: [],

      },
      tableData: [],

      roles: [],
      localizedRoles: [],
      messagepack: {
        data: { taskname: "" }
      },
@@ -59,15 +61,28 @@
  created () {
    this.init();
    this.load();

  },
  methods: {
    load () {
      setAll().then(res => {
        this.tableData = res.data.list;
        //console.log(this.tableData);

        this.roles = res.data.list;
        const language = this.$i18n.locale;
        if (language === 'zh-CN') {
          this.replaceChineseWithEnglish();
        } else {
          this.localizedRoles = [...this.roles];
        }
        console.log(this.localizedRoles);
      });
    },
    replaceChineseWithEnglish () {
      const translation = this.$t('translation');
      this.localizedRoles = this.roles.map(role => ({
        ...role,
        content: translation[role.content] || role.content
      }));
    },
    init () {
      let viewname = "alarm";


 CanadaMes-ui/src/views/home/index.vue

@@ -73,7 +73,7 @@




.blocks {

    min-height: 50vh;

    min-height: 49vh;

    max-width: 100vw;

    background-image: url('../../img/xmjc.png');

    margin: 0 auto;

@@ -110,36 +110,74 @@
.el-table__empty-text {

    line-height: 41px;

}



.box {

    width: 90%;

    margin-left: 5%;

    height: 35px;

    color: red;

    font-size: 12px;

    overflow: hidden;

}



.text {

    width: auto;

    line-height: 35px;

    white-space: nowrap;

    animation: textScroll 20s linear infinite;

    margin: 0 auto;

}



@keyframes textScroll {

    0% {

        transform: translateX(100%);

    }



    100% {

        transform: translateX(-150%);

    }

}

</style>

<template>

    <el-container>

        <!-- <el-header style="padding: 10px;"></el-header> -->

        <el-main>

            <div class="box">

                <div class="text">

                    Alarm:

                    <label v-for="item in this.alarm" :key="item['id']">

                        {{ item['content'] }}

                    </label>

                </div>

            </div>



            <div style="display:flex;justify-content: space-around;width: 95%;margin: 0 auto;">

                <el-input style="width:15%;" placeholder="Enter the glass lD" v-model="glassid"></el-input>

                <el-button type="primary" @click="showform()">Manually feed the glass</el-button>

                <el-input style="width:15%;" placeholder="Enter the order number" v-model="order"></el-input>

                <el-button type="warning" @click="getOrder()">Exit the glass by order number</el-button>

                <el-button type="warning" @click="showform1();">Exit the glass by order number</el-button>

            </div>

            <div>

                <el-table :data="this.tasklist1" border style="width: 100%" >

                    <el-table-column prop="glassId" label="Coming out glass ID"></el-table-column>

                    <el-table-column :width="250" prop="cage" label="The Grille number being used"></el-table-column>

                    <el-table-column :width="250" prop="cell" label="The Grille number being used"></el-table-column>

                    <el-table-column prop="orderId" label="Order Nmuber"></el-table-column>

                    <el-table-column prop="lengthwidth" label="Length and width"></el-table-column>

                    <el-table-column prop="coating" label="coating"></el-table-column>

                    <el-table-column label="Operate">

                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;">end task</el-button>

                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" @click="endtask(0)">end

                            task</el-button>

                    </el-table-column>

                </el-table>

                <el-table :data="this.tasklist2" border style="width: 100%">

                    <el-table-column prop="glassId" label="Incoming glass ID"></el-table-column>

                    <el-table-column :width="250" prop="cage" label="The Grille number being used"></el-table-column>

                    <el-table-column :width="250" prop="cell" label="The Grille number being used"></el-table-column>

                    <el-table-column prop="orderId" label="Order Nmuber"></el-table-column>

                    <el-table-column prop="lengthwidth" label="Length and width"></el-table-column>

                    <el-table-column prop="coating" label="coating"></el-table-column>

                    <el-table-column label="Operate">

                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;">end task</el-button>

                        <el-button type="primary" style="padding: 4px 10px;font-size: 12px;" @click="endtask(1)">end

                            task</el-button>

                    </el-table-column>

                </el-table>

            </div>

@@ -180,7 +218,7 @@
        </el-footer>

        <el-dialog :visible.sync="dialogFormVisible" title="Please confirm the information">

            <el-form :model="form" label-width="100px" style="padding-right: 30px">

                <el-form-item label="Order">

                <el-form-item label="order">

                    <el-input v-model="form.orderno" autocomplete="off" />

                </el-form-item>

                <el-form-item label="length">

@@ -200,12 +238,28 @@
                </span>

            </template>

        </el-dialog>

        <el-dialog :visible.sync="dialogFormVisible1" title="Ordering Information">

            <el-form :model="form1" label-width="100px" style="padding-right: 30px">

                <el-form-item label="order">

                    <el-input v-model="form1.order" autocomplete="off" />

                </el-form-item>

                <el-form-item label="number">

                    <el-input v-model="form1.number" autocomplete="off" />

                </el-form-item>

            </el-form>

            <template #footer>

                <span class="dialog-footer">

                    <el-button @click="cancal1()">cancal</el-button>

                    <el-button @click="getOrder();" type="primary">confirm</el-button>

                </span>

            </template>

        </el-dialog>

    </el-container>

</template>

  

<script>



import { home, home2, loadtask, InsertOrder, Addglassid } from "../../api/home";

import { home, home2, loadtask, InsertOrder, Addglassid, UpdateTask, SelectAlarmmgInfo } from "../../api/home";



let socket;

export default {

@@ -213,12 +267,18 @@
    data() {

        return {

            dialogFormVisible: false,

            dialogFormVisible1: false,

            form: {

                orderno: "NG2210210",

                length: 800,

                width: 1000,

                coating: "red",

            },

            form1: {

                order: "NG2210210",

                number: 800,

            },

            alarm: [],

            tableData: [],

            cagelist1: [],

            cagelist2: [],

@@ -232,7 +292,9 @@
            glassid: "",

            url: "../../img/bigcar01.png",

            car1: 116,

            car2: 187

            car2: 187,

            incell: "",

            outcell: ""

        };

    },

    created() {

@@ -275,7 +337,13 @@
                    this.cagelist4=obj.cagelist4[0];

                    this.tasklist1=obj.tasklist1[0];

                    this.tasklist2=obj.tasklist2[0];

                
                    if (this.tasklist1.length > 0) {

                        this.incell = this.tasklist1[0]['cell'];

                    }

                    if (this.tasklist1.length > 0) {

                        this.outcell = this.tasklist2[0]['cell'];

                    }

                    this.alarm = obj.alarmmg[0];

                    // for (let a = 0; a <= this.record.params.length - 1; a++) {

                    //     // this.record.xyData[a] = [this.record.canshu[a], this.record.params[0][a]];

                    //     // this.record.xyData[a] = { name: this.record.canshu[a], value: this.record.params[0][a] };

@@ -311,14 +379,23 @@
            });

            loadtask(this.task1).then(res => {

                this.tasklist1 = res.data.list;

                console.log(this.tasklist1);

                if (res.data.list.length > 0) {

                    this.incell = this.tasklist1[0]['cell'];

                }

            });

            loadtask(this.task2).then(res => {

                this.tasklist2 = res.data.list;

                if (res.data.list.length > 0) {

                    this.outcell = this.tasklist2[0]['cell'];

                }



            });

            loadtask(this.task2).then(res => {

                this.tasklist2 = res.data.list;

                

            });

            SelectAlarmmgInfo().then(res => {

                this.alarm = res.data.alarmmg;

            });

        },

        //根据格子状态修改颜色

@@ -337,7 +414,7 @@
        },

        //按订单出片

        getOrder() {

            if (this.order != "") {

            if (this.form1.order != "") {

                InsertOrder(this.order).then(res => {

                    if (res.data.message == 200) {

                        this.$message.success("Operation successful");

@@ -349,23 +426,9 @@
            }



        },

        showform() {

            this.form =

            {

                orderno: "NG2210210",

                length: 800,

                width: 1000,

                coating: "red",

            };

            this.dialogFormVisible = true;

        },

        cancal() {

            this.dialogFormVisible = false;

            this.form = {};

        },

        //手动上片

        sbumitglassid() {

            if (this.glassid != "") {

            if (this.form.order != "") {

                Addglassid(this.glassid).then(res => {

                    if (res.data.message2 == 200) {

                        this.$message.success("Operation successful");

@@ -376,12 +439,59 @@
                });

            }

        },

        endtask(type,shelfrack) {

            alert(type);

            alert(shelfrack);

        }

    }

        showform() {

            if (this.glassid != "") {

                this.form =

                {

                    orderno: "NG2210210",

                    length: 800,

                    width: 1000,

                    coating: "red",

};

                this.dialogFormVisible = true;

            }

        },

        showform1() {

            if (this.order != "") {

                this.form1 =

                {

                    order: "NG2210210",

                    number: 800,

                };

                this.dialogFormVisible1 = true;

            }





        },

        cancal() {

            this.dialogFormVisible = false;

            this.form = {};

        },

        cancal1() {

            this.dialogFormVisible1 = false;

            this.form1 = {};

        },

        endtask(type) {

            if (type == 0) {

                UpdateTask(type, this.incell).then(res => {

                    if (res.data.message3 == 200) {

                        this.$message.success("Operation successful");

                    }

                });

            } else {

                UpdateTask(type, this.outcell).then(res => {

                    if (res.data.message3 == 200) {

                        this.$message.success("Operation successful");

                    }

                });

            }





        }



    }

}







</script>

 springboot-vue3/src/main/java/com/example/springboot/component/Plcaction.java

@@ -33,21 +33,19 @@
        }

    }





    private void sendMessages() {

        WebSocketServer sendwServer = WebSocketServer.sessionMap.get("action");

        if (sendwServer != null) {



            List<Boolean> paramlist = S7control.getinstance().ReadBits("DB100.DBW", 12);

            //        new short[]{1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0}

      // new short[]{1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0,

      // 1, 0}

            JSONObject jsonObject = new JSONObject();

            jsonObject.append("params", new short[]{1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0});

      jsonObject.append("params",

          new short[] { 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0 });



            sendwServer.sendMessage(jsonObject.toString());

        }









    }




 springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java

@@ -7,6 +7,7 @@
import org.springframework.context.ConfigurableApplicationContext;

import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;
import com.example.springboot.mapper.HomeMapper;

public class Plchome extends Thread {
@@ -42,7 +43,9 @@
            List<StorageCage> tasklist2=homeMapper.selectinout(3);
            jsonObject.append("tasklist1", tasklist1);
            jsonObject.append("tasklist2", tasklist2);

            //查询报警信息
            List<alarmmg> alarmmg=homeMapper.SelectAlarmmgInfo();
            jsonObject.append("alarmmg", alarmmg);
            //读去Plc进片车与出片车位置
            // List<String> addressList = new ArrayList<>();
            // addressList.add("DB100.DBW0");

 springboot-vue3/src/main/java/com/example/springboot/controller/HomeController.java

@@ -10,6 +10,7 @@
import com.example.springboot.service.HomeService;
import com.example.springboot.common.Result;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;

import org.springframework.web.bind.annotation.*;

@@ -81,12 +82,24 @@
    }

    @GetMapping("/UpdateTask")
    public Result UpdateTask(Integer types,Integer shelf_rack){
    public Result UpdateTask(Integer types,Integer shelfrack){
        Map<String, Object> map = new HashMap<>();
        homeMapper.UpdateTask(types,shelf_rack);
        map.put("message2","200");
        homeMapper.UpdateTask(types,shelfrack);
        if(types==0){
            homeMapper.UpdateCageTask1(shelfrack);
        }else{
            homeMapper.UpdateCageTask2(shelfrack);
        }
        map.put("message3","200");
        return Result.success(map);
    }

    @GetMapping("/SelectAlarmmgInfo")    
    public Result SelectAlarmmgInfo(){
        List<alarmmg> alarmmg=homeMapper.SelectAlarmmgInfo();
        Map<String, Object> map = new HashMap<>();
        map.put("alarmmg",alarmmg);
        return Result.success(map);
    }
    
}

 springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java

@@ -3,11 +3,13 @@
import org.apache.ibatis.annotations.*;

import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;

import java.util.List;

@Mapper
public interface HomeMapper {
  //查询每个笼子的使用情况
  @Select("SELECT cage,round(round(sum(state)/42,2)*100) as cell,42-sum(state) as state FROM storage_cage group by cage")
  List<StorageCage> selectAll();

@@ -48,6 +50,18 @@
  short SelectOutTask();

  // 手动完成任务
  @Select("update storage_task set state=1 where shelf_rack=#{shelf_rack} and task_type=#{task_type} and task_state=0")
  short UpdateTask(@Param("task_type") Integer task_type, @Param("shelf_rack") Integer shelf_rack);
  @Update("update storage_task set task_state=1 where shelf_rack=#{shelf_rack} and task_type=#{task_type} and task_state=0")
  void UpdateTask(@Param("task_type") Integer task_type, @Param("shelf_rack") Integer shelf_rack);

  // 手动完成进片任务修改笼子数据
  @Update("update storage_cage set state=1 where cell=#{cell} and state=2")
  void UpdateCageTask1(@Param("cell") Integer cell);

  // 手动完成出片任务修改笼子数据
  @Update("update storage_cage set state=0,glass_id=null,order_id=null,glasswidth=null,glassheight=null,coating=null where cell=#{cell} and state=2")
  void UpdateCageTask2(@Param("cell") Integer cell);

  //获取报警信息
  @Select("select * from alarmmg where endTime is null")
  List<alarmmg> SelectAlarmmgInfo();
}