diff --git a/yanzhu-bigscreen/public/css/largeScreenStyle.css b/yanzhu-bigscreen/public/css/largeScreenStyle.css
index aedda8a4..780881ef 100644
--- a/yanzhu-bigscreen/public/css/largeScreenStyle.css
+++ b/yanzhu-bigscreen/public/css/largeScreenStyle.css
@@ -60,6 +60,7 @@ body {
     height: 1080px;
   }
   .img-openwin {
+    cursor: pointer;
     width: 26px;
     height: 26px;
   }
diff --git a/yanzhu-bigscreen/src/api/safety.js b/yanzhu-bigscreen/src/api/safety.js
index 603ddabe..0fbc4918 100644
--- a/yanzhu-bigscreen/src/api/safety.js
+++ b/yanzhu-bigscreen/src/api/safety.js
@@ -25,8 +25,6 @@ const listCountForBG = (data) => {
 };
 
 const listForBG = (data) => {
-  data.pageSize = 5;
-  data.pageNum = 1;
   return request({
     url: `/manage/problemmodify/listForBG`,
     method: "get",
diff --git a/yanzhu-bigscreen/src/views/safety/safetyCheckDialog.vue b/yanzhu-bigscreen/src/views/safety/safetyCheckDialog.vue
new file mode 100644
index 00000000..afda7920
--- /dev/null
+++ b/yanzhu-bigscreen/src/views/safety/safetyCheckDialog.vue
@@ -0,0 +1,293 @@
+<template>
+    <MyDialog v-if="show" v-model="show" width="60vw" height="75vh" class="safety-check-dialog">
+        <template slot="title">
+            {{ title }}
+        </template>
+        <div class="head-title-tab" style="padding: 10px 0px;">
+            <div :class="nav == 6 ? 'head-nav active' : 'head-nav'" @click="doNav(6)">待整改{{ counts[0] }}</div>
+            <div :class="nav == 3 ? 'head-nav active' : 'head-nav'" @click="doNav(3)">待复检{{ counts[1] }}</div>
+            <div :class="nav == 7 ? 'head-nav active' : 'head-nav'" @click="doNav(7)">复检驳回{{ counts[2] }}</div>
+            <div :class="nav == 4 ? 'head-nav active' : 'head-nav'" @click="doNav(4)">复检通过{{ counts[3] }}</div>
+            <div :class="nav == 5 ? 'head-nav active' : 'head-nav'" @click="doNav(5)">整改超时{{ counts[4] }}</div>
+        </div>
+        <div class="scroll data-list" :key="dataKey">
+            <div v-if="rows.length == 0" style="text-align: center;" class="div-no-data">
+                <img src="images/nodata.png" style="width: 120px;">
+                <div style="text-align: center;font-size: 12px;color:#888;">暂无数据</div>
+            </div>
+            <div v-for="(it, idx) in rows" :key="idx" class="data-item">
+                <div class="left-image">
+                    <div class="left-header">
+                        <span class="sp-nav" :class="it.imgSel == 0 ? 'active' : ''" @click="it.imgSel = 0">整改前</span>
+                        <span class="sp-nav" :class="it.imgSel == 1 ? 'active' : ''" v-if="it.checkState == 4"
+                            @click="it.imgSel = 1">整改后</span>
+                    </div>
+                    <el-image class="img-sm" fit="scale-down" :src="it.smarkUrl" v-if="it.imgSel == 0"
+                        :preview-src-list="[it.smarkUrl]"></el-image>
+                    <el-image class="img-sm" fit="scale-down" :src="it.marksPicture" v-if="it.imgSel == 1"
+                        :preview-src-list="[it.marksPicture]"></el-image>
+                </div>
+                <div class="right-data">
+                    <el-col :span="12">
+                        <span class="sp-label">隐串类型:</span>
+                        <span class="sp-value">{{ getDict(it.dangerType) }}</span>
+                    </el-col>
+                    <el-col :span="12">
+                        <span class="sp-label">提交时间:</span>
+                        <span class="sp-value">{{ it.createTime }}</span>
+                    </el-col>
+                    <el-col :span="12">
+                        <span class="sp-label">提交人:</span>
+                        <span class="sp-value">{{ it.createUser }}</span>
+                    </el-col>
+                    <el-col :span="12">
+                        <span class="sp-label">整改人:</span>
+                        <span class="sp-value">{{ it.lordSentUser }}</span>
+                    </el-col>
+                    <el-col :span="12">
+                        <span class="sp-label">抄送人:</span>
+                        <span class="sp-value">{{ it.copySendUser }}</span>
+                    </el-col>
+                    <el-col :span="12">
+                        <span class="sp-label">截止时间:</span>
+                        <span class="sp-value">{{ it.nickedTime }}</span>
+                    </el-col>
+                    <el-col :span="24">
+                        <span class="sp-label">隐患描述:</span>
+                        <span class="sp-value">{{ it.workParts }}</span>
+                    </el-col>
+                    <el-col :span="24">
+                        <span class="sp-label">整改要求:</span>
+                        <span class="sp-value">{{ it.changeInfo }}</span>
+                    </el-col>
+                </div>
+            </div>
+        </div>
+        <el-pagination v-if="rows.length > 0" layout="total,prev, pager, next" @current-change="handleCurrentChange"
+            :total="total" :page-size="pageSize" :current-page.sync="pageNum" class="bg-pagination"></el-pagination>
+    </MyDialog>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            show: false,
+            title: "安全隐患排查",
+            prjInfo: {},
+            nav: 6,
+            problemType: null,
+            counts: [],
+            pageNum: 0,
+            pageSize: 10,
+            total: 0,
+            rows: [],
+            dataKey: 0,
+            dangerTypeDict: [],
+        }
+    },
+    methods: {
+        handleCurrentChange(n) {
+            this.pageNum = n;
+            this.loadData();
+        },
+        getDict(n) {
+            let tmps = this.dangerTypeDict.filter(d => d.value == n);
+            return tmps.length > 0 ? tmps[0].label : '';
+        },
+        doNav(n) {
+            this.nav = n;
+            this.loadData();
+        },
+        showDialog(prj, n, dangerTypeDict) {
+            this.dangerTypeDict = dangerTypeDict;
+            this.problemType = n == 0 ? null : n;
+            this.prjInfo = prj;
+            this.title = ["安全隐患排查", "日常巡检", "周检", "月检", "转型检查"][n];
+            this.pageNum = 0;
+            this.show = true;
+            this.getCount(n);
+            this.loadData();
+        },
+        getCount(n) {
+            let postData = {
+                projectId: this.prjInfo.id,
+                comId: this.prjInfo.comId,
+                infoType: 0
+            };
+            if (n > 0) {
+                postData.problemType = n;
+            }
+            this.$api.safety.listCountForBG(postData).then(d => {
+                this.counts = d.data.filter(it => it.projectName != 'a').map(it => it.id)
+            });
+        },
+        loadData() {
+            let postData = {
+                projectId: this.prjInfo.id,
+                comId: this.prjInfo.comId,
+                infoType: 0,
+                pageNum: this.pageNum,
+                pageSize: this.pageSize,
+                problemType: this.problemType,
+                projectName: this.nav
+            };
+            this.$api.safety.listForBG(postData).then(d => {
+                this.total = d.total;
+                this.rows = (d.rows || []).map(it => {
+                    it.imgSel = 0;
+                    return it;
+                });
+                this.dataKey++;
+            });
+        }
+
+    }
+}
+</script>
+
+<style lang="less">
+.safety-check-dialog {
+    .popup-project-introduction-min {
+        transform: translateY(20%);
+    }
+
+    .bg-pagination {
+        margin-top: 5px;
+    }
+
+    .data-list {
+        max-height: calc(75vh - 150px);
+        overflow-y: auto;
+
+        .div-no-data {
+            margin-top: 10vh;
+        }
+
+        .data-item {
+            display: flex;
+            background: #060f239d;
+            padding: 10px;
+            border: solid 1px #cccccc33;
+            margin-top: 20px;
+
+            &:first-child {
+                margin-top: 0;
+            }
+
+            .left-image {
+                width: 160px;
+                box-shadow: 1px 1px 10px 1px #ffffff3b;
+
+                .left-header {
+                    margin-bottom: 8px;
+                    background: #fff;
+
+                    .sp-nav {
+                        display: inline-block;
+                        width: 50%;
+                        line-height: 30px;
+                        text-align: center;
+                        background: #fff;
+                        color: #5B84EB;
+                        cursor: pointer;
+
+                        &.active {
+                            color: #fff;
+                            background: #5B84EB;
+                        }
+                    }
+
+
+                }
+
+                .el-image {
+                    width: 160px;
+                    height: 100px;
+                }
+            }
+
+            .right-data {
+                flex-grow: 1;
+                padding: 0px 20px;
+                line-height: 30px;
+
+                .sp-label {
+                    color: #8BFFD2;
+                }
+            }
+        }
+    }
+
+}
+
+@media (min-width: 1921px) and (max-width: 2560px) {
+    .safety-check-dialog {
+        .bg-pagination {
+            margin-top: 5px;
+
+            * {
+                font-size: 20px !important;
+            }
+
+            button,
+            li {
+                height: 28px !important;
+                line-height: 28px !important;
+            }
+        }
+
+        .data-list {
+            max-height: calc(75vh - 180px);
+
+            .data-item {
+
+
+
+                .right-data {
+                    font-size: 18px;
+
+                    .sp-label {
+                        color: #8BFFD2;
+                    }
+                }
+            }
+        }
+    }
+}
+
+@media (min-width: 2561px) {
+    .safety-check-dialog {
+        .bg-pagination {
+            margin-top: 15px;
+
+            * {
+                font-size: 24px !important;
+            }
+
+            button,
+            li {
+                height: 32px !important;
+                line-height: 32px !important;
+            }
+        }
+
+        .data-list {
+            max-height: calc(75vh - 180px);
+
+            .data-item {
+
+
+
+                .right-data {
+                    font-size: 24px;
+
+                    .sp-label {
+                        color: #8BFFD2;
+                    }
+                }
+            }
+        }
+    }
+}
+</style>
\ No newline at end of file
diff --git a/yanzhu-bigscreen/src/views/safetyCheck.vue b/yanzhu-bigscreen/src/views/safetyCheck.vue
index 187685f0..1aa41cec 100644
--- a/yanzhu-bigscreen/src/views/safetyCheck.vue
+++ b/yanzhu-bigscreen/src/views/safetyCheck.vue
@@ -21,6 +21,7 @@
                 </el-col>
             </module-one-1-1>
             <module-one-2-1 label="日常巡检">
+                <img src="images/icon2001.png" class="img-openwin" @click="showDlg(1)" />
                 <div class="div-item-chart">
                     <div class="data-item-chart">
                         <div class="total-info">{{ item1Data.total }}<br />
@@ -28,36 +29,253 @@
                         </div>
                         <div class="chart-gif chart-overview-gif"></div>
                         <my-chart :key="itemChartKey1" id="project-safety-check-item1" width="100%" height="100%"
-                            :render="o => renderDataItem1(1)"></my-chart>
+                            :render="o => renderDataItem(1)"></my-chart>
+                    </div>
+                    <div class="div-item-info" :key="itemChartKey1">
+                        <div v-for="(it, idx) in item1Data.infos" :key="idx" :class="'item-info'">
+                            <span class="sp-name">{{ it.name }}</span>
+                            <span class="sp-lend" :class="'is-' + it.type"></span>
+                            <span class="sp-value led-number">{{ it.value }}</span>
+                            <span class="sp-percent led-number" v-if="idx > 0">{{ it.percent }}%</span>
+                        </div>
+                    </div>
+                </div>
+                <div class="div-item-data">
+                    <div class="glr-title">最新提交</div>
+                    <div class="div-item-list scroll">
+                        <div v-for="(it, idx) in item1Data.items" :key="idx" class="list-item">
+                            <el-image class="img-sm" fit="scale-down" :src="it.smarkUrl"
+                                :preview-src-list="[it.smarkUrl]"></el-image>
+                            <div class="list-item-info">
+                                <div class="item-row">
+                                    <span class="sp-label">提交人:</span>
+                                    <span class="sp-data">{{ it.createUser }}</span>
+                                </div>
+                                <div class="item-row">
+                                    <span class="sp-label">整改人:</span>
+                                    <span class="sp-data">{{ it.lordSentUser }}</span>
+                                </div>
+                                <div class="item-row">
+                                    <span class="sp-label">复检人:</span>
+                                    <span class="sp-data">{{ it.recheckSendUser }}</span>
+                                </div>
+                                <div class="item-row">
+                                    <span class="sp-label">隐患描述:</span>
+                                    <span class="sp-data">{{ it.workParts }}</span>
+                                </div>
+                                <div class="item-row">
+                                    <span class="sp-label">整改要求:</span>
+                                    <span class="sp-data">{{ it.changeInfo }}</span>
+                                </div>
+                                <div class="item-row">
+                                    <span class="sp-label">状态:</span>
+                                    <span class="sp-data">{{ getStatus(it.checkState) }}</span>
+                                </div>
+                            </div>
+                        </div>
                     </div>
-                    {{ item1Data.infos }}
                 </div>
             </module-one-2-1>
         </el-col>
         <el-col :span="18" class="h100">
             <module-one-1-3 label="隐患类别统计">
+                <img src="images/icon2001.png" class="img-openwin" @click="showDlg(0)" />
                 <my-chart :key="chartKey2" id="project-safety-check-chart2" width="100%" height="100%"
                     :render="renderChart2"></my-chart>
             </module-one-1-3>
             <el-row class="el-right">
                 <el-col :span="8">
-                    <module-one-2-1 label="周检"></module-one-2-1>
+                    <module-one-2-1 label="周检">
+                        <img src="images/icon2001.png" class="img-openwin" @click="showDlg(2)" />
+                        <div class="div-item-chart">
+                            <div class="data-item-chart">
+                                <div class="total-info">{{ item2Data.total }}<br />
+                                    <span class="sp-label">问题总数</span>
+                                </div>
+                                <div class="chart-gif chart-overview-gif"></div>
+                                <my-chart :key="itemChartKey1" id="project-safety-check-item2" width="100%"
+                                    height="100%" :render="o => renderDataItem(2)"></my-chart>
+                            </div>
+                            <div class="div-item-info" :key="itemChartKey1">
+                                <div v-for="(it, idx) in item2Data.infos" :key="idx" :class="'item-info'">
+                                    <span class="sp-name">{{ it.name }}</span>
+                                    <span class="sp-lend" :class="'is-' + it.type"></span>
+                                    <span class="sp-value led-number">{{ it.value }}</span>
+                                    <span class="sp-percent led-number" v-if="idx > 0">{{ it.percent }}%</span>
+                                </div>
+                            </div>
+
+                        </div>
+                        <div class="div-item-data">
+                            <div class="glr-title">最新提交</div>
+                            <div class="div-item-list scroll">
+                                <div v-for="(it, idx) in item2Data.items" :key="idx" class="list-item">
+                                    <el-image class="img-sm" fit="scale-down" :src="it.smarkUrl"
+                                        :preview-src-list="[it.smarkUrl]"></el-image>
+                                    <div class="list-item-info">
+                                        <div class="item-row">
+                                            <span class="sp-label">提交人:</span>
+                                            <span class="sp-data">{{ it.createUser }}</span>
+                                        </div>
+                                        <div class="item-row">
+                                            <span class="sp-label">整改人:</span>
+                                            <span class="sp-data">{{ it.lordSentUser }}</span>
+                                        </div>
+                                        <div class="item-row">
+                                            <span class="sp-label">复检人:</span>
+                                            <span class="sp-data">{{ it.recheckSendUser }}</span>
+                                        </div>
+                                        <div class="item-row">
+                                            <span class="sp-label">隐患描述:</span>
+                                            <span class="sp-data">{{ it.workParts }}</span>
+                                        </div>
+                                        <div class="item-row">
+                                            <span class="sp-label">整改要求:</span>
+                                            <span class="sp-data">{{ it.changeInfo }}</span>
+                                        </div>
+                                        <div class="item-row">
+                                            <span class="sp-label">状态:</span>
+                                            <span class="sp-data">{{ getStatus(it.checkState) }}</span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </module-one-2-1>
                 </el-col>
                 <el-col :span="8">
-                    <module-one-2-1 label="月检"></module-one-2-1>
+                    <module-one-2-1 label="月检">
+                        <img src="images/icon2001.png" class="img-openwin" @click="showDlg(3)" />
+                        <div class="div-item-chart">
+                            <div class="data-item-chart">
+                                <div class="total-info">{{ item3Data.total }}<br />
+                                    <span class="sp-label">问题总数</span>
+                                </div>
+                                <div class="chart-gif chart-overview-gif"></div>
+                                <my-chart :key="itemChartKey1" id="project-safety-check-item3" width="100%"
+                                    height="100%" :render="o => renderDataItem(3)"></my-chart>
+                            </div>
+                            <div class="div-item-info" :key="itemChartKey1">
+                                <div v-for="(it, idx) in item3Data.infos" :key="idx" :class="'item-info'">
+                                    <span class="sp-name">{{ it.name }}</span>
+                                    <span class="sp-lend" :class="'is-' + it.type"></span>
+                                    <span class="sp-value led-number">{{ it.value }}</span>
+                                    <span class="sp-percent led-number" v-if="idx > 0">{{ it.percent }}%</span>
+                                </div>
+                            </div>
+
+                        </div>
+                        <div class="div-item-data">
+                            <div class="glr-title">最新提交</div>
+                            <div class="div-item-list scroll">
+                                <div v-for="(it, idx) in item3Data.items" :key="idx" class="list-item">
+                                    <el-image class="img-sm" fit="scale-down" :src="it.smarkUrl"
+                                        :preview-src-list="[it.smarkUrl]"></el-image>
+                                    <div class="list-item-info">
+                                        <div class="item-row">
+                                            <span class="sp-label">提交人:</span>
+                                            <span class="sp-data">{{ it.createUser }}</span>
+                                        </div>
+                                        <div class="item-row">
+                                            <span class="sp-label">整改人:</span>
+                                            <span class="sp-data">{{ it.lordSentUser }}</span>
+                                        </div>
+                                        <div class="item-row">
+                                            <span class="sp-label">复检人:</span>
+                                            <span class="sp-data">{{ it.recheckSendUser }}</span>
+                                        </div>
+                                        <div class="item-row">
+                                            <span class="sp-label">隐患描述:</span>
+                                            <span class="sp-data">{{ it.workParts }}</span>
+                                        </div>
+                                        <div class="item-row">
+                                            <span class="sp-label">整改要求:</span>
+                                            <span class="sp-data">{{ it.changeInfo }}</span>
+                                        </div>
+                                        <div class="item-row">
+                                            <span class="sp-label">状态:</span>
+                                            <span class="sp-data">{{ getStatus(it.checkState) }}</span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </module-one-2-1>
                 </el-col>
                 <el-col :span="8">
-                    <module-one-2-1 label="转型检查"></module-one-2-1>
+                    <module-one-2-1 label="转型检查">
+                        <img src="images/icon2001.png" class="img-openwin" @click="showDlg(4)" />
+                        <div class="div-item-chart">
+                            <div class="data-item-chart">
+                                <div class="total-info">{{ item4Data.total }}<br />
+                                    <span class="sp-label">问题总数</span>
+                                </div>
+                                <div class="chart-gif chart-overview-gif"></div>
+                                <my-chart :key="itemChartKey1" id="project-safety-check-item4" width="100%"
+                                    height="100%" :render="o => renderDataItem(3)"></my-chart>
+                            </div>
+                            <div class="div-item-info" :key="itemChartKey1">
+                                <div v-for="(it, idx) in item4Data.infos" :key="idx" :class="'item-info'">
+                                    <span class="sp-name">{{ it.name }}</span>
+                                    <span class="sp-lend" :class="'is-' + it.type"></span>
+                                    <span class="sp-value led-number">{{ it.value }}</span>
+                                    <span class="sp-percent led-number" v-if="idx > 0">{{ it.percent }}%</span>
+                                </div>
+                            </div>
+
+                        </div>
+                        <div class="div-item-data">
+                            <div class="glr-title">最新提交</div>
+                            <div class="div-item-list scroll">
+                                <div v-for="(it, idx) in item4Data.items" :key="idx" class="list-item">
+                                    <el-image class="img-sm" fit="scale-down" :src="it.smarkUrl"
+                                        :preview-src-list="[it.smarkUrl]"></el-image>
+                                    <div class="list-item-info">
+                                        <div class="item-row">
+                                            <span class="sp-label">提交人:</span>
+                                            <span class="sp-data">{{ it.createUser }}</span>
+                                        </div>
+                                        <div class="item-row">
+                                            <span class="sp-label">整改人:</span>
+                                            <span class="sp-data">{{ it.lordSentUser }}</span>
+                                        </div>
+                                        <div class="item-row">
+                                            <span class="sp-label">复检人:</span>
+                                            <span class="sp-data">{{ it.recheckSendUser }}</span>
+                                        </div>
+                                        <div class="item-row">
+                                            <span class="sp-label">隐患描述:</span>
+                                            <span class="sp-data">{{ it.workParts }}</span>
+                                        </div>
+                                        <div class="item-row">
+                                            <span class="sp-label">整改要求:</span>
+                                            <span class="sp-data">{{ it.changeInfo }}</span>
+                                        </div>
+                                        <div class="item-row">
+                                            <span class="sp-label">状态:</span>
+                                            <span class="sp-data">{{ getStatus(it.checkState) }}</span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </module-one-2-1>
                 </el-col>
             </el-row>
         </el-col>
+        <safetyCheckDialog ref="dlg" />
     </div>
 </template>
 
 <script>
+import safetyCheckDialog from './safety/safetyCheckDialog.vue'
 export default {
+    components: {
+        safetyCheckDialog,
+    },
     data() {
         return {
+            dangerTypeDict: [],
             chartKey2: 0,
             itemChartKey1: 0,
             dpi: '',
@@ -85,21 +303,25 @@ export default {
                 total: 0,
                 datas: [],
                 infos: [],
+                items: [],
             },
             item2Data: {
                 total: 0,
                 datas: [],
                 infos: [],
+                items: [],
             },
             item3Data: {
                 total: 0,
                 datas: [],
                 infos: [],
+                items: [],
             },
             item4Data: {
                 total: 0,
                 datas: [],
                 infos: [],
+                items: [],
             }
         }
     },
@@ -117,10 +339,17 @@ export default {
             if (this.dpi != this.$dpi()) {
                 this.dpi = this.$dpi();
                 this.chartKey++;
+                this.chartKey2++;
             }
         });
+        this.$api.dict("ssp_proble_sub_type").then((d) => {
+            this.dangerTypeDict = d || [];
+        });
     },
     methods: {
+        showDlg(n) {
+            this.$refs.dlg.showDialog(this.selProject, n, this.dangerTypeDict);
+        },
         init() {
             if (!this.selProject) {
                 return;
@@ -133,13 +362,13 @@ export default {
                 this.$api.safety.groupByProblemType(postData),
                 this.$api.safety.groupByDangerType(postData),
                 this.$api.safety.listCountForBG({ ...postData, problemType: 1, infoType: 0 }),
-                this.$api.safety.listForBG({ ...postData, problemType: 1, infoType: 0 }),
+                this.$api.safety.listForBG({ ...postData, problemType: 1, infoType: 0, pageNum: 1, pageSize: 5 }),
                 this.$api.safety.listCountForBG({ ...postData, problemType: 2, infoType: 0 }),
-                this.$api.safety.listForBG({ ...postData, problemType: 2, infoType: 0 }),
+                this.$api.safety.listForBG({ ...postData, problemType: 2, infoType: 0, pageNum: 1, pageSize: 5 }),
                 this.$api.safety.listCountForBG({ ...postData, problemType: 3, infoType: 0 }),
-                this.$api.safety.listForBG({ ...postData, problemType: 3, infoType: 0 }),
+                this.$api.safety.listForBG({ ...postData, problemType: 3, infoType: 0, pageNum: 1, pageSize: 5 }),
                 this.$api.safety.listCountForBG({ ...postData, problemType: 4, infoType: 0 }),
-                this.$api.safety.listForBG({ ...postData, problemType: 4, infoType: 0 }),
+                this.$api.safety.listForBG({ ...postData, problemType: 4, infoType: 0, pageNum: 1, pageSize: 5 }),
             ];
             this.$api.http.all(ajaxs).then(res => {
                 this.chart1Data = (res[0].data || []).map(it => {
@@ -161,9 +390,13 @@ export default {
                 this.showChart1();//安全隐患排查
                 this.showChart2();//隐患类别统计  
                 this.makeItemData(this.item1Data, res[2].data)
+                this.item1Data.items = res[3].rows;
                 this.makeItemData(this.item2Data, res[4].data)
+                this.item2Data.items = res[5].rows;
                 this.makeItemData(this.item3Data, res[6].data)
+                this.item3Data.items = res[7].rows;
                 this.makeItemData(this.item4Data, res[8].data)
+                this.item4Data.items = res[9].rows;
                 this.itemChartKey1++;
             });
         },
@@ -173,6 +406,13 @@ export default {
         showChart2() {
             this.chartKey2++;
         },
+        getStatus(s) {
+            let checkStates = [{ value: "0", label: '待整改' }, { value: "1", label: '待复检' },
+            { value: "3", label: '复检驳回' },
+            { value: "4", label: '复检通过' }];
+            let objs = checkStates.filter(it => it.value == s);
+            return objs.length > 0 ? objs[0].label : '';
+        },
         makeItemData(item, res) {
             let labels = ['问题总数', '待整改', '待复检', '复检驳回', '整改完成', '超时整改'];
             item.total = res[0].id;
@@ -189,11 +429,15 @@ export default {
                 item.infos.push({
                     name: labels[i],
                     value: res[i].id,
+                    type: res[i].projectName,
                     percent: total == 0 ? 0 : (res[i].id / total * 100.0).toFixed(1)
                 });
             }
         },
-        renderDataItem1() {
+        renderDataItem(n) {
+            let is1K = this.$dpi() == "1K";
+            let is2K = this.$dpi() == "2K";
+            let objs = this._data['item' + n + 'Data'];
             let option = {
                 color: ["#71BCC4", "#EEBE47", "#5EA85D", "#5B84EB", "#E76168"],
                 series: [
@@ -216,11 +460,10 @@ export default {
                         labelLine: {
                             show: false
                         },
-                        data: this.item1Data.datas
+                        data: objs.datas
                     }
                 ]
             };
-            console.log("--->", this.item1Data.datas)
             return option;
         },
         renderChart2(opt) {
@@ -257,9 +500,9 @@ export default {
                         type: "category",
                         data: this.chart2Data.map(it => it.name.replace(/[“”]/g, "'")),
                         axisLabel: {
-                            width: 60,
+                            width: is1K ? 60 : is2K ? 140 : 220,
                             rotate: 15,
-                            fontSize: is1K ? 12 : is2K ? 14 : 24,
+                            fontSize: is1K ? 12 : is2K ? 14 : 22,
                             overflow: "break",
                             color: "#a2c8f9"
                         },
@@ -405,7 +648,8 @@ export default {
             height: 230px;
             width: 230px;
             display: inline-block;
-            position: relative;
+            position: absolute;
+            left: -30px;
 
             .total-info {
                 position: absolute;
@@ -430,6 +674,101 @@ export default {
             }
         }
 
+        .div-item-info {
+            display: inline-block;
+            width: calc(100% - 180px);
+            right: -0px;
+            top: 20px;
+            position: absolute;
+
+            .item-info {
+                line-height: 30px;
+
+                .sp-lend {
+                    display: inline-block;
+                    margin-left: 8px;
+                    width: 10px;
+                    height: 20px;
+                    position: relative;
+                    top: 4px;
+
+                    &.is-b {
+                        background-color: #71BCC4;
+                    }
+
+                    &.is-c {
+                        background-color: #EEBE47;
+                    }
+
+                    &.is-d {
+                        background-color: #5EA85D;
+                    }
+
+                    &.is-e {
+                        background-color: #5B84EB;
+                    }
+                }
+
+                .sp-name {
+                    display: inline-block;
+                    text-align: right;
+                    width: 70px;
+                }
+
+                .sp-value {
+                    margin-left: 8px;
+                    font-size: 24px;
+                    display: inline-block;
+                    text-align: center;
+                    min-width: 70px;
+                }
+
+                .sp-percent {
+                    margin-left: 8px;
+                    color: #5B84EB;
+                }
+            }
+        }
+    }
+
+    .div-item-data {
+        height: calc(100% - 230px);
+
+        .div-item-list {
+            height: calc(100% - 20px);
+            overflow-y: auto;
+
+            .list-item {
+                display: flex;
+                margin-top: 10px;
+                border-top: solid 1px #cccccc88;
+                padding-top: 10px;
+
+                &:first-child {
+                    margin-top: 0px;
+                    border-top: none;
+                }
+
+                .img-sm {
+                    width: calc(100% - 300px);
+                    height: 120px;
+                }
+
+                .list-item-info {
+                    width: 300px;
+                    font-size: 12px;
+                    padding-left: 10px;
+
+                    .item-row {
+                        line-height: 24px;
+
+                        .sp-label {
+                            color: #8BFFD2;
+                        }
+                    }
+                }
+            }
+        }
     }
 
     @media (min-width: 1921px) and (max-width: 2560px) {
@@ -465,6 +804,101 @@ export default {
                 }
             }
         }
+
+        .div-item-chart {
+            position: relative;
+            height: 260px;
+
+            .data-item-chart {
+                height: 260px;
+                width: 260px;
+                left: -30px;
+
+                .total-info {
+                    font-size: 24px;
+                    top: calc(50% - 20px);
+                    left: calc(50% - 50px);
+                    width: 100px;
+                    height: 40px;
+
+                    .sp-label {
+                        font-size: 20px;
+                    }
+                }
+
+                .chart-overview-gif {
+                    width: 80px;
+                    height: 80px;
+                    top: calc(50% - 40px);
+                    left: calc(50% - 40px);
+                }
+            }
+
+            .div-item-info {
+                width: calc(100% - 230px);
+                right: -0px;
+                top: 20px;
+
+                .item-info {
+                    line-height: 30px;
+
+                    .sp-lend {
+                        margin-left: 8px;
+                        width: 10px;
+                        height: 20px;
+                        top: 4px;
+                    }
+
+                    .sp-name {
+                        width: 90px;
+                        font-size: 20px;
+                    }
+
+                    .sp-value {
+                        margin-left: 8px;
+                        font-size: 32px;
+                        min-width: 150px;
+                    }
+
+                    .sp-percent {
+                        font-size: 20px;
+                        margin-left: 8px;
+                    }
+                }
+            }
+        }
+
+        .div-item-data {
+            height: calc(100% - 260px);
+
+            .glr-title {
+                font-size: 24px;
+            }
+
+            .div-item-list {
+                height: calc(100% - 20px);
+
+                .list-item {
+                    margin-top: 10px;
+                    padding-top: 10px;
+
+                    .img-sm {
+                        width: calc(100% - 400px);
+                        height: 120px;
+                    }
+
+                    .list-item-info {
+                        width: 400px;
+                        font-size: 16px;
+                        padding-left: 10px;
+
+                        .item-row {
+                            line-height: 30px;
+                        }
+                    }
+                }
+            }
+        }
     }
 
     @media (min-width: 2561px) {
@@ -499,7 +933,105 @@ export default {
                     }
                 }
             }
+
+
+        }
+
+        .div-item-chart {
+            position: relative;
+            height: 320px;
+
+            .data-item-chart {
+                height: 320px;
+                width: 320px;
+                left: -30px;
+
+                .total-info {
+                    font-size: 32px;
+                    top: calc(50% - 20px);
+                    left: calc(50% - 60px);
+                    width: 120px;
+                    height: 40px;
+
+                    .sp-label {
+                        font-size: 24px;
+                    }
+                }
+
+                .chart-overview-gif {
+                    width: 80px;
+                    height: 80px;
+                    top: calc(50% - 40px);
+                    left: calc(50% - 40px);
+                }
+            }
+
+            .div-item-info {
+                width: calc(100% - 300px);
+                right: -0px;
+                top: 20px;
+
+                .item-info {
+                    line-height: 40px;
+
+                    .sp-lend {
+                        margin-left: 8px;
+                        width: 10px;
+                        height: 20px;
+                        top: 4px;
+                    }
+
+                    .sp-name {
+                        width: 120px;
+                        font-size: 30px;
+                    }
+
+                    .sp-value {
+                        margin-left: 8px;
+                        font-size: 36px;
+                        min-width: 200px;
+                    }
+
+                    .sp-percent {
+                        font-size: 24px;
+                        margin-left: 8px;
+                    }
+                }
+            }
+        }
+
+        .div-item-data {
+            height: calc(100% - 320px);
+
+            .glr-title {
+                font-size: 28px;
+            }
+
+            .div-item-list {
+                height: calc(100% - 20px);
+
+                .list-item {
+                    margin-top: 10px;
+                    padding-top: 10px;
+
+                    .img-sm {
+                        width: calc(100% - 600px);
+                        height: 120px;
+                    }
+
+                    .list-item-info {
+                        width: 600px;
+                        font-size: 20px;
+                        padding-left: 10px;
+
+                        .item-row {
+                            line-height: 32px;
+                        }
+                    }
+                }
+            }
         }
     }
+
 }
 </style>
\ No newline at end of file
diff --git a/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/web/domain/BaseEntity.java b/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/web/domain/BaseEntity.java
index b8cf50f8..496fef64 100644
--- a/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/web/domain/BaseEntity.java
+++ b/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/web/domain/BaseEntity.java
@@ -62,6 +62,16 @@ public class BaseEntity implements Serializable
     /** 数据来源 */
     private String dataSource;
 
+    private String activeName;
+
+    public String getActiveName() {
+        return activeName;
+    }
+
+    public void setActiveName(String activeName) {
+        this.activeName = activeName;
+    }
+
     /** 请求参数 */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private Map<String, Object> params;
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataCollide.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataCollide.java
new file mode 100644
index 00000000..ec59aa08
--- /dev/null
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataCollide.java
@@ -0,0 +1,330 @@
+package com.yanzhu.device.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.yanzhu.common.core.annotation.Excel;
+import com.yanzhu.common.core.web.domain.BaseEntity;
+
+import java.util.List;
+
+/**
+ * 塔机碰撞信息对象 dev_tower_data_collide
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+public class DevTowerDataCollide extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 配置编号 */
+    private Long cfgId;
+
+    /** 项目主键 */
+    private Long projectId;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String projectName;
+
+    /** 总包单位主键 */
+    private Long comId;
+
+    /** 总包单位名称 */
+    @Excel(name = "总包单位名称")
+    private String comName;
+
+    /** 设备序列号 */
+    @Excel(name = "设备序列号")
+    private String deviceKey;
+
+    /** 设备来源 */
+    @Excel(name = "设备来源")
+    private String deviceSource;
+
+    /** 塔机编号 */
+    @Excel(name = "塔机编号")
+    private String towerId;
+
+    /** 塔机坐标x */
+    @Excel(name = "塔机坐标x")
+    private String coordinateX;
+
+    /** 塔机坐标y */
+    @Excel(name = "塔机坐标y")
+    private String coordinateY;
+
+    /** 前臂长度 */
+    @Excel(name = "前臂长度")
+    private String frontBrachium;
+
+    /** 平衡臂长度 */
+    @Excel(name = "平衡臂长度")
+    private String afterBrachium;
+
+    /** 塔身高度 */
+    @Excel(name = "塔身高度")
+    private String towerBodyHeight;
+
+    /** 吊钩实时高度 */
+    @Excel(name = "吊钩实时高度")
+    private String height;
+
+    /** 塔机实时回转角度 */
+    @Excel(name = "塔机实时回转角度")
+    private String angle;
+
+    /** 吊钩实时幅度 */
+    @Excel(name = "吊钩实时幅度")
+    private String range;
+
+    /** 设置的预警距离 */
+    @Excel(name = "设置的预警距离")
+    private String earlyWarningDistance;
+
+    /** 设置的报警距离 */
+    @Excel(name = "设置的报警距离")
+    private String alarmWarningDistance;
+
+    /** 塔身高度相差 */
+    @Excel(name = "塔身高度相差")
+    private String contourValue;
+
+    /** 是否有效 */
+    @Excel(name = "是否有效")
+    private Long isDel;
+
+    /** 碰撞详情信息 */
+    private List<DevTowerDataCollideDetail> devTowerDataCollideDetailList;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+
+    public Long getCfgId() {
+        return cfgId;
+    }
+
+    public void setCfgId(Long cfgId) {
+        this.cfgId = cfgId;
+    }
+
+    public void setProjectId(Long projectId)
+    {
+        this.projectId = projectId;
+    }
+
+    public Long getProjectId() 
+    {
+        return projectId;
+    }
+
+    public Long getComId() {
+        return comId;
+    }
+
+    public void setComId(Long comId) {
+        this.comId = comId;
+    }
+
+    public void setDeviceKey(String deviceKey)
+    {
+        this.deviceKey = deviceKey;
+    }
+
+    public String getDeviceKey() 
+    {
+        return deviceKey;
+    }
+    public void setDeviceSource(String deviceSource) 
+    {
+        this.deviceSource = deviceSource;
+    }
+
+    public String getDeviceSource() 
+    {
+        return deviceSource;
+    }
+    public void setTowerId(String towerId) 
+    {
+        this.towerId = towerId;
+    }
+
+    public String getTowerId() 
+    {
+        return towerId;
+    }
+    public void setCoordinateX(String coordinateX) 
+    {
+        this.coordinateX = coordinateX;
+    }
+
+    public String getCoordinateX() 
+    {
+        return coordinateX;
+    }
+    public void setCoordinateY(String coordinateY) 
+    {
+        this.coordinateY = coordinateY;
+    }
+
+    public String getCoordinateY() 
+    {
+        return coordinateY;
+    }
+    public void setFrontBrachium(String frontBrachium) 
+    {
+        this.frontBrachium = frontBrachium;
+    }
+
+    public String getFrontBrachium() 
+    {
+        return frontBrachium;
+    }
+    public void setAfterBrachium(String afterBrachium) 
+    {
+        this.afterBrachium = afterBrachium;
+    }
+
+    public String getAfterBrachium() 
+    {
+        return afterBrachium;
+    }
+    public void setTowerBodyHeight(String towerBodyHeight) 
+    {
+        this.towerBodyHeight = towerBodyHeight;
+    }
+
+    public String getTowerBodyHeight() 
+    {
+        return towerBodyHeight;
+    }
+    public void setHeight(String height) 
+    {
+        this.height = height;
+    }
+
+    public String getHeight() 
+    {
+        return height;
+    }
+    public void setAngle(String angle) 
+    {
+        this.angle = angle;
+    }
+
+    public String getAngle() 
+    {
+        return angle;
+    }
+    public void setRange(String range) 
+    {
+        this.range = range;
+    }
+
+    public String getRange() 
+    {
+        return range;
+    }
+    public void setEarlyWarningDistance(String earlyWarningDistance) 
+    {
+        this.earlyWarningDistance = earlyWarningDistance;
+    }
+
+    public String getEarlyWarningDistance() 
+    {
+        return earlyWarningDistance;
+    }
+    public void setAlarmWarningDistance(String alarmWarningDistance) 
+    {
+        this.alarmWarningDistance = alarmWarningDistance;
+    }
+
+    public String getAlarmWarningDistance() 
+    {
+        return alarmWarningDistance;
+    }
+    public void setContourValue(String contourValue) 
+    {
+        this.contourValue = contourValue;
+    }
+
+    public String getContourValue() 
+    {
+        return contourValue;
+    }
+    public void setIsDel(Long isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public Long getIsDel() 
+    {
+        return isDel;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getComName() {
+        return comName;
+    }
+
+    public void setComName(String comName) {
+        this.comName = comName;
+    }
+
+    public List<DevTowerDataCollideDetail> getDevTowerDataCollideDetailList()
+    {
+        return devTowerDataCollideDetailList;
+    }
+
+    public void setDevTowerDataCollideDetailList(List<DevTowerDataCollideDetail> devTowerDataCollideDetailList)
+    {
+        this.devTowerDataCollideDetailList = devTowerDataCollideDetailList;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("projectId", getProjectId())
+            .append("comId", getComId())
+            .append("deviceKey", getDeviceKey())
+            .append("deviceSource", getDeviceSource())
+            .append("towerId", getTowerId())
+            .append("coordinateX", getCoordinateX())
+            .append("coordinateY", getCoordinateY())
+            .append("frontBrachium", getFrontBrachium())
+            .append("afterBrachium", getAfterBrachium())
+            .append("towerBodyHeight", getTowerBodyHeight())
+            .append("height", getHeight())
+            .append("angle", getAngle())
+            .append("range", getRange())
+            .append("earlyWarningDistance", getEarlyWarningDistance())
+            .append("alarmWarningDistance", getAlarmWarningDistance())
+            .append("contourValue", getContourValue())
+            .append("isDel", getIsDel())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .append("devTowerDataCollideDetailList", getDevTowerDataCollideDetailList())
+            .toString();
+    }
+}
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataCollideDetail.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataCollideDetail.java
new file mode 100644
index 00000000..245edcc8
--- /dev/null
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataCollideDetail.java
@@ -0,0 +1,246 @@
+package com.yanzhu.device.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.yanzhu.common.core.annotation.Excel;
+import com.yanzhu.common.core.web.domain.BaseEntity;
+
+/**
+ * 碰撞详情对象 dev_tower_data_collide_detail
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+public class DevTowerDataCollideDetail extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 碰撞主键 */
+    @Excel(name = "碰撞主键")
+    private Long collideId;
+
+    /** 设备序列号 */
+    @Excel(name = "设备序列号")
+    private String deviceKey;
+
+    /** 设备来源 */
+    @Excel(name = "设备来源")
+    private String deviceSource;
+
+    /** 塔机编号 */
+    @Excel(name = "塔机编号")
+    private String towerId;
+
+    /** 塔机坐标x */
+    @Excel(name = "塔机坐标x")
+    private String coordinateX;
+
+    /** 塔机坐标y */
+    @Excel(name = "塔机坐标y")
+    private String coordinateY;
+
+    /** 前臂长度 */
+    @Excel(name = "前臂长度")
+    private String frontBrachium;
+
+    /** 平衡臂长度 */
+    @Excel(name = "平衡臂长度")
+    private String afterBrachium;
+
+    /** 塔身高度 */
+    @Excel(name = "塔身高度")
+    private String towerBodyHeight;
+
+    /** 吊钩实时高度 */
+    @Excel(name = "吊钩实时高度")
+    private String height;
+
+    /** 塔机实时回转角度 */
+    @Excel(name = "塔机实时回转角度")
+    private String angle;
+
+    /** 吊钩实时幅度 */
+    @Excel(name = "吊钩实时幅度")
+    private String range;
+
+    /** 最短碰撞水平距离 */
+    @Excel(name = "最短碰撞水平距离")
+    private String collideHorizontalDistance;
+
+    /** 最短碰撞前后距离 */
+    @Excel(name = "最短碰撞前后距离")
+    private String collideVerticalDistance;
+
+    /** 碰撞状态 */
+    @Excel(name = "碰撞状态")
+    private String collideState;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setCollideId(Long collideId) 
+    {
+        this.collideId = collideId;
+    }
+
+    public Long getCollideId() 
+    {
+        return collideId;
+    }
+    public void setDeviceKey(String deviceKey) 
+    {
+        this.deviceKey = deviceKey;
+    }
+
+    public String getDeviceKey() 
+    {
+        return deviceKey;
+    }
+    public void setDeviceSource(String deviceSource) 
+    {
+        this.deviceSource = deviceSource;
+    }
+
+    public String getDeviceSource() 
+    {
+        return deviceSource;
+    }
+    public void setTowerId(String towerId) 
+    {
+        this.towerId = towerId;
+    }
+
+    public String getTowerId() 
+    {
+        return towerId;
+    }
+    public void setCoordinateX(String coordinateX) 
+    {
+        this.coordinateX = coordinateX;
+    }
+
+    public String getCoordinateX() 
+    {
+        return coordinateX;
+    }
+    public void setCoordinateY(String coordinateY) 
+    {
+        this.coordinateY = coordinateY;
+    }
+
+    public String getCoordinateY() 
+    {
+        return coordinateY;
+    }
+    public void setFrontBrachium(String frontBrachium) 
+    {
+        this.frontBrachium = frontBrachium;
+    }
+
+    public String getFrontBrachium() 
+    {
+        return frontBrachium;
+    }
+    public void setAfterBrachium(String afterBrachium) 
+    {
+        this.afterBrachium = afterBrachium;
+    }
+
+    public String getAfterBrachium() 
+    {
+        return afterBrachium;
+    }
+    public void setTowerBodyHeight(String towerBodyHeight) 
+    {
+        this.towerBodyHeight = towerBodyHeight;
+    }
+
+    public String getTowerBodyHeight() 
+    {
+        return towerBodyHeight;
+    }
+    public void setHeight(String height) 
+    {
+        this.height = height;
+    }
+
+    public String getHeight() 
+    {
+        return height;
+    }
+    public void setAngle(String angle) 
+    {
+        this.angle = angle;
+    }
+
+    public String getAngle() 
+    {
+        return angle;
+    }
+    public void setRange(String range) 
+    {
+        this.range = range;
+    }
+
+    public String getRange() 
+    {
+        return range;
+    }
+
+    public String getCollideHorizontalDistance() {
+        return collideHorizontalDistance;
+    }
+
+    public void setCollideHorizontalDistance(String collideHorizontalDistance) {
+        this.collideHorizontalDistance = collideHorizontalDistance;
+    }
+
+    public String getCollideVerticalDistance() {
+        return collideVerticalDistance;
+    }
+
+    public void setCollideVerticalDistance(String collideVerticalDistance) {
+        this.collideVerticalDistance = collideVerticalDistance;
+    }
+
+    public void setCollideState(String collideState)
+    {
+        this.collideState = collideState;
+    }
+
+    public String getCollideState() 
+    {
+        return collideState;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("collideId", getCollideId())
+            .append("deviceKey", getDeviceKey())
+            .append("deviceSource", getDeviceSource())
+            .append("towerId", getTowerId())
+            .append("coordinateX", getCoordinateX())
+            .append("coordinateY", getCoordinateY())
+            .append("frontBrachium", getFrontBrachium())
+            .append("afterBrachium", getAfterBrachium())
+            .append("towerBodyHeight", getTowerBodyHeight())
+            .append("height", getHeight())
+            .append("angle", getAngle())
+            .append("range", getRange())
+            .append("collideHorizontalDistance", getCollideHorizontalDistance())
+            .append("collideVerticalDistance", getCollideVerticalDistance())
+            .append("collideState", getCollideState())
+            .toString();
+    }
+}
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataLimit.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataLimit.java
new file mode 100644
index 00000000..dbe3e1c4
--- /dev/null
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataLimit.java
@@ -0,0 +1,635 @@
+package com.yanzhu.device.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.yanzhu.common.core.annotation.Excel;
+import com.yanzhu.common.core.web.domain.BaseEntity;
+/**
+ * 塔机限位信息对象 dev_tower_data_limit
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+public class DevTowerDataLimit extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 配置编号 */
+    private Long cfgId;
+
+    /** 项目主键 */
+    private Long projectId;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String projectName;
+
+    /** 总包单位主键 */
+    private Long comId;
+
+    /** 总包单位名称 */
+    @Excel(name = "总包单位名称")
+    private String comName;
+
+    /** 设备序列号 */
+    @Excel(name = "设备序列号")
+    private String deviceKey;
+
+    /** 设备来源 */
+    @Excel(name = "设备来源")
+    private String deviceSource;
+
+    /** 塔机编号 */
+    @Excel(name = "塔机编号")
+    private String towerId;
+
+    /** 风速预警 */
+    @Excel(name = "风速预警")
+    private String windSpeedWarning;
+
+    /** 风速报警 */
+    @Excel(name = "风速报警")
+    private String windSpeedAlarm;
+
+    /** 超载预警 */
+    @Excel(name = "超载预警")
+    private String loadWarning;
+
+    /** 超载报警 */
+    @Excel(name = "超载报警")
+    private String loadAlarm;
+
+    /** 力矩预警 */
+    @Excel(name = "力矩预警")
+    private String momentWarning;
+
+    /** 力矩报警 */
+    @Excel(name = "力矩报警")
+    private String momentAlarm;
+
+    /** 高限位预警 */
+    @Excel(name = "高限位预警")
+    private String highLimitWarning;
+
+    /** 高限位报警 */
+    @Excel(name = "高限位报警")
+    private String highLimitAlarm;
+
+    /** 低限位预警 */
+    @Excel(name = "低限位预警")
+    private String lowLimitWarning;
+
+    /** 低限位报警 */
+    @Excel(name = "低限位报警")
+    private String lowLimitAlarm;
+
+    /** 左限位预警 */
+    @Excel(name = "左限位预警")
+    private String leftLimitWarning;
+
+    /** 左限位报警 */
+    @Excel(name = "左限位报警")
+    private String leftLimitAlarm;
+
+    /** 右限位预警 */
+    @Excel(name = "右限位预警")
+    private String rightLimitWarning;
+
+    /** 右限位报警 */
+    @Excel(name = "右限位报警")
+    private String rightLimitAlarm;
+
+    /** 前限位预警 */
+    @Excel(name = "前限位预警")
+    private String frontLimitWarning;
+
+    /** 前限位报警 */
+    @Excel(name = "前限位报警")
+    private String frontLimitAlarm;
+
+    /** 后限位预警 */
+    @Excel(name = "后限位预警")
+    private String backLimitWarning;
+
+    /** 后限位报警 */
+    @Excel(name = "后限位报警")
+    private String backLimitAlarm;
+
+    /** 防碰角度预警 */
+    @Excel(name = "防碰角度预警")
+    private String collisionAngleWarning;
+
+    /** 防碰角度报警 */
+    @Excel(name = "防碰角度报警")
+    private String collisionAngleAlarm;
+
+    /** 防碰距离预警 */
+    @Excel(name = "防碰距离预警")
+    private String collisionDistanceWarning;
+
+    /** 防碰距离报警 */
+    @Excel(name = "防碰距离报警")
+    private String collisionDistanceAlarm;
+
+    /** 水平距离预警值 */
+    @Excel(name = "水平距离预警值")
+    private String hDistanceWarning;
+
+    /** 水平距离报警值 */
+    @Excel(name = "水平距离报警值")
+    private String hDistanceAlarm;
+
+    /** 垂直距离预警值 */
+    @Excel(name = "垂直距离预警值")
+    private String vDistanceWarning;
+
+    /** 垂直距离报警值 */
+    @Excel(name = "垂直距离报警值")
+    private String vDistanceAlarm;
+
+    /** 倾斜预警值 */
+    @Excel(name = "倾斜预警值")
+    private String leanWarning;
+
+    /** 倾斜报警值 */
+    @Excel(name = "倾斜报警值")
+    private String leanAlarm;
+
+    /** 幅度限位起点值 */
+    @Excel(name = "幅度限位起点值")
+    private String rangeLimitStart;
+
+    /** 幅度限位终点值 */
+    @Excel(name = "幅度限位终点值")
+    private String rangeLimitEnd;
+
+    /** 高度限位起点值 */
+    @Excel(name = "高度限位起点值")
+    private String heightLimitStart;
+
+    /** 高度限位终点值 */
+    @Excel(name = "高度限位终点值")
+    private String heightLimitEnd;
+
+    /** 回转限位起点值 */
+    @Excel(name = "回转限位起点值")
+    private String rotationLimitStart;
+
+    /** 回转限位终点值 */
+    @Excel(name = "回转限位终点值")
+    private String rotationLimitEnd;
+
+    /** 是否有效 */
+    @Excel(name = "是否有效")
+    private Long isDel;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+
+    public Long getCfgId() {
+        return cfgId;
+    }
+
+    public void setCfgId(Long cfgId) {
+        this.cfgId = cfgId;
+    }
+
+    public void setProjectId(Long projectId)
+    {
+        this.projectId = projectId;
+    }
+
+    public Long getProjectId() 
+    {
+        return projectId;
+    }
+
+    public Long getComId() {
+        return comId;
+    }
+
+    public void setComId(Long comId) {
+        this.comId = comId;
+    }
+
+    public void setDeviceKey(String deviceKey)
+    {
+        this.deviceKey = deviceKey;
+    }
+
+    public String getDeviceKey() 
+    {
+        return deviceKey;
+    }
+    public void setDeviceSource(String deviceSource) 
+    {
+        this.deviceSource = deviceSource;
+    }
+
+    public String getDeviceSource() 
+    {
+        return deviceSource;
+    }
+    public void setTowerId(String towerId) 
+    {
+        this.towerId = towerId;
+    }
+
+    public String getTowerId() 
+    {
+        return towerId;
+    }
+    public void setWindSpeedWarning(String windSpeedWarning) 
+    {
+        this.windSpeedWarning = windSpeedWarning;
+    }
+
+    public String getWindSpeedWarning() 
+    {
+        return windSpeedWarning;
+    }
+    public void setWindSpeedAlarm(String windSpeedAlarm) 
+    {
+        this.windSpeedAlarm = windSpeedAlarm;
+    }
+
+    public String getWindSpeedAlarm() 
+    {
+        return windSpeedAlarm;
+    }
+    public void setLoadWarning(String loadWarning) 
+    {
+        this.loadWarning = loadWarning;
+    }
+
+    public String getLoadWarning() 
+    {
+        return loadWarning;
+    }
+    public void setLoadAlarm(String loadAlarm) 
+    {
+        this.loadAlarm = loadAlarm;
+    }
+
+    public String getLoadAlarm() 
+    {
+        return loadAlarm;
+    }
+    public void setMomentWarning(String momentWarning) 
+    {
+        this.momentWarning = momentWarning;
+    }
+
+    public String getMomentWarning() 
+    {
+        return momentWarning;
+    }
+    public void setMomentAlarm(String momentAlarm) 
+    {
+        this.momentAlarm = momentAlarm;
+    }
+
+    public String getMomentAlarm() 
+    {
+        return momentAlarm;
+    }
+    public void setHighLimitWarning(String highLimitWarning) 
+    {
+        this.highLimitWarning = highLimitWarning;
+    }
+
+    public String getHighLimitWarning() 
+    {
+        return highLimitWarning;
+    }
+    public void setHighLimitAlarm(String highLimitAlarm) 
+    {
+        this.highLimitAlarm = highLimitAlarm;
+    }
+
+    public String getHighLimitAlarm() 
+    {
+        return highLimitAlarm;
+    }
+    public void setLowLimitWarning(String lowLimitWarning) 
+    {
+        this.lowLimitWarning = lowLimitWarning;
+    }
+
+    public String getLowLimitWarning() 
+    {
+        return lowLimitWarning;
+    }
+    public void setLowLimitAlarm(String lowLimitAlarm) 
+    {
+        this.lowLimitAlarm = lowLimitAlarm;
+    }
+
+    public String getLowLimitAlarm() 
+    {
+        return lowLimitAlarm;
+    }
+    public void setLeftLimitWarning(String leftLimitWarning) 
+    {
+        this.leftLimitWarning = leftLimitWarning;
+    }
+
+    public String getLeftLimitWarning() 
+    {
+        return leftLimitWarning;
+    }
+    public void setLeftLimitAlarm(String leftLimitAlarm) 
+    {
+        this.leftLimitAlarm = leftLimitAlarm;
+    }
+
+    public String getLeftLimitAlarm() 
+    {
+        return leftLimitAlarm;
+    }
+    public void setRightLimitWarning(String rightLimitWarning) 
+    {
+        this.rightLimitWarning = rightLimitWarning;
+    }
+
+    public String getRightLimitWarning() 
+    {
+        return rightLimitWarning;
+    }
+    public void setRightLimitAlarm(String rightLimitAlarm) 
+    {
+        this.rightLimitAlarm = rightLimitAlarm;
+    }
+
+    public String getRightLimitAlarm() 
+    {
+        return rightLimitAlarm;
+    }
+    public void setFrontLimitWarning(String frontLimitWarning) 
+    {
+        this.frontLimitWarning = frontLimitWarning;
+    }
+
+    public String getFrontLimitWarning() 
+    {
+        return frontLimitWarning;
+    }
+    public void setFrontLimitAlarm(String frontLimitAlarm) 
+    {
+        this.frontLimitAlarm = frontLimitAlarm;
+    }
+
+    public String getFrontLimitAlarm() 
+    {
+        return frontLimitAlarm;
+    }
+    public void setBackLimitWarning(String backLimitWarning) 
+    {
+        this.backLimitWarning = backLimitWarning;
+    }
+
+    public String getBackLimitWarning() 
+    {
+        return backLimitWarning;
+    }
+    public void setBackLimitAlarm(String backLimitAlarm) 
+    {
+        this.backLimitAlarm = backLimitAlarm;
+    }
+
+    public String getBackLimitAlarm() 
+    {
+        return backLimitAlarm;
+    }
+    public void setCollisionAngleWarning(String collisionAngleWarning) 
+    {
+        this.collisionAngleWarning = collisionAngleWarning;
+    }
+
+    public String getCollisionAngleWarning() 
+    {
+        return collisionAngleWarning;
+    }
+    public void setCollisionAngleAlarm(String collisionAngleAlarm) 
+    {
+        this.collisionAngleAlarm = collisionAngleAlarm;
+    }
+
+    public String getCollisionAngleAlarm() 
+    {
+        return collisionAngleAlarm;
+    }
+    public void setCollisionDistanceWarning(String collisionDistanceWarning) 
+    {
+        this.collisionDistanceWarning = collisionDistanceWarning;
+    }
+
+    public String getCollisionDistanceWarning() 
+    {
+        return collisionDistanceWarning;
+    }
+    public void setCollisionDistanceAlarm(String collisionDistanceAlarm) 
+    {
+        this.collisionDistanceAlarm = collisionDistanceAlarm;
+    }
+
+    public String getCollisionDistanceAlarm() 
+    {
+        return collisionDistanceAlarm;
+    }
+    public void sethDistanceWarning(String hDistanceWarning) 
+    {
+        this.hDistanceWarning = hDistanceWarning;
+    }
+
+    public String gethDistanceWarning() 
+    {
+        return hDistanceWarning;
+    }
+    public void sethDistanceAlarm(String hDistanceAlarm) 
+    {
+        this.hDistanceAlarm = hDistanceAlarm;
+    }
+
+    public String gethDistanceAlarm() 
+    {
+        return hDistanceAlarm;
+    }
+    public void setvDistanceWarning(String vDistanceWarning) 
+    {
+        this.vDistanceWarning = vDistanceWarning;
+    }
+
+    public String getvDistanceWarning() 
+    {
+        return vDistanceWarning;
+    }
+    public void setvDistanceAlarm(String vDistanceAlarm) 
+    {
+        this.vDistanceAlarm = vDistanceAlarm;
+    }
+
+    public String getvDistanceAlarm() 
+    {
+        return vDistanceAlarm;
+    }
+    public void setLeanWarning(String leanWarning) 
+    {
+        this.leanWarning = leanWarning;
+    }
+
+    public String getLeanWarning() 
+    {
+        return leanWarning;
+    }
+    public void setLeanAlarm(String leanAlarm) 
+    {
+        this.leanAlarm = leanAlarm;
+    }
+
+    public String getLeanAlarm() 
+    {
+        return leanAlarm;
+    }
+    public void setRangeLimitStart(String rangeLimitStart) 
+    {
+        this.rangeLimitStart = rangeLimitStart;
+    }
+
+    public String getRangeLimitStart() 
+    {
+        return rangeLimitStart;
+    }
+    public void setRangeLimitEnd(String rangeLimitEnd) 
+    {
+        this.rangeLimitEnd = rangeLimitEnd;
+    }
+
+    public String getRangeLimitEnd() 
+    {
+        return rangeLimitEnd;
+    }
+    public void setHeightLimitStart(String heightLimitStart) 
+    {
+        this.heightLimitStart = heightLimitStart;
+    }
+
+    public String getHeightLimitStart() 
+    {
+        return heightLimitStart;
+    }
+    public void setHeightLimitEnd(String heightLimitEnd) 
+    {
+        this.heightLimitEnd = heightLimitEnd;
+    }
+
+    public String getHeightLimitEnd() 
+    {
+        return heightLimitEnd;
+    }
+    public void setRotationLimitStart(String rotationLimitStart) 
+    {
+        this.rotationLimitStart = rotationLimitStart;
+    }
+
+    public String getRotationLimitStart() 
+    {
+        return rotationLimitStart;
+    }
+    public void setRotationLimitEnd(String rotationLimitEnd) 
+    {
+        this.rotationLimitEnd = rotationLimitEnd;
+    }
+
+    public String getRotationLimitEnd() 
+    {
+        return rotationLimitEnd;
+    }
+    public void setIsDel(Long isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public Long getIsDel() 
+    {
+        return isDel;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getComName() {
+        return comName;
+    }
+
+    public void setComName(String comName) {
+        this.comName = comName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("projectId", getProjectId())
+            .append("comId", getComId())
+            .append("deviceKey", getDeviceKey())
+            .append("deviceSource", getDeviceSource())
+            .append("towerId", getTowerId())
+            .append("windSpeedWarning", getWindSpeedWarning())
+            .append("windSpeedAlarm", getWindSpeedAlarm())
+            .append("loadWarning", getLoadWarning())
+            .append("loadAlarm", getLoadAlarm())
+            .append("momentWarning", getMomentWarning())
+            .append("momentAlarm", getMomentAlarm())
+            .append("highLimitWarning", getHighLimitWarning())
+            .append("highLimitAlarm", getHighLimitAlarm())
+            .append("lowLimitWarning", getLowLimitWarning())
+            .append("lowLimitAlarm", getLowLimitAlarm())
+            .append("leftLimitWarning", getLeftLimitWarning())
+            .append("leftLimitAlarm", getLeftLimitAlarm())
+            .append("rightLimitWarning", getRightLimitWarning())
+            .append("rightLimitAlarm", getRightLimitAlarm())
+            .append("frontLimitWarning", getFrontLimitWarning())
+            .append("frontLimitAlarm", getFrontLimitAlarm())
+            .append("backLimitWarning", getBackLimitWarning())
+            .append("backLimitAlarm", getBackLimitAlarm())
+            .append("collisionAngleWarning", getCollisionAngleWarning())
+            .append("collisionAngleAlarm", getCollisionAngleAlarm())
+            .append("collisionDistanceWarning", getCollisionDistanceWarning())
+            .append("collisionDistanceAlarm", getCollisionDistanceAlarm())
+            .append("hDistanceWarning", gethDistanceWarning())
+            .append("hDistanceAlarm", gethDistanceAlarm())
+            .append("vDistanceWarning", getvDistanceWarning())
+            .append("vDistanceAlarm", getvDistanceAlarm())
+            .append("leanWarning", getLeanWarning())
+            .append("leanAlarm", getLeanAlarm())
+            .append("rangeLimitStart", getRangeLimitStart())
+            .append("rangeLimitEnd", getRangeLimitEnd())
+            .append("heightLimitStart", getHeightLimitStart())
+            .append("heightLimitEnd", getHeightLimitEnd())
+            .append("rotationLimitStart", getRotationLimitStart())
+            .append("rotationLimitEnd", getRotationLimitEnd())
+            .append("isDel", getIsDel())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataLocal.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataLocal.java
new file mode 100644
index 00000000..85032499
--- /dev/null
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataLocal.java
@@ -0,0 +1,412 @@
+package com.yanzhu.device.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.yanzhu.common.core.annotation.Excel;
+import com.yanzhu.common.core.web.domain.BaseEntity;
+
+/**
+ * 塔机定位信息对象 dev_tower_data_local
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+public class DevTowerDataLocal extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 配置编号 */
+    private Long cfgId;
+
+    /** 项目主键 */
+    private Long projectId;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String projectName;
+
+    /** 总包单位主键 */
+    private Long comId;
+
+    /** 总包单位名称 */
+    @Excel(name = "总包单位名称")
+    private String comName;
+
+    /** 设备序列号 */
+    @Excel(name = "设备序列号")
+    private String deviceKey;
+
+    /** 设备来源 */
+    @Excel(name = "设备来源")
+    private String deviceSource;
+
+    /** 塔机编号 */
+    @Excel(name = "塔机编号")
+    private String towerId;
+
+    /** 近端幅度标定AD定值 */
+    @Excel(name = "近端幅度标定AD定值")
+    private String rangeNearEndAdValue;
+
+    /** 近端幅度标定实际值 */
+    @Excel(name = "近端幅度标定实际值")
+    private String rangeNearEndRealityValue;
+
+    /** 远端幅度标定AD定值 */
+    @Excel(name = "远端幅度标定AD定值")
+    private String rangeFarEndAdValue;
+
+    /** 远端幅度标定实际值 */
+    @Excel(name = "远端幅度标定实际值")
+    private String rangeFarEndRealityValue;
+
+    /** 高度近端标定AD定值 */
+    @Excel(name = "高度近端标定AD定值")
+    private String highNearEndAdValue;
+
+    /** 高度近端标定实际值 */
+    @Excel(name = "高度近端标定实际值")
+    private String highNearEndRealityValue;
+
+    /** 高度远端标定AD定值 */
+    @Excel(name = "高度远端标定AD定值")
+    private String highFarEndAdValue;
+
+    /** 高度远端标定实际值 */
+    @Excel(name = "高度远端标定实际值")
+    private String highFarEndRealityValue;
+
+    /** 空载重量AD值 */
+    @Excel(name = "空载重量AD值")
+    private String emptyWeightAdValue;
+
+    /** 空载重量实际值 */
+    @Excel(name = "空载重量实际值")
+    private String emptyWeightRealityValue;
+
+    /** 负载重量AD值 */
+    @Excel(name = "负载重量AD值")
+    private String loadWeightAdValue;
+
+    /** 负载重量实际值 */
+    @Excel(name = "负载重量实际值")
+    private String loadWeightRealityValue;
+
+    /** 回转起点AD值 */
+    @Excel(name = "回转起点AD值")
+    private String rotationStartAdValue;
+
+    /** 回转起点实际角度 */
+    @Excel(name = "回转起点实际角度")
+    private String rotationStartRealityValue;
+
+    /** 回转终点AD值 */
+    @Excel(name = "回转终点AD值")
+    private String rotationEndAdValue;
+
+    /** 回转终点实际角度 */
+    @Excel(name = "回转终点实际角度")
+    private String rotationEndRealityValue;
+
+    /** 风速校准系数 */
+    @Excel(name = "风速校准系数")
+    private String windSpeedFactor;
+
+    /** 倾斜校准系数 */
+    @Excel(name = "倾斜校准系数")
+    private String tiltFactor;
+
+    /** 是否有效 */
+    @Excel(name = "是否有效")
+    private Long isDel;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+
+    public Long getCfgId() {
+        return cfgId;
+    }
+
+    public void setCfgId(Long cfgId) {
+        this.cfgId = cfgId;
+    }
+
+    public void setProjectId(Long projectId)
+    {
+        this.projectId = projectId;
+    }
+
+    public Long getProjectId() 
+    {
+        return projectId;
+    }
+
+    public Long getComId() {
+        return comId;
+    }
+
+    public void setComId(Long comId) {
+        this.comId = comId;
+    }
+
+    public void setDeviceKey(String deviceKey)
+    {
+        this.deviceKey = deviceKey;
+    }
+
+    public String getDeviceKey() 
+    {
+        return deviceKey;
+    }
+    public void setDeviceSource(String deviceSource) 
+    {
+        this.deviceSource = deviceSource;
+    }
+
+    public String getDeviceSource() 
+    {
+        return deviceSource;
+    }
+    public void setTowerId(String towerId) 
+    {
+        this.towerId = towerId;
+    }
+
+    public String getTowerId() 
+    {
+        return towerId;
+    }
+    public void setRangeNearEndAdValue(String rangeNearEndAdValue) 
+    {
+        this.rangeNearEndAdValue = rangeNearEndAdValue;
+    }
+
+    public String getRangeNearEndAdValue() 
+    {
+        return rangeNearEndAdValue;
+    }
+    public void setRangeNearEndRealityValue(String rangeNearEndRealityValue) 
+    {
+        this.rangeNearEndRealityValue = rangeNearEndRealityValue;
+    }
+
+    public String getRangeNearEndRealityValue() 
+    {
+        return rangeNearEndRealityValue;
+    }
+    public void setRangeFarEndAdValue(String rangeFarEndAdValue) 
+    {
+        this.rangeFarEndAdValue = rangeFarEndAdValue;
+    }
+
+    public String getRangeFarEndAdValue() 
+    {
+        return rangeFarEndAdValue;
+    }
+    public void setRangeFarEndRealityValue(String rangeFarEndRealityValue) 
+    {
+        this.rangeFarEndRealityValue = rangeFarEndRealityValue;
+    }
+
+    public String getRangeFarEndRealityValue() 
+    {
+        return rangeFarEndRealityValue;
+    }
+    public void setHighNearEndAdValue(String highNearEndAdValue) 
+    {
+        this.highNearEndAdValue = highNearEndAdValue;
+    }
+
+    public String getHighNearEndAdValue() 
+    {
+        return highNearEndAdValue;
+    }
+    public void setHighNearEndRealityValue(String highNearEndRealityValue) 
+    {
+        this.highNearEndRealityValue = highNearEndRealityValue;
+    }
+
+    public String getHighNearEndRealityValue() 
+    {
+        return highNearEndRealityValue;
+    }
+    public void setHighFarEndAdValue(String highFarEndAdValue) 
+    {
+        this.highFarEndAdValue = highFarEndAdValue;
+    }
+
+    public String getHighFarEndAdValue() 
+    {
+        return highFarEndAdValue;
+    }
+    public void setHighFarEndRealityValue(String highFarEndRealityValue) 
+    {
+        this.highFarEndRealityValue = highFarEndRealityValue;
+    }
+
+    public String getHighFarEndRealityValue() 
+    {
+        return highFarEndRealityValue;
+    }
+    public void setEmptyWeightAdValue(String emptyWeightAdValue) 
+    {
+        this.emptyWeightAdValue = emptyWeightAdValue;
+    }
+
+    public String getEmptyWeightAdValue() 
+    {
+        return emptyWeightAdValue;
+    }
+    public void setEmptyWeightRealityValue(String emptyWeightRealityValue) 
+    {
+        this.emptyWeightRealityValue = emptyWeightRealityValue;
+    }
+
+    public String getEmptyWeightRealityValue() 
+    {
+        return emptyWeightRealityValue;
+    }
+    public void setLoadWeightAdValue(String loadWeightAdValue) 
+    {
+        this.loadWeightAdValue = loadWeightAdValue;
+    }
+
+    public String getLoadWeightAdValue() 
+    {
+        return loadWeightAdValue;
+    }
+    public void setLoadWeightRealityValue(String loadWeightRealityValue) 
+    {
+        this.loadWeightRealityValue = loadWeightRealityValue;
+    }
+
+    public String getLoadWeightRealityValue() 
+    {
+        return loadWeightRealityValue;
+    }
+    public void setRotationStartAdValue(String rotationStartAdValue) 
+    {
+        this.rotationStartAdValue = rotationStartAdValue;
+    }
+
+    public String getRotationStartAdValue() 
+    {
+        return rotationStartAdValue;
+    }
+    public void setRotationStartRealityValue(String rotationStartRealityValue) 
+    {
+        this.rotationStartRealityValue = rotationStartRealityValue;
+    }
+
+    public String getRotationStartRealityValue() 
+    {
+        return rotationStartRealityValue;
+    }
+    public void setRotationEndAdValue(String rotationEndAdValue) 
+    {
+        this.rotationEndAdValue = rotationEndAdValue;
+    }
+
+    public String getRotationEndAdValue() 
+    {
+        return rotationEndAdValue;
+    }
+    public void setRotationEndRealityValue(String rotationEndRealityValue) 
+    {
+        this.rotationEndRealityValue = rotationEndRealityValue;
+    }
+
+    public String getRotationEndRealityValue() 
+    {
+        return rotationEndRealityValue;
+    }
+    public void setWindSpeedFactor(String windSpeedFactor) 
+    {
+        this.windSpeedFactor = windSpeedFactor;
+    }
+
+    public String getWindSpeedFactor() 
+    {
+        return windSpeedFactor;
+    }
+    public void setTiltFactor(String tiltFactor) 
+    {
+        this.tiltFactor = tiltFactor;
+    }
+
+    public String getTiltFactor() 
+    {
+        return tiltFactor;
+    }
+    public void setIsDel(Long isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public Long getIsDel() 
+    {
+        return isDel;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getComName() {
+        return comName;
+    }
+
+    public void setComName(String comName) {
+        this.comName = comName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("projectId", getProjectId())
+            .append("comId", getComId())
+            .append("deviceKey", getDeviceKey())
+            .append("deviceSource", getDeviceSource())
+            .append("towerId", getTowerId())
+            .append("rangeNearEndAdValue", getRangeNearEndAdValue())
+            .append("rangeNearEndRealityValue", getRangeNearEndRealityValue())
+            .append("rangeFarEndAdValue", getRangeFarEndAdValue())
+            .append("rangeFarEndRealityValue", getRangeFarEndRealityValue())
+            .append("highNearEndAdValue", getHighNearEndAdValue())
+            .append("highNearEndRealityValue", getHighNearEndRealityValue())
+            .append("highFarEndAdValue", getHighFarEndAdValue())
+            .append("highFarEndRealityValue", getHighFarEndRealityValue())
+            .append("emptyWeightAdValue", getEmptyWeightAdValue())
+            .append("emptyWeightRealityValue", getEmptyWeightRealityValue())
+            .append("loadWeightAdValue", getLoadWeightAdValue())
+            .append("loadWeightRealityValue", getLoadWeightRealityValue())
+            .append("rotationStartAdValue", getRotationStartAdValue())
+            .append("rotationStartRealityValue", getRotationStartRealityValue())
+            .append("rotationEndAdValue", getRotationEndAdValue())
+            .append("rotationEndRealityValue", getRotationEndRealityValue())
+            .append("windSpeedFactor", getWindSpeedFactor())
+            .append("tiltFactor", getTiltFactor())
+            .append("isDel", getIsDel())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataRound.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataRound.java
new file mode 100644
index 00000000..aefbd404
--- /dev/null
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataRound.java
@@ -0,0 +1,534 @@
+package com.yanzhu.device.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.yanzhu.common.core.annotation.Excel;
+import com.yanzhu.common.core.web.domain.BaseEntity;
+
+/**
+ * 塔机工作循环对象 dev_tower_data_round
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+public class DevTowerDataRound extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 配置编号 */
+    private Long cfgId;
+
+    /** 项目主键 */
+    private Long projectId;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String projectName;
+
+    /** 总包单位主键 */
+    private Long comId;
+
+    /** 总包单位名称 */
+    @Excel(name = "总包单位名称")
+    private String comName;
+
+    /** 设备序列号 */
+    @Excel(name = "设备序列号")
+    private String deviceKey;
+
+    /** 设备来源 */
+    @Excel(name = "设备来源")
+    private String deviceSource;
+
+    /** 塔吊编号 */
+    @Excel(name = "塔吊编号")
+    private String towerId;
+
+    /** 工作循环开始 */
+    @Excel(name = "工作循环开始")
+    private String workStartTime;
+
+    /** 工作循环结束 */
+    @Excel(name = "工作循环结束")
+    private String workEndTime;
+
+    /** 工作循环最小高度 */
+    @Excel(name = "工作循环最小高度")
+    private String minHeight;
+
+    /** 工作循环最大高度 */
+    @Excel(name = "工作循环最大高度")
+    private String maxHeight;
+
+    /** 工作循环最小幅度 */
+    @Excel(name = "工作循环最小幅度")
+    private String minRange;
+
+    /** 工作循环最大幅度 */
+    @Excel(name = "工作循环最大幅度")
+    private String maxRange;
+
+    /** 工作循环开始高度 */
+    @Excel(name = "工作循环开始高度")
+    private String startHeight;
+
+    /** 工作循环结束高度 */
+    @Excel(name = "工作循环结束高度")
+    private String endHeight;
+
+    /** 工作循环开始幅度 */
+    @Excel(name = "工作循环开始幅度")
+    private String startRange;
+
+    /** 工作循环结束幅度单位米 */
+    @Excel(name = "工作循环结束幅度单位米")
+    private String endRange;
+
+    /** 工作循环开始回转角度单位度 */
+    @Excel(name = "工作循环开始回转角度单位度")
+    private String startRotation;
+
+    /** 工作循环结束回转角度单位度 */
+    @Excel(name = "工作循环结束回转角度单位度")
+    private String endRotation;
+
+    /** 工作循环最大吊重单位吨 */
+    @Excel(name = "工作循环最大吊重单位吨")
+    private String maxLoad;
+
+    /** 工作循环最大重量百分比 */
+    @Excel(name = "工作循环最大重量百分比")
+    private String maxLoadPercent;
+
+    /** 工作循环最大力矩 */
+    @Excel(name = "工作循环最大力矩")
+    private String maxMoment;
+
+    /** 工作循环最大力矩百分比 */
+    @Excel(name = "工作循环最大力矩百分比")
+    private String maxMomentPercent;
+
+    /** 工作循环开始风速 */
+    @Excel(name = "工作循环开始风速")
+    private String startWindSpeed;
+
+    /** 工作循环结束风速 */
+    @Excel(name = "工作循环结束风速")
+    private String endWindSpeed;
+
+    /** 工作循环开始风速等级 */
+    @Excel(name = "工作循环开始风速等级")
+    private String startWindSpeedPercent;
+
+    /** 工作循环结束风速等级 */
+    @Excel(name = "工作循环结束风速等级")
+    private String endWindSpeedPercent;
+
+    /** 工作循环开始水平倾角 */
+    @Excel(name = "工作循环开始水平倾角")
+    private String startLeanAngleX;
+
+    /** 工作循环结束水平倾角 */
+    @Excel(name = "工作循环结束水平倾角")
+    private String endLeanAngleX;
+
+    /** 工作循环开始垂直倾角 */
+    @Excel(name = "工作循环开始垂直倾角")
+    private String startLeanAngleY;
+
+    /** 工作循环结束垂直倾角 */
+    @Excel(name = "工作循环结束垂直倾角")
+    private String endLeanAngleY;
+
+    /** 警报信息 */
+    @Excel(name = "警报信息")
+    private String warnings;
+
+    /** 是否告警 */
+    @Excel(name = "是否告警")
+    private Long isAlarm;
+
+    /** 是否告警 */
+    @Excel(name = "是否告警")
+    private Long isOverload;
+
+    /** 是否有效 */
+    @Excel(name = "是否有效")
+    private Long isDel;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+
+    public Long getCfgId() {
+        return cfgId;
+    }
+
+    public void setCfgId(Long cfgId) {
+        this.cfgId = cfgId;
+    }
+
+    public void setProjectId(Long projectId)
+    {
+        this.projectId = projectId;
+    }
+
+    public Long getProjectId() 
+    {
+        return projectId;
+    }
+
+    public Long getComId() {
+        return comId;
+    }
+
+    public void setComId(Long comId) {
+        this.comId = comId;
+    }
+
+    public void setDeviceKey(String deviceKey)
+    {
+        this.deviceKey = deviceKey;
+    }
+
+    public String getDeviceKey() 
+    {
+        return deviceKey;
+    }
+    public void setDeviceSource(String deviceSource) 
+    {
+        this.deviceSource = deviceSource;
+    }
+
+    public String getDeviceSource() 
+    {
+        return deviceSource;
+    }
+    public void setTowerId(String towerId)
+    {
+        this.towerId = towerId;
+    }
+
+    public String getTowerId()
+    {
+        return towerId;
+    }
+    public void setWorkStartTime(String workStartTime) 
+    {
+        this.workStartTime = workStartTime;
+    }
+
+    public String getWorkStartTime() 
+    {
+        return workStartTime;
+    }
+    public void setWorkEndTime(String workEndTime) 
+    {
+        this.workEndTime = workEndTime;
+    }
+
+    public String getWorkEndTime() 
+    {
+        return workEndTime;
+    }
+    public void setMinHeight(String minHeight) 
+    {
+        this.minHeight = minHeight;
+    }
+
+    public String getMinHeight() 
+    {
+        return minHeight;
+    }
+    public void setMaxHeight(String maxHeight) 
+    {
+        this.maxHeight = maxHeight;
+    }
+
+    public String getMaxHeight() 
+    {
+        return maxHeight;
+    }
+    public void setMinRange(String minRange) 
+    {
+        this.minRange = minRange;
+    }
+
+    public String getMinRange() 
+    {
+        return minRange;
+    }
+    public void setMaxRange(String maxRange) 
+    {
+        this.maxRange = maxRange;
+    }
+
+    public String getMaxRange() 
+    {
+        return maxRange;
+    }
+    public void setStartHeight(String startHeight) 
+    {
+        this.startHeight = startHeight;
+    }
+
+    public String getStartHeight() 
+    {
+        return startHeight;
+    }
+    public void setEndHeight(String endHeight) 
+    {
+        this.endHeight = endHeight;
+    }
+
+    public String getEndHeight() 
+    {
+        return endHeight;
+    }
+    public void setStartRange(String startRange) 
+    {
+        this.startRange = startRange;
+    }
+
+    public String getStartRange() 
+    {
+        return startRange;
+    }
+    public void setEndRange(String endRange) 
+    {
+        this.endRange = endRange;
+    }
+
+    public String getEndRange() 
+    {
+        return endRange;
+    }
+    public void setStartRotation(String startRotation) 
+    {
+        this.startRotation = startRotation;
+    }
+
+    public String getStartRotation() 
+    {
+        return startRotation;
+    }
+    public void setEndRotation(String endRotation) 
+    {
+        this.endRotation = endRotation;
+    }
+
+    public String getEndRotation() 
+    {
+        return endRotation;
+    }
+    public void setMaxLoad(String maxLoad) 
+    {
+        this.maxLoad = maxLoad;
+    }
+
+    public String getMaxLoad() 
+    {
+        return maxLoad;
+    }
+    public void setMaxLoadPercent(String maxLoadPercent) 
+    {
+        this.maxLoadPercent = maxLoadPercent;
+    }
+
+    public String getMaxLoadPercent() 
+    {
+        return maxLoadPercent;
+    }
+    public void setMaxMoment(String maxMoment) 
+    {
+        this.maxMoment = maxMoment;
+    }
+
+    public String getMaxMoment() 
+    {
+        return maxMoment;
+    }
+    public void setMaxMomentPercent(String maxMomentPercent) 
+    {
+        this.maxMomentPercent = maxMomentPercent;
+    }
+
+    public String getMaxMomentPercent() 
+    {
+        return maxMomentPercent;
+    }
+    public void setStartWindSpeed(String startWindSpeed) 
+    {
+        this.startWindSpeed = startWindSpeed;
+    }
+
+    public String getStartWindSpeed() 
+    {
+        return startWindSpeed;
+    }
+    public void setEndWindSpeed(String endWindSpeed) 
+    {
+        this.endWindSpeed = endWindSpeed;
+    }
+
+    public String getEndWindSpeed() 
+    {
+        return endWindSpeed;
+    }
+    public void setStartWindSpeedPercent(String startWindSpeedPercent) 
+    {
+        this.startWindSpeedPercent = startWindSpeedPercent;
+    }
+
+    public String getStartWindSpeedPercent() 
+    {
+        return startWindSpeedPercent;
+    }
+    public void setEndWindSpeedPercent(String endWindSpeedPercent) 
+    {
+        this.endWindSpeedPercent = endWindSpeedPercent;
+    }
+
+    public String getEndWindSpeedPercent() 
+    {
+        return endWindSpeedPercent;
+    }
+    public void setStartLeanAngleX(String startLeanAngleX) 
+    {
+        this.startLeanAngleX = startLeanAngleX;
+    }
+
+    public String getStartLeanAngleX() 
+    {
+        return startLeanAngleX;
+    }
+    public void setEndLeanAngleX(String endLeanAngleX) 
+    {
+        this.endLeanAngleX = endLeanAngleX;
+    }
+
+    public String getEndLeanAngleX() 
+    {
+        return endLeanAngleX;
+    }
+    public void setStartLeanAngleY(String startLeanAngleY) 
+    {
+        this.startLeanAngleY = startLeanAngleY;
+    }
+
+    public String getStartLeanAngleY() 
+    {
+        return startLeanAngleY;
+    }
+    public void setEndLeanAngleY(String endLeanAngleY) 
+    {
+        this.endLeanAngleY = endLeanAngleY;
+    }
+
+    public String getEndLeanAngleY() 
+    {
+        return endLeanAngleY;
+    }
+    public void setWarnings(String warnings) 
+    {
+        this.warnings = warnings;
+    }
+
+    public String getWarnings() 
+    {
+        return warnings;
+    }
+    public void setIsDel(Long isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public Long getIsDel() 
+    {
+        return isDel;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getComName() {
+        return comName;
+    }
+
+    public void setComName(String comName) {
+        this.comName = comName;
+    }
+
+    public Long getIsAlarm() {
+        return isAlarm;
+    }
+
+    public void setIsAlarm(Long isAlarm) {
+        this.isAlarm = isAlarm;
+    }
+
+    public Long getIsOverload() {
+        return isOverload;
+    }
+
+    public void setIsOverload(Long isOverload) {
+        this.isOverload = isOverload;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("projectId", getProjectId())
+            .append("comId", getComId())
+            .append("deviceKey", getDeviceKey())
+            .append("deviceSource", getDeviceSource())
+            .append("towerId", getTowerId())
+            .append("workStartTime", getWorkStartTime())
+            .append("workEndTime", getWorkEndTime())
+            .append("minHeight", getMinHeight())
+            .append("maxHeight", getMaxHeight())
+            .append("minRange", getMinRange())
+            .append("maxRange", getMaxRange())
+            .append("startHeight", getStartHeight())
+            .append("endHeight", getEndHeight())
+            .append("startRange", getStartRange())
+            .append("endRange", getEndRange())
+            .append("startRotation", getStartRotation())
+            .append("endRotation", getEndRotation())
+            .append("maxLoad", getMaxLoad())
+            .append("maxLoadPercent", getMaxLoadPercent())
+            .append("maxMoment", getMaxMoment())
+            .append("maxMomentPercent", getMaxMomentPercent())
+            .append("startWindSpeed", getStartWindSpeed())
+            .append("endWindSpeed", getEndWindSpeed())
+            .append("startWindSpeedPercent", getStartWindSpeedPercent())
+            .append("endWindSpeedPercent", getEndWindSpeedPercent())
+            .append("startLeanAngleX", getStartLeanAngleX())
+            .append("endLeanAngleX", getEndLeanAngleX())
+            .append("startLeanAngleY", getStartLeanAngleY())
+            .append("endLeanAngleY", getEndLeanAngleY())
+            .append("warnings", getWarnings())
+            .append("isDel", getIsDel())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataRun.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataRun.java
new file mode 100644
index 00000000..0614f1f0
--- /dev/null
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataRun.java
@@ -0,0 +1,452 @@
+package com.yanzhu.device.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.yanzhu.common.core.annotation.Excel;
+import com.yanzhu.common.core.web.domain.BaseEntity;
+
+/**
+ * 塔机实时数据对象 dev_tower_data_run
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+public class DevTowerDataRun extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 配置编号 */
+    private Long cfgId;
+
+    /** 项目主键 */
+    private Long projectId;
+    /** 租户名称 */
+    @Excel(name = "租户名称")
+    private String comName;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String projectName;
+
+    /** 总包单位主键 */
+    private Long comId;
+
+
+    /** 设备序列号 */
+    @Excel(name = "设备序列号")
+    private String deviceKey;
+
+    /** 设备来源 */
+    @Excel(name = "设备来源")
+    private String deviceSource;
+
+    /** 当前高度 */
+    @Excel(name = "当前高度")
+    private String height;
+
+    /** 当前幅度 */
+    @Excel(name = "当前幅度")
+    private String range;
+
+    /** 回转 */
+    @Excel(name = "回转")
+    private String rotation;
+
+    /** 当前吊重 */
+    @Excel(name = "当前吊重")
+    private String load;
+
+    /** 风速 */
+    @Excel(name = "风速")
+    private String windSpeed;
+
+    /** 水平倾角 */
+    @Excel(name = "水平倾角")
+    private String leanAngleX;
+
+    /** 垂直倾角 */
+    @Excel(name = "垂直倾角")
+    private String leanAngleY;
+
+    /** 重量百分比 */
+    @Excel(name = "重量百分比")
+    private String loadPercent;
+
+    /** 力矩百分比 */
+    @Excel(name = "力矩百分比")
+    private String momentPercent;
+
+    /** 风速等级 */
+    @Excel(name = "风速等级")
+    private String windSpeedPercent;
+
+    /** 倾斜百分比 */
+    @Excel(name = "倾斜百分比")
+    private String leanAnglePercent;
+
+    /** 警报信息 */
+    @Excel(name = "警报信息")
+    private String warnings;
+
+    /** 倍率 */
+    @Excel(name = "倍率")
+    private String rate;
+
+    /** 回转传感器状态 */
+    @Excel(name = "回转传感器状态")
+    private String rotationSensorState;
+
+    /** 重量传感器状态 */
+    @Excel(name = "重量传感器状态")
+    private String loadSensorState;
+
+    /** 风速传感器状态 */
+    @Excel(name = "风速传感器状态")
+    private String windSpeedSensorState;
+
+    /** 倾角传感器状态 */
+    @Excel(name = "倾角传感器状态")
+    private String leanAngleSensorState;
+
+    /** 幅度传感器状态 */
+    @Excel(name = "幅度传感器状态")
+    private String rangeSensorState;
+
+    /** 高度传感器状态 */
+    @Excel(name = "高度传感器状态")
+    private String heightSensorState;
+
+    /** 控制状态 */
+    @Excel(name = "控制状态")
+    private String brakingStatus;
+
+    /** 时间戳 */
+    @Excel(name = "时间戳")
+    private Long timeLongs;
+
+    /** 是否告警 */
+    @Excel(name = "是否告警")
+    private Long isAlarm;
+
+    /** 是否有效 */
+    @Excel(name = "是否有效")
+    private Long isDel;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+
+    public Long getCfgId() {
+        return cfgId;
+    }
+
+    public void setCfgId(Long cfgId) {
+        this.cfgId = cfgId;
+    }
+
+    public void setProjectId(Long projectId)
+    {
+        this.projectId = projectId;
+    }
+
+    public Long getProjectId() 
+    {
+        return projectId;
+    }
+
+    public Long getComId() {
+        return comId;
+    }
+
+    public void setComId(Long comId) {
+        this.comId = comId;
+    }
+
+    public void setDeviceKey(String deviceKey)
+    {
+        this.deviceKey = deviceKey;
+    }
+
+    public String getDeviceKey() 
+    {
+        return deviceKey;
+    }
+    public void setDeviceSource(String deviceSource) 
+    {
+        this.deviceSource = deviceSource;
+    }
+
+    public String getDeviceSource() 
+    {
+        return deviceSource;
+    }
+    public void setHeight(String height) 
+    {
+        this.height = height;
+    }
+
+    public String getHeight() 
+    {
+        return height;
+    }
+    public void setRange(String range) 
+    {
+        this.range = range;
+    }
+
+    public String getRange() 
+    {
+        return range;
+    }
+    public void setRotation(String rotation) 
+    {
+        this.rotation = rotation;
+    }
+
+    public String getRotation() 
+    {
+        return rotation;
+    }
+    public void setLoad(String load) 
+    {
+        this.load = load;
+    }
+
+    public String getLoad() 
+    {
+        return load;
+    }
+    public void setWindSpeed(String windSpeed) 
+    {
+        this.windSpeed = windSpeed;
+    }
+
+    public String getWindSpeed() 
+    {
+        return windSpeed;
+    }
+    public void setLeanAngleX(String leanAngleX) 
+    {
+        this.leanAngleX = leanAngleX;
+    }
+
+    public String getLeanAngleX() 
+    {
+        return leanAngleX;
+    }
+    public void setLeanAngleY(String leanAngleY) 
+    {
+        this.leanAngleY = leanAngleY;
+    }
+
+    public String getLeanAngleY() 
+    {
+        return leanAngleY;
+    }
+    public void setLoadPercent(String loadPercent) 
+    {
+        this.loadPercent = loadPercent;
+    }
+
+    public String getLoadPercent() 
+    {
+        return loadPercent;
+    }
+    public void setMomentPercent(String momentPercent) 
+    {
+        this.momentPercent = momentPercent;
+    }
+
+    public String getMomentPercent() 
+    {
+        return momentPercent;
+    }
+    public void setWindSpeedPercent(String windSpeedPercent) 
+    {
+        this.windSpeedPercent = windSpeedPercent;
+    }
+
+    public String getWindSpeedPercent() 
+    {
+        return windSpeedPercent;
+    }
+    public void setLeanAnglePercent(String leanAnglePercent) 
+    {
+        this.leanAnglePercent = leanAnglePercent;
+    }
+
+    public String getLeanAnglePercent() 
+    {
+        return leanAnglePercent;
+    }
+    public void setWarnings(String warnings) 
+    {
+        this.warnings = warnings;
+    }
+
+    public String getWarnings() 
+    {
+        return warnings;
+    }
+    public void setRate(String rate) 
+    {
+        this.rate = rate;
+    }
+
+    public String getRate() 
+    {
+        return rate;
+    }
+    public void setRotationSensorState(String rotationSensorState) 
+    {
+        this.rotationSensorState = rotationSensorState;
+    }
+
+    public String getRotationSensorState() 
+    {
+        return rotationSensorState;
+    }
+    public void setLoadSensorState(String loadSensorState) 
+    {
+        this.loadSensorState = loadSensorState;
+    }
+
+    public String getLoadSensorState() 
+    {
+        return loadSensorState;
+    }
+    public void setWindSpeedSensorState(String windSpeedSensorState) 
+    {
+        this.windSpeedSensorState = windSpeedSensorState;
+    }
+
+    public String getWindSpeedSensorState() 
+    {
+        return windSpeedSensorState;
+    }
+    public void setLeanAngleSensorState(String leanAngleSensorState) 
+    {
+        this.leanAngleSensorState = leanAngleSensorState;
+    }
+
+    public String getLeanAngleSensorState() 
+    {
+        return leanAngleSensorState;
+    }
+    public void setRangeSensorState(String rangeSensorState) 
+    {
+        this.rangeSensorState = rangeSensorState;
+    }
+
+    public String getRangeSensorState() 
+    {
+        return rangeSensorState;
+    }
+    public void setHeightSensorState(String heightSensorState) 
+    {
+        this.heightSensorState = heightSensorState;
+    }
+
+    public String getHeightSensorState() 
+    {
+        return heightSensorState;
+    }
+    public void setBrakingStatus(String brakingStatus) 
+    {
+        this.brakingStatus = brakingStatus;
+    }
+
+    public String getBrakingStatus() 
+    {
+        return brakingStatus;
+    }
+    public void setTimeLongs(Long timeLongs) 
+    {
+        this.timeLongs = timeLongs;
+    }
+
+    public Long getTimeLongs() 
+    {
+        return timeLongs;
+    }
+    public void setIsDel(Long isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public Long getIsDel() 
+    {
+        return isDel;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getComName() {
+        return comName;
+    }
+
+    public void setComName(String comName) {
+        this.comName = comName;
+    }
+
+    public Long getIsAlarm() {
+        return isAlarm;
+    }
+
+    public void setIsAlarm(Long isAlarm) {
+        this.isAlarm = isAlarm;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("projectId", getProjectId())
+            .append("comId", getComId())
+            .append("deviceKey", getDeviceKey())
+            .append("deviceSource", getDeviceSource())
+            .append("height", getHeight())
+            .append("range", getRange())
+            .append("rotation", getRotation())
+            .append("load", getLoad())
+            .append("windSpeed", getWindSpeed())
+            .append("leanAngleX", getLeanAngleX())
+            .append("leanAngleY", getLeanAngleY())
+            .append("loadPercent", getLoadPercent())
+            .append("momentPercent", getMomentPercent())
+            .append("windSpeedPercent", getWindSpeedPercent())
+            .append("leanAnglePercent", getLeanAnglePercent())
+            .append("warnings", getWarnings())
+            .append("rate", getRate())
+            .append("rotationSensorState", getRotationSensorState())
+            .append("loadSensorState", getLoadSensorState())
+            .append("windSpeedSensorState", getWindSpeedSensorState())
+            .append("leanAngleSensorState", getLeanAngleSensorState())
+            .append("rangeSensorState", getRangeSensorState())
+            .append("heightSensorState", getHeightSensorState())
+            .append("brakingStatus", getBrakingStatus())
+            .append("timeLongs", getTimeLongs())
+            .append("isDel", getIsDel())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataWarning.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataWarning.java
new file mode 100644
index 00000000..7e97c179
--- /dev/null
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataWarning.java
@@ -0,0 +1,230 @@
+package com.yanzhu.device.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.yanzhu.common.core.annotation.Excel;
+import com.yanzhu.common.core.web.domain.BaseEntity;
+
+/**
+ * 塔机预警管理对象 dev_tower_data_warning
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+public class DevTowerDataWarning extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 配置编号 */
+    private Long cfgId;
+
+    /** 项目主键 */
+    private Long projectId;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String projectName;
+
+    /** 总包单位主键 */
+    private Long comId;
+
+    /** 总包单位名称 */
+    @Excel(name = "总包单位名称")
+    private String comName;
+
+    /** 设备序列号 */
+    @Excel(name = "设备序列号")
+    private String deviceKey;
+
+    /** 设备来源 */
+    @Excel(name = "设备来源")
+    private String deviceSource;
+
+    /** 塔机编号 */
+    @Excel(name = "塔机编号")
+    private String towerId;
+
+    /** 预警类型 */
+    @Excel(name = "预警类型")
+    private Long warnType;
+
+    /** 预警名称 */
+    @Excel(name = "预警名称")
+    private String warnName;
+
+    /** 预警内容 */
+    @Excel(name = "预警内容")
+    private String warnNote;
+
+    /** 预警值 */
+    @Excel(name = "预警值")
+    private String warnData;
+
+    /** 实际值 */
+    @Excel(name = "实际值")
+    private String realData;
+
+    /** 是否有效 */
+    @Excel(name = "是否有效")
+    private Long isDel;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+
+    public Long getCfgId() {
+        return cfgId;
+    }
+
+    public void setCfgId(Long cfgId) {
+        this.cfgId = cfgId;
+    }
+
+    public void setProjectId(Long projectId)
+    {
+        this.projectId = projectId;
+    }
+
+    public Long getProjectId() 
+    {
+        return projectId;
+    }
+
+    public Long getComId() {
+        return comId;
+    }
+
+    public void setComId(Long comId) {
+        this.comId = comId;
+    }
+
+    public void setDeviceKey(String deviceKey)
+    {
+        this.deviceKey = deviceKey;
+    }
+
+    public String getDeviceKey() 
+    {
+        return deviceKey;
+    }
+    public void setDeviceSource(String deviceSource) 
+    {
+        this.deviceSource = deviceSource;
+    }
+
+    public String getDeviceSource() 
+    {
+        return deviceSource;
+    }
+    public void setTowerId(String towerId) 
+    {
+        this.towerId = towerId;
+    }
+
+    public String getTowerId() 
+    {
+        return towerId;
+    }
+    public void setWarnType(Long warnType) 
+    {
+        this.warnType = warnType;
+    }
+
+    public Long getWarnType() 
+    {
+        return warnType;
+    }
+    public void setWarnName(String warnName) 
+    {
+        this.warnName = warnName;
+    }
+
+    public String getWarnName() 
+    {
+        return warnName;
+    }
+    public void setWarnNote(String warnNote) 
+    {
+        this.warnNote = warnNote;
+    }
+
+    public String getWarnNote() 
+    {
+        return warnNote;
+    }
+    public void setWarnData(String warnData) 
+    {
+        this.warnData = warnData;
+    }
+
+    public String getWarnData() 
+    {
+        return warnData;
+    }
+    public void setRealData(String realData) 
+    {
+        this.realData = realData;
+    }
+
+    public String getRealData() 
+    {
+        return realData;
+    }
+    public void setIsDel(Long isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public Long getIsDel() 
+    {
+        return isDel;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getComName() {
+        return comName;
+    }
+
+    public void setComName(String comName) {
+        this.comName = comName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("projectId", getProjectId())
+            .append("comId", getComId())
+            .append("deviceKey", getDeviceKey())
+            .append("deviceSource", getDeviceSource())
+            .append("towerId", getTowerId())
+            .append("warnType", getWarnType())
+            .append("warnName", getWarnName())
+            .append("warnNote", getWarnNote())
+            .append("warnData", getWarnData())
+            .append("realData", getRealData())
+            .append("isDel", getIsDel())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerProjectConfig.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerProjectConfig.java
new file mode 100644
index 00000000..38e4648a
--- /dev/null
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerProjectConfig.java
@@ -0,0 +1,340 @@
+package com.yanzhu.device.domain;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.yanzhu.common.core.annotation.Excel;
+import com.yanzhu.common.core.web.domain.BaseEntity;
+
+/**
+ * 塔基检测配置对象 dev_tower_project_config
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+public class DevTowerProjectConfig extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 主键 */
+    private Long id;
+
+    /** 项目主键 */
+    private Long projectId;
+
+    /** 租户名称 */
+    @Excel(name = "租户名称")
+    private String comName;
+
+    /** 项目名称 */
+    @Excel(name = "项目名称")
+    private String projectName;
+
+    /** 总包单位主键 */
+    private Long comId;
+
+
+
+    /** 设备序列号 */
+    @Excel(name = "设备序列号")
+    private String deviceSn;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String deviceName;
+
+    /** 设备来源 */
+    @Excel(name = "设备来源")
+    private String deviceSource;
+
+    /** 塔机编号 */
+    @Excel(name = "塔机编号")
+    private String towerId;
+
+    /** 塔机类型 */
+    @Excel(name = "塔机类型")
+    private String towerType;
+
+    /** 塔机坐标x */
+    @Excel(name = "塔机坐标x")
+    private String coordinateX;
+
+    /** 塔机坐标y */
+    @Excel(name = "塔机坐标y")
+    private String coordinateY;
+
+    /** 前臂长度 */
+    @Excel(name = "前臂长度")
+    private String frontBrachium;
+
+    /** 平衡臂长度 */
+    @Excel(name = "平衡臂长度")
+    private String afterBrachium;
+
+    /** 塔身高度 */
+    @Excel(name = "塔身高度")
+    private String towerBodyHeight;
+
+    /** 塔帽高度 */
+    @Excel(name = "塔帽高度")
+    private String towerCapHeight;
+
+    /** 塔节高度 */
+    @Excel(name = "塔节高度")
+    private String towerSectionHeight;
+
+    /** 设备状态 */
+    @Excel(name = "设备状态")
+    private String online;
+
+    /** 司机名称 */
+    @Excel(name = "司机名称")
+    private String driName;
+
+    /** 司机电话 */
+    @Excel(name = "司机电话")
+    private String driPhone;
+
+    /** 安全员名称 */
+    @Excel(name = "安全员名称")
+    private String safName;
+
+    /** 安全员电话 */
+    @Excel(name = "安全员电话")
+    private String safPhone;
+
+    /** 是否有效 */
+    @Excel(name = "是否有效")
+    private Long isDel;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setProjectId(Long projectId) 
+    {
+        this.projectId = projectId;
+    }
+
+    public Long getProjectId() 
+    {
+        return projectId;
+    }
+
+    public Long getComId() {
+        return comId;
+    }
+
+    public void setComId(Long comId) {
+        this.comId = comId;
+    }
+
+    public void setDeviceSn(String deviceSn)
+    {
+        this.deviceSn = deviceSn;
+    }
+
+    public String getDeviceSn() 
+    {
+        return deviceSn;
+    }
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+    public void setDeviceSource(String deviceSource)
+    {
+        this.deviceSource = deviceSource;
+    }
+
+    public String getDeviceSource() 
+    {
+        return deviceSource;
+    }
+
+    public String getTowerId() {
+        return towerId;
+    }
+
+    public void setTowerId(String towerId) {
+        this.towerId = towerId;
+    }
+
+    public void setTowerType(String towerType)
+    {
+        this.towerType = towerType;
+    }
+
+    public String getTowerType() 
+    {
+        return towerType;
+    }
+    public void setCoordinateX(String coordinateX) 
+    {
+        this.coordinateX = coordinateX;
+    }
+
+    public String getCoordinateX() 
+    {
+        return coordinateX;
+    }
+    public void setCoordinateY(String coordinateY) 
+    {
+        this.coordinateY = coordinateY;
+    }
+
+    public String getCoordinateY() 
+    {
+        return coordinateY;
+    }
+    public void setFrontBrachium(String frontBrachium) 
+    {
+        this.frontBrachium = frontBrachium;
+    }
+
+    public String getFrontBrachium() 
+    {
+        return frontBrachium;
+    }
+    public void setAfterBrachium(String afterBrachium) 
+    {
+        this.afterBrachium = afterBrachium;
+    }
+
+    public String getAfterBrachium() 
+    {
+        return afterBrachium;
+    }
+    public void setTowerBodyHeight(String towerBodyHeight) 
+    {
+        this.towerBodyHeight = towerBodyHeight;
+    }
+
+    public String getTowerBodyHeight() 
+    {
+        return towerBodyHeight;
+    }
+    public void setTowerCapHeight(String towerCapHeight) 
+    {
+        this.towerCapHeight = towerCapHeight;
+    }
+
+    public String getTowerCapHeight() 
+    {
+        return towerCapHeight;
+    }
+    public void setTowerSectionHeight(String towerSectionHeight) 
+    {
+        this.towerSectionHeight = towerSectionHeight;
+    }
+
+    public String getTowerSectionHeight() 
+    {
+        return towerSectionHeight;
+    }
+
+    public String getOnline() {
+        return online;
+    }
+
+    public void setOnline(String online) {
+        this.online = online;
+    }
+
+    public String getDriName() {
+        return driName;
+    }
+
+    public void setDriName(String driName) {
+        this.driName = driName;
+    }
+
+    public String getDriPhone() {
+        return driPhone;
+    }
+
+    public void setDriPhone(String driPhone) {
+        this.driPhone = driPhone;
+    }
+
+    public String getSafName() {
+        return safName;
+    }
+
+    public void setSafName(String safName) {
+        this.safName = safName;
+    }
+
+    public String getSafPhone() {
+        return safPhone;
+    }
+
+    public void setSafPhone(String safPhone) {
+        this.safPhone = safPhone;
+    }
+
+    public void setIsDel(Long isDel)
+    {
+        this.isDel = isDel;
+    }
+
+    public Long getIsDel() 
+    {
+        return isDel;
+    }
+
+    public String getProjectName() {
+        return projectName;
+    }
+
+    public void setProjectName(String projectName) {
+        this.projectName = projectName;
+    }
+
+    public String getComName() {
+        return comName;
+    }
+
+    public void setComName(String comName) {
+        this.comName = comName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("projectId", getProjectId())
+            .append("comId", getComId())
+            .append("deviceSn", getDeviceSn())
+            .append("deviceName", getDeviceName())
+            .append("deviceSource", getDeviceSource())
+            .append("towerType", getTowerType())
+            .append("coordinateX", getCoordinateX())
+            .append("coordinateY", getCoordinateY())
+            .append("frontBrachium", getFrontBrachium())
+            .append("afterBrachium", getAfterBrachium())
+            .append("towerBodyHeight", getTowerBodyHeight())
+            .append("towerCapHeight", getTowerCapHeight())
+            .append("towerSectionHeight", getTowerSectionHeight())
+            .append("online", getOnline())
+            .append("driName", getDriName())
+            .append("driPhone", getDriPhone())
+            .append("safName", getSafName())
+            .append("safPhone", getSafPhone())
+            .append("isDel", getIsDel())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/mapper/DevTowerDataCollideMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/mapper/DevTowerDataCollideMapper.java
new file mode 100644
index 00000000..74ebae12
--- /dev/null
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/mapper/DevTowerDataCollideMapper.java
@@ -0,0 +1,98 @@
+package com.yanzhu.device.mapper;
+
+
+import com.yanzhu.device.domain.DevTowerDataCollide;
+import com.yanzhu.device.domain.DevTowerDataCollideDetail;
+import com.yanzhu.device.domain.DevTowerDataRound;
+
+import java.util.List;
+
+/**
+ * 塔机碰撞信息Mapper接口
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+public interface DevTowerDataCollideMapper 
+{
+    /**
+     * 查询塔机碰撞信息
+     * 
+     * @param id 塔机碰撞信息主键
+     * @return 塔机碰撞信息
+     */
+    public DevTowerDataCollide selectDevTowerDataCollideById(Long id);
+
+    /**
+     * 查询塔机碰撞信息列表
+     * 
+     * @param devTowerDataCollide 塔机碰撞信息
+     * @return 塔机碰撞信息集合
+     */
+    public List<DevTowerDataCollide> selectDevTowerDataCollideList(DevTowerDataCollide devTowerDataCollide);
+
+    /**
+     * 新增塔机碰撞信息
+     * 
+     * @param devTowerDataCollide 塔机碰撞信息
+     * @return 结果
+     */
+    public int insertDevTowerDataCollide(DevTowerDataCollide devTowerDataCollide);
+
+    /**
+     * 修改塔机碰撞信息
+     * 
+     * @param devTowerDataCollide 塔机碰撞信息
+     * @return 结果
+     */
+    public int updateDevTowerDataCollide(DevTowerDataCollide devTowerDataCollide);
+
+    /**
+     * 删除塔机碰撞信息
+     * 
+     * @param id 塔机碰撞信息主键
+     * @return 结果
+     */
+    public int deleteDevTowerDataCollideById(Long id);
+
+    /**
+     * 批量删除塔机碰撞信息
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteDevTowerDataCollideByIds(Long[] ids);
+
+    /**
+     * 批量删除碰撞详情
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteDevTowerDataCollideDetailByCollideIds(Long[] ids);
+    
+    /**
+     * 批量新增碰撞详情
+     * 
+     * @param devTowerDataCollideDetailList 碰撞详情列表
+     * @return 结果
+     */
+    public int batchDevTowerDataCollideDetail(List<DevTowerDataCollideDetail> devTowerDataCollideDetailList);
+    
+
+    /**
+     * 通过塔机碰撞信息主键删除碰撞详情信息
+     * 
+     * @param id 塔机碰撞信息ID
+     * @return 结果
+     */
+    public int deleteDevTowerDataCollideDetailByCollideId(Long id);
+
+    /**
+     * 查询塔机碰撞数据
+     *
+     * @param DevTowerDataRound 设备循环信息
+     * @return 结果
+     */
+    public int findCollideCountByDeviceKey(DevTowerDataRound DevTowerDataRound);
+}
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/mapper/DevTowerDataLimitMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/mapper/DevTowerDataLimitMapper.java
new file mode 100644
index 00000000..54395cca
--- /dev/null
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/mapper/DevTowerDataLimitMapper.java
@@ -0,0 +1,64 @@
+package com.yanzhu.device.mapper;
+
+
+
+import com.yanzhu.device.domain.DevTowerDataLimit;
+
+import java.util.List;
+
+/**
+ * 塔机限位信息Mapper接口
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+public interface DevTowerDataLimitMapper 
+{
+    /**
+     * 查询塔机限位信息
+     * 
+     * @param id 塔机限位信息主键
+     * @return 塔机限位信息
+     */
+    public DevTowerDataLimit selectDevTowerDataLimitById(Long id);
+
+    /**
+     * 查询塔机限位信息列表
+     * 
+     * @param devTowerDataLimit 塔机限位信息
+     * @return 塔机限位信息集合
+     */
+    public List<DevTowerDataLimit> selectDevTowerDataLimitList(DevTowerDataLimit devTowerDataLimit);
+
+    /**
+     * 新增塔机限位信息
+     * 
+     * @param devTowerDataLimit 塔机限位信息
+     * @return 结果
+     */
+    public int insertDevTowerDataLimit(DevTowerDataLimit devTowerDataLimit);
+
+    /**
+     * 修改塔机限位信息
+     * 
+     * @param devTowerDataLimit 塔机限位信息
+     * @return 结果
+     */
+    public int updateDevTowerDataLimit(DevTowerDataLimit devTowerDataLimit);
+
+    /**
+     * 删除塔机限位信息
+     * 
+     * @param id 塔机限位信息主键
+     * @return 结果
+     */
+    public int deleteDevTowerDataLimitById(Long id);
+
+    /**
+     * 批量删除塔机限位信息
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteDevTowerDataLimitByIds(Long[] ids);
+}
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/mapper/DevTowerDataLocalMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/mapper/DevTowerDataLocalMapper.java
new file mode 100644
index 00000000..620fdb08
--- /dev/null
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/mapper/DevTowerDataLocalMapper.java
@@ -0,0 +1,64 @@
+package com.yanzhu.device.mapper;
+
+
+
+import com.yanzhu.device.domain.DevTowerDataLocal;
+
+import java.util.List;
+
+/**
+ * 塔机定位信息Mapper接口
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+public interface DevTowerDataLocalMapper 
+{
+    /**
+     * 查询塔机定位信息
+     * 
+     * @param id 塔机定位信息主键
+     * @return 塔机定位信息
+     */
+    public DevTowerDataLocal selectDevTowerDataLocalById(Long id);
+
+    /**
+     * 查询塔机定位信息列表
+     * 
+     * @param devTowerDataLocal 塔机定位信息
+     * @return 塔机定位信息集合
+     */
+    public List<DevTowerDataLocal> selectDevTowerDataLocalList(DevTowerDataLocal devTowerDataLocal);
+
+    /**
+     * 新增塔机定位信息
+     * 
+     * @param devTowerDataLocal 塔机定位信息
+     * @return 结果
+     */
+    public int insertDevTowerDataLocal(DevTowerDataLocal devTowerDataLocal);
+
+    /**
+     * 修改塔机定位信息
+     * 
+     * @param devTowerDataLocal 塔机定位信息
+     * @return 结果
+     */
+    public int updateDevTowerDataLocal(DevTowerDataLocal devTowerDataLocal);
+
+    /**
+     * 删除塔机定位信息
+     * 
+     * @param id 塔机定位信息主键
+     * @return 结果
+     */
+    public int deleteDevTowerDataLocalById(Long id);
+
+    /**
+     * 批量删除塔机定位信息
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteDevTowerDataLocalByIds(Long[] ids);
+}
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/mapper/DevTowerDataRoundMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/mapper/DevTowerDataRoundMapper.java
new file mode 100644
index 00000000..2397720d
--- /dev/null
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/mapper/DevTowerDataRoundMapper.java
@@ -0,0 +1,72 @@
+package com.yanzhu.device.mapper;
+
+
+
+import com.yanzhu.device.domain.DevTowerDataRound;
+
+import java.util.List;
+
+/**
+ * 塔机工作循环Mapper接口
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+public interface DevTowerDataRoundMapper 
+{
+    /**
+     * 查询塔机工作循环
+     * 
+     * @param id 塔机工作循环主键
+     * @return 塔机工作循环
+     */
+    public DevTowerDataRound selectDevTowerDataRoundById(Long id);
+
+    /**
+     * 查询塔机工作循环列表
+     * 
+     * @param devTowerDataRound 塔机工作循环
+     * @return 塔机工作循环集合
+     */
+    public List<DevTowerDataRound> selectDevTowerDataRoundList(DevTowerDataRound devTowerDataRound);
+
+    /**
+     * 新增塔机工作循环
+     * 
+     * @param devTowerDataRound 塔机工作循环
+     * @return 结果
+     */
+    public int insertDevTowerDataRound(DevTowerDataRound devTowerDataRound);
+
+    /**
+     * 修改塔机工作循环
+     * 
+     * @param devTowerDataRound 塔机工作循环
+     * @return 结果
+     */
+    public int updateDevTowerDataRound(DevTowerDataRound devTowerDataRound);
+
+    /**
+     * 删除塔机工作循环
+     * 
+     * @param id 塔机工作循环主键
+     * @return 结果
+     */
+    public int deleteDevTowerDataRoundById(Long id);
+
+    /**
+     * 批量删除塔机工作循环
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteDevTowerDataRoundByIds(Long[] ids);
+
+    /**
+     * 查询塔机工作循环数据
+     *
+     * @param devTowerDataRound 设备循环信息
+     * @return 结果
+     */
+    public int findRoundCountByDeviceKey(DevTowerDataRound devTowerDataRound);
+}
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/mapper/DevTowerDataRunMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/mapper/DevTowerDataRunMapper.java
new file mode 100644
index 00000000..424511e3
--- /dev/null
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/mapper/DevTowerDataRunMapper.java
@@ -0,0 +1,71 @@
+package com.yanzhu.device.mapper;
+
+import com.yanzhu.device.domain.DevTowerDataRound;
+import com.yanzhu.device.domain.DevTowerDataRun;
+
+import java.util.List;
+
+/**
+ * 塔机实时数据Mapper接口
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+public interface DevTowerDataRunMapper 
+{
+    /**
+     * 查询塔机实时数据
+     * 
+     * @param id 塔机实时数据主键
+     * @return 塔机实时数据
+     */
+    public DevTowerDataRun selectDevTowerDataRunById(Long id);
+
+    /**
+     * 查询塔机实时数据列表
+     * 
+     * @param devTowerDataRun 塔机实时数据
+     * @return 塔机实时数据集合
+     */
+    public List<DevTowerDataRun> selectDevTowerDataRunList(DevTowerDataRun devTowerDataRun);
+
+    /**
+     * 新增塔机实时数据
+     * 
+     * @param devTowerDataRun 塔机实时数据
+     * @return 结果
+     */
+    public int insertDevTowerDataRun(DevTowerDataRun devTowerDataRun);
+
+    /**
+     * 修改塔机实时数据
+     * 
+     * @param devTowerDataRun 塔机实时数据
+     * @return 结果
+     */
+    public int updateDevTowerDataRun(DevTowerDataRun devTowerDataRun);
+
+    /**
+     * 删除塔机实时数据
+     * 
+     * @param id 塔机实时数据主键
+     * @return 结果
+     */
+    public int deleteDevTowerDataRunById(Long id);
+
+    /**
+     * 批量删除塔机实时数据
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteDevTowerDataRunByIds(Long[] ids);
+
+    /**
+     * 查询塔机实时数据
+     *
+     * @param DevTowerDataRound 设备循环信息
+     * @return 结果
+     */
+    public int findRunCountByDeviceKey(DevTowerDataRound DevTowerDataRound);
+}
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/mapper/DevTowerDataWarningMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/mapper/DevTowerDataWarningMapper.java
new file mode 100644
index 00000000..1323f4e7
--- /dev/null
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/mapper/DevTowerDataWarningMapper.java
@@ -0,0 +1,62 @@
+package com.yanzhu.device.mapper;
+
+import com.yanzhu.device.domain.DevTowerDataWarning;
+
+import java.util.List;
+
+/**
+ * 塔机预警管理Mapper接口
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+public interface DevTowerDataWarningMapper 
+{
+    /**
+     * 查询塔机预警管理
+     * 
+     * @param id 塔机预警管理主键
+     * @return 塔机预警管理
+     */
+    public DevTowerDataWarning selectDevTowerDataWarningById(Long id);
+
+    /**
+     * 查询塔机预警管理列表
+     * 
+     * @param devTowerDataWarning 塔机预警管理
+     * @return 塔机预警管理集合
+     */
+    public List<DevTowerDataWarning> selectDevTowerDataWarningList(DevTowerDataWarning devTowerDataWarning);
+
+    /**
+     * 新增塔机预警管理
+     * 
+     * @param devTowerDataWarning 塔机预警管理
+     * @return 结果
+     */
+    public int insertDevTowerDataWarning(DevTowerDataWarning devTowerDataWarning);
+
+    /**
+     * 修改塔机预警管理
+     * 
+     * @param devTowerDataWarning 塔机预警管理
+     * @return 结果
+     */
+    public int updateDevTowerDataWarning(DevTowerDataWarning devTowerDataWarning);
+
+    /**
+     * 删除塔机预警管理
+     * 
+     * @param id 塔机预警管理主键
+     * @return 结果
+     */
+    public int deleteDevTowerDataWarningById(Long id);
+
+    /**
+     * 批量删除塔机预警管理
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteDevTowerDataWarningByIds(Long[] ids);
+}
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/mapper/DevTowerProjectConfigMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/mapper/DevTowerProjectConfigMapper.java
new file mode 100644
index 00000000..fd62f5d5
--- /dev/null
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/mapper/DevTowerProjectConfigMapper.java
@@ -0,0 +1,70 @@
+package com.yanzhu.device.mapper;
+
+import com.yanzhu.device.domain.DevTowerProjectConfig;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 塔基检测配置Mapper接口
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+public interface DevTowerProjectConfigMapper 
+{
+    /**
+     * 查询塔基检测配置
+     * 
+     * @param id 塔基检测配置主键
+     * @return 塔基检测配置
+     */
+    public DevTowerProjectConfig selectDevTowerProjectConfigById(Long id);
+
+    /**
+     * 查询塔基检测配置列表
+     * 
+     * @param devTowerProjectConfig 塔基检测配置
+     * @return 塔基检测配置集合
+     */
+    public List<DevTowerProjectConfig> selectDevTowerProjectConfigList(DevTowerProjectConfig devTowerProjectConfig);
+
+    /**
+     * 新增塔基检测配置
+     * 
+     * @param devTowerProjectConfig 塔基检测配置
+     * @return 结果
+     */
+    public int insertDevTowerProjectConfig(DevTowerProjectConfig devTowerProjectConfig);
+
+    /**
+     * 修改塔基检测配置
+     * 
+     * @param devTowerProjectConfig 塔基检测配置
+     * @return 结果
+     */
+    public int updateDevTowerProjectConfig(DevTowerProjectConfig devTowerProjectConfig);
+
+    /**
+     * 删除塔基检测配置
+     * 
+     * @param id 塔基检测配置主键
+     * @return 结果
+     */
+    public int deleteDevTowerProjectConfigById(Long id);
+
+    /**
+     * 批量删除塔基检测配置
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteDevTowerProjectConfigByIds(Long[] ids);
+
+    /**
+     * 根据设备状态统计设备
+     * @param devTowerProjectConfig
+     * @return
+     */
+    public List<Map<String, Object>> findtowerConfigGroupOnline(DevTowerProjectConfig devTowerProjectConfig);
+}
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataCollideMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataCollideMapper.xml
new file mode 100644
index 00000000..597adfb6
--- /dev/null
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataCollideMapper.xml
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yanzhu.device.mapper.DevTowerDataCollideMapper">
+    
+    <resultMap type="DevTowerDataCollide" id="DevTowerDataCollideResult">
+        <result property="id"    column="id"    />
+        <result property="cfgId"    column="cfg_id"    />
+        <result property="projectId"    column="project_id"    />
+        <result property="projectName"    column="projectName"    />
+        <result property="comId"    column="com_id"    />
+        <result property="comName"    column="com_name"    />
+        <result property="deviceKey"    column="device_key"    />
+        <result property="deviceSource"    column="device_source"    />
+        <result property="towerId"    column="tower_id"    />
+        <result property="coordinateX"    column="coordinate_x"    />
+        <result property="coordinateY"    column="coordinate_y"    />
+        <result property="frontBrachium"    column="front_brachium"    />
+        <result property="afterBrachium"    column="after_brachium"    />
+        <result property="towerBodyHeight"    column="tower_body_height"    />
+        <result property="height"    column="height"    />
+        <result property="angle"    column="angle"    />
+        <result property="range"    column="range"    />
+        <result property="earlyWarningDistance"    column="early_warning_distance"    />
+        <result property="alarmWarningDistance"    column="alarm_warning_distance"    />
+        <result property="contourValue"    column="contour_value"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <resultMap id="DevTowerDataCollideDevTowerDataCollideDetailResult" type="DevTowerDataCollide" extends="DevTowerDataCollideResult">
+        <collection property="devTowerDataCollideDetailList" notNullColumn="sub_id" javaType="java.util.List" resultMap="DevTowerDataCollideDetailResult" />
+    </resultMap>
+
+    <resultMap type="DevTowerDataCollideDetail" id="DevTowerDataCollideDetailResult">
+        <result property="id"    column="sub_id"    />
+        <result property="collideId"    column="sub_collide_id"    />
+        <result property="deviceKey"    column="sub_device_key"    />
+        <result property="deviceSource"    column="sub_device_source"    />
+        <result property="towerId"    column="sub_tower_id"    />
+        <result property="coordinateX"    column="sub_coordinate_x"    />
+        <result property="coordinateY"    column="sub_coordinate_y"    />
+        <result property="frontBrachium"    column="sub_front_brachium"    />
+        <result property="afterBrachium"    column="sub_after_brachium"    />
+        <result property="towerBodyHeight"    column="sub_tower_body_height"    />
+        <result property="height"    column="sub_height"    />
+        <result property="angle"    column="sub_angle"    />
+        <result property="range"    column="sub_range"    />
+        <result property="collideHorizontalDistance"    column="sub_collide_horizontal_distance"    />
+        <result property="collideVerticalDistance"    column="sub_collide_vertical_distance"    />
+        <result property="collideState"    column="sub_collide_state"    />
+    </resultMap>
+
+    <sql id="selectDevTowerDataCollideVo">
+        select dtdc.id, dtdc.cfg_id, dtdc.project_id, dtdc.com_id, sp.dept_name projectName, sd.dept_name com_name, dtdc.device_key, dtdc.device_source, dtdc.tower_id, dtdc.coordinate_x, dtdc.coordinate_y, dtdc.front_brachium, dtdc.after_brachium, dtdc.tower_body_height, dtdc.height, dtdc.angle, dtdc.range, dtdc.early_warning_distance, dtdc.alarm_warning_distance, dtdc.contour_value, dtdc.is_del, dtdc.create_by, dtdc.create_time, dtdc.update_by, dtdc.update_time, dtdc.remark
+        from dev_tower_data_collide dtdc
+         left join sys_dept sp on sp.dept_id = dtdc.project_id
+         left join sys_dept sd on sd.dept_id = dtdc.com_id
+    </sql>
+
+    <select id="selectDevTowerDataCollideList" parameterType="DevTowerDataCollide" resultMap="DevTowerDataCollideResult">
+        <include refid="selectDevTowerDataCollideVo"/>
+        <where>
+            <if test="cfgId != null">and dtdc.cfg_id = #{cfgId}</if>
+            <if test="projectId != null "> and dtdc.project_id = #{projectId}</if>
+            <if test="comId != null "> and dtdc.com_id = #{comId}</if>
+            <if test="projectName != null and projectName != ''"> and dtdc.project_id in (select spv.dept_id from sys_dept spv where spv.dept_name like concat('%', #{projectName}, '%'))</if>
+            <if test="comName != null and comName != ''"> and dtdc.com_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{comName}, '%'))</if>
+            <if test="deviceKey != null  and deviceKey != ''"> and dtdc.device_key = #{deviceKey}</if>
+            <if test="deviceSource != null  and deviceSource != ''"> and dtdc.device_source = #{deviceSource}</if>
+            <if test="towerId != null  and towerId != ''"> and dtdc.tower_id = #{towerId}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and dtdc.create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+        </where>
+        order by dtdc.id desc
+    </select>
+    
+    <select id="selectDevTowerDataCollideById" parameterType="Long" resultMap="DevTowerDataCollideDevTowerDataCollideDetailResult">
+        select a.id, a.project_id, a.com_id, a.device_key, a.device_source, a.tower_id, a.coordinate_x, a.coordinate_y, a.front_brachium, a.after_brachium, a.tower_body_height, a.height, a.angle, a.range, a.early_warning_distance, a.alarm_warning_distance, a.contour_value, a.is_del, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,
+               b.id as sub_id, b.collide_id as sub_collide_id, b.device_key as sub_device_key, b.device_source as sub_device_source, b.tower_id as sub_tower_id, b.coordinate_x as sub_coordinate_x, b.coordinate_y as sub_coordinate_y, b.front_brachium as sub_front_brachium, b.after_brachium as sub_after_brachium, b.tower_body_height as sub_tower_body_height, b.height as sub_height, b.angle as sub_angle, b.range as sub_range, b.collide_horizontal_distance as sub_collide_horizontal_distance, b.collide_vertical_distance as sub_collide_vertical_distance, b.collide_state as sub_collide_state
+        from dev_tower_data_collide a
+                 left join dev_tower_data_collide_detail b on b.collide_id = a.id
+        where a.id = #{id}
+    </select>
+        
+    <insert id="insertDevTowerDataCollide" parameterType="DevTowerDataCollide" useGeneratedKeys="true" keyProperty="id">
+        insert into dev_tower_data_collide
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="cfgId != null">cfg_id,</if>
+            <if test="projectId != null">project_id,</if>
+            <if test="comId != null">com_id,</if>
+            <if test="deviceKey != null">device_key,</if>
+            <if test="deviceSource != null">device_source,</if>
+            <if test="towerId != null">tower_id,</if>
+            <if test="coordinateX != null">coordinate_x,</if>
+            <if test="coordinateY != null">coordinate_y,</if>
+            <if test="frontBrachium != null">front_brachium,</if>
+            <if test="afterBrachium != null">after_brachium,</if>
+            <if test="towerBodyHeight != null">tower_body_height,</if>
+            <if test="height != null">height,</if>
+            <if test="angle != null">angle,</if>
+            <if test="range != null">`range`,</if>
+            <if test="earlyWarningDistance != null">early_warning_distance,</if>
+            <if test="alarmWarningDistance != null">alarm_warning_distance,</if>
+            <if test="contourValue != null">contour_value,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="cfgId != null">#{cfgId},</if>
+            <if test="projectId != null">#{projectId},</if>
+            <if test="comId != null">#{comId},</if>
+            <if test="deviceKey != null">#{deviceKey},</if>
+            <if test="deviceSource != null">#{deviceSource},</if>
+            <if test="towerId != null">#{towerId},</if>
+            <if test="coordinateX != null">#{coordinateX},</if>
+            <if test="coordinateY != null">#{coordinateY},</if>
+            <if test="frontBrachium != null">#{frontBrachium},</if>
+            <if test="afterBrachium != null">#{afterBrachium},</if>
+            <if test="towerBodyHeight != null">#{towerBodyHeight},</if>
+            <if test="height != null">#{height},</if>
+            <if test="angle != null">#{angle},</if>
+            <if test="range != null">#{range},</if>
+            <if test="earlyWarningDistance != null">#{earlyWarningDistance},</if>
+            <if test="alarmWarningDistance != null">#{alarmWarningDistance},</if>
+            <if test="contourValue != null">#{contourValue},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateDevTowerDataCollide" parameterType="DevTowerDataCollide">
+        update dev_tower_data_collide
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="cfgId != null">cfg_id = #{cfgId},</if>
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="comId != null">com_id = #{comId},</if>
+            <if test="deviceKey != null">device_key = #{deviceKey},</if>
+            <if test="deviceSource != null">device_source = #{deviceSource},</if>
+            <if test="towerId != null">tower_id = #{towerId},</if>
+            <if test="coordinateX != null">coordinate_x = #{coordinateX},</if>
+            <if test="coordinateY != null">coordinate_y = #{coordinateY},</if>
+            <if test="frontBrachium != null">front_brachium = #{frontBrachium},</if>
+            <if test="afterBrachium != null">after_brachium = #{afterBrachium},</if>
+            <if test="towerBodyHeight != null">tower_body_height = #{towerBodyHeight},</if>
+            <if test="height != null">height = #{height},</if>
+            <if test="angle != null">angle = #{angle},</if>
+            <if test="range != null">`range` = #{range},</if>
+            <if test="earlyWarningDistance != null">early_warning_distance = #{earlyWarningDistance},</if>
+            <if test="alarmWarningDistance != null">alarm_warning_distance = #{alarmWarningDistance},</if>
+            <if test="contourValue != null">contour_value = #{contourValue},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteDevTowerDataCollideById" parameterType="Long">
+        delete from dev_tower_data_collide where id = #{id}
+    </delete>
+
+    <delete id="deleteDevTowerDataCollideByIds" parameterType="String">
+        delete from dev_tower_data_collide where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    
+    <delete id="deleteDevTowerDataCollideDetailByCollideIds" parameterType="String">
+        delete from dev_tower_data_collide_detail where collide_id in 
+        <foreach item="collideId" collection="array" open="(" separator="," close=")">
+            #{collideId}
+        </foreach>
+    </delete>
+
+    <delete id="deleteDevTowerDataCollideDetailByCollideId" parameterType="Long">
+        delete from dev_tower_data_collide_detail where collide_id = #{collideId}
+    </delete>
+
+    <insert id="batchDevTowerDataCollideDetail">
+        insert into dev_tower_data_collide_detail( id, collide_id, device_key, device_source, tower_id, coordinate_x, coordinate_y, front_brachium, after_brachium, tower_body_height, height, angle, range, collide_horizontal_distance, collide_vertical_distance, collide_state) values
+		<foreach item="item" index="index" collection="list" separator=",">
+            ( #{item.id}, #{item.collideId}, #{item.deviceKey}, #{item.deviceSource}, #{item.towerId}, #{item.coordinateX}, #{item.coordinateY}, #{item.frontBrachium}, #{item.afterBrachium}, #{item.towerBodyHeight}, #{item.height}, #{item.angle}, #{item.range}, #{item.collideHorizontalDistance}, #{item.collideVerticalDistance}, #{item.collideState})
+        </foreach>
+    </insert>
+
+    <select id="findCollideCountByDeviceKey" parameterType="DevTowerDataRound" resultType="Int">
+        select count(1) as total from dev_tower_data_collide
+        <where>
+            <if test="deviceKey != null  and deviceKey != ''">and cfg_id = (select dc.id from dev_tower_project_config dc where dc.device_sn=#{deviceKey}) and device_key = #{deviceKey}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and date(create_time) between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+        </where>
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataLimitMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataLimitMapper.xml
new file mode 100644
index 00000000..4885e2d0
--- /dev/null
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataLimitMapper.xml
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yanzhu.device.mapper.DevTowerDataLimitMapper">
+    
+    <resultMap type="DevTowerDataLimit" id="DevTowerDataLimitResult">
+        <result property="id"    column="id"    />
+        <result property="cfgId"    column="cfg_id"    />
+        <result property="projectId"    column="project_id"    />
+        <result property="projectName"    column="projectName"    />
+        <result property="comId"    column="com_id"    />
+        <result property="comName"    column="com_name"    />
+        <result property="deviceKey"    column="device_key"    />
+        <result property="deviceSource"    column="device_source"    />
+        <result property="towerId"    column="tower_id"    />
+        <result property="windSpeedWarning"    column="wind_speed_warning"    />
+        <result property="windSpeedAlarm"    column="wind_speed_alarm"    />
+        <result property="loadWarning"    column="load_warning"    />
+        <result property="loadAlarm"    column="load_alarm"    />
+        <result property="momentWarning"    column="moment_warning"    />
+        <result property="momentAlarm"    column="moment_alarm"    />
+        <result property="highLimitWarning"    column="high_limit_warning"    />
+        <result property="highLimitAlarm"    column="high_limit_alarm"    />
+        <result property="lowLimitWarning"    column="low_limit_warning"    />
+        <result property="lowLimitAlarm"    column="low_limit_alarm"    />
+        <result property="leftLimitWarning"    column="left_limit_warning"    />
+        <result property="leftLimitAlarm"    column="left_limit_alarm"    />
+        <result property="rightLimitWarning"    column="right_limit_warning"    />
+        <result property="rightLimitAlarm"    column="right_limit_alarm"    />
+        <result property="frontLimitWarning"    column="front_limit_warning"    />
+        <result property="frontLimitAlarm"    column="front_limit_alarm"    />
+        <result property="backLimitWarning"    column="back_limit_warning"    />
+        <result property="backLimitAlarm"    column="back_limit_alarm"    />
+        <result property="collisionAngleWarning"    column="collision_angle_warning"    />
+        <result property="collisionAngleAlarm"    column="collision_angle_alarm"    />
+        <result property="collisionDistanceWarning"    column="collision_distance_warning"    />
+        <result property="collisionDistanceAlarm"    column="collision_distance_alarm"    />
+        <result property="hDistanceWarning"    column="h_distance_warning"    />
+        <result property="hDistanceAlarm"    column="h_distance_alarm"    />
+        <result property="vDistanceWarning"    column="v_distance_warning"    />
+        <result property="vDistanceAlarm"    column="v_distance_alarm"    />
+        <result property="leanWarning"    column="lean_warning"    />
+        <result property="leanAlarm"    column="lean_alarm"    />
+        <result property="rangeLimitStart"    column="range_limit_start"    />
+        <result property="rangeLimitEnd"    column="range_limit_end"    />
+        <result property="heightLimitStart"    column="height_limit_start"    />
+        <result property="heightLimitEnd"    column="height_limit_end"    />
+        <result property="rotationLimitStart"    column="rotation_limit_start"    />
+        <result property="rotationLimitEnd"    column="rotation_limit_end"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectDevTowerDataLimitVo">
+        select dtdl.id, dtdl.cfg_id, dtdl.project_id, dtdl.com_id, sp.dept_name projectName, sd.dept_name com_name, dtdl.device_key, dtdl.device_source, dtdl.tower_id, dtdl.wind_speed_warning, dtdl.wind_speed_alarm, dtdl.load_warning, dtdl.load_alarm, dtdl.moment_warning, dtdl.moment_alarm, dtdl.high_limit_warning, dtdl.high_limit_alarm, dtdl.low_limit_warning, dtdl.low_limit_alarm, dtdl.left_limit_warning, dtdl.left_limit_alarm, dtdl.right_limit_warning, dtdl.right_limit_alarm, dtdl.front_limit_warning, dtdl.front_limit_alarm, dtdl.back_limit_warning, dtdl.back_limit_alarm, dtdl.collision_angle_warning, dtdl.collision_angle_alarm, dtdl.collision_distance_warning, dtdl.collision_distance_alarm, dtdl.h_distance_warning, dtdl.h_distance_alarm, dtdl.v_distance_warning, dtdl.v_distance_alarm, dtdl.lean_warning, dtdl.lean_alarm, dtdl.range_limit_start, dtdl.range_limit_end, dtdl.height_limit_start, dtdl.height_limit_end, dtdl.rotation_limit_start, dtdl.rotation_limit_end, dtdl.is_del, dtdl.create_by, dtdl.create_time, dtdl.update_by, dtdl.update_time, dtdl.remark
+        from dev_tower_data_limit dtdl
+                 left join sys_dept sp on sp.dept_id = dtdl.project_id
+                 left join sys_dept sd on sd.dept_id = dtdl.com_id
+
+    </sql>
+
+    <select id="selectDevTowerDataLimitList" parameterType="DevTowerDataLimit" resultMap="DevTowerDataLimitResult">
+        <include refid="selectDevTowerDataLimitVo"/>
+        <where>
+            <if test="cfgId != null">and dtdl.cfg_id = #{cfgId}</if>
+            <if test="projectId != null "> and dtdl.project_id = #{projectId}</if>
+            <if test="comId != null "> and dtdl.com_id = #{comId}</if>
+            <if test="projectName != null and projectName != ''"> and dtdl.project_id in (select spv.dept_id from sys_dept spv where spv.dept_name like concat('%', #{projectName}, '%'))</if>
+            <if test="comName != null and comName != ''"> and dtdl.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{comName}, '%'))</if>
+            <if test="deviceKey != null  and deviceKey != ''"> and dtdl.device_key = #{deviceKey}</if>
+            <if test="deviceSource != null  and deviceSource != ''"> and dtdl.device_source = #{deviceSource}</if>
+            <if test="towerId != null  and towerId != ''"> and dtdl.tower_id = #{towerId}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and dtdl.create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+        </where>
+        order by dtdl.id desc
+    </select>
+    
+    <select id="selectDevTowerDataLimitById" parameterType="Long" resultMap="DevTowerDataLimitResult">
+        <include refid="selectDevTowerDataLimitVo"/>
+        where dtdl.id = #{id}
+    </select>
+        
+    <insert id="insertDevTowerDataLimit" parameterType="DevTowerDataLimit" useGeneratedKeys="true" keyProperty="id">
+        insert into dev_tower_data_limit
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="cfgId != null">cfg_id,</if>
+            <if test="projectId != null">project_id,</if>
+            <if test="comId != null">com_id,</if>
+            <if test="deviceKey != null">device_key,</if>
+            <if test="deviceSource != null">device_source,</if>
+            <if test="towerId != null">tower_id,</if>
+            <if test="windSpeedWarning != null">wind_speed_warning,</if>
+            <if test="windSpeedAlarm != null">wind_speed_alarm,</if>
+            <if test="loadWarning != null">load_warning,</if>
+            <if test="loadAlarm != null">load_alarm,</if>
+            <if test="momentWarning != null">moment_warning,</if>
+            <if test="momentAlarm != null">moment_alarm,</if>
+            <if test="highLimitWarning != null">high_limit_warning,</if>
+            <if test="highLimitAlarm != null">high_limit_alarm,</if>
+            <if test="lowLimitWarning != null">low_limit_warning,</if>
+            <if test="lowLimitAlarm != null">low_limit_alarm,</if>
+            <if test="leftLimitWarning != null">left_limit_warning,</if>
+            <if test="leftLimitAlarm != null">left_limit_alarm,</if>
+            <if test="rightLimitWarning != null">right_limit_warning,</if>
+            <if test="rightLimitAlarm != null">right_limit_alarm,</if>
+            <if test="frontLimitWarning != null">front_limit_warning,</if>
+            <if test="frontLimitAlarm != null">front_limit_alarm,</if>
+            <if test="backLimitWarning != null">back_limit_warning,</if>
+            <if test="backLimitAlarm != null">back_limit_alarm,</if>
+            <if test="collisionAngleWarning != null">collision_angle_warning,</if>
+            <if test="collisionAngleAlarm != null">collision_angle_alarm,</if>
+            <if test="collisionDistanceWarning != null">collision_distance_warning,</if>
+            <if test="collisionDistanceAlarm != null">collision_distance_alarm,</if>
+            <if test="hDistanceWarning != null">h_distance_warning,</if>
+            <if test="hDistanceAlarm != null">h_distance_alarm,</if>
+            <if test="vDistanceWarning != null">v_distance_warning,</if>
+            <if test="vDistanceAlarm != null">v_distance_alarm,</if>
+            <if test="leanWarning != null">lean_warning,</if>
+            <if test="leanAlarm != null">lean_alarm,</if>
+            <if test="rangeLimitStart != null">range_limit_start,</if>
+            <if test="rangeLimitEnd != null">range_limit_end,</if>
+            <if test="heightLimitStart != null">height_limit_start,</if>
+            <if test="heightLimitEnd != null">height_limit_end,</if>
+            <if test="rotationLimitStart != null">rotation_limit_start,</if>
+            <if test="rotationLimitEnd != null">rotation_limit_end,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="cfgId != null">#{cfgId},</if>
+            <if test="projectId != null">#{projectId},</if>
+            <if test="comId != null">#{comId},</if>
+            <if test="deviceKey != null">#{deviceKey},</if>
+            <if test="deviceSource != null">#{deviceSource},</if>
+            <if test="towerId != null">#{towerId},</if>
+            <if test="windSpeedWarning != null">#{windSpeedWarning},</if>
+            <if test="windSpeedAlarm != null">#{windSpeedAlarm},</if>
+            <if test="loadWarning != null">#{loadWarning},</if>
+            <if test="loadAlarm != null">#{loadAlarm},</if>
+            <if test="momentWarning != null">#{momentWarning},</if>
+            <if test="momentAlarm != null">#{momentAlarm},</if>
+            <if test="highLimitWarning != null">#{highLimitWarning},</if>
+            <if test="highLimitAlarm != null">#{highLimitAlarm},</if>
+            <if test="lowLimitWarning != null">#{lowLimitWarning},</if>
+            <if test="lowLimitAlarm != null">#{lowLimitAlarm},</if>
+            <if test="leftLimitWarning != null">#{leftLimitWarning},</if>
+            <if test="leftLimitAlarm != null">#{leftLimitAlarm},</if>
+            <if test="rightLimitWarning != null">#{rightLimitWarning},</if>
+            <if test="rightLimitAlarm != null">#{rightLimitAlarm},</if>
+            <if test="frontLimitWarning != null">#{frontLimitWarning},</if>
+            <if test="frontLimitAlarm != null">#{frontLimitAlarm},</if>
+            <if test="backLimitWarning != null">#{backLimitWarning},</if>
+            <if test="backLimitAlarm != null">#{backLimitAlarm},</if>
+            <if test="collisionAngleWarning != null">#{collisionAngleWarning},</if>
+            <if test="collisionAngleAlarm != null">#{collisionAngleAlarm},</if>
+            <if test="collisionDistanceWarning != null">#{collisionDistanceWarning},</if>
+            <if test="collisionDistanceAlarm != null">#{collisionDistanceAlarm},</if>
+            <if test="hDistanceWarning != null">#{hDistanceWarning},</if>
+            <if test="hDistanceAlarm != null">#{hDistanceAlarm},</if>
+            <if test="vDistanceWarning != null">#{vDistanceWarning},</if>
+            <if test="vDistanceAlarm != null">#{vDistanceAlarm},</if>
+            <if test="leanWarning != null">#{leanWarning},</if>
+            <if test="leanAlarm != null">#{leanAlarm},</if>
+            <if test="rangeLimitStart != null">#{rangeLimitStart},</if>
+            <if test="rangeLimitEnd != null">#{rangeLimitEnd},</if>
+            <if test="heightLimitStart != null">#{heightLimitStart},</if>
+            <if test="heightLimitEnd != null">#{heightLimitEnd},</if>
+            <if test="rotationLimitStart != null">#{rotationLimitStart},</if>
+            <if test="rotationLimitEnd != null">#{rotationLimitEnd},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateDevTowerDataLimit" parameterType="DevTowerDataLimit">
+        update dev_tower_data_limit
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="cfgId != null">cfg_id = #{cfgId},</if>
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="comId != null">com_id = #{comId},</if>
+            <if test="deviceKey != null">device_key = #{deviceKey},</if>
+            <if test="deviceSource != null">device_source = #{deviceSource},</if>
+            <if test="towerId != null">tower_id = #{towerId},</if>
+            <if test="windSpeedWarning != null">wind_speed_warning = #{windSpeedWarning},</if>
+            <if test="windSpeedAlarm != null">wind_speed_alarm = #{windSpeedAlarm},</if>
+            <if test="loadWarning != null">load_warning = #{loadWarning},</if>
+            <if test="loadAlarm != null">load_alarm = #{loadAlarm},</if>
+            <if test="momentWarning != null">moment_warning = #{momentWarning},</if>
+            <if test="momentAlarm != null">moment_alarm = #{momentAlarm},</if>
+            <if test="highLimitWarning != null">high_limit_warning = #{highLimitWarning},</if>
+            <if test="highLimitAlarm != null">high_limit_alarm = #{highLimitAlarm},</if>
+            <if test="lowLimitWarning != null">low_limit_warning = #{lowLimitWarning},</if>
+            <if test="lowLimitAlarm != null">low_limit_alarm = #{lowLimitAlarm},</if>
+            <if test="leftLimitWarning != null">left_limit_warning = #{leftLimitWarning},</if>
+            <if test="leftLimitAlarm != null">left_limit_alarm = #{leftLimitAlarm},</if>
+            <if test="rightLimitWarning != null">right_limit_warning = #{rightLimitWarning},</if>
+            <if test="rightLimitAlarm != null">right_limit_alarm = #{rightLimitAlarm},</if>
+            <if test="frontLimitWarning != null">front_limit_warning = #{frontLimitWarning},</if>
+            <if test="frontLimitAlarm != null">front_limit_alarm = #{frontLimitAlarm},</if>
+            <if test="backLimitWarning != null">back_limit_warning = #{backLimitWarning},</if>
+            <if test="backLimitAlarm != null">back_limit_alarm = #{backLimitAlarm},</if>
+            <if test="collisionAngleWarning != null">collision_angle_warning = #{collisionAngleWarning},</if>
+            <if test="collisionAngleAlarm != null">collision_angle_alarm = #{collisionAngleAlarm},</if>
+            <if test="collisionDistanceWarning != null">collision_distance_warning = #{collisionDistanceWarning},</if>
+            <if test="collisionDistanceAlarm != null">collision_distance_alarm = #{collisionDistanceAlarm},</if>
+            <if test="hDistanceWarning != null">h_distance_warning = #{hDistanceWarning},</if>
+            <if test="hDistanceAlarm != null">h_distance_alarm = #{hDistanceAlarm},</if>
+            <if test="vDistanceWarning != null">v_distance_warning = #{vDistanceWarning},</if>
+            <if test="vDistanceAlarm != null">v_distance_alarm = #{vDistanceAlarm},</if>
+            <if test="leanWarning != null">lean_warning = #{leanWarning},</if>
+            <if test="leanAlarm != null">lean_alarm = #{leanAlarm},</if>
+            <if test="rangeLimitStart != null">range_limit_start = #{rangeLimitStart},</if>
+            <if test="rangeLimitEnd != null">range_limit_end = #{rangeLimitEnd},</if>
+            <if test="heightLimitStart != null">height_limit_start = #{heightLimitStart},</if>
+            <if test="heightLimitEnd != null">height_limit_end = #{heightLimitEnd},</if>
+            <if test="rotationLimitStart != null">rotation_limit_start = #{rotationLimitStart},</if>
+            <if test="rotationLimitEnd != null">rotation_limit_end = #{rotationLimitEnd},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteDevTowerDataLimitById" parameterType="Long">
+        delete from dev_tower_data_limit where id = #{id}
+    </delete>
+
+    <delete id="deleteDevTowerDataLimitByIds" parameterType="String">
+        delete from dev_tower_data_limit where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataLocalMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataLocalMapper.xml
new file mode 100644
index 00000000..4a0ff633
--- /dev/null
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataLocalMapper.xml
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yanzhu.device.mapper.DevTowerDataLocalMapper">
+    
+    <resultMap type="DevTowerDataLocal" id="DevTowerDataLocalResult">
+        <result property="id"    column="id"    />
+        <result property="cfgId"    column="cfg_id"    />
+        <result property="projectId"    column="project_id"    />
+        <result property="projectName"    column="projectName"    />
+        <result property="comId"    column="com_id"    />
+        <result property="comName"    column="com_name"    />
+        <result property="deviceKey"    column="device_key"    />
+        <result property="deviceSource"    column="device_source"    />
+        <result property="towerId"    column="tower_id"    />
+        <result property="rangeNearEndAdValue"    column="range_near_end_ad_value"    />
+        <result property="rangeNearEndRealityValue"    column="range_near_end_reality_value"    />
+        <result property="rangeFarEndAdValue"    column="range_far_end_ad_value"    />
+        <result property="rangeFarEndRealityValue"    column="range_far_end_reality_value"    />
+        <result property="highNearEndAdValue"    column="high_near_end_ad_value"    />
+        <result property="highNearEndRealityValue"    column="high_near_end_reality_value"    />
+        <result property="highFarEndAdValue"    column="high_far_end_ad_value"    />
+        <result property="highFarEndRealityValue"    column="high_far_end_reality_value"    />
+        <result property="emptyWeightAdValue"    column="empty_weight_ad_value"    />
+        <result property="emptyWeightRealityValue"    column="empty_weight_reality_value"    />
+        <result property="loadWeightAdValue"    column="load_weight_ad_value"    />
+        <result property="loadWeightRealityValue"    column="load_weight_reality_value"    />
+        <result property="rotationStartAdValue"    column="rotation_start_ad_value"    />
+        <result property="rotationStartRealityValue"    column="rotation_start_reality_value"    />
+        <result property="rotationEndAdValue"    column="rotation_end_ad_value"    />
+        <result property="rotationEndRealityValue"    column="rotation_end_reality_value"    />
+        <result property="windSpeedFactor"    column="wind_speed_factor"    />
+        <result property="tiltFactor"    column="tilt_factor"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectDevTowerDataLocalVo">
+        select dtdl.id,
+               dtdl.cfg_id,
+               dtdl.project_id,
+               dtdl.com_id,
+               sp.dept_name projectName,
+               sd.dept_name com_name,
+               dtdl.device_key,
+               dtdl.device_source,
+               dtdl.tower_id,
+               dtdl.range_near_end_ad_value,
+               dtdl.range_near_end_reality_value,
+               dtdl.range_far_end_ad_value,
+               dtdl.range_far_end_reality_value,
+               dtdl.high_near_end_ad_value,
+               dtdl.high_near_end_reality_value,
+               dtdl.high_far_end_ad_value,
+               dtdl.high_far_end_reality_value,
+               dtdl.empty_weight_ad_value,
+               dtdl.empty_weight_reality_value,
+               dtdl.load_weight_ad_value,
+               dtdl.load_weight_reality_value,
+               dtdl.rotation_start_ad_value,
+               dtdl.rotation_start_reality_value,
+               dtdl.rotation_end_ad_value,
+               dtdl.rotation_end_reality_value,
+               dtdl.wind_speed_factor,
+               dtdl.tilt_factor,
+               dtdl.is_del,
+               dtdl.create_by,
+               dtdl.create_time,
+               dtdl.update_by,
+               dtdl.update_time,
+               dtdl.remark
+        from dev_tower_data_local dtdl
+                 left join sys_dept sp on sp.dept_id = dtdl.project_id
+                 left join sys_dept sd on sd.dept_id = dtdl.com_id
+    </sql>
+
+    <select id="selectDevTowerDataLocalList" parameterType="DevTowerDataLocal" resultMap="DevTowerDataLocalResult">
+        <include refid="selectDevTowerDataLocalVo"/>
+        <where>
+            <if test="cfgId != null">and dtdl.cfg_id = #{cfgId}</if>
+            <if test="projectId != null "> and dtdl.project_id = #{projectId}</if>
+            <if test="comId != null "> and dtdl.com_id = #{comId}</if>
+            <if test="projectName != null and projectName != ''"> and dtdl.project_id in (select spv.dept_id from sys_dept spv where spv.dept_name like concat('%', #{projectName}, '%'))</if>
+            <if test="comName != null and comName != ''"> and dtdl.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{comName}, '%'))</if>
+            <if test="deviceKey != null  and deviceKey != ''"> and dtdl.device_key = #{deviceKey}</if>
+            <if test="deviceSource != null  and deviceSource != ''"> and dtdl.device_source = #{deviceSource}</if>
+            <if test="towerId != null  and towerId != ''"> and dtdl.tower_id = #{towerId}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and dtdl.create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+        </where>
+        order by dtdl.id desc
+    </select>
+    
+    <select id="selectDevTowerDataLocalById" parameterType="Long" resultMap="DevTowerDataLocalResult">
+        <include refid="selectDevTowerDataLocalVo"/>
+        where dtdl.id = #{id}
+    </select>
+        
+    <insert id="insertDevTowerDataLocal" parameterType="DevTowerDataLocal" useGeneratedKeys="true" keyProperty="id">
+        insert into dev_tower_data_local
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="cfgId != null">cfg_id,</if>
+            <if test="projectId != null">project_id,</if>
+            <if test="comId != null">com_id,</if>
+            <if test="deviceKey != null">device_key,</if>
+            <if test="deviceSource != null">device_source,</if>
+            <if test="towerId != null">tower_id,</if>
+            <if test="rangeNearEndAdValue != null">range_near_end_ad_value,</if>
+            <if test="rangeNearEndRealityValue != null">range_near_end_reality_value,</if>
+            <if test="rangeFarEndAdValue != null">range_far_end_ad_value,</if>
+            <if test="rangeFarEndRealityValue != null">range_far_end_reality_value,</if>
+            <if test="highNearEndAdValue != null">high_near_end_ad_value,</if>
+            <if test="highNearEndRealityValue != null">high_near_end_reality_value,</if>
+            <if test="highFarEndAdValue != null">high_far_end_ad_value,</if>
+            <if test="highFarEndRealityValue != null">high_far_end_reality_value,</if>
+            <if test="emptyWeightAdValue != null">empty_weight_ad_value,</if>
+            <if test="emptyWeightRealityValue != null">empty_weight_reality_value,</if>
+            <if test="loadWeightAdValue != null">load_weight_ad_value,</if>
+            <if test="loadWeightRealityValue != null">load_weight_reality_value,</if>
+            <if test="rotationStartAdValue != null">rotation_start_ad_value,</if>
+            <if test="rotationStartRealityValue != null">rotation_start_reality_value,</if>
+            <if test="rotationEndAdValue != null">rotation_end_ad_value,</if>
+            <if test="rotationEndRealityValue != null">rotation_end_reality_value,</if>
+            <if test="windSpeedFactor != null">wind_speed_factor,</if>
+            <if test="tiltFactor != null">tilt_factor,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="cfgId != null">#{cfgId},</if>
+            <if test="projectId != null">#{projectId},</if>
+            <if test="comId != null">#{comId},</if>
+            <if test="deviceKey != null">#{deviceKey},</if>
+            <if test="deviceSource != null">#{deviceSource},</if>
+            <if test="towerId != null">#{towerId},</if>
+            <if test="rangeNearEndAdValue != null">#{rangeNearEndAdValue},</if>
+            <if test="rangeNearEndRealityValue != null">#{rangeNearEndRealityValue},</if>
+            <if test="rangeFarEndAdValue != null">#{rangeFarEndAdValue},</if>
+            <if test="rangeFarEndRealityValue != null">#{rangeFarEndRealityValue},</if>
+            <if test="highNearEndAdValue != null">#{highNearEndAdValue},</if>
+            <if test="highNearEndRealityValue != null">#{highNearEndRealityValue},</if>
+            <if test="highFarEndAdValue != null">#{highFarEndAdValue},</if>
+            <if test="highFarEndRealityValue != null">#{highFarEndRealityValue},</if>
+            <if test="emptyWeightAdValue != null">#{emptyWeightAdValue},</if>
+            <if test="emptyWeightRealityValue != null">#{emptyWeightRealityValue},</if>
+            <if test="loadWeightAdValue != null">#{loadWeightAdValue},</if>
+            <if test="loadWeightRealityValue != null">#{loadWeightRealityValue},</if>
+            <if test="rotationStartAdValue != null">#{rotationStartAdValue},</if>
+            <if test="rotationStartRealityValue != null">#{rotationStartRealityValue},</if>
+            <if test="rotationEndAdValue != null">#{rotationEndAdValue},</if>
+            <if test="rotationEndRealityValue != null">#{rotationEndRealityValue},</if>
+            <if test="windSpeedFactor != null">#{windSpeedFactor},</if>
+            <if test="tiltFactor != null">#{tiltFactor},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateDevTowerDataLocal" parameterType="DevTowerDataLocal">
+        update dev_tower_data_local
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="cfgId != null">cfg_id = #{cfgId},</if>
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="comId != null">com_id = #{comId},</if>
+            <if test="deviceKey != null">device_key = #{deviceKey},</if>
+            <if test="deviceSource != null">device_source = #{deviceSource},</if>
+            <if test="towerId != null">tower_id = #{towerId},</if>
+            <if test="rangeNearEndAdValue != null">range_near_end_ad_value = #{rangeNearEndAdValue},</if>
+            <if test="rangeNearEndRealityValue != null">range_near_end_reality_value = #{rangeNearEndRealityValue},</if>
+            <if test="rangeFarEndAdValue != null">range_far_end_ad_value = #{rangeFarEndAdValue},</if>
+            <if test="rangeFarEndRealityValue != null">range_far_end_reality_value = #{rangeFarEndRealityValue},</if>
+            <if test="highNearEndAdValue != null">high_near_end_ad_value = #{highNearEndAdValue},</if>
+            <if test="highNearEndRealityValue != null">high_near_end_reality_value = #{highNearEndRealityValue},</if>
+            <if test="highFarEndAdValue != null">high_far_end_ad_value = #{highFarEndAdValue},</if>
+            <if test="highFarEndRealityValue != null">high_far_end_reality_value = #{highFarEndRealityValue},</if>
+            <if test="emptyWeightAdValue != null">empty_weight_ad_value = #{emptyWeightAdValue},</if>
+            <if test="emptyWeightRealityValue != null">empty_weight_reality_value = #{emptyWeightRealityValue},</if>
+            <if test="loadWeightAdValue != null">load_weight_ad_value = #{loadWeightAdValue},</if>
+            <if test="loadWeightRealityValue != null">load_weight_reality_value = #{loadWeightRealityValue},</if>
+            <if test="rotationStartAdValue != null">rotation_start_ad_value = #{rotationStartAdValue},</if>
+            <if test="rotationStartRealityValue != null">rotation_start_reality_value = #{rotationStartRealityValue},</if>
+            <if test="rotationEndAdValue != null">rotation_end_ad_value = #{rotationEndAdValue},</if>
+            <if test="rotationEndRealityValue != null">rotation_end_reality_value = #{rotationEndRealityValue},</if>
+            <if test="windSpeedFactor != null">wind_speed_factor = #{windSpeedFactor},</if>
+            <if test="tiltFactor != null">tilt_factor = #{tiltFactor},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteDevTowerDataLocalById" parameterType="Long">
+        delete from dev_tower_data_local where id = #{id}
+    </delete>
+
+    <delete id="deleteDevTowerDataLocalByIds" parameterType="String">
+        delete from dev_tower_data_local where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRoundMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRoundMapper.xml
new file mode 100644
index 00000000..2cf47509
--- /dev/null
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRoundMapper.xml
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yanzhu.device.mapper.DevTowerDataRoundMapper">
+    
+    <resultMap type="DevTowerDataRound" id="DevTowerDataRoundResult">
+        <result property="id"    column="id"    />
+        <result property="cfgId"    column="cfg_id"    />
+        <result property="projectId"    column="project_id"    />
+        <result property="projectName"    column="projectName"    />
+        <result property="comId"    column="com_id"    />
+        <result property="comName"    column="com_name"    />
+        <result property="deviceKey"    column="device_key"    />
+        <result property="deviceSource"    column="device_source"    />
+        <result property="towerId"    column="tower_id"    />
+        <result property="workStartTime"    column="work_start_time"    />
+        <result property="workEndTime"    column="work_end_time"    />
+        <result property="minHeight"    column="min_height"    />
+        <result property="maxHeight"    column="max_height"    />
+        <result property="minRange"    column="min_range"    />
+        <result property="maxRange"    column="max_range"    />
+        <result property="startHeight"    column="start_height"    />
+        <result property="endHeight"    column="end_height"    />
+        <result property="startRange"    column="start_range"    />
+        <result property="endRange"    column="end_range"    />
+        <result property="startRotation"    column="start_rotation"    />
+        <result property="endRotation"    column="end_rotation"    />
+        <result property="maxLoad"    column="max_load"    />
+        <result property="maxLoadPercent"    column="max_load_percent"    />
+        <result property="maxMoment"    column="max_moment"    />
+        <result property="maxMomentPercent"    column="max_moment_percent"    />
+        <result property="startWindSpeed"    column="start_wind_speed"    />
+        <result property="endWindSpeed"    column="end_wind_speed"    />
+        <result property="startWindSpeedPercent"    column="start_wind_speed_percent"    />
+        <result property="endWindSpeedPercent"    column="end_wind_speed_percent"    />
+        <result property="startLeanAngleX"    column="start_lean_angle_x"    />
+        <result property="endLeanAngleX"    column="end_lean_angle_x"    />
+        <result property="startLeanAngleY"    column="start_lean_angle_y"    />
+        <result property="endLeanAngleY"    column="end_lean_angle_y"    />
+        <result property="warnings"    column="warnings"    />
+        <result property="isAlarm"    column="is_alarm"    />
+        <result property="isOverload"    column="is_overload"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectDevTowerDataRoundVo">
+        select dtdr.id,
+               dtdr.cfg_id,
+               dtdr.project_id,
+               dtdr.com_id,
+               sp.dept_name projectName,
+               sd.dept_name com_name,
+               dtdr.device_key,
+               dtdr.device_source,
+               dtdr.tower_id,
+               dtdr.work_start_time,
+               dtdr.work_end_time,
+               dtdr.min_height,
+               dtdr.max_height,
+               dtdr.min_range,
+               dtdr.max_range,
+               dtdr.start_height,
+               dtdr.end_height,
+               dtdr.start_range,
+               dtdr.end_range,
+               dtdr.start_rotation,
+               dtdr.end_rotation,
+               dtdr.max_load,
+               dtdr.max_load_percent,
+               dtdr.max_moment,
+               dtdr.max_moment_percent,
+               dtdr.start_wind_speed,
+               dtdr.end_wind_speed,
+               dtdr.start_wind_speed_percent,
+               dtdr.end_wind_speed_percent,
+               dtdr.start_lean_angle_x,
+               dtdr.end_lean_angle_x,
+               dtdr.start_lean_angle_y,
+               dtdr.end_lean_angle_y,
+               dtdr.warnings,
+               dtdr.is_alarm,
+               dtdr.is_del,
+               dtdr.create_by,
+               dtdr.create_time,
+               dtdr.update_by,
+               dtdr.update_time,
+               dtdr.remark
+        from dev_tower_data_round dtdr
+                 left join sys_dept sp on sp.dept_id = dtdr.project_id
+                 left join sys_dept sd on sd.dept_id = dtdr.com_id
+    </sql>
+
+    <select id="selectDevTowerDataRoundList" parameterType="DevTowerDataRound" resultMap="DevTowerDataRoundResult">
+        <include refid="selectDevTowerDataRoundVo"/>
+        <where>
+            <if test="cfgId != null">and dtdr.cfg_id = #{cfgId}</if>
+            <if test="projectId != null "> and dtdr.project_id = #{projectId}</if>
+            <if test="comId != null "> and dtdr.com_id = #{comId}</if>
+            <if test="projectName != null and projectName != ''"> and dtdr.project_id in (select spv.dept_id from sys_dept spv where spv.dept_name like concat('%', #{projectName}, '%'))</if>
+            <if test="comName != null and comName != ''"> and dtdr.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{comName}, '%'))</if>
+            <if test="deviceKey != null  and deviceKey != ''"> and dtdr.device_key = #{deviceKey}</if>
+            <if test="deviceSource != null  and deviceSource != ''"> and dtdr.device_source = #{deviceSource}</if>
+            <if test="towerId != null  and towerId != ''"> and dtdr.tower_id = #{towerId}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and dtdr.create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+        </where>
+        order by dtdr.id desc
+    </select>
+    
+    <select id="selectDevTowerDataRoundById" parameterType="Long" resultMap="DevTowerDataRoundResult">
+        <include refid="selectDevTowerDataRoundVo"/>
+        where dtdr.id = #{id}
+    </select>
+        
+    <insert id="insertDevTowerDataRound" parameterType="DevTowerDataRound" useGeneratedKeys="true" keyProperty="id">
+        insert into dev_tower_data_round
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="cfgId != null">cfg_id,</if>
+            <if test="projectId != null">project_id,</if>
+            <if test="comId != null">com_id,</if>
+            <if test="deviceKey != null">device_key,</if>
+            <if test="deviceSource != null">device_source,</if>
+            <if test="towerId != null">tower_id,</if>
+            <if test="workStartTime != null">work_start_time,</if>
+            <if test="workEndTime != null">work_end_time,</if>
+            <if test="minHeight != null">min_height,</if>
+            <if test="maxHeight != null">max_height,</if>
+            <if test="minRange != null">min_range,</if>
+            <if test="maxRange != null">max_range,</if>
+            <if test="startHeight != null">start_height,</if>
+            <if test="endHeight != null">end_height,</if>
+            <if test="startRange != null">start_range,</if>
+            <if test="endRange != null">end_range,</if>
+            <if test="startRotation != null">start_rotation,</if>
+            <if test="endRotation != null">end_rotation,</if>
+            <if test="maxLoad != null">max_load,</if>
+            <if test="maxLoadPercent != null">max_load_percent,</if>
+            <if test="maxMoment != null">max_moment,</if>
+            <if test="maxMomentPercent != null">max_moment_percent,</if>
+            <if test="startWindSpeed != null">start_wind_speed,</if>
+            <if test="endWindSpeed != null">end_wind_speed,</if>
+            <if test="startWindSpeedPercent != null">start_wind_speed_percent,</if>
+            <if test="endWindSpeedPercent != null">end_wind_speed_percent,</if>
+            <if test="startLeanAngleX != null">start_lean_angle_x,</if>
+            <if test="endLeanAngleX != null">end_lean_angle_x,</if>
+            <if test="startLeanAngleY != null">start_lean_angle_y,</if>
+            <if test="endLeanAngleY != null">end_lean_angle_y,</if>
+            <if test="warnings != null">warnings,</if>
+            <if test="isAlarm != null">is_alarm,</if>
+            <if test="isOverload != null">is_overload,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="cfgId != null">#{cfgId},</if>
+            <if test="projectId != null">#{projectId},</if>
+            <if test="comId != null">#{comId},</if>
+            <if test="deviceKey != null">#{deviceKey},</if>
+            <if test="deviceSource != null">#{deviceSource},</if>
+            <if test="towerId != null">#{towerId},</if>
+            <if test="workStartTime != null">#{workStartTime},</if>
+            <if test="workEndTime != null">#{workEndTime},</if>
+            <if test="minHeight != null">#{minHeight},</if>
+            <if test="maxHeight != null">#{maxHeight},</if>
+            <if test="minRange != null">#{minRange},</if>
+            <if test="maxRange != null">#{maxRange},</if>
+            <if test="startHeight != null">#{startHeight},</if>
+            <if test="endHeight != null">#{endHeight},</if>
+            <if test="startRange != null">#{startRange},</if>
+            <if test="endRange != null">#{endRange},</if>
+            <if test="startRotation != null">#{startRotation},</if>
+            <if test="endRotation != null">#{endRotation},</if>
+            <if test="maxLoad != null">#{maxLoad},</if>
+            <if test="maxLoadPercent != null">#{maxLoadPercent},</if>
+            <if test="maxMoment != null">#{maxMoment},</if>
+            <if test="maxMomentPercent != null">#{maxMomentPercent},</if>
+            <if test="startWindSpeed != null">#{startWindSpeed},</if>
+            <if test="endWindSpeed != null">#{endWindSpeed},</if>
+            <if test="startWindSpeedPercent != null">#{startWindSpeedPercent},</if>
+            <if test="endWindSpeedPercent != null">#{endWindSpeedPercent},</if>
+            <if test="startLeanAngleX != null">#{startLeanAngleX},</if>
+            <if test="endLeanAngleX != null">#{endLeanAngleX},</if>
+            <if test="startLeanAngleY != null">#{startLeanAngleY},</if>
+            <if test="endLeanAngleY != null">#{endLeanAngleY},</if>
+            <if test="warnings != null">#{warnings},</if>
+            <if test="isAlarm != null">#{isAlarm},</if>
+            <if test="isOverload != null">#{isOverload},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateDevTowerDataRound" parameterType="DevTowerDataRound">
+        update dev_tower_data_round
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="cfgId != null">cfg_id = #{cfgId},</if>
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="comId != null">com_id = #{comId},</if>
+            <if test="deviceKey != null">device_key = #{deviceKey},</if>
+            <if test="deviceSource != null">device_source = #{deviceSource},</if>
+            <if test="towerId != null">tower_id = #{towerId},</if>
+            <if test="workStartTime != null">work_start_time = #{workStartTime},</if>
+            <if test="workEndTime != null">work_end_time = #{workEndTime},</if>
+            <if test="minHeight != null">min_height = #{minHeight},</if>
+            <if test="maxHeight != null">max_height = #{maxHeight},</if>
+            <if test="minRange != null">min_range = #{minRange},</if>
+            <if test="maxRange != null">max_range = #{maxRange},</if>
+            <if test="startHeight != null">start_height = #{startHeight},</if>
+            <if test="endHeight != null">end_height = #{endHeight},</if>
+            <if test="startRange != null">start_range = #{startRange},</if>
+            <if test="endRange != null">end_range = #{endRange},</if>
+            <if test="startRotation != null">start_rotation = #{startRotation},</if>
+            <if test="endRotation != null">end_rotation = #{endRotation},</if>
+            <if test="maxLoad != null">max_load = #{maxLoad},</if>
+            <if test="maxLoadPercent != null">max_load_percent = #{maxLoadPercent},</if>
+            <if test="maxMoment != null">max_moment = #{maxMoment},</if>
+            <if test="maxMomentPercent != null">max_moment_percent = #{maxMomentPercent},</if>
+            <if test="startWindSpeed != null">start_wind_speed = #{startWindSpeed},</if>
+            <if test="endWindSpeed != null">end_wind_speed = #{endWindSpeed},</if>
+            <if test="startWindSpeedPercent != null">start_wind_speed_percent = #{startWindSpeedPercent},</if>
+            <if test="endWindSpeedPercent != null">end_wind_speed_percent = #{endWindSpeedPercent},</if>
+            <if test="startLeanAngleX != null">start_lean_angle_x = #{startLeanAngleX},</if>
+            <if test="endLeanAngleX != null">end_lean_angle_x = #{endLeanAngleX},</if>
+            <if test="startLeanAngleY != null">start_lean_angle_y = #{startLeanAngleY},</if>
+            <if test="endLeanAngleY != null">end_lean_angle_y = #{endLeanAngleY},</if>
+            <if test="warnings != null">warnings = #{warnings},</if>
+            <if test="isAlarm != null">is_alarm = #{isAlarm},</if>
+            <if test="isOverload != null">is_overload = #{isOverload},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteDevTowerDataRoundById" parameterType="Long">
+        delete from dev_tower_data_round where id = #{id}
+    </delete>
+
+    <delete id="deleteDevTowerDataRoundByIds" parameterType="String">
+        delete from dev_tower_data_round where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <select id="findRoundCountByDeviceKey" parameterType="DevTowerDataRound" resultType="Int">
+        select count(1) as total from dev_tower_data_round
+        <where>
+            <if test="deviceKey != null  and deviceKey != ''">and cfg_id = (select dc.id from dev_tower_project_config dc where dc.device_sn=#{deviceKey}) and device_key = #{deviceKey}</if>
+            <if test='activeName == "cz"'> and is_overload = 1 </if>
+            <if test='activeName == "gj"'> and is_alarm = 1 </if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and date(create_time) between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+        </where>
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRunMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRunMapper.xml
new file mode 100644
index 00000000..f3436936
--- /dev/null
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRunMapper.xml
@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yanzhu.device.mapper.DevTowerDataRunMapper">
+    
+    <resultMap type="DevTowerDataRun" id="DevTowerDataRunResult">
+        <result property="id"    column="id"    />
+        <result property="cfgId"    column="cfg_id"    />
+        <result property="projectId"    column="project_id"    />
+        <result property="projectName"    column="projectName"    />
+        <result property="comId"    column="com_id"    />
+        <result property="comName"    column="com_name"    />
+        <result property="deviceKey"    column="device_key"    />
+        <result property="deviceSource"    column="device_source"    />
+        <result property="height"    column="height"    />
+        <result property="range"    column="range"    />
+        <result property="rotation"    column="rotation"    />
+        <result property="load"    column="load"    />
+        <result property="windSpeed"    column="wind_speed"    />
+        <result property="leanAngleX"    column="lean_angle_x"    />
+        <result property="leanAngleY"    column="lean_angle_y"    />
+        <result property="loadPercent"    column="load_percent"    />
+        <result property="momentPercent"    column="moment_percent"    />
+        <result property="windSpeedPercent"    column="wind_speed_percent"    />
+        <result property="leanAnglePercent"    column="lean_angle_percent"    />
+        <result property="warnings"    column="warnings"    />
+        <result property="rate"    column="rate"    />
+        <result property="rotationSensorState"    column="rotation_sensor_state"    />
+        <result property="loadSensorState"    column="load_sensor_state"    />
+        <result property="windSpeedSensorState"    column="wind_speed_sensor_state"    />
+        <result property="leanAngleSensorState"    column="lean_angle_sensor_state"    />
+        <result property="rangeSensorState"    column="range_sensor_state"    />
+        <result property="heightSensorState"    column="height_sensor_state"    />
+        <result property="brakingStatus"    column="braking_status"    />
+        <result property="timeLongs"    column="time_longs"    />
+        <result property="isAlarm"    column="is_alarm"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectDevTowerDataRunVo">
+        select dtdr.id,
+               dtdr.cfg_id,
+               dtdr.project_id,
+               dtdr.com_id,
+               sp.dept_name projectName,
+               sd.dept_name com_name,
+               dtdr.device_key,
+               dtdr.device_source,
+               dtdr.height,
+               dtdr.range,
+               dtdr.rotation,
+               dtdr.load,
+               dtdr.wind_speed,
+               dtdr.lean_angle_x,
+               dtdr.lean_angle_y,
+               dtdr.load_percent,
+               dtdr.moment_percent,
+               dtdr.wind_speed_percent,
+               dtdr.lean_angle_percent,
+               dtdr.warnings,
+               dtdr.rate,
+               dtdr.rotation_sensor_state,
+               dtdr.load_sensor_state,
+               dtdr.wind_speed_sensor_state,
+               dtdr.lean_angle_sensor_state,
+               dtdr.range_sensor_state,
+               dtdr.height_sensor_state,
+               dtdr.braking_status,
+               dtdr.time_longs,
+               dtdr.is_alarm,
+               dtdr.is_del,
+               dtdr.create_by,
+               dtdr.create_time,
+               dtdr.update_by,
+               dtdr.update_time,
+               dtdr.remark
+        from dev_tower_data_run dtdr
+                 left join sys_dept sp on sp.dept_id = dtdr.project_id
+                 left join sys_dept sd on sd.dept_id = dtdr.com_id
+
+    </sql>
+
+    <select id="selectDevTowerDataRunList" parameterType="DevTowerDataRun" resultMap="DevTowerDataRunResult">
+        <include refid="selectDevTowerDataRunVo"/>
+        <where>
+            <if test="cfgId != null">and dtdr.cfg_id = #{cfgId}</if>
+            <if test="projectId != null "> and dtdr.project_id = #{projectId}</if>
+            <if test="comId != null "> and dtdr.com_id = #{comId}</if>
+            <if test="projectName != null and projectName != ''"> and dtdr.project_id in (select spv.dept_id from sys_dept spv where spv.dept_name like concat('%', #{projectName}, '%'))</if>
+            <if test="comName != null and comName != ''"> and dtdr.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{comName}, '%'))</if>
+            <if test="deviceKey != null  and deviceKey != ''"> and dtdr.device_key = #{deviceKey}</if>
+            <if test="deviceSource != null  and deviceSource != ''"> and dtdr.device_source = #{deviceSource}</if>
+            <if test="warnings != null  and warnings != ''"> and dtdr.warnings is not null </if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and dtdr.create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+        </where>
+        order by dtdr.id desc
+    </select>
+    
+    <select id="selectDevTowerDataRunById" parameterType="Long" resultMap="DevTowerDataRunResult">
+        <include refid="selectDevTowerDataRunVo"/>
+        where dtdr.id = #{id}
+    </select>
+        
+    <insert id="insertDevTowerDataRun" parameterType="DevTowerDataRun" useGeneratedKeys="true" keyProperty="id">
+        insert into dev_tower_data_run
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="cfgId != null">cfg_id,</if>
+            <if test="projectId != null">project_id,</if>
+            <if test="comId != null">com_id,</if>
+            <if test="deviceKey != null">device_key,</if>
+            <if test="deviceSource != null">device_source,</if>
+            <if test="height != null">height,</if>
+            <if test="range != null">`range`,</if>
+            <if test="rotation != null">rotation,</if>
+            <if test="load != null">`load`,</if>
+            <if test="windSpeed != null">wind_speed,</if>
+            <if test="leanAngleX != null">lean_angle_x,</if>
+            <if test="leanAngleY != null">lean_angle_y,</if>
+            <if test="loadPercent != null">load_percent,</if>
+            <if test="momentPercent != null">moment_percent,</if>
+            <if test="windSpeedPercent != null">wind_speed_percent,</if>
+            <if test="leanAnglePercent != null">lean_angle_percent,</if>
+            <if test="warnings != null">warnings,</if>
+            <if test="rate != null">rate,</if>
+            <if test="rotationSensorState != null">rotation_sensor_state,</if>
+            <if test="loadSensorState != null">load_sensor_state,</if>
+            <if test="windSpeedSensorState != null">wind_speed_sensor_state,</if>
+            <if test="leanAngleSensorState != null">lean_angle_sensor_state,</if>
+            <if test="rangeSensorState != null">range_sensor_state,</if>
+            <if test="heightSensorState != null">height_sensor_state,</if>
+            <if test="brakingStatus != null">braking_status,</if>
+            <if test="timeLongs != null">time_longs,</if>
+            <if test="isAlarm != null">is_alarm,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="cfgId != null">#{cfgId},</if>
+            <if test="projectId != null">#{projectId},</if>
+            <if test="comId != null">#{comId},</if>
+            <if test="deviceKey != null">#{deviceKey},</if>
+            <if test="deviceSource != null">#{deviceSource},</if>
+            <if test="height != null">#{height},</if>
+            <if test="range != null">#{range},</if>
+            <if test="rotation != null">#{rotation},</if>
+            <if test="load != null">#{load},</if>
+            <if test="windSpeed != null">#{windSpeed},</if>
+            <if test="leanAngleX != null">#{leanAngleX},</if>
+            <if test="leanAngleY != null">#{leanAngleY},</if>
+            <if test="loadPercent != null">#{loadPercent},</if>
+            <if test="momentPercent != null">#{momentPercent},</if>
+            <if test="windSpeedPercent != null">#{windSpeedPercent},</if>
+            <if test="leanAnglePercent != null">#{leanAnglePercent},</if>
+            <if test="warnings != null">#{warnings},</if>
+            <if test="rate != null">#{rate},</if>
+            <if test="rotationSensorState != null">#{rotationSensorState},</if>
+            <if test="loadSensorState != null">#{loadSensorState},</if>
+            <if test="windSpeedSensorState != null">#{windSpeedSensorState},</if>
+            <if test="leanAngleSensorState != null">#{leanAngleSensorState},</if>
+            <if test="rangeSensorState != null">#{rangeSensorState},</if>
+            <if test="heightSensorState != null">#{heightSensorState},</if>
+            <if test="brakingStatus != null">#{brakingStatus},</if>
+            <if test="timeLongs != null">#{timeLongs},</if>
+            <if test="isAlarm != null">#{isAlarm},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateDevTowerDataRun" parameterType="DevTowerDataRun">
+        update dev_tower_data_run
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="cfgId != null">cfg_id = #{cfgId},</if>
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="comId != null">com_id = #{comId},</if>
+            <if test="deviceKey != null">device_key = #{deviceKey},</if>
+            <if test="deviceSource != null">device_source = #{deviceSource},</if>
+            <if test="height != null">height = #{height},</if>
+            <if test="range != null">`range` = #{range},</if>
+            <if test="rotation != null">rotation = #{rotation},</if>
+            <if test="load != null">`load` = #{load},</if>
+            <if test="windSpeed != null">wind_speed = #{windSpeed},</if>
+            <if test="leanAngleX != null">lean_angle_x = #{leanAngleX},</if>
+            <if test="leanAngleY != null">lean_angle_y = #{leanAngleY},</if>
+            <if test="loadPercent != null">load_percent = #{loadPercent},</if>
+            <if test="momentPercent != null">moment_percent = #{momentPercent},</if>
+            <if test="windSpeedPercent != null">wind_speed_percent = #{windSpeedPercent},</if>
+            <if test="leanAnglePercent != null">lean_angle_percent = #{leanAnglePercent},</if>
+            <if test="warnings != null">warnings = #{warnings},</if>
+            <if test="rate != null">rate = #{rate},</if>
+            <if test="rotationSensorState != null">rotation_sensor_state = #{rotationSensorState},</if>
+            <if test="loadSensorState != null">load_sensor_state = #{loadSensorState},</if>
+            <if test="windSpeedSensorState != null">wind_speed_sensor_state = #{windSpeedSensorState},</if>
+            <if test="leanAngleSensorState != null">lean_angle_sensor_state = #{leanAngleSensorState},</if>
+            <if test="rangeSensorState != null">range_sensor_state = #{rangeSensorState},</if>
+            <if test="heightSensorState != null">height_sensor_state = #{heightSensorState},</if>
+            <if test="brakingStatus != null">braking_status = #{brakingStatus},</if>
+            <if test="timeLongs != null">time_longs = #{timeLongs},</if>
+            <if test="isAlarm != null">is_alarm = #{isAlarm},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteDevTowerDataRunById" parameterType="Long">
+        delete from dev_tower_data_run where id = #{id}
+    </delete>
+
+    <delete id="deleteDevTowerDataRunByIds" parameterType="String">
+        delete from dev_tower_data_run where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <select id="findRunCountByDeviceKey" parameterType="DevTowerDataRound" resultType="Int">
+        select count(1) as total from dev_tower_data_run
+        <where>
+            <if test="deviceKey != null  and deviceKey != ''">and cfg_id = (select dc.id from dev_tower_project_config dc where dc.device_sn=#{deviceKey}) and device_key = #{deviceKey}</if>
+            <if test='activeName == "gj"'> and is_alarm = 1 </if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and date(create_time) between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+        </where>
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataWarningMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataWarningMapper.xml
new file mode 100644
index 00000000..bb1d1469
--- /dev/null
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataWarningMapper.xml
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yanzhu.device.mapper.DevTowerDataWarningMapper">
+    
+    <resultMap type="DevTowerDataWarning" id="DevTowerDataWarningResult">
+        <result property="id"    column="id"    />
+        <result property="cfgId"    column="cfg_id"    />
+        <result property="projectId"    column="project_id"    />
+        <result property="projectName"    column="projectName"    />
+        <result property="comId"    column="com_id"    />
+        <result property="comName"    column="com_name"    />
+        <result property="deviceKey"    column="device_key"    />
+        <result property="deviceSource"    column="device_source"    />
+        <result property="towerId"    column="tower_id"    />
+        <result property="warnType"    column="warn_type"    />
+        <result property="warnName"    column="warn_name"    />
+        <result property="warnNote"    column="warn_note"    />
+        <result property="warnData"    column="warn_data"    />
+        <result property="realData"    column="real_data"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectDevTowerDataWarningVo">
+        select dtdw.id,
+               dtdw.cfg_id,
+               dtdw.project_id,
+               dtdw.com_id,
+               sp.dept_name projectName,
+               sd.dept_name com_name,
+               dtdw.device_key,
+               dtdw.device_source,
+               dtdw.tower_id,
+               dtdw.warn_type,
+               dtdw.warn_name,
+               dtdw.warn_note,
+               dtdw.warn_data,
+               dtdw.real_data,
+               dtdw.is_del,
+               dtdw.create_by,
+               dtdw.create_time,
+               dtdw.update_by,
+               dtdw.update_time,
+               dtdw.remark
+        from dev_tower_data_warning dtdw
+                 left join sys_dept sp on sp.dept_id = dtdw.project_id
+                 left join sys_dept sd on sd.dept_id = dtdw.com_id
+    </sql>
+
+    <select id="selectDevTowerDataWarningList" parameterType="DevTowerDataWarning" resultMap="DevTowerDataWarningResult">
+        <include refid="selectDevTowerDataWarningVo"/>
+        <where>
+            <if test="cfgId != null">and dtdw.cfg_id = #{cfgId}</if>
+            <if test="projectId != null "> and dtdw.project_id = #{projectId}</if>
+            <if test="comId != null "> and dtdw.com_id = #{comId}</if>
+            <if test="projectName != null and projectName != ''"> and dtdw.project_id in (select spv.dept_id from sys_dept spv where spv.dept_name like concat('%', #{projectName}, '%'))</if>
+            <if test="comName != null and comName != ''"> and dtdw.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{comName}, '%'))</if>
+            <if test="deviceKey != null  and deviceKey != ''"> and dtdw.device_key = #{deviceKey}</if>
+            <if test="deviceSource != null  and deviceSource != ''"> and dtdw.device_source = #{deviceSource}</if>
+            <if test="towerId != null  and towerId != ''"> and dtdw.tower_id = #{towerId}</if>
+            <if test="warnType != null "> and dtdw.warn_type = #{warnType}</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and dtdw.create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+        </where>
+        order by dtdw.id desc
+    </select>
+    
+    <select id="selectDevTowerDataWarningById" parameterType="Long" resultMap="DevTowerDataWarningResult">
+        <include refid="selectDevTowerDataWarningVo"/>
+        where dtdw.id = #{id}
+    </select>
+        
+    <insert id="insertDevTowerDataWarning" parameterType="DevTowerDataWarning" useGeneratedKeys="true" keyProperty="id">
+        insert into dev_tower_data_warning
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="projectId != null">project_id,</if>
+            <if test="cfgId != null">cfg_id,</if>
+            <if test="comId != null">com_id,</if>
+            <if test="deviceKey != null">device_key,</if>
+            <if test="deviceSource != null">device_source,</if>
+            <if test="towerId != null">tower_id,</if>
+            <if test="warnType != null">warn_type,</if>
+            <if test="warnName != null">warn_name,</if>
+            <if test="warnNote != null">warn_note,</if>
+            <if test="warnData != null">warn_data,</if>
+            <if test="realData != null">real_data,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="cfgId != null">#{cfgId},</if>
+            <if test="projectId != null">#{projectId},</if>
+            <if test="comId != null">#{comId},</if>
+            <if test="deviceKey != null">#{deviceKey},</if>
+            <if test="deviceSource != null">#{deviceSource},</if>
+            <if test="towerId != null">#{towerId},</if>
+            <if test="warnType != null">#{warnType},</if>
+            <if test="warnName != null">#{warnName},</if>
+            <if test="warnNote != null">#{warnNote},</if>
+            <if test="warnData != null">#{warnData},</if>
+            <if test="realData != null">#{realData},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateDevTowerDataWarning" parameterType="DevTowerDataWarning">
+        update dev_tower_data_warning
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="cfgId != null">cfg_id = #{cfgId},</if>
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="comId != null">com_id = #{comId},</if>
+            <if test="deviceKey != null">device_key = #{deviceKey},</if>
+            <if test="deviceSource != null">device_source = #{deviceSource},</if>
+            <if test="towerId != null">tower_id = #{towerId},</if>
+            <if test="warnType != null">warn_type = #{warnType},</if>
+            <if test="warnName != null">warn_name = #{warnName},</if>
+            <if test="warnNote != null">warn_note = #{warnNote},</if>
+            <if test="warnData != null">warn_data = #{warnData},</if>
+            <if test="realData != null">real_data = #{realData},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteDevTowerDataWarningById" parameterType="Long">
+        delete from dev_tower_data_warning where id = #{id}
+    </delete>
+
+    <delete id="deleteDevTowerDataWarningByIds" parameterType="String">
+        delete from dev_tower_data_warning where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerProjectConfigMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerProjectConfigMapper.xml
new file mode 100644
index 00000000..df2efb3b
--- /dev/null
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerProjectConfigMapper.xml
@@ -0,0 +1,204 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yanzhu.device.mapper.DevTowerProjectConfigMapper">
+    
+    <resultMap type="DevTowerProjectConfig" id="DevTowerProjectConfigResult">
+        <result property="id"    column="id"    />
+        <result property="projectId"    column="project_id"    />
+        <result property="projectName"    column="projectName"    />
+        <result property="comId"    column="com_id"    />
+        <result property="comName"    column="com_name"    />
+        <result property="deviceSn"    column="device_sn"    />
+        <result property="deviceName"    column="device_name"    />
+        <result property="deviceSource"    column="device_source"    />
+        <result property="towerId"    column="tower_id"    />
+        <result property="towerType"    column="tower_type"    />
+        <result property="coordinateX"    column="coordinate_x"    />
+        <result property="coordinateY"    column="coordinate_y"    />
+        <result property="frontBrachium"    column="front_brachium"    />
+        <result property="afterBrachium"    column="after_brachium"    />
+        <result property="towerBodyHeight"    column="tower_body_height"    />
+        <result property="towerCapHeight"    column="tower_cap_height"    />
+        <result property="towerSectionHeight"    column="tower_section_height"    />
+        <result property="online"    column="online"    />
+        <result property="driName"    column="dri_name"    />
+        <result property="driPhone"    column="dri_phone"    />
+        <result property="safName"    column="saf_name"    />
+        <result property="safPhone"    column="saf_phone"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectDevTowerProjectConfigVo">
+        select dtpc.id,
+               dtpc.project_id,
+               dtpc.com_id,
+               sp.dept_name projectName,
+               sd.dept_name com_name,
+               dtpc.device_sn,
+               dtpc.device_name,
+               dtpc.device_source,
+               dtpc.tower_id,
+               dtpc.tower_type,
+               dtpc.coordinate_x,
+               dtpc.coordinate_y,
+               dtpc.front_brachium,
+               dtpc.after_brachium,
+               dtpc.tower_body_height,
+               dtpc.tower_cap_height,
+               dtpc.tower_section_height,
+               dtpc.online,
+               dtpc.dri_name,
+               dtpc.dri_phone,
+               dtpc.saf_name,
+               dtpc.saf_phone,
+               dtpc.is_del,
+               dtpc.create_by,
+               dtpc.create_time,
+               dtpc.update_by,
+               dtpc.update_time,
+               dtpc.remark
+        from dev_tower_project_config dtpc
+                 left join sys_dept sp on sp.dept_id = dtpc.project_id
+                 left join sys_dept sd on sd.dept_id = dtpc.com_id
+    </sql>
+
+    <select id="selectDevTowerProjectConfigList" parameterType="DevTowerProjectConfig" resultMap="DevTowerProjectConfigResult">
+        <include refid="selectDevTowerProjectConfigVo"/>
+        <where>  
+            <if test="projectId != null "> and dtpc.project_id = #{projectId}</if>
+            <if test="projectName != null and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if>
+            <if test="comId != null "> and dtpc.com_id = #{comId}</if>
+            <if test="comName != null and comName != ''"> and sd.dept_name like concat('%', #{comName}, '%')</if>
+            <if test="deviceSn != null  and deviceSn != ''"> and dtpc.device_sn like concat('%', #{deviceSn}, '%')</if>
+            <if test="deviceName != null  and deviceName != ''"> and dtpc.device_name like concat('%', #{deviceName}, '%')</if>
+            <if test="deviceSource != null  and deviceSource != ''"> and dtpc.device_source = #{deviceSource}</if>
+            <if test="towerId != null  and towerId != ''"> and dtpc.tower_id = #{towerId}</if>
+            <if test="towerType != null  and towerType != ''"> and dtpc.tower_type = #{towerType}</if>
+            <if test="isDel != null "> and dtpc.is_del = #{isDel}</if>
+        </where>
+        order by dtpc.id desc
+    </select>
+    
+    <select id="selectDevTowerProjectConfigById" parameterType="Long" resultMap="DevTowerProjectConfigResult">
+        <include refid="selectDevTowerProjectConfigVo"/>
+        where dtpc.id = #{id}
+    </select>
+        
+    <insert id="insertDevTowerProjectConfig" parameterType="DevTowerProjectConfig" useGeneratedKeys="true" keyProperty="id">
+        insert into dev_tower_project_config
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="projectId != null">project_id,</if>
+            <if test="comId != null">com_id,</if>
+            <if test="deviceSn != null">device_sn,</if>
+            <if test="deviceName != null">device_name,</if>
+            <if test="deviceSource != null">device_source,</if>
+            <if test="towerType != null">tower_type,</if>
+            <if test="towerId != null">tower_id,</if>
+            <if test="coordinateX != null">coordinate_x,</if>
+            <if test="coordinateY != null">coordinate_y,</if>
+            <if test="frontBrachium != null">front_brachium,</if>
+            <if test="afterBrachium != null">after_brachium,</if>
+            <if test="towerBodyHeight != null">tower_body_height,</if>
+            <if test="towerCapHeight != null">tower_cap_height,</if>
+            <if test="towerSectionHeight != null">tower_section_height,</if>
+            <if test="online != null">online,</if>
+            <if test="driName != null">dri_name,</if>
+            <if test="driPhone != null">dri_phone,</if>
+            <if test="safName != null">saf_name,</if>
+            <if test="safPhone != null">saf_phone,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="projectId != null">#{projectId},</if>
+            <if test="comId != null">#{comId},</if>
+            <if test="deviceSn != null">#{deviceSn},</if>
+            <if test="deviceName != null">#{deviceName},</if>
+            <if test="deviceSource != null">#{deviceSource},</if>
+            <if test="towerType != null">#{towerType},</if>
+            <if test="towerId != null">#{towerId},</if>
+            <if test="coordinateX != null">#{coordinateX},</if>
+            <if test="coordinateY != null">#{coordinateY},</if>
+            <if test="frontBrachium != null">#{frontBrachium},</if>
+            <if test="afterBrachium != null">#{afterBrachium},</if>
+            <if test="towerBodyHeight != null">#{towerBodyHeight},</if>
+            <if test="towerCapHeight != null">#{towerCapHeight},</if>
+            <if test="towerSectionHeight != null">#{towerSectionHeight},</if>
+            <if test="online != null">#{online},</if>
+            <if test="driName != null">#{driName},</if>
+            <if test="driPhone != null">#{driPhone},</if>
+            <if test="safName != null">#{safName},</if>
+            <if test="safPhone != null">#{safPhone},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateDevTowerProjectConfig" parameterType="DevTowerProjectConfig">
+        update dev_tower_project_config
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="comId != null">com_id = #{comId},</if>
+            <if test="deviceSn != null">device_sn = #{deviceSn},</if>
+            <if test="deviceName != null">device_name = #{deviceName},</if>
+            <if test="deviceSource != null">device_source = #{deviceSource},</if>
+            <if test="towerType != null">tower_type = #{towerType},</if>
+            <if test="towerId != null">tower_id = #{towerId},</if>
+            <if test="coordinateX != null">coordinate_x = #{coordinateX},</if>
+            <if test="coordinateY != null">coordinate_y = #{coordinateY},</if>
+            <if test="frontBrachium != null">front_brachium = #{frontBrachium},</if>
+            <if test="afterBrachium != null">after_brachium = #{afterBrachium},</if>
+            <if test="towerBodyHeight != null">tower_body_height = #{towerBodyHeight},</if>
+            <if test="towerCapHeight != null">tower_cap_height = #{towerCapHeight},</if>
+            <if test="towerSectionHeight != null">tower_section_height = #{towerSectionHeight},</if>
+            <if test="online != null">online = #{online},</if>
+            <if test="driName != null">dri_name = #{driName},</if>
+            <if test="driPhone != null">dri_phone = #{driPhone},</if>
+            <if test="safName != null">saf_name = #{safName},</if>
+            <if test="safPhone != null">saf_phone = #{safPhone},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteDevTowerProjectConfigById" parameterType="Long">
+        update dev_tower_project_config set is_del=1 where id = #{id}
+    </update>
+
+    <update id="deleteDevTowerProjectConfigByIds" parameterType="String">
+        update dev_tower_project_config set is_del=1 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
+    <select id="findtowerConfigGroupOnline" parameterType="DevTowerProjectConfig" resultType="Map">
+        select online, count(1) as total from dev_tower_project_config
+        <where>
+            <if test="projectId != null "> and project_id = #{projectId}</if>
+            <if test="comId != null "> and com_id = #{comId}</if>
+        </where>
+        group by online
+    </select>
+
+</mapper>
\ No newline at end of file
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
index 998ecb40..fd86c73c 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
@@ -456,6 +456,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="projectName==5">
             and a.checkState not in (4) and date(nickedTime) &lt;= curdate()
         </if>
+        <if test="projectName==6">
+            and a.checkState in (0)
+        </if>
+        <if test="projectName==7">
+            and a.checkState in (3)
+        </if>
         <include refid="countUserWhere"></include>
         <if test="isNew!=null and isNew!=0">
             order by a.id desc
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/constant/CacheConstants.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/constant/CacheConstants.java
new file mode 100644
index 00000000..448c8a52
--- /dev/null
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/constant/CacheConstants.java
@@ -0,0 +1,99 @@
+package com.yanzhu.manage.constant;
+
+/**
+ * 缓存的key 常量
+ * 
+ * @author ruoyi
+ */
+public class CacheConstants
+{
+    /**
+     * 登录用户 redis key
+     */
+    public static final String LOGIN_TOKEN_KEY = "login_tokens:";
+
+    /**
+     * 验证码 redis key
+     */
+    public static final String CAPTCHA_CODE_KEY = "captcha_codes:";
+
+    /**
+     * 参数管理 cache key
+     */
+    public static final String SYS_CONFIG_KEY = "sys_config:";
+
+    /**
+     * 字典管理 cache key
+     */
+    public static final String SYS_DICT_KEY = "sys_dict:";
+
+    /**
+     * 防重提交 redis key
+     */
+    public static final String REPEAT_SUBMIT_KEY = "repeat_submit:";
+
+    /**
+     * 限流 redis key
+     */
+    public static final String RATE_LIMIT_KEY = "rate_limit:";
+
+    /**
+     * 登录账户密码错误次数 redis key
+     */
+    public static final String PWD_ERR_CNT_KEY = "pwd_err_cnt:";
+
+    /**
+     * yanzhu系统应用注册 redis key
+     */
+    public static final String YANZHU_SYSTEM_CONFIG = "yanzhu_system_config:";
+
+    /**
+     * yanzhu设备塔吊检测 redis key
+     */
+    public static final String YANZHU_DEVICE_TOWER = "device.tower_cfg:";
+
+    /**
+     * yanzhu设备塔吊检测 redis key
+     */
+    public static final String YANZHU_DEVICE_AI = "device.aibox_cfg:";
+
+    /**
+     * 微信公众号模板消息 redis key
+     */
+    public static final String WX_MPMESSAGE_KEY = "wx.mpmessage.key::";
+
+    /**
+     * 微信消息推送openId
+     */
+    public static final String WX_MPMESSAGE_OPENID = "wx.mpmessage.openId::";
+
+    /**
+     * 微信消息推送通知人名称
+     */
+    public static final String WX_MPMESSAGE_UNAME = "wx.mpmessage.uname::";
+
+    /**
+     * 微信消息推送项目名称
+     */
+    public static final String WX_MPMESSAGE_PNAME = "wx.mpmessage.pname::";
+
+    /**
+     * 微信消息推送单位名称
+     */
+    public static final String WX_MPMESSAGE_DNAME = "wx.mpmessage.dname::";
+
+    /**
+     * 微信消息推送项目总监
+     */
+    public static final String WX_MPMESSAGE_P_SUP = "wx.mpmessage.p.sup::";
+
+    /**
+     * 微信消息推送项目甲代
+     */
+    public static final String WX_MPMESSAGE_P_MAG = "wx.mpmessage.p.mag::";
+
+    /**
+     * 微信消息推送项目经理
+     */
+    public static final String WX_MPMESSAGE_P_ORG = "wx.mpmessage.p.org::";
+}
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/DevTowerDataCollideController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/DevTowerDataCollideController.java
new file mode 100644
index 00000000..fecb4a7f
--- /dev/null
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/DevTowerDataCollideController.java
@@ -0,0 +1,98 @@
+package com.yanzhu.manage.controller.device;
+
+
+import com.yanzhu.common.core.utils.poi.ExcelUtil;
+import com.yanzhu.common.core.web.controller.BaseController;
+import com.yanzhu.common.core.web.domain.AjaxResult;
+import com.yanzhu.common.core.web.page.TableDataInfo;
+import com.yanzhu.common.log.enums.BusinessType;
+import com.yanzhu.common.security.annotation.RequiresPermissions;
+import com.yanzhu.device.domain.DevTowerDataCollide;
+import com.yanzhu.manage.service.IDevTowerDataCollideService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.yanzhu.common.log.annotation.Log;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 塔机碰撞信息Controller
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+@RestController
+@RequestMapping("/device/towerDataCollide")
+public class DevTowerDataCollideController extends BaseController
+{
+    @Autowired
+    private IDevTowerDataCollideService devTowerDataCollideService;
+
+    /**
+     * 查询塔机碰撞信息列表
+     */
+    @RequiresPermissions("device:towerDataCollide:list")
+    @GetMapping("/list")
+    public TableDataInfo list(DevTowerDataCollide devTowerDataCollide)
+    {
+        startPage();
+        List<DevTowerDataCollide> list = devTowerDataCollideService.selectDevTowerDataCollideList(devTowerDataCollide);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出塔机碰撞信息列表
+     */
+    @RequiresPermissions("device:towerDataCollide:export")
+    @Log(title = "塔机碰撞信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, DevTowerDataCollide devTowerDataCollide)
+    {
+        List<DevTowerDataCollide> list = devTowerDataCollideService.selectDevTowerDataCollideList(devTowerDataCollide);
+        ExcelUtil<DevTowerDataCollide> util = new ExcelUtil<DevTowerDataCollide>(DevTowerDataCollide.class);
+        util.exportExcel(response, list, "塔机碰撞信息数据");
+    }
+
+    /**
+     * 获取塔机碰撞信息详细信息
+     */
+    @RequiresPermissions("device:towerDataCollide:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(devTowerDataCollideService.selectDevTowerDataCollideById(id));
+    }
+
+    /**
+     * 新增塔机碰撞信息
+     */
+    @RequiresPermissions("device:towerDataCollide:add")
+    @Log(title = "塔机碰撞信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody DevTowerDataCollide devTowerDataCollide)
+    {
+        return toAjax(devTowerDataCollideService.insertDevTowerDataCollide(devTowerDataCollide));
+    }
+
+    /**
+     * 修改塔机碰撞信息
+     */
+    @RequiresPermissions("device:towerDataCollide:edit")
+    @Log(title = "塔机碰撞信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody DevTowerDataCollide devTowerDataCollide)
+    {
+        return toAjax(devTowerDataCollideService.updateDevTowerDataCollide(devTowerDataCollide));
+    }
+
+    /**
+     * 删除塔机碰撞信息
+     */
+    @RequiresPermissions("device:towerDataCollide:remove")
+    @Log(title = "塔机碰撞信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(devTowerDataCollideService.deleteDevTowerDataCollideByIds(ids));
+    }
+}
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/DevTowerDataLimitController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/DevTowerDataLimitController.java
new file mode 100644
index 00000000..63e90165
--- /dev/null
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/DevTowerDataLimitController.java
@@ -0,0 +1,98 @@
+package com.yanzhu.manage.controller.device;
+
+import com.yanzhu.common.core.utils.poi.ExcelUtil;
+import com.yanzhu.common.core.web.controller.BaseController;
+import com.yanzhu.common.core.web.domain.AjaxResult;
+import com.yanzhu.common.core.web.page.TableDataInfo;
+import com.yanzhu.common.log.annotation.Log;
+import com.yanzhu.common.log.enums.BusinessType;
+import com.yanzhu.common.security.annotation.RequiresPermissions;
+import com.yanzhu.device.domain.DevTowerDataLimit;
+import com.yanzhu.manage.service.IDevTowerDataLimitService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 塔机限位信息Controller
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+@RestController
+@RequestMapping("/device/towerDataLimit")
+public class DevTowerDataLimitController extends BaseController
+{
+    @Autowired
+    private IDevTowerDataLimitService devTowerDataLimitService;
+
+    /**
+     * 查询塔机限位信息列表
+     */
+    @RequiresPermissions("device:towerDataLimit:list")
+    @GetMapping("/list")
+    public TableDataInfo list(DevTowerDataLimit devTowerDataLimit)
+    {
+        startPage();
+        List<DevTowerDataLimit> list = devTowerDataLimitService.selectDevTowerDataLimitList(devTowerDataLimit);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出塔机限位信息列表
+     */
+    @RequiresPermissions("device:towerDataLimit:export")
+    @Log(title = "塔机限位信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, DevTowerDataLimit devTowerDataLimit)
+    {
+        List<DevTowerDataLimit> list = devTowerDataLimitService.selectDevTowerDataLimitList(devTowerDataLimit);
+        ExcelUtil<DevTowerDataLimit> util = new ExcelUtil<DevTowerDataLimit>(DevTowerDataLimit.class);
+        util.exportExcel(response, list, "塔机限位信息数据");
+    }
+
+    /**
+     * 获取塔机限位信息详细信息
+     */
+    @RequiresPermissions("device:towerDataLimit:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(devTowerDataLimitService.selectDevTowerDataLimitById(id));
+    }
+
+    /**
+     * 新增塔机限位信息
+     */
+    @RequiresPermissions("device:towerDataLimit:add")
+    @Log(title = "塔机限位信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody DevTowerDataLimit devTowerDataLimit)
+    {
+        return toAjax(devTowerDataLimitService.insertDevTowerDataLimit(devTowerDataLimit));
+    }
+
+    /**
+     * 修改塔机限位信息
+     */
+    @RequiresPermissions("device:towerDataLimit:edit")
+    @Log(title = "塔机限位信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody DevTowerDataLimit devTowerDataLimit)
+    {
+        return toAjax(devTowerDataLimitService.updateDevTowerDataLimit(devTowerDataLimit));
+    }
+
+    /**
+     * 删除塔机限位信息
+     */
+    @RequiresPermissions("device:towerDataLimit:remove")
+    @Log(title = "塔机限位信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(devTowerDataLimitService.deleteDevTowerDataLimitByIds(ids));
+    }
+}
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/DevTowerDataLocalController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/DevTowerDataLocalController.java
new file mode 100644
index 00000000..bea6e6bb
--- /dev/null
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/DevTowerDataLocalController.java
@@ -0,0 +1,98 @@
+package com.yanzhu.manage.controller.device;
+
+import com.yanzhu.common.core.utils.poi.ExcelUtil;
+import com.yanzhu.common.core.web.controller.BaseController;
+import com.yanzhu.common.core.web.domain.AjaxResult;
+import com.yanzhu.common.core.web.page.TableDataInfo;
+import com.yanzhu.common.log.annotation.Log;
+import com.yanzhu.common.log.enums.BusinessType;
+import com.yanzhu.common.security.annotation.RequiresPermissions;
+import com.yanzhu.device.domain.DevTowerDataLocal;
+import com.yanzhu.manage.service.IDevTowerDataLocalService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 塔机定位信息Controller
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+@RestController
+@RequestMapping("/device/towerDataLocal")
+public class DevTowerDataLocalController extends BaseController
+{
+    @Autowired
+    private IDevTowerDataLocalService devTowerDataLocalService;
+
+    /**
+     * 查询塔机定位信息列表
+     */
+    @RequiresPermissions("device:towerDataLocal:list")
+    @GetMapping("/list")
+    public TableDataInfo list(DevTowerDataLocal devTowerDataLocal)
+    {
+        startPage();
+        List<DevTowerDataLocal> list = devTowerDataLocalService.selectDevTowerDataLocalList(devTowerDataLocal);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出塔机定位信息列表
+     */
+    @RequiresPermissions("device:towerDataLocal:export")
+    @Log(title = "塔机定位信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, DevTowerDataLocal devTowerDataLocal)
+    {
+        List<DevTowerDataLocal> list = devTowerDataLocalService.selectDevTowerDataLocalList(devTowerDataLocal);
+        ExcelUtil<DevTowerDataLocal> util = new ExcelUtil<DevTowerDataLocal>(DevTowerDataLocal.class);
+        util.exportExcel(response, list, "塔机定位信息数据");
+    }
+
+    /**
+     * 获取塔机定位信息详细信息
+     */
+    @RequiresPermissions("device:towerDataLocal:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(devTowerDataLocalService.selectDevTowerDataLocalById(id));
+    }
+
+    /**
+     * 新增塔机定位信息
+     */
+    @RequiresPermissions("device:towerDataLocal:add")
+    @Log(title = "塔机定位信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody DevTowerDataLocal devTowerDataLocal)
+    {
+        return toAjax(devTowerDataLocalService.insertDevTowerDataLocal(devTowerDataLocal));
+    }
+
+    /**
+     * 修改塔机定位信息
+     */
+    @RequiresPermissions("device:towerDataLocal:edit")
+    @Log(title = "塔机定位信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody DevTowerDataLocal devTowerDataLocal)
+    {
+        return toAjax(devTowerDataLocalService.updateDevTowerDataLocal(devTowerDataLocal));
+    }
+
+    /**
+     * 删除塔机定位信息
+     */
+    @RequiresPermissions("device:towerDataLocal:remove")
+    @Log(title = "塔机定位信息", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(devTowerDataLocalService.deleteDevTowerDataLocalByIds(ids));
+    }
+}
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/DevTowerDataRoundController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/DevTowerDataRoundController.java
new file mode 100644
index 00000000..df96d877
--- /dev/null
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/DevTowerDataRoundController.java
@@ -0,0 +1,99 @@
+package com.yanzhu.manage.controller.device;
+
+
+import com.yanzhu.common.core.utils.poi.ExcelUtil;
+import com.yanzhu.common.core.web.controller.BaseController;
+import com.yanzhu.common.core.web.domain.AjaxResult;
+import com.yanzhu.common.core.web.page.TableDataInfo;
+import com.yanzhu.common.log.annotation.Log;
+import com.yanzhu.common.log.enums.BusinessType;
+import com.yanzhu.common.security.annotation.RequiresPermissions;
+import com.yanzhu.device.domain.DevTowerDataRound;
+import com.yanzhu.manage.service.IDevTowerDataRoundService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 塔机工作循环Controller
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+@RestController
+@RequestMapping("/device/towerDataRound")
+public class DevTowerDataRoundController extends BaseController
+{
+    @Autowired
+    private IDevTowerDataRoundService devTowerDataRoundService;
+
+    /**
+     * 查询塔机工作循环列表
+     */
+    @RequiresPermissions("device:towerDataRound:list")
+    @GetMapping("/list")
+    public TableDataInfo list(DevTowerDataRound devTowerDataRound)
+    {
+        startPage();
+        List<DevTowerDataRound> list = devTowerDataRoundService.selectDevTowerDataRoundList(devTowerDataRound);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出塔机工作循环列表
+     */
+    @RequiresPermissions("device:towerDataRound:export")
+    @Log(title = "塔机工作循环", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, DevTowerDataRound devTowerDataRound)
+    {
+        List<DevTowerDataRound> list = devTowerDataRoundService.selectDevTowerDataRoundList(devTowerDataRound);
+        ExcelUtil<DevTowerDataRound> util = new ExcelUtil<DevTowerDataRound>(DevTowerDataRound.class);
+        util.exportExcel(response, list, "塔机工作循环数据");
+    }
+
+    /**
+     * 获取塔机工作循环详细信息
+     */
+    @RequiresPermissions("device:towerDataRound:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(devTowerDataRoundService.selectDevTowerDataRoundById(id));
+    }
+
+    /**
+     * 新增塔机工作循环
+     */
+    @RequiresPermissions("device:towerDataRound:add")
+    @Log(title = "塔机工作循环", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody DevTowerDataRound devTowerDataRound)
+    {
+        return toAjax(devTowerDataRoundService.insertDevTowerDataRound(devTowerDataRound));
+    }
+
+    /**
+     * 修改塔机工作循环
+     */
+    @RequiresPermissions("device:towerDataRound:edit")
+    @Log(title = "塔机工作循环", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody DevTowerDataRound devTowerDataRound)
+    {
+        return toAjax(devTowerDataRoundService.updateDevTowerDataRound(devTowerDataRound));
+    }
+
+    /**
+     * 删除塔机工作循环
+     */
+    @RequiresPermissions("device:towerDataRound:remove")
+    @Log(title = "塔机工作循环", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(devTowerDataRoundService.deleteDevTowerDataRoundByIds(ids));
+    }
+}
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/DevTowerDataRunController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/DevTowerDataRunController.java
new file mode 100644
index 00000000..86a51e00
--- /dev/null
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/DevTowerDataRunController.java
@@ -0,0 +1,98 @@
+package com.yanzhu.manage.controller.device;
+
+import com.yanzhu.common.core.utils.poi.ExcelUtil;
+import com.yanzhu.common.core.web.controller.BaseController;
+import com.yanzhu.common.core.web.domain.AjaxResult;
+import com.yanzhu.common.core.web.page.TableDataInfo;
+import com.yanzhu.common.log.annotation.Log;
+import com.yanzhu.common.log.enums.BusinessType;
+import com.yanzhu.common.security.annotation.RequiresPermissions;
+import com.yanzhu.device.domain.DevTowerDataRun;
+import com.yanzhu.manage.service.IDevTowerDataRunService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 塔机实时数据Controller
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+@RestController
+@RequestMapping("/device/towerDataRun")
+public class DevTowerDataRunController extends BaseController
+{
+    @Autowired
+    private IDevTowerDataRunService devTowerDataRunService;
+
+    /**
+     * 查询塔机实时数据列表
+     */
+    @RequiresPermissions("device:towerDataRun:list")
+    @GetMapping("/list")
+    public TableDataInfo list(DevTowerDataRun devTowerDataRun)
+    {
+        startPage();
+        List<DevTowerDataRun> list = devTowerDataRunService.selectDevTowerDataRunList(devTowerDataRun);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出塔机实时数据列表
+     */
+    @RequiresPermissions("device:towerDataRun:export")
+    @Log(title = "塔机实时数据", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, DevTowerDataRun devTowerDataRun)
+    {
+        List<DevTowerDataRun> list = devTowerDataRunService.selectDevTowerDataRunList(devTowerDataRun);
+        ExcelUtil<DevTowerDataRun> util = new ExcelUtil<DevTowerDataRun>(DevTowerDataRun.class);
+        util.exportExcel(response, list, "塔机实时数据数据");
+    }
+
+    /**
+     * 获取塔机实时数据详细信息
+     */
+    @RequiresPermissions("device:towerDataRun:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(devTowerDataRunService.selectDevTowerDataRunById(id));
+    }
+
+    /**
+     * 新增塔机实时数据
+     */
+    @RequiresPermissions("device:towerDataRun:add")
+    @Log(title = "塔机实时数据", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody DevTowerDataRun devTowerDataRun)
+    {
+        return toAjax(devTowerDataRunService.insertDevTowerDataRun(devTowerDataRun));
+    }
+
+    /**
+     * 修改塔机实时数据
+     */
+    @RequiresPermissions("device:towerDataRun:edit")
+    @Log(title = "塔机实时数据", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody DevTowerDataRun devTowerDataRun)
+    {
+        return toAjax(devTowerDataRunService.updateDevTowerDataRun(devTowerDataRun));
+    }
+
+    /**
+     * 删除塔机实时数据
+     */
+    @RequiresPermissions("device:towerDataRun:remove")
+    @Log(title = "塔机实时数据", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(devTowerDataRunService.deleteDevTowerDataRunByIds(ids));
+    }
+}
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/DevTowerDataWarningController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/DevTowerDataWarningController.java
new file mode 100644
index 00000000..0ce19a1b
--- /dev/null
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/DevTowerDataWarningController.java
@@ -0,0 +1,98 @@
+package com.yanzhu.manage.controller.device;
+
+import com.yanzhu.common.core.utils.poi.ExcelUtil;
+import com.yanzhu.common.core.web.controller.BaseController;
+import com.yanzhu.common.core.web.domain.AjaxResult;
+import com.yanzhu.common.core.web.page.TableDataInfo;
+import com.yanzhu.common.log.annotation.Log;
+import com.yanzhu.common.log.enums.BusinessType;
+import com.yanzhu.common.security.annotation.RequiresPermissions;
+import com.yanzhu.device.domain.DevTowerDataWarning;
+import com.yanzhu.manage.service.IDevTowerDataWarningService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 塔机预警管理Controller
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+@RestController
+@RequestMapping("/device/towerDataWarning")
+public class DevTowerDataWarningController extends BaseController
+{
+    @Autowired
+    private IDevTowerDataWarningService devTowerDataWarningService;
+
+    /**
+     * 查询塔机预警管理列表
+     */
+    @RequiresPermissions("device:towerDataWarning:list")
+    @GetMapping("/list")
+    public TableDataInfo list(DevTowerDataWarning devTowerDataWarning)
+    {
+        startPage();
+        List<DevTowerDataWarning> list = devTowerDataWarningService.selectDevTowerDataWarningList(devTowerDataWarning);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出塔机预警管理列表
+     */
+    @RequiresPermissions("device:towerDataWarning:export")
+    @Log(title = "塔机预警管理", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, DevTowerDataWarning devTowerDataWarning)
+    {
+        List<DevTowerDataWarning> list = devTowerDataWarningService.selectDevTowerDataWarningList(devTowerDataWarning);
+        ExcelUtil<DevTowerDataWarning> util = new ExcelUtil<DevTowerDataWarning>(DevTowerDataWarning.class);
+        util.exportExcel(response, list, "塔机预警管理数据");
+    }
+
+    /**
+     * 获取塔机预警管理详细信息
+     */
+    @RequiresPermissions("device:towerDataWarning:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(devTowerDataWarningService.selectDevTowerDataWarningById(id));
+    }
+
+    /**
+     * 新增塔机预警管理
+     */
+    @RequiresPermissions("device:towerDataWarning:add")
+    @Log(title = "塔机预警管理", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody DevTowerDataWarning devTowerDataWarning)
+    {
+        return toAjax(devTowerDataWarningService.insertDevTowerDataWarning(devTowerDataWarning));
+    }
+
+    /**
+     * 修改塔机预警管理
+     */
+    @RequiresPermissions("device:towerDataWarning:edit")
+    @Log(title = "塔机预警管理", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody DevTowerDataWarning devTowerDataWarning)
+    {
+        return toAjax(devTowerDataWarningService.updateDevTowerDataWarning(devTowerDataWarning));
+    }
+
+    /**
+     * 删除塔机预警管理
+     */
+    @RequiresPermissions("device:towerDataWarning:remove")
+    @Log(title = "塔机预警管理", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(devTowerDataWarningService.deleteDevTowerDataWarningByIds(ids));
+    }
+}
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/DevTowerProjectConfigController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/DevTowerProjectConfigController.java
new file mode 100644
index 00000000..2a9eb065
--- /dev/null
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/DevTowerProjectConfigController.java
@@ -0,0 +1,106 @@
+package com.yanzhu.manage.controller.device;
+
+import com.yanzhu.common.core.utils.poi.ExcelUtil;
+import com.yanzhu.common.core.web.controller.BaseController;
+import com.yanzhu.common.core.web.domain.AjaxResult;
+import com.yanzhu.common.core.web.page.TableDataInfo;
+import com.yanzhu.common.log.annotation.Log;
+import com.yanzhu.common.log.enums.BusinessType;
+import com.yanzhu.common.security.annotation.RequiresPermissions;
+import com.yanzhu.common.security.utils.SecurityUtils;
+import com.yanzhu.device.domain.DevTowerProjectConfig;
+import com.yanzhu.manage.service.IDevTowerProjectConfigService;
+import com.yanzhu.system.api.domain.SysUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 塔基检测配置Controller
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+@RestController
+@RequestMapping("/device/towerProjectConfig")
+public class DevTowerProjectConfigController extends BaseController
+{
+    @Autowired
+    private IDevTowerProjectConfigService devTowerProjectConfigService;
+
+    /**
+     * 查询塔基检测配置列表
+     */
+    @RequiresPermissions("device:towerProjectConfig:list")
+    @GetMapping("/list")
+    public TableDataInfo list(DevTowerProjectConfig where)
+    {
+        startPage();
+        SysUser sysUser=SecurityUtils.getLoginUser().getSysUser();
+        where.setComId(sysUser.getActiveComId());
+        where.setProjectId(sysUser.getActiveProjectId());
+        if(SecurityUtils.isAdmin(SecurityUtils.getUserId()) || SecurityUtils.isGSAdmin()) {
+            where.setProjectId(null);
+        }
+        List<DevTowerProjectConfig> list = devTowerProjectConfigService.selectDevTowerProjectConfigList(where);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出塔基检测配置列表
+     */
+    @RequiresPermissions("device:towerProjectConfig:export")
+    @Log(title = "塔基检测配置", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, DevTowerProjectConfig devTowerProjectConfig)
+    {
+        List<DevTowerProjectConfig> list = devTowerProjectConfigService.selectDevTowerProjectConfigList(devTowerProjectConfig);
+        ExcelUtil<DevTowerProjectConfig> util = new ExcelUtil<DevTowerProjectConfig>(DevTowerProjectConfig.class);
+        util.exportExcel(response, list, "塔基检测配置数据");
+    }
+
+    /**
+     * 获取塔基检测配置详细信息
+     */
+    @RequiresPermissions("device:towerProjectConfig:query")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(devTowerProjectConfigService.selectDevTowerProjectConfigById(id));
+    }
+
+    /**
+     * 新增塔基检测配置
+     */
+    @RequiresPermissions("device:towerProjectConfig:add")
+    @Log(title = "塔基检测配置", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody DevTowerProjectConfig devTowerProjectConfig)
+    {
+        return toAjax(devTowerProjectConfigService.insertDevTowerProjectConfig(devTowerProjectConfig));
+    }
+
+    /**
+     * 修改塔基检测配置
+     */
+    @RequiresPermissions("device:towerProjectConfig:edit")
+    @Log(title = "塔基检测配置", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody DevTowerProjectConfig devTowerProjectConfig)
+    {
+        return toAjax(devTowerProjectConfigService.updateDevTowerProjectConfig(devTowerProjectConfig));
+    }
+
+    /**
+     * 删除塔基检测配置
+     */
+    @RequiresPermissions("device:towerProjectConfig:remove")
+    @Log(title = "塔基检测配置", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(devTowerProjectConfigService.deleteDevTowerProjectConfigByIds(ids));
+    }
+}
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/TowerCraneApiController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/TowerCraneApiController.java
new file mode 100644
index 00000000..5ae7b3d8
--- /dev/null
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/TowerCraneApiController.java
@@ -0,0 +1,344 @@
+package com.yanzhu.manage.controller.device;
+
+import com.alibaba.fastjson2.JSON;
+import com.yanzhu.common.core.annotation.RateLimiter;
+import com.yanzhu.common.core.enums.LimitType;
+import com.yanzhu.common.core.exception.ServiceException;
+import com.yanzhu.common.core.text.Convert;
+import com.yanzhu.common.core.utils.StringUtils;
+import com.yanzhu.common.core.web.domain.AjaxResult;
+import com.yanzhu.common.redis.service.RedisService;
+import com.yanzhu.device.domain.*;
+import com.yanzhu.manage.constant.CacheConstants;
+import com.yanzhu.manage.domain.TowerReqVo;
+import com.yanzhu.manage.enums.HttpStatusEnum;
+import com.yanzhu.manage.enums.TowerTypeEnums;
+import com.yanzhu.manage.service.*;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 塔吊监测APIController
+ *
+ * @author JiangYuQi
+ * @date 2024-01-13
+ */
+@Slf4j
+@RestController
+@RequestMapping("/desApi/towerCrane")
+public class TowerCraneApiController {
+
+    @Autowired
+    private RedisService redisService;
+
+    @Autowired
+    private IDevTowerDataRunService devTowerDataRunService;
+
+    @Autowired
+    private IDevTowerDataRoundService devTowerDataRoundService;
+
+    @Autowired
+    private IDevTowerDataLimitService devTowerDataLimitService;
+
+    @Autowired
+    private IDevTowerDataLocalService devTowerDataLocalService;
+
+    @Autowired
+    private IDevTowerDataCollideService devTowerDataCollideService;
+
+    @Autowired
+    private IDevTowerProjectConfigService devTowerProjectConfigService;
+
+    /**
+     * 塔吊监测++
+     * 限流规则[60秒内最多请求10次，限流策略IP]
+     * @param req 请求信息
+     * @author JiangYuQi
+     * @date 2024-01-13
+     */
+    @ApiOperation(value = "塔吊监测")
+    @RateLimiter(count = 10, limitType = LimitType.IP)
+    @PostMapping("/v1/push")
+    public AjaxResult pushData(@Validated @RequestBody TowerReqVo req) {
+        DevTowerProjectConfig config = redisService.getCacheObject(CacheConstants.YANZHU_DEVICE_TOWER+req.getContent().getDeviceKey());
+        if(config==null){
+            throw new ServiceException(HttpStatusEnum.DARA_EXCEPTION.getInfo(), HttpStatusEnum.DARA_EXCEPTION.getCode());
+        }
+        if(req.getType() == TowerTypeEnums.BASE.getCode()){
+            this.pushConfigData(config,req);
+        }else if(req.getType() == TowerTypeEnums.RUN.getCode()){
+            this.pushRunData(config,req);
+        }else if(req.getType() == TowerTypeEnums.ROUND.getCode()){
+            this.pushRoundData(config,req);
+        }else if(req.getType() == TowerTypeEnums.COLLIDE.getCode()){
+            this.pushCollideData(config,req);
+        }else if(req.getType() == TowerTypeEnums.LIMIT.getCode()){
+            this.pushLimitData(config,req);
+        }else if(req.getType() == TowerTypeEnums.LOCAL.getCode()){
+            this.pushLocalData(config,req);
+        }
+        return AjaxResult.success();
+    }
+
+    /**
+     * 塔机上报基本信息
+     * @param req
+     */
+    private void pushConfigData(DevTowerProjectConfig config,TowerReqVo req){
+        DevTowerProjectConfig devTowerProjectConfig = devTowerProjectConfigService.selectDevTowerProjectConfigById(config.getId());
+        Map<String, Object> dataContent = req.getContent().getDataContent();
+        devTowerProjectConfig.setTowerId(Convert.toStr(dataContent.get("towerId")));
+        devTowerProjectConfig.setTowerType(Convert.toStr(dataContent.get("towerType")));
+        devTowerProjectConfig.setCoordinateX(Convert.toStr(dataContent.get("coordinateX")));
+        devTowerProjectConfig.setCoordinateY(Convert.toStr(dataContent.get("coordinateY")));
+        devTowerProjectConfig.setFrontBrachium(Convert.toStr(dataContent.get("frontBrachium")));
+        devTowerProjectConfig.setAfterBrachium(Convert.toStr(dataContent.get("afterBrachium")));
+        devTowerProjectConfig.setTowerBodyHeight(Convert.toStr(dataContent.get("towerBodyHeight")));
+        devTowerProjectConfig.setTowerCapHeight(Convert.toStr(dataContent.get("towerCapHeight")));
+        devTowerProjectConfig.setTowerSectionHeight(Convert.toStr(dataContent.get("towerSectionHeight")));
+        devTowerProjectConfigService.updateDevTowerProjectConfigNoCache(devTowerProjectConfig);
+    }
+
+    /**
+     * 塔机上报实时数据
+     * @param req
+     */
+    private static void pushRunData(DevTowerProjectConfig config,TowerReqVo req){
+        DevTowerDataRun devTowerDataRun = new DevTowerDataRun();
+        Map<String, Object> dataContent = req.getContent().getDataContent();
+        devTowerDataRun.setCfgId(config.getId());
+        devTowerDataRun.setProjectId(config.getProjectId());
+        devTowerDataRun.setComId(config.getComId());
+        devTowerDataRun.setDeviceKey(config.getDeviceSn());
+        devTowerDataRun.setHeight(Convert.toStr(dataContent.get("height")));
+        devTowerDataRun.setRange(Convert.toStr(dataContent.get("range")));
+        devTowerDataRun.setRotation(Convert.toStr(dataContent.get("rotation")));
+        devTowerDataRun.setLoad(Convert.toStr(dataContent.get("load")));
+        devTowerDataRun.setWindSpeed(Convert.toStr(dataContent.get("windSpeed")));
+        devTowerDataRun.setLeanAngleX(Convert.toStr(dataContent.get("leanAngleX")));
+        devTowerDataRun.setLeanAngleY(Convert.toStr(dataContent.get("leanAngleY")));
+        devTowerDataRun.setLoadPercent(Convert.toStr(dataContent.get("loadPercent")));
+        devTowerDataRun.setMomentPercent(Convert.toStr(dataContent.get("momentPercent")));
+        devTowerDataRun.setWindSpeedPercent(Convert.toStr(dataContent.get("windSpeedPercent")));
+        devTowerDataRun.setLeanAnglePercent(Convert.toStr(dataContent.get("leanAnglePercent")));
+        devTowerDataRun.setRate(Convert.toStr(dataContent.get("rate")));
+        devTowerDataRun.setRotationSensorState(Convert.toStr(dataContent.get("rotationSensorState")));
+        devTowerDataRun.setLoadSensorState(Convert.toStr(dataContent.get("loadSensorState")));
+        devTowerDataRun.setWindSpeedSensorState(Convert.toStr(dataContent.get("windSpeedSensorState")));
+        devTowerDataRun.setLeanAngleSensorState(Convert.toStr(dataContent.get("leanAngleSensorState")));
+        devTowerDataRun.setRangeSensorState(Convert.toStr(dataContent.get("rangeSensorState")));
+        devTowerDataRun.setHeightSensorState(Convert.toStr(dataContent.get("heightSensorState")));
+        devTowerDataRun.setBrakingStatus(Convert.toStr(dataContent.get("brakingStatus")));
+        if(dataContent.get("warnings")!=null){
+            List<String> warnings = (List<String>)dataContent.get("warnings");
+            devTowerDataRun.setWarnings(String.join(",", warnings));
+            for(String warning:warnings){
+                Integer alarm = Convert.toInt(warning);
+                if(alarm>100 && alarm<120){
+                    devTowerDataRun.setIsAlarm(1L);
+                }
+            }
+        }
+        System.out.println(devTowerDataRun);
+        //devTowerDataRunService.insertDevTowerDataRun(devTowerDataRun);
+    }
+
+    public static void main(String[] args) {
+        String str = "{\"type\":111,\"content\":{\"time\":1496263304,\"dataType\":113001,\"deviceKey\":\"jycw6\",\"dataContent\":{\"height\":\"4.1\",\"range\": \"21.9\",\"rotation\": \"171.0\",\"load\": \"0.0\",\"windSpeed\": \"0.0\",\"leanAngleX\":\"0.5\",\"leanAngley\":\"0.0\",\"loadPercent\":\"0\", \"mome ntPercent\":\"0\",\"windSpeedPercent\":\"0\",\"leanAnglePercent\": \"0\", \"warnings\": [\"0\"],\"rate\":\"2\",\"rotationSensorState\":\"1\",\"loadSensorState\": \"1\",\"windSpeedSensorState\": \"1\",\"leanAngleSensorState\":\"1\",\"rangeSensorState\":\"1\",\"heightSensorState\":\"1\",\"bra kingStatus\":\"0\"}}}";
+        TowerReqVo req = JSON.parseObject(str,TowerReqVo.class);
+        System.out.println(req);
+        DevTowerProjectConfig config = new DevTowerProjectConfig();
+        pushRunData(config,req);
+    }
+
+    /**
+     * 塔机上报循环数据
+     * @param req
+     */
+    private void pushRoundData(DevTowerProjectConfig config,TowerReqVo req){
+        DevTowerDataRound devTowerDataRound = new DevTowerDataRound();
+        Map<String, Object> dataContent = req.getContent().getDataContent();
+        devTowerDataRound.setCfgId(config.getId());
+        devTowerDataRound.setProjectId(config.getProjectId());
+        devTowerDataRound.setComId(config.getComId());
+        devTowerDataRound.setDeviceKey(config.getDeviceSn());
+        devTowerDataRound.setTowerId(Convert.toStr(dataContent.get("towerId")));
+        devTowerDataRound.setWorkStartTime(Convert.toStr(dataContent.get("workStartTime")));
+        devTowerDataRound.setWorkEndTime(Convert.toStr(dataContent.get("workEndTime")));
+        devTowerDataRound.setMinHeight(Convert.toStr(dataContent.get("minHeight")));
+        devTowerDataRound.setMaxHeight(Convert.toStr(dataContent.get("maxHeight")));
+        devTowerDataRound.setMinRange(Convert.toStr(dataContent.get("minRange")));
+        devTowerDataRound.setMaxRange(Convert.toStr(dataContent.get("maxRange")));
+        devTowerDataRound.setStartHeight(Convert.toStr(dataContent.get("startHeight")));
+        devTowerDataRound.setEndHeight(Convert.toStr(dataContent.get("endHeight")));
+        devTowerDataRound.setStartRange(Convert.toStr(dataContent.get("startRange")));
+        devTowerDataRound.setEndRange(Convert.toStr(dataContent.get("endRange")));
+        devTowerDataRound.setStartRotation(Convert.toStr(dataContent.get("startRotation")));
+        devTowerDataRound.setEndRotation(Convert.toStr(dataContent.get("endRotation")));
+        devTowerDataRound.setMaxLoad(Convert.toStr(dataContent.get("maxLoad")));
+        devTowerDataRound.setMaxLoadPercent(Convert.toStr(dataContent.get("maxLoadPercent")));
+        devTowerDataRound.setMaxMoment(Convert.toStr(dataContent.get("maxMoment")));
+        devTowerDataRound.setMaxMomentPercent(Convert.toStr(dataContent.get("maxMomentPercent")));
+        devTowerDataRound.setStartWindSpeed(Convert.toStr(dataContent.get("startWindSpeed")));
+        devTowerDataRound.setEndWindSpeed(Convert.toStr(dataContent.get("endWindSpeed")));
+        devTowerDataRound.setStartWindSpeedPercent(Convert.toStr(dataContent.get("startWindSpeedPercent")));
+        devTowerDataRound.setEndWindSpeedPercent(Convert.toStr(dataContent.get("endWindSpeedPercent")));
+        devTowerDataRound.setStartLeanAngleX(Convert.toStr(dataContent.get("startleanAngleX")));
+        devTowerDataRound.setEndLeanAngleX(Convert.toStr(dataContent.get("endLeanAngleX")));
+        devTowerDataRound.setStartLeanAngleY(Convert.toStr(dataContent.get("startleanAngleY")));
+        devTowerDataRound.setEndLeanAngleY(Convert.toStr(dataContent.get("endLeanAngleY")));
+        if(dataContent.get("warning")!=null){
+            List<String> warnings = (List<String>)dataContent.get("warning");
+            devTowerDataRound.setWarnings(String.join(",", warnings));
+            for(String warning:warnings){
+                Integer alarm = Convert.toInt(warning);
+                if(alarm>6 && alarm<10){
+                    devTowerDataRound.setIsOverload(1L);
+                }
+                if(alarm>100 && alarm<120){
+                    devTowerDataRound.setIsAlarm(1L);
+                }
+            }
+        }
+        devTowerDataRoundService.insertDevTowerDataRound(devTowerDataRound);
+    }
+
+    /**
+     * 塔机上报碰撞信息
+     * @param req
+     */
+    private void pushCollideData(DevTowerProjectConfig config,TowerReqVo req){
+        DevTowerDataCollide devTowerDataCollide = new DevTowerDataCollide();
+        Map<String, Object> dataContent = req.getContent().getLocalDeviceInfo();
+        devTowerDataCollide.setCfgId(config.getId());
+        devTowerDataCollide.setProjectId(config.getProjectId());
+        devTowerDataCollide.setComId(config.getComId());
+        devTowerDataCollide.setDeviceKey(config.getDeviceSn());
+        devTowerDataCollide.setTowerId(Convert.toStr(dataContent.get("towerId")));
+        devTowerDataCollide.setCoordinateX(Convert.toStr(dataContent.get("coordinateX")));
+        devTowerDataCollide.setCoordinateY(Convert.toStr(dataContent.get("coordinateY")));
+        devTowerDataCollide.setFrontBrachium(Convert.toStr(dataContent.get("frontBrachium")));
+        devTowerDataCollide.setAfterBrachium(Convert.toStr(dataContent.get("afterBrachium")));
+        devTowerDataCollide.setTowerBodyHeight(Convert.toStr(dataContent.get("towerBodyHeight")));
+        devTowerDataCollide.setHeight(Convert.toStr(dataContent.get("height")));
+        devTowerDataCollide.setAngle(Convert.toStr(dataContent.get("angle")));
+        devTowerDataCollide.setRange(Convert.toStr(dataContent.get("range")));
+        devTowerDataCollide.setEarlyWarningDistance(Convert.toStr(dataContent.get("earlyWarningDistance")));
+        devTowerDataCollide.setAlarmWarningDistance(Convert.toStr(dataContent.get("alarmWarningDistance")));
+        devTowerDataCollide.setContourValue(Convert.toStr(dataContent.get("contourValue")));
+        List<DevTowerDataCollideDetail> devTowerDataCollideDetailList = new ArrayList<>();
+        if(StringUtils.isNotEmpty(req.getContent().getCollideTowers())){
+            for (Map<String, Object> collideTowers:req.getContent().getCollideTowers()){
+                DevTowerDataCollideDetail devTowerDataCollideDetail = new DevTowerDataCollideDetail();
+                devTowerDataCollideDetail.setTowerId(Convert.toStr(collideTowers.get("towerId")));
+                devTowerDataCollideDetail.setCoordinateX(Convert.toStr(collideTowers.get("coordinateX")));
+                devTowerDataCollideDetail.setCoordinateY(Convert.toStr(collideTowers.get("coordinateY")));
+                devTowerDataCollideDetail.setFrontBrachium(Convert.toStr(collideTowers.get("frontBrachium")));
+                devTowerDataCollideDetail.setAfterBrachium(Convert.toStr(collideTowers.get("afterBrachium")));
+                devTowerDataCollideDetail.setTowerBodyHeight(Convert.toStr(collideTowers.get("towerBodyHeight")));
+                devTowerDataCollideDetail.setHeight(Convert.toStr(collideTowers.get("height")));
+                devTowerDataCollideDetail.setAngle(Convert.toStr(collideTowers.get("angle")));
+                devTowerDataCollideDetail.setRange(Convert.toStr(collideTowers.get("range")));
+                devTowerDataCollideDetail.setCollideHorizontalDistance(Convert.toStr(collideTowers.get("collideHorizontalDistance")));
+                devTowerDataCollideDetail.setCollideVerticalDistance(Convert.toStr(collideTowers.get("collideVerticalDistance")));
+                devTowerDataCollideDetail.setCollideState(Convert.toStr(collideTowers.get("collideState")));
+                devTowerDataCollideDetailList.add(devTowerDataCollideDetail);
+            }
+            devTowerDataCollide.setDevTowerDataCollideDetailList(devTowerDataCollideDetailList);
+        }
+        devTowerDataCollideService.insertDevTowerDataCollide(devTowerDataCollide);
+    }
+
+    /**
+     * 塔机上报限位信息
+     * @param req
+     */
+    private void pushLimitData(DevTowerProjectConfig config,TowerReqVo req){
+        DevTowerDataLimit devTowerDataLimit = new DevTowerDataLimit();
+        Map<String, Object> dataContent = req.getContent().getDataContent();
+        devTowerDataLimit.setCfgId(config.getId());
+        devTowerDataLimit.setProjectId(config.getProjectId());
+        devTowerDataLimit.setComId(config.getComId());
+        devTowerDataLimit.setDeviceKey(config.getDeviceSn());
+        devTowerDataLimit.setTowerId(Convert.toStr(dataContent.get("towerId")));
+        devTowerDataLimit.setWindSpeedWarning(Convert.toStr(dataContent.get("windSpeedWarning")));
+        devTowerDataLimit.setWindSpeedAlarm(Convert.toStr(dataContent.get("windSpeedAlarm")));
+        devTowerDataLimit.setLoadWarning(Convert.toStr(dataContent.get("loadWarning")));
+        devTowerDataLimit.setLoadAlarm(Convert.toStr(dataContent.get("loadAlarm")));
+        devTowerDataLimit.setMomentWarning(Convert.toStr(dataContent.get("momentWarning")));
+        devTowerDataLimit.setMomentAlarm(Convert.toStr(dataContent.get("momentAlarm")));
+        devTowerDataLimit.setHighLimitWarning(Convert.toStr(dataContent.get("highLimitWarning")));
+        devTowerDataLimit.setHighLimitAlarm(Convert.toStr(dataContent.get("highLimitAlarm")));
+        devTowerDataLimit.setLowLimitWarning(Convert.toStr(dataContent.get("lowLimitWarning")));
+        devTowerDataLimit.setLowLimitAlarm(Convert.toStr(dataContent.get("lowLimitAlarm")));
+        devTowerDataLimit.setLeftLimitWarning(Convert.toStr(dataContent.get("leftLimitWarning")));
+        devTowerDataLimit.setLeftLimitAlarm(Convert.toStr(dataContent.get("leftLimitAlarm")));
+        devTowerDataLimit.setRightLimitWarning(Convert.toStr(dataContent.get("rightLimitWarning")));
+        devTowerDataLimit.setRightLimitAlarm(Convert.toStr(dataContent.get("rightLimitAlarm")));
+        devTowerDataLimit.setFrontLimitWarning(Convert.toStr(dataContent.get("frontLimitWarning")));
+        devTowerDataLimit.setFrontLimitAlarm(Convert.toStr(dataContent.get("frontLimitAlarm")));
+        devTowerDataLimit.setBackLimitWarning(Convert.toStr(dataContent.get("backLimitWarning")));
+        devTowerDataLimit.setBackLimitAlarm(Convert.toStr(dataContent.get("backLimitAlarm")));
+        devTowerDataLimit.setCollisionAngleWarning(Convert.toStr(dataContent.get("collisionAngleWarning")));
+        devTowerDataLimit.setCollisionAngleAlarm(Convert.toStr(dataContent.get("collisionAngleAlarm")));
+        devTowerDataLimit.setCollisionDistanceWarning(Convert.toStr(dataContent.get("collisionDistanceWarning")));
+        devTowerDataLimit.setCollisionDistanceAlarm(Convert.toStr(dataContent.get("collisionDistanceAlarm")));
+        devTowerDataLimit.sethDistanceWarning(Convert.toStr(dataContent.get("hDistanceWarning")));
+        devTowerDataLimit.sethDistanceAlarm(Convert.toStr(dataContent.get("hDistanceAlarm")));
+        devTowerDataLimit.setvDistanceWarning(Convert.toStr(dataContent.get("vDistanceWarning")));
+        devTowerDataLimit.setvDistanceAlarm(Convert.toStr(dataContent.get("vDistanceAlarm")));
+        devTowerDataLimit.setLeanWarning(Convert.toStr(dataContent.get("leanWarning")));
+        devTowerDataLimit.setLeanAlarm(Convert.toStr(dataContent.get("leanAlarm")));
+        devTowerDataLimit.setRangeLimitStart(Convert.toStr(dataContent.get("rangeLimitStart")));
+        devTowerDataLimit.setRangeLimitEnd(Convert.toStr(dataContent.get("rangeLimitEnd")));
+        devTowerDataLimit.setHeightLimitStart(Convert.toStr(dataContent.get("heightLimitStart")));
+        devTowerDataLimit.setHeightLimitEnd(Convert.toStr(dataContent.get("heightLimitEnd")));
+        devTowerDataLimit.setRotationLimitStart(Convert.toStr(dataContent.get("rotationLimitStart")));
+        devTowerDataLimit.setRotationLimitEnd(Convert.toStr(dataContent.get("rotationLimitEnd")));
+        devTowerDataLimitService.insertDevTowerDataLimit(devTowerDataLimit);
+    }
+
+    /**
+     * 塔机上报标定位信息
+     * @param req
+     */
+    private void pushLocalData(DevTowerProjectConfig config,TowerReqVo req){
+        DevTowerDataLocal devTowerDataLocal = new DevTowerDataLocal();
+        Map<String, Object> dataContent = req.getContent().getDataContent();
+        devTowerDataLocal.setCfgId(config.getId());
+        devTowerDataLocal.setProjectId(config.getProjectId());
+        devTowerDataLocal.setComId(config.getComId());
+        devTowerDataLocal.setDeviceKey(config.getDeviceSn());
+        devTowerDataLocal.setTowerId(Convert.toStr(dataContent.get("towerId")));
+        devTowerDataLocal.setRangeNearEndAdValue(Convert.toStr(dataContent.get("rangeNearEndADValue")));
+        devTowerDataLocal.setRangeNearEndRealityValue(Convert.toStr(dataContent.get("rangeNearEndRealityValue")));
+        devTowerDataLocal.setRangeFarEndAdValue(Convert.toStr(dataContent.get("rangeFarEndADValue")));
+        devTowerDataLocal.setRangeFarEndRealityValue(Convert.toStr(dataContent.get("rangeFarEndRealityValue")));
+        devTowerDataLocal.setHighNearEndAdValue(Convert.toStr(dataContent.get("highNearEndADValue")));
+        devTowerDataLocal.setHighNearEndRealityValue(Convert.toStr(dataContent.get("highNearEndRealityValue")));
+        devTowerDataLocal.setHighFarEndAdValue(Convert.toStr(dataContent.get("highFarEndADValue")));
+        devTowerDataLocal.setHighFarEndRealityValue(Convert.toStr(dataContent.get("highFarEndRealityValue")));
+        devTowerDataLocal.setEmptyWeightAdValue(Convert.toStr(dataContent.get("emptyWeightADValue")));
+        devTowerDataLocal.setEmptyWeightRealityValue(Convert.toStr(dataContent.get("emptyWeightRealityValue")));
+        devTowerDataLocal.setLoadWeightAdValue(Convert.toStr(dataContent.get("loadWeightADValue")));
+        devTowerDataLocal.setLoadWeightRealityValue(Convert.toStr(dataContent.get("loadWeightRealityValue")));
+        devTowerDataLocal.setRotationStartAdValue(Convert.toStr(dataContent.get("rotationStartADValue")));
+        devTowerDataLocal.setRotationStartRealityValue(Convert.toStr(dataContent.get("rotationStartRealityValue")));
+        devTowerDataLocal.setRotationEndAdValue(Convert.toStr(dataContent.get("rotationEndADValue")));
+        devTowerDataLocal.setRotationEndRealityValue(Convert.toStr(dataContent.get("rotationEndRealityValue")));
+        devTowerDataLocal.setWindSpeedFactor(Convert.toStr(dataContent.get("windSpeedFactor")));
+        devTowerDataLocal.setTiltFactor(Convert.toStr(dataContent.get("tiltFactor")));
+        devTowerDataLocalService.insertDevTowerDataLocal(devTowerDataLocal);
+    }
+
+}
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/domain/TowerContentReqVo.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/domain/TowerContentReqVo.java
new file mode 100644
index 00000000..ebff326d
--- /dev/null
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/domain/TowerContentReqVo.java
@@ -0,0 +1,47 @@
+package com.yanzhu.manage.domain;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 塔吊检测推送信息 请求内容
+ *
+ * @author: JiangYuQi
+ * @date: 2024/01/13 12:21
+ */
+@Data
+public class TowerContentReqVo {
+
+    /**
+     * 数据产生的时间戳
+     */
+    private Long time;
+
+    /**
+     * 数据类型
+     */
+    private String dataType;
+
+    /**
+     * 设备序列号，唯一标识 84E0*****
+     */
+    private String deviceKey;
+
+    /**
+     * 上报内容
+     */
+    private Map<String, Object> dataContent;
+
+    /**
+     * 碰撞信息
+     */
+    private Map<String, Object> localDeviceInfo;
+
+    /**
+     * 碰撞塔吊设备信息
+     */
+    private List<Map<String, Object>> collideTowers;
+
+}
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/domain/TowerReqVo.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/domain/TowerReqVo.java
new file mode 100644
index 00000000..a1735d67
--- /dev/null
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/domain/TowerReqVo.java
@@ -0,0 +1,28 @@
+package com.yanzhu.manage.domain;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 塔吊检测推送信息 请求参数
+ *
+ * @author: JiangYuQi
+ * @date: 2024/01/13 12:21
+ */
+@Data
+public class TowerReqVo {
+
+    /**
+     * 上报类型
+     */
+    @NotNull(message = "上报类型不能为空")
+    private int type;
+
+    /**
+     * 上报内容
+     */
+    @NotNull(message = "上报内容不能为空")
+    private TowerContentReqVo content;
+
+}
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/enums/HttpStatusEnum.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/enums/HttpStatusEnum.java
new file mode 100644
index 00000000..248f1805
--- /dev/null
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/enums/HttpStatusEnum.java
@@ -0,0 +1,36 @@
+package com.yanzhu.manage.enums;
+
+/**
+ * 订单Http状态
+ *
+ * @author JiangYuQi
+ */
+public enum HttpStatusEnum {
+
+    ERROR(11110, "AppId不存在或已被删除"),
+    DISABLE(11112, "AppId已被停用"),
+    SINGET_ERROR(11113, "签名值不正确"),
+    SINGET_TIMEOUT(11114, "签名数据已过期"),
+    SINGET_EXCEPTION(11115, "签名数据解密异常"),
+    DARA_EXCEPTION(11116, "数据解析异常");
+
+    private final Integer code;
+    private final String info;
+
+    HttpStatusEnum(Integer code, String info)
+    {
+        this.code = code;
+        this.info = info;
+    }
+
+    public Integer getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+
+}
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/enums/TowerTypeEnums.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/enums/TowerTypeEnums.java
new file mode 100644
index 00000000..12da94f2
--- /dev/null
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/enums/TowerTypeEnums.java
@@ -0,0 +1,34 @@
+package com.yanzhu.manage.enums;
+
+/**
+ * 塔吊数据类型
+ */
+public enum TowerTypeEnums {
+
+    BASE(118,"塔机上报基本信息"),
+    RUN(111,"塔机上报实时数据"),
+    ROUND(119,"塔机上报工作循环数据"),
+    COLLIDE(116,"塔机上报碰撞信息"),
+    LIMIT(120,"塔机上报限位信息"),
+    LOCAL(121,"塔机上报标定位信息");
+
+    private final int code;
+    private final String info;
+
+    TowerTypeEnums(int code, String info)
+    {
+        this.code = code;
+        this.info = info;
+    }
+
+    public int getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+
+}
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IDevTowerDataCollideService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IDevTowerDataCollideService.java
new file mode 100644
index 00000000..4af4f586
--- /dev/null
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IDevTowerDataCollideService.java
@@ -0,0 +1,63 @@
+package com.yanzhu.manage.service;
+
+
+import com.yanzhu.device.domain.DevTowerDataCollide;
+
+import java.util.List;
+
+/**
+ * 塔机碰撞信息Service接口
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+public interface IDevTowerDataCollideService 
+{
+    /**
+     * 查询塔机碰撞信息
+     * 
+     * @param id 塔机碰撞信息主键
+     * @return 塔机碰撞信息
+     */
+    public DevTowerDataCollide selectDevTowerDataCollideById(Long id);
+
+    /**
+     * 查询塔机碰撞信息列表
+     * 
+     * @param devTowerDataCollide 塔机碰撞信息
+     * @return 塔机碰撞信息集合
+     */
+    public List<DevTowerDataCollide> selectDevTowerDataCollideList(DevTowerDataCollide devTowerDataCollide);
+
+    /**
+     * 新增塔机碰撞信息
+     * 
+     * @param devTowerDataCollide 塔机碰撞信息
+     * @return 结果
+     */
+    public int insertDevTowerDataCollide(DevTowerDataCollide devTowerDataCollide);
+
+    /**
+     * 修改塔机碰撞信息
+     * 
+     * @param devTowerDataCollide 塔机碰撞信息
+     * @return 结果
+     */
+    public int updateDevTowerDataCollide(DevTowerDataCollide devTowerDataCollide);
+
+    /**
+     * 批量删除塔机碰撞信息
+     * 
+     * @param ids 需要删除的塔机碰撞信息主键集合
+     * @return 结果
+     */
+    public int deleteDevTowerDataCollideByIds(Long[] ids);
+
+    /**
+     * 删除塔机碰撞信息信息
+     * 
+     * @param id 塔机碰撞信息主键
+     * @return 结果
+     */
+    public int deleteDevTowerDataCollideById(Long id);
+}
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IDevTowerDataLimitService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IDevTowerDataLimitService.java
new file mode 100644
index 00000000..c857ebff
--- /dev/null
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IDevTowerDataLimitService.java
@@ -0,0 +1,62 @@
+package com.yanzhu.manage.service;
+
+import com.yanzhu.device.domain.DevTowerDataLimit;
+
+import java.util.List;
+
+/**
+ * 塔机限位信息Service接口
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+public interface IDevTowerDataLimitService 
+{
+    /**
+     * 查询塔机限位信息
+     * 
+     * @param id 塔机限位信息主键
+     * @return 塔机限位信息
+     */
+    public DevTowerDataLimit selectDevTowerDataLimitById(Long id);
+
+    /**
+     * 查询塔机限位信息列表
+     * 
+     * @param devTowerDataLimit 塔机限位信息
+     * @return 塔机限位信息集合
+     */
+    public List<DevTowerDataLimit> selectDevTowerDataLimitList(DevTowerDataLimit devTowerDataLimit);
+
+    /**
+     * 新增塔机限位信息
+     * 
+     * @param devTowerDataLimit 塔机限位信息
+     * @return 结果
+     */
+    public int insertDevTowerDataLimit(DevTowerDataLimit devTowerDataLimit);
+
+    /**
+     * 修改塔机限位信息
+     * 
+     * @param devTowerDataLimit 塔机限位信息
+     * @return 结果
+     */
+    public int updateDevTowerDataLimit(DevTowerDataLimit devTowerDataLimit);
+
+    /**
+     * 批量删除塔机限位信息
+     * 
+     * @param ids 需要删除的塔机限位信息主键集合
+     * @return 结果
+     */
+    public int deleteDevTowerDataLimitByIds(Long[] ids);
+
+    /**
+     * 删除塔机限位信息信息
+     * 
+     * @param id 塔机限位信息主键
+     * @return 结果
+     */
+    public int deleteDevTowerDataLimitById(Long id);
+}
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IDevTowerDataLocalService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IDevTowerDataLocalService.java
new file mode 100644
index 00000000..05466319
--- /dev/null
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IDevTowerDataLocalService.java
@@ -0,0 +1,62 @@
+package com.yanzhu.manage.service;
+
+import com.yanzhu.device.domain.DevTowerDataLocal;
+
+import java.util.List;
+
+/**
+ * 塔机定位信息Service接口
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+public interface IDevTowerDataLocalService 
+{
+    /**
+     * 查询塔机定位信息
+     * 
+     * @param id 塔机定位信息主键
+     * @return 塔机定位信息
+     */
+    public DevTowerDataLocal selectDevTowerDataLocalById(Long id);
+
+    /**
+     * 查询塔机定位信息列表
+     * 
+     * @param devTowerDataLocal 塔机定位信息
+     * @return 塔机定位信息集合
+     */
+    public List<DevTowerDataLocal> selectDevTowerDataLocalList(DevTowerDataLocal devTowerDataLocal);
+
+    /**
+     * 新增塔机定位信息
+     * 
+     * @param devTowerDataLocal 塔机定位信息
+     * @return 结果
+     */
+    public int insertDevTowerDataLocal(DevTowerDataLocal devTowerDataLocal);
+
+    /**
+     * 修改塔机定位信息
+     * 
+     * @param devTowerDataLocal 塔机定位信息
+     * @return 结果
+     */
+    public int updateDevTowerDataLocal(DevTowerDataLocal devTowerDataLocal);
+
+    /**
+     * 批量删除塔机定位信息
+     * 
+     * @param ids 需要删除的塔机定位信息主键集合
+     * @return 结果
+     */
+    public int deleteDevTowerDataLocalByIds(Long[] ids);
+
+    /**
+     * 删除塔机定位信息信息
+     * 
+     * @param id 塔机定位信息主键
+     * @return 结果
+     */
+    public int deleteDevTowerDataLocalById(Long id);
+}
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IDevTowerDataRoundService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IDevTowerDataRoundService.java
new file mode 100644
index 00000000..8bd9bbbc
--- /dev/null
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IDevTowerDataRoundService.java
@@ -0,0 +1,62 @@
+package com.yanzhu.manage.service;
+
+import com.yanzhu.device.domain.DevTowerDataRound;
+
+import java.util.List;
+
+/**
+ * 塔机工作循环Service接口
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+public interface IDevTowerDataRoundService 
+{
+    /**
+     * 查询塔机工作循环
+     * 
+     * @param id 塔机工作循环主键
+     * @return 塔机工作循环
+     */
+    public DevTowerDataRound selectDevTowerDataRoundById(Long id);
+
+    /**
+     * 查询塔机工作循环列表
+     * 
+     * @param devTowerDataRound 塔机工作循环
+     * @return 塔机工作循环集合
+     */
+    public List<DevTowerDataRound> selectDevTowerDataRoundList(DevTowerDataRound devTowerDataRound);
+
+    /**
+     * 新增塔机工作循环
+     * 
+     * @param devTowerDataRound 塔机工作循环
+     * @return 结果
+     */
+    public int insertDevTowerDataRound(DevTowerDataRound devTowerDataRound);
+
+    /**
+     * 修改塔机工作循环
+     * 
+     * @param devTowerDataRound 塔机工作循环
+     * @return 结果
+     */
+    public int updateDevTowerDataRound(DevTowerDataRound devTowerDataRound);
+
+    /**
+     * 批量删除塔机工作循环
+     * 
+     * @param ids 需要删除的塔机工作循环主键集合
+     * @return 结果
+     */
+    public int deleteDevTowerDataRoundByIds(Long[] ids);
+
+    /**
+     * 删除塔机工作循环信息
+     * 
+     * @param id 塔机工作循环主键
+     * @return 结果
+     */
+    public int deleteDevTowerDataRoundById(Long id);
+}
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IDevTowerDataRunService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IDevTowerDataRunService.java
new file mode 100644
index 00000000..d0c2fc5a
--- /dev/null
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IDevTowerDataRunService.java
@@ -0,0 +1,69 @@
+package com.yanzhu.manage.service;
+
+import com.yanzhu.device.domain.DevTowerDataRun;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 塔机实时数据Service接口
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+public interface IDevTowerDataRunService 
+{
+    /**
+     * 查询塔机实时数据
+     * 
+     * @param id 塔机实时数据主键
+     * @return 塔机实时数据
+     */
+    public DevTowerDataRun selectDevTowerDataRunById(Long id);
+
+    /**
+     * 查询塔机实时数据列表
+     * 
+     * @param devTowerDataRun 塔机实时数据
+     * @return 塔机实时数据集合
+     */
+    public List<DevTowerDataRun> selectDevTowerDataRunList(DevTowerDataRun devTowerDataRun);
+
+    /**
+     * 新增塔机实时数据
+     * 
+     * @param devTowerDataRun 塔机实时数据
+     * @return 结果
+     */
+    public int insertDevTowerDataRun(DevTowerDataRun devTowerDataRun);
+
+    /**
+     * 修改塔机实时数据
+     * 
+     * @param devTowerDataRun 塔机实时数据
+     * @return 结果
+     */
+    public int updateDevTowerDataRun(DevTowerDataRun devTowerDataRun);
+
+    /**
+     * 批量删除塔机实时数据
+     * 
+     * @param ids 需要删除的塔机实时数据主键集合
+     * @return 结果
+     */
+    public int deleteDevTowerDataRunByIds(Long[] ids);
+
+    /**
+     * 删除塔机实时数据信息
+     * 
+     * @param id 塔机实时数据主键
+     * @return 结果
+     */
+    public int deleteDevTowerDataRunById(Long id);
+
+    /**
+     * 查询塔机运行数据
+     * @return
+     */
+    public Map<String, Object> findtowerStatisticsView(String deviceSn);
+}
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IDevTowerDataWarningService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IDevTowerDataWarningService.java
new file mode 100644
index 00000000..1571f4d0
--- /dev/null
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IDevTowerDataWarningService.java
@@ -0,0 +1,62 @@
+package com.yanzhu.manage.service;
+
+import com.yanzhu.device.domain.DevTowerDataWarning;
+
+import java.util.List;
+
+/**
+ * 塔机预警管理Service接口
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+public interface IDevTowerDataWarningService 
+{
+    /**
+     * 查询塔机预警管理
+     * 
+     * @param id 塔机预警管理主键
+     * @return 塔机预警管理
+     */
+    public DevTowerDataWarning selectDevTowerDataWarningById(Long id);
+
+    /**
+     * 查询塔机预警管理列表
+     * 
+     * @param devTowerDataWarning 塔机预警管理
+     * @return 塔机预警管理集合
+     */
+    public List<DevTowerDataWarning> selectDevTowerDataWarningList(DevTowerDataWarning devTowerDataWarning);
+
+    /**
+     * 新增塔机预警管理
+     * 
+     * @param devTowerDataWarning 塔机预警管理
+     * @return 结果
+     */
+    public int insertDevTowerDataWarning(DevTowerDataWarning devTowerDataWarning);
+
+    /**
+     * 修改塔机预警管理
+     * 
+     * @param devTowerDataWarning 塔机预警管理
+     * @return 结果
+     */
+    public int updateDevTowerDataWarning(DevTowerDataWarning devTowerDataWarning);
+
+    /**
+     * 批量删除塔机预警管理
+     * 
+     * @param ids 需要删除的塔机预警管理主键集合
+     * @return 结果
+     */
+    public int deleteDevTowerDataWarningByIds(Long[] ids);
+
+    /**
+     * 删除塔机预警管理信息
+     * 
+     * @param id 塔机预警管理主键
+     * @return 结果
+     */
+    public int deleteDevTowerDataWarningById(Long id);
+}
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IDevTowerProjectConfigService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IDevTowerProjectConfigService.java
new file mode 100644
index 00000000..af866a07
--- /dev/null
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IDevTowerProjectConfigService.java
@@ -0,0 +1,83 @@
+package com.yanzhu.manage.service;
+
+import com.yanzhu.device.domain.DevTowerProjectConfig;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 塔基检测配置Service接口
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+public interface IDevTowerProjectConfigService 
+{
+    /**
+     * 项目启动时，初始化塔吊检测配置到缓存
+     */
+    public void loadingDevTowerProjectConfigCache();
+
+    /**
+     * 查询塔基检测配置
+     *
+     * @param id 塔基检测配置主键
+     * @return 塔基检测配置
+     */
+    public DevTowerProjectConfig selectDevTowerProjectConfigById(Long id);
+
+    /**
+     * 查询塔基检测配置列表
+     * 
+     * @param devTowerProjectConfig 塔基检测配置
+     * @return 塔基检测配置集合
+     */
+    public List<DevTowerProjectConfig> selectDevTowerProjectConfigList(DevTowerProjectConfig devTowerProjectConfig);
+
+    /**
+     * 新增塔基检测配置
+     * 
+     * @param devTowerProjectConfig 塔基检测配置
+     * @return 结果
+     */
+    public int insertDevTowerProjectConfig(DevTowerProjectConfig devTowerProjectConfig);
+
+    /**
+     * 修改塔基检测配置
+     * 
+     * @param devTowerProjectConfig 塔基检测配置
+     * @return 结果
+     */
+    public int updateDevTowerProjectConfig(DevTowerProjectConfig devTowerProjectConfig);
+
+    /**
+     * 修改塔基检测配置
+     *
+     * @param devTowerProjectConfig 塔基检测配置
+     * @return 结果
+     */
+    public int updateDevTowerProjectConfigNoCache(DevTowerProjectConfig devTowerProjectConfig);
+
+    /**
+     * 批量删除塔基检测配置
+     * 
+     * @param ids 需要删除的塔基检测配置主键集合
+     * @return 结果
+     */
+    public int deleteDevTowerProjectConfigByIds(Long[] ids);
+
+    /**
+     * 删除塔基检测配置信息
+     * 
+     * @param id 塔基检测配置主键
+     * @return 结果
+     */
+    public int deleteDevTowerProjectConfigById(Long id);
+
+    /**
+     * 根据设备状态统计设备
+     * @param devTowerProjectConfig
+     * @return
+     */
+    public List<Map<String, Object>> findtowerConfigGroupOnline(DevTowerProjectConfig devTowerProjectConfig);
+}
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataCollideServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataCollideServiceImpl.java
new file mode 100644
index 00000000..a44fe768
--- /dev/null
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataCollideServiceImpl.java
@@ -0,0 +1,136 @@
+package com.yanzhu.manage.service.impl;
+
+import com.yanzhu.common.core.utils.DateUtils;
+import com.yanzhu.common.core.utils.StringUtils;
+import com.yanzhu.device.domain.DevTowerDataCollide;
+import com.yanzhu.device.domain.DevTowerDataCollideDetail;
+import com.yanzhu.device.mapper.DevTowerDataCollideMapper;
+import com.yanzhu.manage.service.IDevTowerDataCollideService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+/**
+ * 塔机碰撞信息Service业务层处理
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+@Service
+public class DevTowerDataCollideServiceImpl implements IDevTowerDataCollideService
+{
+    @Autowired
+    private DevTowerDataCollideMapper devTowerDataCollideMapper;
+
+    /**
+     * 查询塔机碰撞信息
+     * 
+     * @param id 塔机碰撞信息主键
+     * @return 塔机碰撞信息
+     */
+    @Override
+    public DevTowerDataCollide selectDevTowerDataCollideById(Long id)
+    {
+        return devTowerDataCollideMapper.selectDevTowerDataCollideById(id);
+    }
+
+    /**
+     * 查询塔机碰撞信息列表
+     * 
+     * @param devTowerDataCollide 塔机碰撞信息
+     * @return 塔机碰撞信息
+     */
+    @Override
+    public List<DevTowerDataCollide> selectDevTowerDataCollideList(DevTowerDataCollide devTowerDataCollide)
+    {
+        return devTowerDataCollideMapper.selectDevTowerDataCollideList(devTowerDataCollide);
+    }
+
+    /**
+     * 新增塔机碰撞信息
+     * 
+     * @param devTowerDataCollide 塔机碰撞信息
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int insertDevTowerDataCollide(DevTowerDataCollide devTowerDataCollide)
+    {
+        //devTowerDataCollide.setCreateBy(SecurityUtils.getUsername());
+        devTowerDataCollide.setCreateTime(DateUtils.getNowDate());
+        int rows = devTowerDataCollideMapper.insertDevTowerDataCollide(devTowerDataCollide);
+        insertDevTowerDataCollideDetail(devTowerDataCollide);
+        return rows;
+    }
+
+    /**
+     * 修改塔机碰撞信息
+     * 
+     * @param devTowerDataCollide 塔机碰撞信息
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int updateDevTowerDataCollide(DevTowerDataCollide devTowerDataCollide)
+    {
+        //devTowerDataCollide.setUpdateBy(SecurityUtils.getUsername());
+        devTowerDataCollide.setUpdateTime(DateUtils.getNowDate());
+        devTowerDataCollideMapper.deleteDevTowerDataCollideDetailByCollideId(devTowerDataCollide.getId());
+        insertDevTowerDataCollideDetail(devTowerDataCollide);
+        return devTowerDataCollideMapper.updateDevTowerDataCollide(devTowerDataCollide);
+    }
+
+    /**
+     * 批量删除塔机碰撞信息
+     * 
+     * @param ids 需要删除的塔机碰撞信息主键
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int deleteDevTowerDataCollideByIds(Long[] ids)
+    {
+        devTowerDataCollideMapper.deleteDevTowerDataCollideDetailByCollideIds(ids);
+        return devTowerDataCollideMapper.deleteDevTowerDataCollideByIds(ids);
+    }
+
+    /**
+     * 删除塔机碰撞信息信息
+     * 
+     * @param id 塔机碰撞信息主键
+     * @return 结果
+     */
+    @Transactional
+    @Override
+    public int deleteDevTowerDataCollideById(Long id)
+    {
+        devTowerDataCollideMapper.deleteDevTowerDataCollideDetailByCollideId(id);
+        return devTowerDataCollideMapper.deleteDevTowerDataCollideById(id);
+    }
+
+    /**
+     * 新增碰撞详情信息
+     * 
+     * @param devTowerDataCollide 塔机碰撞信息对象
+     */
+    public void insertDevTowerDataCollideDetail(DevTowerDataCollide devTowerDataCollide)
+    {
+        List<DevTowerDataCollideDetail> devTowerDataCollideDetailList = devTowerDataCollide.getDevTowerDataCollideDetailList();
+        Long id = devTowerDataCollide.getId();
+        if (StringUtils.isNotNull(devTowerDataCollideDetailList))
+        {
+            List<DevTowerDataCollideDetail> list = new ArrayList<DevTowerDataCollideDetail>();
+            for (DevTowerDataCollideDetail devTowerDataCollideDetail : devTowerDataCollideDetailList)
+            {
+                devTowerDataCollideDetail.setCollideId(id);
+                list.add(devTowerDataCollideDetail);
+            }
+            if (list.size() > 0)
+            {
+                devTowerDataCollideMapper.batchDevTowerDataCollideDetail(list);
+            }
+        }
+    }
+}
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataLimitServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataLimitServiceImpl.java
new file mode 100644
index 00000000..7f91f42e
--- /dev/null
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataLimitServiceImpl.java
@@ -0,0 +1,98 @@
+package com.yanzhu.manage.service.impl;
+
+import com.yanzhu.common.core.utils.DateUtils;
+import com.yanzhu.device.domain.DevTowerDataLimit;
+import com.yanzhu.device.mapper.DevTowerDataLimitMapper;
+import com.yanzhu.manage.service.IDevTowerDataLimitService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+/**
+ * 塔机限位信息Service业务层处理
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+@Service
+public class DevTowerDataLimitServiceImpl implements IDevTowerDataLimitService
+{
+    @Autowired
+    private DevTowerDataLimitMapper devTowerDataLimitMapper;
+
+    /**
+     * 查询塔机限位信息
+     * 
+     * @param id 塔机限位信息主键
+     * @return 塔机限位信息
+     */
+    @Override
+    public DevTowerDataLimit selectDevTowerDataLimitById(Long id)
+    {
+        return devTowerDataLimitMapper.selectDevTowerDataLimitById(id);
+    }
+
+    /**
+     * 查询塔机限位信息列表
+     * 
+     * @param devTowerDataLimit 塔机限位信息
+     * @return 塔机限位信息
+     */
+    @Override
+    public List<DevTowerDataLimit> selectDevTowerDataLimitList(DevTowerDataLimit devTowerDataLimit)
+    {
+        return devTowerDataLimitMapper.selectDevTowerDataLimitList(devTowerDataLimit);
+    }
+
+    /**
+     * 新增塔机限位信息
+     * 
+     * @param devTowerDataLimit 塔机限位信息
+     * @return 结果
+     */
+    @Override
+    public int insertDevTowerDataLimit(DevTowerDataLimit devTowerDataLimit)
+    {
+        //devTowerDataLimit.setCreateBy(SecurityUtils.getUsername());
+        devTowerDataLimit.setCreateTime(DateUtils.getNowDate());
+        return devTowerDataLimitMapper.insertDevTowerDataLimit(devTowerDataLimit);
+    }
+
+    /**
+     * 修改塔机限位信息
+     * 
+     * @param devTowerDataLimit 塔机限位信息
+     * @return 结果
+     */
+    @Override
+    public int updateDevTowerDataLimit(DevTowerDataLimit devTowerDataLimit)
+    {
+        //devTowerDataLimit.setUpdateBy(SecurityUtils.getUsername());
+        devTowerDataLimit.setUpdateTime(DateUtils.getNowDate());
+        return devTowerDataLimitMapper.updateDevTowerDataLimit(devTowerDataLimit);
+    }
+
+    /**
+     * 批量删除塔机限位信息
+     * 
+     * @param ids 需要删除的塔机限位信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDevTowerDataLimitByIds(Long[] ids)
+    {
+        return devTowerDataLimitMapper.deleteDevTowerDataLimitByIds(ids);
+    }
+
+    /**
+     * 删除塔机限位信息信息
+     * 
+     * @param id 塔机限位信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDevTowerDataLimitById(Long id)
+    {
+        return devTowerDataLimitMapper.deleteDevTowerDataLimitById(id);
+    }
+}
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataLocalServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataLocalServiceImpl.java
new file mode 100644
index 00000000..b4f53314
--- /dev/null
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataLocalServiceImpl.java
@@ -0,0 +1,98 @@
+package com.yanzhu.manage.service.impl;
+
+import com.yanzhu.common.core.utils.DateUtils;
+import com.yanzhu.device.domain.DevTowerDataLocal;
+import com.yanzhu.device.mapper.DevTowerDataLocalMapper;
+import com.yanzhu.manage.service.IDevTowerDataLocalService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+/**
+ * 塔机定位信息Service业务层处理
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+@Service
+public class DevTowerDataLocalServiceImpl implements IDevTowerDataLocalService
+{
+    @Autowired
+    private DevTowerDataLocalMapper devTowerDataLocalMapper;
+
+    /**
+     * 查询塔机定位信息
+     * 
+     * @param id 塔机定位信息主键
+     * @return 塔机定位信息
+     */
+    @Override
+    public DevTowerDataLocal selectDevTowerDataLocalById(Long id)
+    {
+        return devTowerDataLocalMapper.selectDevTowerDataLocalById(id);
+    }
+
+    /**
+     * 查询塔机定位信息列表
+     * 
+     * @param devTowerDataLocal 塔机定位信息
+     * @return 塔机定位信息
+     */
+    @Override
+    public List<DevTowerDataLocal> selectDevTowerDataLocalList(DevTowerDataLocal devTowerDataLocal)
+    {
+        return devTowerDataLocalMapper.selectDevTowerDataLocalList(devTowerDataLocal);
+    }
+
+    /**
+     * 新增塔机定位信息
+     * 
+     * @param devTowerDataLocal 塔机定位信息
+     * @return 结果
+     */
+    @Override
+    public int insertDevTowerDataLocal(DevTowerDataLocal devTowerDataLocal)
+    {
+        //devTowerDataLocal.setCreateBy(SecurityUtils.getUsername());
+        devTowerDataLocal.setCreateTime(DateUtils.getNowDate());
+        return devTowerDataLocalMapper.insertDevTowerDataLocal(devTowerDataLocal);
+    }
+
+    /**
+     * 修改塔机定位信息
+     * 
+     * @param devTowerDataLocal 塔机定位信息
+     * @return 结果
+     */
+    @Override
+    public int updateDevTowerDataLocal(DevTowerDataLocal devTowerDataLocal)
+    {
+        //devTowerDataLocal.setUpdateBy(SecurityUtils.getUsername());
+        devTowerDataLocal.setUpdateTime(DateUtils.getNowDate());
+        return devTowerDataLocalMapper.updateDevTowerDataLocal(devTowerDataLocal);
+    }
+
+    /**
+     * 批量删除塔机定位信息
+     * 
+     * @param ids 需要删除的塔机定位信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDevTowerDataLocalByIds(Long[] ids)
+    {
+        return devTowerDataLocalMapper.deleteDevTowerDataLocalByIds(ids);
+    }
+
+    /**
+     * 删除塔机定位信息信息
+     * 
+     * @param id 塔机定位信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDevTowerDataLocalById(Long id)
+    {
+        return devTowerDataLocalMapper.deleteDevTowerDataLocalById(id);
+    }
+}
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataRoundServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataRoundServiceImpl.java
new file mode 100644
index 00000000..049b9109
--- /dev/null
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataRoundServiceImpl.java
@@ -0,0 +1,98 @@
+package com.yanzhu.manage.service.impl;
+
+import com.yanzhu.common.core.utils.DateUtils;
+import com.yanzhu.device.domain.DevTowerDataRound;
+import com.yanzhu.device.mapper.DevTowerDataRoundMapper;
+import com.yanzhu.manage.service.IDevTowerDataRoundService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+/**
+ * 塔机工作循环Service业务层处理
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+@Service
+public class DevTowerDataRoundServiceImpl implements IDevTowerDataRoundService
+{
+    @Autowired
+    private DevTowerDataRoundMapper devTowerDataRoundMapper;
+
+    /**
+     * 查询塔机工作循环
+     * 
+     * @param id 塔机工作循环主键
+     * @return 塔机工作循环
+     */
+    @Override
+    public DevTowerDataRound selectDevTowerDataRoundById(Long id)
+    {
+        return devTowerDataRoundMapper.selectDevTowerDataRoundById(id);
+    }
+
+    /**
+     * 查询塔机工作循环列表
+     * 
+     * @param devTowerDataRound 塔机工作循环
+     * @return 塔机工作循环
+     */
+    @Override
+    public List<DevTowerDataRound> selectDevTowerDataRoundList(DevTowerDataRound devTowerDataRound)
+    {
+        return devTowerDataRoundMapper.selectDevTowerDataRoundList(devTowerDataRound);
+    }
+
+    /**
+     * 新增塔机工作循环
+     * 
+     * @param devTowerDataRound 塔机工作循环
+     * @return 结果
+     */
+    @Override
+    public int insertDevTowerDataRound(DevTowerDataRound devTowerDataRound)
+    {
+        //devTowerDataRound.setCreateBy(SecurityUtils.getUsername());
+        devTowerDataRound.setCreateTime(DateUtils.getNowDate());
+        return devTowerDataRoundMapper.insertDevTowerDataRound(devTowerDataRound);
+    }
+
+    /**
+     * 修改塔机工作循环
+     * 
+     * @param devTowerDataRound 塔机工作循环
+     * @return 结果
+     */
+    @Override
+    public int updateDevTowerDataRound(DevTowerDataRound devTowerDataRound)
+    {
+        //devTowerDataRound.setUpdateBy(SecurityUtils.getUsername());
+        devTowerDataRound.setUpdateTime(DateUtils.getNowDate());
+        return devTowerDataRoundMapper.updateDevTowerDataRound(devTowerDataRound);
+    }
+
+    /**
+     * 批量删除塔机工作循环
+     * 
+     * @param ids 需要删除的塔机工作循环主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDevTowerDataRoundByIds(Long[] ids)
+    {
+        return devTowerDataRoundMapper.deleteDevTowerDataRoundByIds(ids);
+    }
+
+    /**
+     * 删除塔机工作循环信息
+     * 
+     * @param id 塔机工作循环主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDevTowerDataRoundById(Long id)
+    {
+        return devTowerDataRoundMapper.deleteDevTowerDataRoundById(id);
+    }
+}
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataRunServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataRunServiceImpl.java
new file mode 100644
index 00000000..cb95a66e
--- /dev/null
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataRunServiceImpl.java
@@ -0,0 +1,165 @@
+package com.yanzhu.manage.service.impl;
+
+import com.yanzhu.common.core.utils.DateUtils;
+import com.yanzhu.device.domain.DevTowerDataRound;
+import com.yanzhu.device.domain.DevTowerDataRun;
+import com.yanzhu.device.mapper.DevTowerDataCollideMapper;
+import com.yanzhu.device.mapper.DevTowerDataRoundMapper;
+import com.yanzhu.device.mapper.DevTowerDataRunMapper;
+import com.yanzhu.manage.service.IDevTowerDataRunService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 塔机实时数据Service业务层处理
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+@Service
+public class DevTowerDataRunServiceImpl implements IDevTowerDataRunService
+{
+    @Autowired
+    private DevTowerDataRunMapper devTowerDataRunMapper;
+
+    @Autowired
+    private DevTowerDataRoundMapper devTowerDataRoundMapper;
+
+    @Autowired
+    private DevTowerDataCollideMapper devTowerDataCollideMapper;
+
+    /**
+     * 查询塔机实时数据
+     * 
+     * @param id 塔机实时数据主键
+     * @return 塔机实时数据
+     */
+    @Override
+    public DevTowerDataRun selectDevTowerDataRunById(Long id)
+    {
+        return devTowerDataRunMapper.selectDevTowerDataRunById(id);
+    }
+
+    /**
+     * 查询塔机实时数据列表
+     * 
+     * @param devTowerDataRun 塔机实时数据
+     * @return 塔机实时数据
+     */
+    @Override
+    public List<DevTowerDataRun> selectDevTowerDataRunList(DevTowerDataRun devTowerDataRun)
+    {
+        return devTowerDataRunMapper.selectDevTowerDataRunList(devTowerDataRun);
+    }
+
+    /**
+     * 新增塔机实时数据
+     * 
+     * @param devTowerDataRun 塔机实时数据
+     * @return 结果
+     */
+    @Override
+    public int insertDevTowerDataRun(DevTowerDataRun devTowerDataRun)
+    {
+        //devTowerDataRun.setCreateBy(SecurityUtils.getUsername());
+        devTowerDataRun.setCreateTime(DateUtils.getNowDate());
+        return devTowerDataRunMapper.insertDevTowerDataRun(devTowerDataRun);
+    }
+
+    /**
+     * 修改塔机实时数据
+     * 
+     * @param devTowerDataRun 塔机实时数据
+     * @return 结果
+     */
+    @Override
+    public int updateDevTowerDataRun(DevTowerDataRun devTowerDataRun)
+    {
+        //devTowerDataRun.setUpdateBy(SecurityUtils.getUsername());
+        devTowerDataRun.setUpdateTime(DateUtils.getNowDate());
+        return devTowerDataRunMapper.updateDevTowerDataRun(devTowerDataRun);
+    }
+
+    /**
+     * 批量删除塔机实时数据
+     * 
+     * @param ids 需要删除的塔机实时数据主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDevTowerDataRunByIds(Long[] ids)
+    {
+        return devTowerDataRunMapper.deleteDevTowerDataRunByIds(ids);
+    }
+
+    /**
+     * 删除塔机实时数据信息
+     * 
+     * @param id 塔机实时数据主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDevTowerDataRunById(Long id)
+    {
+        return devTowerDataRunMapper.deleteDevTowerDataRunById(id);
+    }
+
+    /**
+     * 查询塔机运行数据
+     * @return
+     */
+    @Override
+    public Map<String, Object> findtowerStatisticsView(String deviceSn){
+        Map<String, Object> dataMap = new HashMap<>();
+        DevTowerDataRound devTowerDataRound = new DevTowerDataRound();
+        devTowerDataRound.setDeviceKey(deviceSn);
+        int a0 = devTowerDataRoundMapper.findRoundCountByDeviceKey(devTowerDataRound);
+        dataMap.put("a0",a0);
+        devTowerDataRound.setActiveName("cz");
+        int b0 = devTowerDataRoundMapper.findRoundCountByDeviceKey(devTowerDataRound);
+        dataMap.put("b0",b0);
+        devTowerDataRound.setActiveName("gj");
+        int c0 = devTowerDataRunMapper.findRunCountByDeviceKey(devTowerDataRound);
+        //int d0 = devTowerDataRoundMapper.findRoundCountByDeviceKey(devTowerDataRound);
+        //int e0 = devTowerDataCollideMapper.findCollideCountByDeviceKey(devTowerDataRound);
+        dataMap.put("c0",c0);
+        Calendar cale = Calendar.getInstance();
+        // 获取当月第一天和最后一天
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        // 第一天
+        String firstDay = "";
+        cale = Calendar.getInstance();
+        cale.add(Calendar.MONTH, 0);
+        cale.set(Calendar.DAY_OF_MONTH, 1);
+        firstDay = format.format(cale.getTime());
+        // 最后一天
+        String lastDay = "";
+        cale = Calendar.getInstance();
+        cale.add(Calendar.MONTH, 1);
+        cale.set(Calendar.DAY_OF_MONTH, 0);
+        lastDay = format.format(cale.getTime());
+        Map<String, Object> params = new HashMap<>();
+        params.put("beginCreateTime",firstDay);
+        params.put("endCreateTime",lastDay);
+        devTowerDataRound.setParams(params);
+        int a1 = devTowerDataRoundMapper.findRoundCountByDeviceKey(devTowerDataRound);
+        dataMap.put("a1",a1);
+        devTowerDataRound.setActiveName("cz");
+        int b1 = devTowerDataRoundMapper.findRoundCountByDeviceKey(devTowerDataRound);
+        dataMap.put("b1",b1);
+        devTowerDataRound.setActiveName("gj");
+        int c1 = devTowerDataRunMapper.findRunCountByDeviceKey(devTowerDataRound);
+        //int d1 = devTowerDataRoundMapper.findRoundCountByDeviceKey(devTowerDataRound);
+        //int e1 = devTowerDataCollideMapper.findCollideCountByDeviceKey(devTowerDataRound);
+        dataMap.put("c1",c1);
+        return dataMap;
+    }
+
+
+}
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataWarningServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataWarningServiceImpl.java
new file mode 100644
index 00000000..be5e353b
--- /dev/null
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataWarningServiceImpl.java
@@ -0,0 +1,98 @@
+package com.yanzhu.manage.service.impl;
+
+import com.yanzhu.common.core.utils.DateUtils;
+import com.yanzhu.device.domain.DevTowerDataWarning;
+import com.yanzhu.device.mapper.DevTowerDataWarningMapper;
+import com.yanzhu.manage.service.IDevTowerDataWarningService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+/**
+ * 塔机预警管理Service业务层处理
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+@Service
+public class DevTowerDataWarningServiceImpl implements IDevTowerDataWarningService
+{
+    @Autowired
+    private DevTowerDataWarningMapper devTowerDataWarningMapper;
+
+    /**
+     * 查询塔机预警管理
+     * 
+     * @param id 塔机预警管理主键
+     * @return 塔机预警管理
+     */
+    @Override
+    public DevTowerDataWarning selectDevTowerDataWarningById(Long id)
+    {
+        return devTowerDataWarningMapper.selectDevTowerDataWarningById(id);
+    }
+
+    /**
+     * 查询塔机预警管理列表
+     * 
+     * @param devTowerDataWarning 塔机预警管理
+     * @return 塔机预警管理
+     */
+    @Override
+    public List<DevTowerDataWarning> selectDevTowerDataWarningList(DevTowerDataWarning devTowerDataWarning)
+    {
+        return devTowerDataWarningMapper.selectDevTowerDataWarningList(devTowerDataWarning);
+    }
+
+    /**
+     * 新增塔机预警管理
+     * 
+     * @param devTowerDataWarning 塔机预警管理
+     * @return 结果
+     */
+    @Override
+    public int insertDevTowerDataWarning(DevTowerDataWarning devTowerDataWarning)
+    {
+        //devTowerDataWarning.setCreateBy(SecurityUtils.getUsername());
+        devTowerDataWarning.setCreateTime(DateUtils.getNowDate());
+        return devTowerDataWarningMapper.insertDevTowerDataWarning(devTowerDataWarning);
+    }
+
+    /**
+     * 修改塔机预警管理
+     * 
+     * @param devTowerDataWarning 塔机预警管理
+     * @return 结果
+     */
+    @Override
+    public int updateDevTowerDataWarning(DevTowerDataWarning devTowerDataWarning)
+    {
+        //devTowerDataWarning.setUpdateBy(SecurityUtils.getUsername());
+        devTowerDataWarning.setUpdateTime(DateUtils.getNowDate());
+        return devTowerDataWarningMapper.updateDevTowerDataWarning(devTowerDataWarning);
+    }
+
+    /**
+     * 批量删除塔机预警管理
+     * 
+     * @param ids 需要删除的塔机预警管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDevTowerDataWarningByIds(Long[] ids)
+    {
+        return devTowerDataWarningMapper.deleteDevTowerDataWarningByIds(ids);
+    }
+
+    /**
+     * 删除塔机预警管理信息
+     * 
+     * @param id 塔机预警管理主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDevTowerDataWarningById(Long id)
+    {
+        return devTowerDataWarningMapper.deleteDevTowerDataWarningById(id);
+    }
+}
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerProjectConfigServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerProjectConfigServiceImpl.java
new file mode 100644
index 00000000..1f2ba9c4
--- /dev/null
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerProjectConfigServiceImpl.java
@@ -0,0 +1,169 @@
+package com.yanzhu.manage.service.impl;
+
+import com.yanzhu.common.core.utils.DateUtils;
+import com.yanzhu.common.redis.service.RedisService;
+import com.yanzhu.common.security.utils.SecurityUtils;
+import com.yanzhu.device.domain.DevTowerProjectConfig;
+import com.yanzhu.device.mapper.DevTowerProjectConfigMapper;
+import com.yanzhu.manage.service.IDevTowerProjectConfigService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PostConstruct;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 塔基检测配置Service业务层处理
+ * 
+ * @author JiangYuQi
+ * @date 2024-08-04
+ */
+@Service
+public class DevTowerProjectConfigServiceImpl implements IDevTowerProjectConfigService
+{
+    public static final String YANZHU_DEVICE_TOWER = "device.tower_cfg:";
+    @Autowired
+    private RedisService redisService;
+
+    @Autowired
+    private DevTowerProjectConfigMapper devTowerProjectConfigMapper;
+
+    /**
+     * 项目启动时，初始化塔吊检测配置到缓存
+     */
+    @PostConstruct
+    public void init()
+    {
+        loadingDevTowerProjectConfigCache();
+    }
+
+    /**
+     * 加载注册应用
+     */
+    @Override
+    public void loadingDevTowerProjectConfigCache()
+    {
+        this.clearConfigCache();
+        List<DevTowerProjectConfig> configList = devTowerProjectConfigMapper.selectDevTowerProjectConfigList(new DevTowerProjectConfig());
+        if(CollectionUtils.isNotEmpty(configList)){
+            for (DevTowerProjectConfig config : configList) {
+                redisService.setCacheObject(YANZHU_DEVICE_TOWER + config.getDeviceSn(), config);
+            }
+        }
+    }
+
+    private void clearConfigCache()
+    {
+        Collection<String> keys = redisService.keys(YANZHU_DEVICE_TOWER + "*");
+        redisService.deleteObject(keys);
+    }
+
+    /**
+     * 查询塔基检测配置
+     * 
+     * @param id 塔基检测配置主键
+     * @return 塔基检测配置
+     */
+    @Override
+    public DevTowerProjectConfig selectDevTowerProjectConfigById(Long id)
+    {
+        return devTowerProjectConfigMapper.selectDevTowerProjectConfigById(id);
+    }
+
+    /**
+     * 查询塔基检测配置列表
+     * 
+     * @param devTowerProjectConfig 塔基检测配置
+     * @return 塔基检测配置
+     */
+    @Override
+    public List<DevTowerProjectConfig> selectDevTowerProjectConfigList(DevTowerProjectConfig devTowerProjectConfig)
+    {
+        return devTowerProjectConfigMapper.selectDevTowerProjectConfigList(devTowerProjectConfig);
+    }
+
+    /**
+     * 新增塔基检测配置
+     * 
+     * @param devTowerProjectConfig 塔基检测配置
+     * @return 结果
+     */
+    @Override
+    public int insertDevTowerProjectConfig(DevTowerProjectConfig devTowerProjectConfig)
+    {
+        devTowerProjectConfig.setCreateBy(SecurityUtils.getUsername());
+        devTowerProjectConfig.setCreateTime(DateUtils.getNowDate());
+        int res = devTowerProjectConfigMapper.insertDevTowerProjectConfig(devTowerProjectConfig);
+        this.loadingDevTowerProjectConfigCache();
+        return res;
+    }
+
+    /**
+     * 修改塔基检测配置
+     * 
+     * @param devTowerProjectConfig 塔基检测配置
+     * @return 结果
+     */
+    @Override
+    public int updateDevTowerProjectConfig(DevTowerProjectConfig devTowerProjectConfig)
+    {
+        devTowerProjectConfig.setUpdateBy(SecurityUtils.getUsername());
+        devTowerProjectConfig.setUpdateTime(DateUtils.getNowDate());
+        int res = devTowerProjectConfigMapper.updateDevTowerProjectConfig(devTowerProjectConfig);
+        this.loadingDevTowerProjectConfigCache();
+        return res;
+    }
+
+    /**
+     * 修改塔基检测配置
+     *
+     * @param devTowerProjectConfig 塔基检测配置
+     * @return 结果
+     */
+    @Override
+    public int updateDevTowerProjectConfigNoCache(DevTowerProjectConfig devTowerProjectConfig)
+    {
+        devTowerProjectConfig.setUpdateTime(DateUtils.getNowDate());
+        return devTowerProjectConfigMapper.updateDevTowerProjectConfig(devTowerProjectConfig);
+    }
+
+    /**
+     * 批量删除塔基检测配置
+     * 
+     * @param ids 需要删除的塔基检测配置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDevTowerProjectConfigByIds(Long[] ids)
+    {
+        int res = devTowerProjectConfigMapper.deleteDevTowerProjectConfigByIds(ids);
+        this.loadingDevTowerProjectConfigCache();
+        return res;
+    }
+
+    /**
+     * 删除塔基检测配置信息
+     * 
+     * @param id 塔基检测配置主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDevTowerProjectConfigById(Long id)
+    {
+        int res = devTowerProjectConfigMapper.deleteDevTowerProjectConfigById(id);
+        this.loadingDevTowerProjectConfigCache();
+        return res;
+    }
+
+    /**
+     * 根据设备状态统计设备
+     * @param devTowerProjectConfig
+     * @return
+     */
+    public List<Map<String, Object>> findtowerConfigGroupOnline(DevTowerProjectConfig devTowerProjectConfig){
+        return devTowerProjectConfigMapper.findtowerConfigGroupOnline(devTowerProjectConfig);
+    }
+}
diff --git a/yanzhu-ui-vue3/src/api/device/towerDataRun.js b/yanzhu-ui-vue3/src/api/device/towerDataRun.js
new file mode 100644
index 00000000..b4bd5ce2
--- /dev/null
+++ b/yanzhu-ui-vue3/src/api/device/towerDataRun.js
@@ -0,0 +1,44 @@
+import request from "@/utils/request";
+
+// 查询塔机实时数据列表
+export function listTowerDataRun(query) {
+  return request({
+    url: "/manage/device/towerDataRun/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查询塔机实时数据详细
+export function getTowerDataRun(id) {
+  return request({
+    url: "/manage/device/towerDataRun/" + id,
+    method: "get",
+  });
+}
+
+// 新增塔机实时数据
+export function addTowerDataRun(data) {
+  return request({
+    url: "/manage/device/towerDataRun",
+    method: "post",
+    data: data,
+  });
+}
+
+// 修改塔机实时数据
+export function updateTowerDataRun(data) {
+  return request({
+    url: "/manage/device/towerDataRun",
+    method: "put",
+    data: data,
+  });
+}
+
+// 删除塔机实时数据
+export function delTowerDataRun(id) {
+  return request({
+    url: "/manage/device/towerDataRun/" + id,
+    method: "delete",
+  });
+}
diff --git a/yanzhu-ui-vue3/src/api/device/towerProjectConfig.js b/yanzhu-ui-vue3/src/api/device/towerProjectConfig.js
new file mode 100644
index 00000000..39fd62d5
--- /dev/null
+++ b/yanzhu-ui-vue3/src/api/device/towerProjectConfig.js
@@ -0,0 +1,44 @@
+import request from "@/utils/request";
+
+// 查询塔基检测配置列表
+export function listTowerProjectConfig(query) {
+  return request({
+    url: "/manage/device/towerProjectConfig/list",
+    method: "get",
+    params: query,
+  });
+}
+
+// 查询塔基检测配置详细
+export function getTowerProjectConfig(id) {
+  return request({
+    url: "/manage/device/towerProjectConfig/" + id,
+    method: "get",
+  });
+}
+
+// 新增塔基检测配置
+export function addTowerProjectConfig(data) {
+  return request({
+    url: "/manage/device/towerProjectConfig",
+    method: "post",
+    data: data,
+  });
+}
+
+// 修改塔基检测配置
+export function updateTowerProjectConfig(data) {
+  return request({
+    url: "/manage/device/towerProjectConfig",
+    method: "put",
+    data: data,
+  });
+}
+
+// 删除塔基检测配置
+export function delTowerProjectConfig(id) {
+  return request({
+    url: "/manage/device/towerProjectConfig/" + id,
+    method: "delete",
+  });
+}
diff --git a/yanzhu-ui-vue3/src/layout/components/AppMain.vue b/yanzhu-ui-vue3/src/layout/components/AppMain.vue
index 42fffdf7..f7279b71 100644
--- a/yanzhu-ui-vue3/src/layout/components/AppMain.vue
+++ b/yanzhu-ui-vue3/src/layout/components/AppMain.vue
@@ -1,9 +1,9 @@
 <template>
   <section class="app-main">
     <router-view v-slot="{ Component, route }">
-      <transition name="fade-transform" mode="out-in">
+      <transition name="fade-transform">
         <keep-alive :include="tagsViewStore.cachedViews">
-          <component v-if="!route.meta.link" :is="Component" :key="route.path"/>
+          <component v-if="!route.meta.link" :is="Component" :key="route.path" />
         </keep-alive>
       </transition>
     </router-view>
@@ -27,7 +27,7 @@ const tagsViewStore = useTagsViewStore()
   overflow: hidden;
 }
 
-.fixed-header + .app-main {
+.fixed-header+.app-main {
   padding-top: 50px;
 }
 
@@ -37,7 +37,7 @@ const tagsViewStore = useTagsViewStore()
     min-height: calc(100vh - 84px);
   }
 
-  .fixed-header + .app-main {
+  .fixed-header+.app-main {
     padding-top: 84px;
   }
 }
@@ -65,4 +65,3 @@ const tagsViewStore = useTagsViewStore()
   border-radius: 3px;
 }
 </style>
-
diff --git a/yanzhu-ui-vue3/src/layout/components/IframeToggle/index.vue b/yanzhu-ui-vue3/src/layout/components/IframeToggle/index.vue
index 2e07fe88..b94d6213 100644
--- a/yanzhu-ui-vue3/src/layout/components/IframeToggle/index.vue
+++ b/yanzhu-ui-vue3/src/layout/components/IframeToggle/index.vue
@@ -1,12 +1,7 @@
 <template>
-  <transition-group name="fade-transform" mode="out-in">
-    <inner-link
-      v-for="(item, index) in tagsViewStore.iframeViews"
-      :key="item.path"
-      :iframeId="'iframe' + index"
-      v-show="route.path === item.path"
-      :src="item.meta.link"
-    ></inner-link>
+  <transition-group name="fade-transform">
+    <inner-link v-for="(item, index) in tagsViewStore.iframeViews" :key="item.path" :iframeId="'iframe' + index"
+      v-show="route.path === item.path" :src="item.meta.link"></inner-link>
   </transition-group>
 </template>
 
diff --git a/yanzhu-ui-vue3/src/views/device/towerDataCollide/index.vue b/yanzhu-ui-vue3/src/views/device/towerDataCollide/index.vue
new file mode 100644
index 00000000..8e45bac1
--- /dev/null
+++ b/yanzhu-ui-vue3/src/views/device/towerDataCollide/index.vue
@@ -0,0 +1,15 @@
+<template>
+    <div class="app-container tower-data-collide">
+        222222
+    </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+.tower-data-collide {}
+</style>
\ No newline at end of file
diff --git a/yanzhu-ui-vue3/src/views/device/towerDataLimit/index.vue b/yanzhu-ui-vue3/src/views/device/towerDataLimit/index.vue
new file mode 100644
index 00000000..02a637de
--- /dev/null
+++ b/yanzhu-ui-vue3/src/views/device/towerDataLimit/index.vue
@@ -0,0 +1,15 @@
+<template>
+    <div class="app-container tower-data-limit">
+        222222
+    </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+.tower-data-limit {}
+</style>
\ No newline at end of file
diff --git a/yanzhu-ui-vue3/src/views/device/towerDataLocal/index.vue b/yanzhu-ui-vue3/src/views/device/towerDataLocal/index.vue
new file mode 100644
index 00000000..5728a514
--- /dev/null
+++ b/yanzhu-ui-vue3/src/views/device/towerDataLocal/index.vue
@@ -0,0 +1,15 @@
+<template>
+    <div class="app-container tower-data-local">
+        222222
+    </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+.tower-data-local {}
+</style>
\ No newline at end of file
diff --git a/yanzhu-ui-vue3/src/views/device/towerDataRound/index.vue b/yanzhu-ui-vue3/src/views/device/towerDataRound/index.vue
new file mode 100644
index 00000000..5a728fc3
--- /dev/null
+++ b/yanzhu-ui-vue3/src/views/device/towerDataRound/index.vue
@@ -0,0 +1,15 @@
+<template>
+    <div class="app-container tower-data-round">
+        222222
+    </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+.tower-data-round {}
+</style>
\ No newline at end of file
diff --git a/yanzhu-ui-vue3/src/views/device/towerDataRun/index.vue b/yanzhu-ui-vue3/src/views/device/towerDataRun/index.vue
new file mode 100644
index 00000000..c62ace6a
--- /dev/null
+++ b/yanzhu-ui-vue3/src/views/device/towerDataRun/index.vue
@@ -0,0 +1,434 @@
+<template>
+    <div class="app-container tower-data-run">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+            label-width="68px">
+            <el-form-item label="项目名称" prop="projectId">
+                <el-select v-model="queryParams.projectId" :disabled="currentPrjId ? true : false" filterable
+                    placeholder="请选择所属项目" style="width: 240px">
+                    <el-option v-for="item in projects" :key="item.id" :label="item.projectName" :value="item.id">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="创建时间">
+                <el-date-picker v-model="daterangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
+                    type="daterange" range-separator="-" start-placeholder="开始日期"
+                    end-placeholder="结束日期"></el-date-picker>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button type="danger" plain icon="el-icon-delete" size="small" :disabled="multiple"
+                    @click="handleDelete" v-hasPermi="['device:towerDataRun:remove']">删除</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="warning" plain icon="Download" size="small" @click="handleExport"
+                    v-hasPermi="['device:towerDataRun:export']">导出</el-button>
+            </el-col>
+            <right-toolbar :showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+        <el-row>
+            <el-alert title="温馨提示：" type="warning" description="塔基监测实时数据只保留最近15天数据,历史数据永久性删除且不可找回！！！" show-icon>
+            </el-alert>
+        </el-row>
+
+        <el-table v-loading="loading" :data="towerDataRunList" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column label="项目名称" align="center" prop="projectName" width="200"
+                v-if="currentPrjId ? false : true" />
+            <el-table-column label="设备序列号" align="center" prop="deviceKey" width="200" />
+            <el-table-column label="警报信息" align="center" prop="warnings" width="200">
+                <template #default="scope">
+                    <div class="tag-group">
+                        <dict-tag :options="dict.device_tower_warning"
+                            :value="scope.row.warnings ? scope.row.warnings.split(',') : '0'" />
+                    </div>
+                </template>
+            </el-table-column>
+            <el-table-column label="当前高度" align="center" prop="height" width="100" />
+            <el-table-column label="当前幅度" align="center" prop="range" width="100" />
+            <el-table-column label="回转" align="center" prop="rotation" width="80" />
+            <el-table-column label="当前吊重" align="center" prop="load" width="100" />
+            <el-table-column label="风速" align="center" prop="windSpeed" width="80" />
+            <el-table-column label="水平倾角" align="center" prop="leanAngleX" width="100" />
+            <el-table-column label="垂直倾角" align="center" prop="leanAngleY" width="100" />
+            <el-table-column label="重量百分比" align="center" prop="loadPercent" width="120" />
+            <el-table-column label="力矩百分比" align="center" prop="momentPercent" width="120" />
+            <el-table-column label="风速等级" align="center" prop="windSpeedPercent" width="100" />
+            <el-table-column label="倾斜百分比" align="center" prop="leanAnglePercent" width="120" />
+            <el-table-column label="倍率" align="center" prop="rate" width="100" />
+            <el-table-column label="回转传感器状态" align="center" prop="rotationSensorState" width="160">
+                <template #default="scope">
+                    <dict-tag :options="dict.device_rotation_state" :value="scope.row.rotationSensorState" />
+                </template>
+            </el-table-column>
+            <el-table-column label="重量传感器状态" align="center" prop="loadSensorState" width="160">
+                <template #default="scope">
+                    <dict-tag :options="dict.device_rotation_state" :value="scope.row.loadSensorState" />
+                </template>
+            </el-table-column>
+            <el-table-column label="风速传感器状态" align="center" prop="windSpeedSensorState" width="160">
+                <template #default="scope">
+                    <dict-tag :options="dict.device_rotation_state" :value="scope.row.windSpeedSensorState" />
+                </template>
+            </el-table-column>
+            <el-table-column label="倾角传感器状态" align="center" prop="leanAngleSensorState" width="160">
+                <template #default="scope">
+                    <dict-tag :options="dict.device_rotation_state" :value="scope.row.leanAngleSensorState" />
+                </template>
+            </el-table-column>
+            <el-table-column label="幅度传感器状态" align="center" prop="rangeSensorState" width="160">
+                <template #default="scope">
+                    <dict-tag :options="dict.device_rotation_state" :value="scope.row.rangeSensorState" />
+                </template>
+            </el-table-column>
+            <el-table-column label="高度传感器状态" align="center" prop="heightSensorState" width="160">
+                <template #default="scope">
+                    <dict-tag :options="dict.device_rotation_state" :value="scope.row.heightSensorState" />
+                </template>
+            </el-table-column>
+            <el-table-column label="控制状态" align="center" prop="brakingStatus" width="100">
+                <template #default="scope">
+                    <dict-tag :options="dict.device_braking_status" :value="scope.row.brakingStatus" />
+                </template>
+            </el-table-column>
+            <el-table-column label="是否有效" align="center" prop="isDel" width="100">
+                <template #default="scope">
+                    <dict-tag :options="dict.sys_common_isdel" :value="scope.row.isDel" />
+                </template>
+            </el-table-column>
+            <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+                <template #default="scope">
+                    <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100" fixed="right">
+                <template #default="scope">
+                    <el-button size="small" text icon="el-icon-delete" @click="handleDelete(scope.row)"
+                        v-hasPermi="['device:towerDataRun:remove']">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+        <!-- 添加或修改塔机实时数据对话框 -->
+        <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+            <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+                <el-form-item label="项目主键" prop="projectId">
+                    <el-input v-model="form.projectId" placeholder="请输入项目主键" />
+                </el-form-item>
+                <el-form-item label="总包单位主键" prop="deptId">
+                    <el-input v-model="form.deptId" placeholder="请输入总包单位主键" />
+                </el-form-item>
+                <el-form-item label="设备序列号" prop="deviceKey">
+                    <el-input v-model="form.deviceKey" placeholder="请输入设备序列号" />
+                </el-form-item>
+                <el-form-item label="设备来源" prop="deviceSource">
+                    <el-input v-model="form.deviceSource" placeholder="请输入设备来源" />
+                </el-form-item>
+                <el-form-item label="当前高度" prop="height">
+                    <el-input v-model="form.height" placeholder="请输入当前高度" />
+                </el-form-item>
+                <el-form-item label="当前幅度" prop="range">
+                    <el-input v-model="form.range" placeholder="请输入当前幅度" />
+                </el-form-item>
+                <el-form-item label="回转" prop="rotation">
+                    <el-input v-model="form.rotation" placeholder="请输入回转" />
+                </el-form-item>
+                <el-form-item label="当前吊重" prop="load">
+                    <el-input v-model="form.load" placeholder="请输入当前吊重" />
+                </el-form-item>
+                <el-form-item label="风速" prop="windSpeed">
+                    <el-input v-model="form.windSpeed" placeholder="请输入风速" />
+                </el-form-item>
+                <el-form-item label="水平倾角" prop="leanAngleX">
+                    <el-input v-model="form.leanAngleX" placeholder="请输入水平倾角" />
+                </el-form-item>
+                <el-form-item label="垂直倾角" prop="leanAngleY">
+                    <el-input v-model="form.leanAngleY" placeholder="请输入垂直倾角" />
+                </el-form-item>
+                <el-form-item label="重量百分比" prop="loadPercent">
+                    <el-input v-model="form.loadPercent" placeholder="请输入重量百分比" />
+                </el-form-item>
+                <el-form-item label="力矩百分比" prop="momentPercent">
+                    <el-input v-model="form.momentPercent" placeholder="请输入力矩百分比" />
+                </el-form-item>
+                <el-form-item label="风速等级" prop="windSpeedPercent">
+                    <el-input v-model="form.windSpeedPercent" placeholder="请输入风速等级" />
+                </el-form-item>
+                <el-form-item label="倾斜百分比" prop="leanAnglePercent">
+                    <el-input v-model="form.leanAnglePercent" placeholder="请输入倾斜百分比" />
+                </el-form-item>
+                <el-form-item label="警报信息" prop="warnings">
+                    <el-input v-model="form.warnings" placeholder="请输入警报信息" />
+                </el-form-item>
+                <el-form-item label="倍率" prop="rate">
+                    <el-input v-model="form.rate" placeholder="请输入倍率" />
+                </el-form-item>
+                <el-form-item label="回转传感器状态" prop="rotationSensorState">
+                    <el-input v-model="form.rotationSensorState" placeholder="请输入回转传感器状态" />
+                </el-form-item>
+                <el-form-item label="重量传感器状态" prop="loadSensorState">
+                    <el-input v-model="form.loadSensorState" placeholder="请输入重量传感器状态" />
+                </el-form-item>
+                <el-form-item label="风速传感器状态" prop="windSpeedSensorState">
+                    <el-input v-model="form.windSpeedSensorState" placeholder="请输入风速传感器状态" />
+                </el-form-item>
+                <el-form-item label="倾角传感器状态" prop="leanAngleSensorState">
+                    <el-input v-model="form.leanAngleSensorState" placeholder="请输入倾角传感器状态" />
+                </el-form-item>
+                <el-form-item label="幅度传感器状态" prop="rangeSensorState">
+                    <el-input v-model="form.rangeSensorState" placeholder="请输入幅度传感器状态" />
+                </el-form-item>
+                <el-form-item label="高度传感器状态" prop="heightSensorState">
+                    <el-input v-model="form.heightSensorState" placeholder="请输入高度传感器状态" />
+                </el-form-item>
+                <el-form-item label="时间戳" prop="timeLongs">
+                    <el-input v-model="form.timeLongs" placeholder="请输入时间戳" />
+                </el-form-item>
+                <el-form-item label="是否有效" prop="isDel">
+                    <el-select v-model="form.isDel" placeholder="请选择是否有效">
+                        <el-option v-for="dict in dict.sys_common_isdel" :key="dict.value" :label="dict.label"
+                            :value="parseInt(dict.value)"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item label="备注" prop="remark">
+                    <el-input v-model="form.remark" placeholder="请输入备注" />
+                </el-form-item>
+            </el-form>
+            <div slot-slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import {
+    listTowerDataRun,
+    getTowerDataRun,
+    delTowerDataRun,
+    addTowerDataRun,
+    updateTowerDataRun,
+} from "@/api/device/towerDataRun";
+import useUserStore from '@/store/modules/user'
+import { findMyProjectList } from "@/api/publics";
+export default {
+    name: "TowerDataRun", data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 塔机实时数据表格数据
+            towerDataRunList: [],
+            // 弹出层标题
+            title: "",
+            // 是否显示弹出层
+            open: false,
+            // 备注时间范围
+            daterangeCreateTime: [],
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                projectId: null,
+                projectName: null,
+                deptId: null,
+                deptName: null,
+                deviceKey: null,
+                deviceSource: null,
+                createTime: null,
+            },
+            // 表单参数
+            form: {},
+            // 表单校验
+            rules: {},
+            projectOptions: [],
+            dict: {
+                sys_common_isdel: [],
+                device_tower_warning: [],
+                device_braking_status: [],
+                device_rotation_state: []
+            },
+            userStore: {},
+            isAdmin: false,
+            projects: [],
+            currentPrjId: null,
+
+        };
+    },
+    created() {
+        this.dict = this.useDict('sys_common_isdel', 'device_tower_warning', 'device_braking_status', 'device_rotation_state');
+        this.userStore = useUserStore()
+        this.isAdmin = this.userStore.isAdmin;
+        this.queryParams.projectId = this.userStore.currentPrjId;
+        this.queryParams.comId = this.userStore.currentComId;
+        this.currentPrjId = this.userStore.currentPrjId;
+        this.getList();
+        this.getProjectList();
+    },
+    methods: {
+        /** 查询项目列表 */
+        getProjectList() {
+            findMyProjectList({ pageNum: 1, pageSize: 100 }).then(response => {
+                this.projects = response.rows;
+            });
+        },
+
+        /** 查询塔机实时数据列表 */
+        getList() {
+            this.loading = true;
+            this.queryParams.params = {};
+            if (null != this.daterangeCreateTime && "" != this.daterangeCreateTime) {
+                this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
+                this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
+            }
+            listTowerDataRun(this.queryParams).then((response) => {
+                this.towerDataRunList = response.rows;
+                this.total = response.total;
+                this.loading = false;
+            });
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false;
+            this.reset();
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                id: null,
+                projectId: null,
+                deptId: null,
+                deviceKey: null,
+                deviceSource: null,
+                height: null,
+                range: null,
+                rotation: null,
+                load: null,
+                windSpeed: null,
+                leanAngleX: null,
+                leanAngleY: null,
+                loadPercent: null,
+                momentPercent: null,
+                windSpeedPercent: null,
+                leanAnglePercent: null,
+                warnings: null,
+                rate: null,
+                rotationSensorState: null,
+                loadSensorState: null,
+                windSpeedSensorState: null,
+                leanAngleSensorState: null,
+                rangeSensorState: null,
+                heightSensorState: null,
+                brakingStatus: null,
+                timeLongs: null,
+                isDel: null,
+                createBy: null,
+                createTime: null,
+                updateBy: null,
+                updateTime: null,
+                remark: null,
+            };
+            this.resetForm("form");
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.daterangeCreateTime = [];
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map((item) => item.id);
+            this.single = selection.length !== 1;
+            this.multiple = !selection.length;
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset();
+            this.open = true;
+            this.title = "添加塔机实时数据";
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.reset();
+            const id = row.id || this.ids;
+            getTowerDataRun(id).then((response) => {
+                this.form = response.data;
+                this.open = true;
+                this.title = "修改塔机实时数据";
+            });
+        },
+        /** 提交按钮 */
+        submitForm() {
+            this.$refs["form"].validate((valid) => {
+                if (valid) {
+                    if (this.form.id != null) {
+                        updateTowerDataRun(this.form).then((response) => {
+                            this.$modal.msgSuccess("修改成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    } else {
+                        addTowerDataRun(this.form).then((response) => {
+                            this.$modal.msgSuccess("新增成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    }
+                }
+            });
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const ids = row.id || this.ids;
+            this.$modal
+                .confirm('是否确认删除塔机实时数据编号为"' + ids + '"的数据项？')
+                .then(function () {
+                    return delTowerDataRun(ids);
+                })
+                .then(() => {
+                    this.getList();
+                    this.$modal.msgSuccess("删除成功");
+                })
+                .catch(() => { });
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            this.download(
+                "manage/device/towerDataRun/export",
+                {
+                    ...this.queryParams,
+                },
+                `towerDataRun_${new Date().getTime()}.xlsx`
+            );
+        },
+    },
+};
+</script>
+
+<style lang="scss">
+.tower-data-run {}
+</style>
\ No newline at end of file
diff --git a/yanzhu-ui-vue3/src/views/device/towerDataWarning/index.vue b/yanzhu-ui-vue3/src/views/device/towerDataWarning/index.vue
new file mode 100644
index 00000000..6b9baad4
--- /dev/null
+++ b/yanzhu-ui-vue3/src/views/device/towerDataWarning/index.vue
@@ -0,0 +1,15 @@
+<template>
+    <div class="app-container tower-data-warning">
+        222222
+    </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss">
+.tower-data-warning {}
+</style>
\ No newline at end of file
diff --git a/yanzhu-ui-vue3/src/views/device/towerProjectConfig/index.vue b/yanzhu-ui-vue3/src/views/device/towerProjectConfig/index.vue
new file mode 100644
index 00000000..36b48eff
--- /dev/null
+++ b/yanzhu-ui-vue3/src/views/device/towerProjectConfig/index.vue
@@ -0,0 +1,460 @@
+<template>
+    <div class="app-container tower-project-config">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+            label-width="68px">
+            <el-form-item label="项目名称" prop="projectId">
+                <el-select v-model="queryParams.projectId" :disabled="currentPrjId ? true : false" filterable
+                    placeholder="请选择所属项目" style="width: 200px">
+                    <el-option v-for="item in projects" :key="item.id" :label="item.projectName" :value="item.id">
+                    </el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="设备名称" prop="deviceName">
+                <el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="设备序号" prop="deviceSn">
+                <el-input v-model="queryParams.deviceSn" placeholder="请输入设备序列号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">搜索</el-button>
+                <el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+            <el-col :span="1.5">
+                <el-button type="primary" plain icon="el-icon-plus" size="small" @click="handleAdd"
+                    v-hasPermi="['device:towerProjectConfig:add']">新增</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="success" plain icon="el-icon-edit" size="small" :disabled="single"
+                    @click="handleUpdate" v-hasPermi="['device:towerProjectConfig:edit']">修改</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="danger" plain icon="el-icon-delete" size="small" :disabled="multiple"
+                    @click="handleDelete" v-hasPermi="['device:towerProjectConfig:remove']">删除</el-button>
+            </el-col>
+            <el-col :span="1.5">
+                <el-button type="warning" plain icon="Download" size="small" @click="handleExport"
+                    v-hasPermi="['device:towerProjectConfig:export']">导出</el-button>
+            </el-col>
+            <right-toolbar :showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+        <el-table v-loading="loading" :data="towerProjectConfigList" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column label="项目名称" align="center" prop="projectName" width="150"
+                v-if="currentPrjId ? false : true" />
+            <el-table-column label="设备名称" align="center" prop="deviceName" width="150" />
+            <el-table-column label="设备序号" align="center" prop="deviceSn" width="150" />
+            <el-table-column label="塔机类型" align="center" prop="towerType">
+                <template #default="scope">
+                    <dict-tag :options="dict.device_tower_type" :value="scope.row.towerType" />
+                </template>
+            </el-table-column>
+            <el-table-column label="设备厂商" align="center" prop="deviceSource" />
+            <el-table-column label="塔机坐标x" align="center" prop="coordinateX" width="100" />
+            <el-table-column label="塔机坐标y" align="center" prop="coordinateY" width="100" />
+            <el-table-column label="前臂长度" align="center" prop="frontBrachium" />
+            <el-table-column label="平衡臂长度" align="center" prop="afterBrachium" width="100" />
+            <el-table-column label="塔身高度" align="center" prop="towerBodyHeight" />
+            <el-table-column label="塔帽高度" align="center" prop="towerCapHeight" />
+            <el-table-column label="塔节高度" align="center" prop="towerSectionHeight" />
+            <el-table-column label="司机" align="center">
+                <template #default="scope">
+                    <div>{{ scope.row.driName }}</div>
+                    <div>{{ scope.row.driPhone }}</div>
+                </template>
+            </el-table-column>
+            <el-table-column label="安全员" align="center">
+                <template #default="scope">
+                    <div>{{ scope.row.safName }}</div>
+                    <div>{{ scope.row.safPhone }}</div>
+                </template>
+            </el-table-column>
+            <el-table-column label="塔机状态" align="center" prop="online">
+                <template #default="scope">
+                    <dict-tag :options="dict.project_video_signal_state" :value="scope.row.online" />
+                </template>
+            </el-table-column>
+            <el-table-column label="启用状态" align="center" prop="isDel" width="80">
+                <template #default="scope">
+                    <el-switch v-model="scope.row.isDel" active-value="0" inactive-value="1"
+                        @change="setStatus(scope.row, $event)"></el-switch>
+                </template>
+            </el-table-column>
+            <el-table-column label="更新时间" align="center" prop="updateTime" width="160">
+                <template #default="scope">
+                    <span>{{ parseTime(scope.row.updateTime, "{y}-{m}-{d} {h}:{i}") }}</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100" fixed="right">
+                <template #default="scope">
+                    <el-button size="small" text icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                        v-hasPermi="['device:towerProjectConfig:edit']">修改</el-button>
+
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+        <!-- 添加或修改塔基检测配置对话框 -->
+        <el-dialog :title="title" v-model="open" width="960px" append-to-body>
+            <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="所属项目" prop="projectId">
+                            <el-select v-model="form.projectId" :disabled="currentPrjId ? true : false" filterable
+                                placeholder="请选择所属项目" style="width: 100%">
+                                <el-option v-for="item in projects" :key="item.id" :label="item.projectName"
+                                    :value="item.id">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="设备名称" prop="deviceName">
+                            <el-input v-model="form.deviceName" placeholder="请输入设备名称" maxlength="32" show-word-limit />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="设备序列号" prop="deviceSn">
+                            <el-input v-model="form.deviceSn" placeholder="请输入设备序列号" maxlength="32" show-word-limit />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="设备厂商" prop="deviceSource">
+                            <el-input v-model="form.deviceSource" placeholder="请输入设备厂商" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="塔机司机" prop="driName">
+                            <el-input v-model="form.driName" placeholder="请输入塔机司机" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="司机电话" prop="driPhone">
+                            <el-input v-model="form.driPhone" placeholder="请输入司机电话" />
+                        </el-form-item>
+                    </el-col></el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="安全员" prop="safName">
+                            <el-input v-model="form.safName" placeholder="请输入安全员" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="安全员电话" prop="safPhone">
+                            <el-input v-model="form.safPhone" placeholder="请输入安全员电话" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-alert title="温馨提示：" type="warning" description="以下数据在设备运行过程中，不定时更新。无需填写，填写后会被定时覆盖！！！" show-icon>
+                </el-alert>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="塔机类型" prop="towerType" style="margin-top: 16px;">
+                            <el-select v-model="form.towerType" placeholder="请选择塔机类型" style="width:100%">
+                                <el-option v-for="dict in dict.device_tower_type" :key="dict.value" :label="dict.label"
+                                    :value="parseInt(dict.value)"></el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="塔机坐标x" prop="coordinateX">
+                            <el-input v-model="form.coordinateX" placeholder="请输入塔机坐标x" />
+                        </el-form-item>
+                    </el-col></el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="塔机坐标y" prop="coordinateY">
+                            <el-input v-model="form.coordinateY" placeholder="请输入塔机坐标y" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="前臂长度" prop="frontBrachium">
+                            <el-input v-model="form.frontBrachium" placeholder="请输入前臂长度" />
+                        </el-form-item>
+                    </el-col></el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="平衡臂长度" prop="afterBrachium">
+                            <el-input v-model="form.afterBrachium" placeholder="请输入平衡臂长度" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="塔身高度" prop="towerBodyHeight">
+                            <el-input v-model="form.towerBodyHeight" placeholder="请输入塔身高度" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="12">
+                        <el-form-item label="塔帽高度" prop="towerCapHeight">
+                            <el-input v-model="form.towerCapHeight" placeholder="请输入塔帽高度" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="塔节高度" prop="towerSectionHeight">
+                            <el-input v-model="form.towerSectionHeight" placeholder="请输入塔节高度" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <div slot-slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import {
+    listTowerProjectConfig,
+    getTowerProjectConfig,
+    delTowerProjectConfig,
+    addTowerProjectConfig,
+    updateTowerProjectConfig,
+} from "@/api/device/towerProjectConfig";
+import useUserStore from '@/store/modules/user'
+import { findMyProjectList } from "@/api/publics";
+export default {
+    name: "TowerProjectConfig",
+
+    data() {
+        return {
+            // 遮罩层
+            loading: true,
+            // 选中数组
+            ids: [],
+            // 非单个禁用
+            single: true,
+            // 非多个禁用
+            multiple: true,
+            // 显示搜索条件
+            showSearch: true,
+            // 总条数
+            total: 0,
+            // 塔基检测配置表格数据
+            towerProjectConfigList: [],
+            // 弹出层标题
+            title: "",
+            // 是否显示弹出层
+            open: false,
+            // 查询参数
+            queryParams: {
+                pageNum: 1,
+                pageSize: 10,
+                projectId: null,
+                projectName: null,
+                comtId: null,
+                comName: null,
+                deviceSn: null,
+                deviceSource: null,
+                towerType: null,
+            },
+            // 表单参数
+            form: {},
+            // 表单校验
+            rules: {
+                projectId: [{ required: true, message: "请选择所属项目", trigger: "change" }],
+                deptId: [{ required: true, message: "请选择所属单位", trigger: "change" }],
+                deviceName: [
+                    { required: true, message: "设备名称不能为空", trigger: "blur" },
+                ],
+                deviceSn: [
+                    { required: true, message: "设备序列表不能为空", trigger: "blur" },
+                    { max: 64, message: "最多输入64个字符" },
+                ],
+            },
+            projectOptions: [],
+            dict: {
+                sys_common_isdel: [],
+                device_tower_type: [],
+                project_video_signal_state: []
+            },
+            userStore: {},
+            isAdmin: false,
+            projects: [],
+            currentPrjId: null,
+        };
+    },
+    created() {
+        this.getList();
+        this.dict = this.useDict('sys_common_isdel', 'device_tower_type', 'project_video_signal_state');
+        this.userStore = useUserStore()
+        this.isAdmin = this.userStore.isAdmin;
+        this.queryParams.projectId = this.userStore.currentPrjId;
+        this.queryParams.comId = this.userStore.currentComId;
+        this.currentPrjId = this.userStore.currentPrjId;
+        this.getProjectList();
+    },
+    methods: {
+        /** 查询项目列表 */
+        getProjectList() {
+            findMyProjectList({ pageNum: 1, pageSize: 100 }).then(response => {
+                this.projects = response.rows;
+            });
+        },
+        /** 查询塔基检测配置列表 */
+        getList() {
+            this.loading = true;
+            listTowerProjectConfig(this.queryParams).then((response) => {
+                this.towerProjectConfigList = response.rows;
+                this.total = response.total;
+                setTimeout(() => {
+                    this.loading = false;
+                }, 800);
+            });
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false;
+            this.reset();
+        },
+        // 表单重置
+        reset() {
+            this.form = {
+                id: null,
+                projectId: null,
+                deptId: null,
+                deviceSn: null,
+                deviceSource: null,
+                towerType: null,
+                coordinateX: null,
+                coordinateY: null,
+                frontBrachium: null,
+                afterBrachium: null,
+                towerBodyHeight: null,
+                towerCapHeight: null,
+                towerSectionHeight: null,
+                driName: null,
+                driPhone: null,
+                safName: null,
+                safPhone: null,
+                isDel: null,
+                createBy: null,
+                createTime: null,
+                updateBy: null,
+                updateTime: null,
+                remark: null,
+            };
+            this.resetForm("form");
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map((item) => item.id);
+            this.single = selection.length !== 1;
+            this.multiple = !selection.length;
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset();
+            this.form.comId = this.userStore.currentComId;
+            this.form.projectId = this.userStore.currentPrjId;
+            this.open = true;
+            this.title = "添加塔基检测配置";
+        },
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.reset();
+            const id = row.id || this.ids;
+            getTowerProjectConfig(id).then((response) => {
+                this.form = response.data;
+                this.form.towerType = this.form.towerType ? 1 * this.form.towerType : '';
+                this.open = true;
+                this.title = "修改塔基检测配置";
+            });
+        },
+        /** 提交按钮 */
+        submitForm() {
+            this.$refs["form"].validate((valid) => {
+                if (valid) {
+                    if (this.form.id != null) {
+                        updateTowerProjectConfig(this.form).then((response) => {
+                            this.$modal.msgSuccess("修改成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    } else {
+                        addTowerProjectConfig(this.form).then((response) => {
+                            this.$modal.msgSuccess("新增成功");
+                            this.open = false;
+                            this.getList();
+                        });
+                    }
+                }
+            });
+        },
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            const ids = row.id || this.ids;
+            this.$modal
+                .confirm('是否确认删除塔基检测配置编号为"' + ids + '"的数据项？')
+                .then(function () {
+                    return delTowerProjectConfig(ids);
+                })
+                .then(() => {
+                    this.getList();
+                    this.$modal.msgSuccess("删除成功");
+                })
+                .catch(() => { });
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+            this.download(
+                "manage/device/towerProjectConfig/export",
+                {
+                    ...this.queryParams,
+                },
+                `towerProjectConfig_${new Date().getTime()}.xlsx`
+            );
+        },
+        //修改塔吊配置状态
+        setStatus(row, val) {
+            if (this.loading) {
+                return
+            }
+            this.$confirm(`是否确认${val == 0 ? "启用" : "停用"}当前数据配置？`, "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(async () => {
+                    delTowerProjectConfig(row.id).then((response) => {
+                        this.$modal.msgSuccess("修改成功");
+                        this.getList();
+                    });
+                })
+                .catch(() => {
+                    // 取消时恢复原始开关状态
+                    if (val == "0") {
+                        row.isDel = "1";
+                    } else {
+                        row.isDel = "0";
+                    }
+                });
+        },
+    },
+}
+</script>
+
+<style lang="scss">
+.tower-project-config {}
+</style>
\ No newline at end of file
diff --git a/yanzhu-ui-vue3/src/views/trouble/problemmodify/detailDrawer.vue b/yanzhu-ui-vue3/src/views/trouble/problemmodify/detailDrawer.vue
index 6cebd9dd..7831a5f1 100644
--- a/yanzhu-ui-vue3/src/views/trouble/problemmodify/detailDrawer.vue
+++ b/yanzhu-ui-vue3/src/views/trouble/problemmodify/detailDrawer.vue
@@ -253,8 +253,8 @@ let data = reactive({
         ]
     },
     checkStates: [{ value: "0", label: '待整改' }, { value: "1", label: '待复检' },
-    { value: "2", label: '复检驳回' },
-    { value: "3", label: '复检通过' }]
+    { value: "3", label: '复检驳回' },
+    { value: "4", label: '复检通过' }]
 });
 const { step2Form, step2Rules, step3Form, step3Rules } = toRefs(data);
 function validateStep2Images(rule, value, callback) {
diff --git a/yanzhu-ui-vue3/src/views/trouble/problemmodify/index.vue b/yanzhu-ui-vue3/src/views/trouble/problemmodify/index.vue
index 44cc0918..a65f70db 100644
--- a/yanzhu-ui-vue3/src/views/trouble/problemmodify/index.vue
+++ b/yanzhu-ui-vue3/src/views/trouble/problemmodify/index.vue
@@ -130,8 +130,8 @@ const data = reactive({
   activeName: 'a',
   tabInfo: {},
   checkStates: [{ value: "0", label: '待整改' }, { value: "1", label: '待复检' },
-  { value: "2", label: '复检驳回' },
-  { value: "3", label: '复检通过' }]
+  { value: "3", label: '复检驳回' },
+  { value: "4", label: '复检通过' }]
 });
 
 const { queryParams, form, rules } = toRefs(data);