完成设备台账添加是否在大屏展示功能，台账数据项添加排序功能

industry-admin/src/api/device/deviceLedger.js

@@ -183,6 +183,17 @@ export function addLedgerItemList(data) {
     })
 }
 
+export function updateLedgerItem(data) {
+    return request({
+        url: '/deviceLedger/updateLedgerItem',
+        headers: {
+            isToken: true
+        },
+        method: 'post',
+        params: data
+    })
+}
+
 /**
  * 删除台账数据项信息
  * @param data

industry-admin/src/views/device/deviceLedger/deviceLedger.vue

@@ -9,19 +9,18 @@
                     <el-col :span="8">
                         <el-form-item label="设备类别" prop="deviceType" label-width="22%">
                             <el-input v-model="deviceLedgerForm.deviceType" disabled placeholder="请选择设备类别" maxlength="10">
-                                <el-button type="primary" slot="append" icon="el-icon-search"
-                                    @click="chooseDeviceType">选择</el-button>
+                                <el-button type="primary" slot="append" @click="chooseDeviceType">选择</el-button>
                             </el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="设备名称" prop="deviceName" label-width="22%">
-                            <el-input v-model="deviceLedgerForm.deviceName" placeholder="设备名称" maxlength="10" />
+                            <el-input v-model="deviceLedgerForm.deviceName" placeholder="请输入设备名称" maxlength="10" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="设备编号" prop="deviceNum" label-width="22%">
-                            <el-input v-model="deviceLedgerForm.deviceNum" placeholder="设备编号" maxlength="10" />
+                            <el-input v-model="deviceLedgerForm.deviceNum" placeholder="请输入设备编号" maxlength="10" />
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -37,12 +36,12 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="设备规格型号" prop="deviceModel" label-width="30%">
-                            <el-input v-model="deviceLedgerForm.deviceModel" placeholder="设备规格型号" maxlength="10" />
+                            <el-input v-model="deviceLedgerForm.deviceModel" placeholder="请输入设备规格型号" maxlength="10" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="设备位置" prop="deviceLocation" label-width="22%">
-                            <el-input v-model="deviceLedgerForm.deviceLocation" placeholder="设备位置" maxlength="10" />
+                            <el-input v-model="deviceLedgerForm.deviceLocation" placeholder="请输入设备位置" maxlength="10" />
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -58,16 +57,17 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="使用部门" prop="deviceDeptName" label-width="22%">
-                            <el-input v-model="deviceLedgerForm.deviceDeptName" disabled placeholder="请选择使用部门" maxlength="10">
-                                <el-button slot="append" icon="el-icon-search" @click="chooseDept">选择</el-button>
+                            <el-input v-model="deviceLedgerForm.deviceDeptName" disabled placeholder="请选择使用部门"
+                                maxlength="10">
+                                <el-button slot="append" @click="chooseDept">选择</el-button>
                             </el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="责任人" prop="devicePersonName" label-width="22%">
-                            <el-input v-model="deviceLedgerForm.devicePersonName" disabled placeholder="请选择责任人" maxlength="10">
-                                <el-button type="primary" slot="append" icon="el-icon-search"
-                                    @click="chooseDevicePerson">选择</el-button>
+                            <el-input v-model="deviceLedgerForm.devicePersonName" disabled placeholder="请选择责任人"
+                                maxlength="10">
+                                <el-button type="primary" slot="append" @click="chooseDevicePerson">选择</el-button>
                             </el-input>
                         </el-form-item>
                     </el-col>
@@ -109,12 +109,12 @@
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="设备序列号" prop="serialNumber" label-width="30%">
-                            <el-input v-model="deviceLedgerForm.serialNumber" placeholder="设备位置" maxlength="10" />
+                            <el-input v-model="deviceLedgerForm.serialNumber" placeholder="请输入设备序列号" maxlength="10" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="运行条件" prop="runCondition" label-width="22%">
-                            <el-input v-model="deviceLedgerForm.runCondition" placeholder="设备位置" maxlength="10" />
+                            <el-input v-model="deviceLedgerForm.runCondition" placeholder="请选择运行条件" maxlength="10" />
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -137,6 +137,15 @@
                             </el-select>
                         </el-form-item>
                     </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="是否展示" prop="isShow" label-width="22%">
+                            <el-select clearable v-model="deviceLedgerForm.isShow" placeholder="请选择单位">
+                                <el-option v-for="isShow in isShowList" :key="isShow.value" :label="isShow.label"
+                                    :value="isShow.value">
+                                </el-option>
+                            </el-select>
+                        </el-form-item>
+                    </el-col>
                 </el-row>
                 <el-row>
                     <el-col :span="12">
@@ -253,6 +262,7 @@ export default {
                 deviceState: null,
                 pictureList: [],
                 unit: null,
+                isShow: 0,
                 remark: null
             },
             //字典回显参数
@@ -262,6 +272,14 @@ export default {
             manufacturerList: [],
             deviceStateList: [],
             deviceUnitList: [],
+            //字典回显参数
+            isShowList: [{
+                value: 0,
+                label: '否'
+            }, {
+                value: 1,
+                label: '是'
+            }],
             //设备技术参数得到的文件
             technicalDataFiles: [],
             //图片上传得到的文件

industry-admin/src/views/device/deviceLedger/index.css

@@ -7,4 +7,16 @@
 	margin-left: 0 !important;
 	font-size: 14;
 	border-radius: 0;
+}
+
+/* 设置鼠标移动到节点上时的背景颜色 */
+.el-tree-node__content {
+	&:hover {
+		background-color: #eee1d3;
+	}
+}
+
+/* 当前选中节点的背景颜色 */
+.el-tree-node .is-current>.el-tree-node__content {
+	background-color: #eee1d3 !important;
 }

industry-admin/src/views/device/deviceLedger/index.vue

@@ -397,6 +397,7 @@ export default {
                     this.$refs.deviceLedger.deviceLedgerForm.pictureList.push(newItem)
                 })
                 this.$refs.deviceLedger.deviceLedgerForm.unit = data.unit
+                this.$refs.deviceLedger.deviceLedgerForm.isShow = data.isShow
                 this.$refs.deviceLedger.deviceLedgerForm.remark = data.remark
                 this.$refs.deviceLedger.deviceLedgerForm.delTechnicalNameList = []
                 this.$refs.deviceLedger.deviceLedgerForm.delPictureNameList = []

industry-admin/src/views/device/deviceLedger/itemList.vue

@@ -28,7 +28,8 @@
             <!-- 设备台账数据项信息 -->
             <CommonTable ref="deviceTableData" :tableHeaderTitle="tableHeaderTitle" :tableData="tableData"
                 :isShowCheckbox="isShowCheckbox" :isShowIndex="isShowIndex" :tableHight="tableHight"
-                :tableOperate="tableOperate" @receiveCheckedData="receiveCheckedData" @deleteItem="deleteItem">
+                :tableOperate="tableOperate" @receiveCheckedData="receiveCheckedData" @updateItem="updateItem"
+                @deleteItem="deleteItem">
             </CommonTable>
             <!-- 分页信息 -->
             <pagination v-show="tableTotal > 0" small :total="tableTotal" :page.sync="queryParam.page"
@@ -37,12 +38,15 @@
 
         <!-- 添加数据项 -->
         <AddItem ref="addItem" @getLedgerItemList="getLedgerItemList"></AddItem>
+        <!-- 修改数据项 -->
+        <UpdateItem ref="updateItem" @getLedgerItemList="getLedgerItemList"></UpdateItem>
     </div>
 </template>
 
 <script>
 import { showConfirmWin } from '@/utils/cqcy'
 import CommonTable from '@/components/CommonTable/index.vue'
+import UpdateItem from './updateItem.vue'
 import AddItem from './addItem.vue'
 import {
     getLedgerItemList, delLedgerItemList
@@ -51,7 +55,8 @@ import {
 export default {
     components: {
         CommonTable,
-        AddItem
+        AddItem,
+        UpdateItem
     },
     data() {
         return {
@@ -72,11 +77,22 @@ export default {
                 {
                     propName: "describe",
                     labelName: "别名",
+                },
+                {
+                    propName: "sortNum",
+                    labelName: "排序号",
                 }
             ],
             tableData: [],
             tableOperate: [
                 {
+                    btnName: '编辑',
+                    size: "mini",
+                    style: '',
+                    icon: 'el-icon-edit',
+                    methodName: "updateItem",
+                },
+                {
                     btnName: '删除',
                     size: "mini",
                     style: 'color: red;',
@@ -137,6 +153,13 @@ export default {
                 this.tableData = arr
             })
         },
+        updateItem(row) {
+            this.$refs.updateItem.itemForm.deviceLedgerId = row.deviceLedgerId
+            this.$refs.updateItem.itemForm.itemId = row.itemId
+            this.$refs.updateItem.itemForm.sortNum = row.sortNum
+            this.$refs.updateItem.title = '修改数据项'
+            this.$refs.updateItem.visible = true
+        },
         /** 表格操作按钮删除数据项 */
         deleteItem(row) {
             let params = {

industry-admin/src/views/device/deviceLedger/updateItem.vue

@@ -0,0 +1,71 @@
+<template>
+    <!-- 修改数据项 -->
+    <el-dialog :title="title" width="600px" top="10vh" center v-if="visible" :before-close="dialogClose"
+        :visible.sync="visible" :close-on-click-modal="false" :append-to-body="true">
+        <el-form ref="itemForm" :model="itemForm" :rules="itemFormRules" label-width="150px">
+            <el-form-item label="ID" prop="id" style="display: none;">
+                <el-input v-model='itemForm.id' type="text" auto-complete="off"></el-input>
+            </el-form-item>
+            <el-form-item label="排序号" prop="sortNum">
+                <el-input v-model.trim='itemForm.sortNum' type="text" auto-complete="off" show-word-limit maxlength="20"
+                    placeholder="请输入排序号"></el-input>
+            </el-form-item>
+        </el-form>
+        <span slot='footer'>
+            <el-button type="primary" @click="editConfirmEvent" style="margin-top: 20px;">确定</el-button>
+            <el-button @click="dialogClose" style="margin-top: 20px;">取消</el-button>
+        </span>
+    </el-dialog>
+</template>
+
+<script>
+
+import { showLoading } from '@/utils/cqcy'
+import { updateLedgerItem } from '@/api/device/deviceLedger'
+export default {
+    data() {
+        return {
+            visible: false,
+            title: '修改数据项',
+            itemForm: {
+                deviceLedgerId: null,
+                itemId: null,
+                sortNum: null
+            },
+            itemFormRules: {
+                sortNum: [
+                    { required: true, message: '排序号不能为空', trigger: 'blur' }
+                ]
+            }
+        }
+    },
+    methods: {
+        /** 关闭弹出层 */
+        dialogClose() {
+            if (this.$refs['itemForm']) this.$refs['itemForm'].resetFields()
+            this.visible = false
+        },
+        /** 编辑确认事件 */
+        editConfirmEvent() {
+            this.$refs['itemForm'].validate((valid) => {
+                if (valid) {
+                    let loading = showLoading(this, '数据加载中，请稍候···')
+                    let params = JSON.parse(JSON.stringify(this.itemForm))
+                    updateLedgerItem(params).then(res => {
+                        loading.close()
+                        if (res.data) {
+                            this.$message({
+                                message: '修改成功！',
+                                type: 'success'
+                            })
+                            this.$emit('getLedgerItemList')
+                            this.dialogClose()
+                            return
+                        }
+                    })
+                }
+            })
+        }
+    }
+}
+</script>

industry-admin/src/views/source/dataQuery/index.vue

@@ -579,7 +579,7 @@ export default {
                         }
                     }
                     //排序，并删除多余数据
-                    if (arr) {
+                    if (arr.length != 0) {
                         // arr.sort((c, d) => c[0] - d[0])
                         let count = new Date(arr[arr.length - 1][0]).getTime() - this.count
                         let num = 0

industry-system/cqcy-ei-common/src/main/java/com/example/opc_common/entity/DeviceLedger.java

@@ -66,6 +66,8 @@ public class DeviceLedger {
     List<DevicePicture> pictureList=new ArrayList<>();
     //单位（字典）
     private Integer deviceUnit;
+    //是否在可视化界面展示,0否，1是
+    private Integer isShow = 0;
     //备注
     private String remark;
     //创建时间

industry-system/cqcy-ei-common/src/main/java/com/example/opc_common/entity/DeviceLedgerItem.java

@@ -12,4 +12,6 @@ public class DeviceLedgerItem extends ItemsParent{
     private String describe;
     //虚拟字段，单位
     private String unit;
+    //排序号
+    private Integer sortNum;
 }

industry-system/industry-da/src/main/java/com/example/opc_da/controller/DeviceLedgerController.java

@@ -224,6 +224,19 @@ public class DeviceLedgerController {
     }
 
     /**
+     * 修改设备台账数据项排序号
+     * @param deviceLedgerId
+     * @param itemId
+     * @param sortNum
+     * @return
+     */
+    @RequestMapping(value = "/updateLedgerItem", method = RequestMethod.POST)
+    @WebLog(ServerEnum = ServerEnum.CLIENT, ModelEnum = ModelEnum.DEVICELEDGER, OperationEnum = OperationEnum.UPDATE)
+    public Result updateLedgerItem(@RequestParam Integer deviceLedgerId, @RequestParam Integer itemId, @RequestParam Integer sortNum) {
+        return deviceLedgerService.updateLedgerItem(deviceLedgerId, itemId, sortNum);
+    }
+
+    /**
      * 删除台账数据项信息
      *
      * @param map
@@ -268,7 +281,7 @@ public class DeviceLedgerController {
     }
 
     /**
-     * 通过设备台账id，获取所有的设备关联的数据项
+     * 通过设备台账id，获取所有的设备关联的数据项，及实时数据
      *
      * @param deviceLedgerId
      * @return
@@ -280,7 +293,7 @@ public class DeviceLedgerController {
     }
 
     /**
-     * 通过设备台账id，获取所有的设备关联的数据项,及数据
+     * 通过设备台账id，获取所有的设备关联的数据项,及历史数据
      *
      * @param deviceLedgerId
      * @return

industry-system/industry-da/src/main/java/com/example/opc_da/dao/DeviceLedgerDao.java

@@ -69,6 +69,8 @@ public interface DeviceLedgerDao {
 
     Integer addLedgerItemList(Integer deviceLedgerId, List<Integer> itemIdList);
 
+    Integer updateLedgerItem(Integer deviceLedgerId, Integer itemId, Integer sortNum);
+
     Integer delLedgerItemList(Integer deviceLedgerId, List<Integer> itemIdList);
 
     int getAlarmLogCount(List<DeviceDirectory> deviceDirectoryList, String startTime, String endTime);

industry-system/industry-da/src/main/java/com/example/opc_da/service/DeviceLedgerService.java

@@ -36,6 +36,8 @@ public interface DeviceLedgerService {
 
     Result addLedgerItemList(Integer deviceLedgerId, List<Integer> itemIdList);
 
+    Result updateLedgerItem(Integer deviceLedgerId, Integer itemId, Integer sortNum);
+
     Result delLedgerItemList(Integer deviceLedgerId, List<Integer> itemIdList);
 
     Result getDeviceDirectoryLevel(Integer level);
@@ -49,4 +51,5 @@ public interface DeviceLedgerService {
     Result getDeviceLedgerAll(Integer directoryId);
 
     Result getItemDataByLedgerId(Integer deviceLedgerId, String startTime, String endTime);
+
 }

industry-system/industry-da/src/main/java/com/example/opc_da/service/impl/DeviceLedgerServiceImpl.java

@@ -300,6 +300,14 @@ public class DeviceLedgerServiceImpl implements DeviceLedgerService {
     }
 
     @Override
+    public Result updateLedgerItem(Integer deviceLedgerId, Integer itemId, Integer sortNum) {
+        if (deviceLedgerDao.updateLedgerItem(deviceLedgerId, itemId, sortNum) <= 0) {
+            return Result.no(ResultEnum.SUCCESS.getRespCode(), "修改数据项失败");
+        }
+        return Result.ok("修改数据项成功");
+    }
+
+    @Override
     public synchronized Result delLedgerItemList(Integer deviceLedgerId, List<Integer> itemIdList) {
         if (deviceLedgerDao.delLedgerItemList(deviceLedgerId, itemIdList) <= 0) {
             return Result.no(ResultEnum.SUCCESS.getRespCode(), "删除设备台账数据项失败");
@@ -393,9 +401,9 @@ public class DeviceLedgerServiceImpl implements DeviceLedgerService {
     @Override
     public Result getItemDataByLedgerId(Integer deviceLedgerId, String startTime, String endTime) {
         List<DeviceLedgerItem> deviceLedgerItems = deviceLedgerDao.getItemByLedgerId(deviceLedgerId);
-        for (DeviceLedgerItem d:deviceLedgerItems) {
-            if(Blank.isEmpty(d.getDataSourceId(),d.getItemReadName())){
-                return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(),"表格中没有名称的数据项在数据组中已被删除，请调整后调用");
+        for (DeviceLedgerItem d : deviceLedgerItems) {
+            if (Blank.isEmpty(d.getDataSourceId(), d.getItemReadName())) {
+                return Result.no(ResultEnum.REQUEST_WRONGPARAMS.getRespCode(), "表格中没有名称的数据项在数据组中已被删除，请调整后调用");
             }
         }
         //从工具类中组装对应数据项的数据到集合中

industry-system/industry-da/src/main/resources/mapper/DeviceLedgerDao.xml

@@ -11,7 +11,7 @@
         id
         ,directory_id,device_type_id,device_name,device_num,device_level,device_model,
             device_location,device_health,device_dept_id,device_person,buy_time,use_time,
-            supplier,manufacturer,serial_number,run_condition,device_state,device_unit,remark,create_time
+            supplier,manufacturer,serial_number,run_condition,device_state,device_unit,is_show,remark,create_time
     </sql>
 
     <sql id="technicalData">
@@ -40,10 +40,11 @@
                                      device_location, device_health, device_dept_id, device_person, buy_time,
                                      use_time,
                                      supplier, manufacturer, serial_number, run_condition, device_state, device_unit,
+                                     is_show,
                                      remark, create_time)
             value (#{directoryId},#{deviceTypeId},#{deviceName},#{deviceNum},#{deviceLevel},#{deviceModel},#{deviceLocation},
             #{deviceHealth},#{deviceDeptId},#{devicePerson},#{buyTime},#{useTime},#{supplier},
-            #{manufacturer},#{serialNumber},#{runCondition},#{deviceState},#{deviceUnit},#{remark},now())
+            #{manufacturer},#{serialNumber},#{runCondition},#{deviceState},#{deviceUnit},#{isShow},#{remark},now())
     </insert>
 
     <insert id="addTechnicalDataList">
@@ -69,10 +70,10 @@
     </insert>
 
     <insert id="addLedgerItemList">
-        insert into t_device_ledger_item(device_ledger_id, item_id)
+        insert into t_device_ledger_item(device_ledger_id, item_id ,sort_num)
         values
         <foreach collection="itemIdList" item="itemId" index="index" separator=",">
-            (#{deviceLedgerId}, #{itemId})
+            (#{deviceLedgerId}, #{itemId}, #{sortNum})
         </foreach>
     </insert>
 
@@ -104,10 +105,18 @@
             run_condition=#{runCondition},
             device_state=#{deviceState},
             device_unit=#{deviceUnit},
+            is_show=#{isShow},
             remark=#{remark}
         where id = #{id}
     </update>
 
+    <update id="updateLedgerItem">
+        update t_device_ledger_item
+        set sort_num=#{sortNum}
+        where device_ledger_id = #{deviceLedgerId}
+          and item_id = #{itemId}
+    </update>
+
     <delete id="delDeviceDirectoryById">
         delete
         from t_device_directory
@@ -260,12 +269,13 @@
                tdl.run_condition,
                tdl.device_state,
                tdl.device_unit,
+               tdl.is_show,
                tdl.remark,
                tdl.create_time
         from t_device_ledger tdl
                  left join t_device_type tdt on tdl.device_type_id = tdt.id
                  left join sys_department sd on tdl.device_dept_id = sd.id
-                 left join sys_staff ss on tdl.device_person=ss.id
+                 left join sys_staff ss on tdl.device_person = ss.id
         where tdl.id = #{id}
     </select>
 
@@ -307,6 +317,7 @@
         tdl.run_condition,
         tdl.device_state,
         tdl.device_unit,
+        tdl.is_show,
         tdl.remark,
         tdl.create_time
         from t_device_ledger tdl
@@ -357,13 +368,15 @@
         tdli.device_ledger_id,
         tdli.item_id,
         ti.item_read_name,
-        ti.describe
+        ti.describe,
+        tdli.sort_num
         from t_device_ledger_item tdli
         left join t_item ti on tdli.item_id = ti.id
         where tdli.device_ledger_id = #{deviceLedgerId}
         <if test="itemReadName !=null and itemReadName !=''">
             AND ti.item_read_name LIKE CONCAT('%',#{itemReadName},'%')
         </if>
+        order by tdli.sort_num
         limit #{startNum}, #{limitNum}
     </select>
 
@@ -437,11 +450,13 @@
                tdli.item_id,
                ti.item_read_name,
                tig.data_source_id,
-               ti.describe
+               ti.describe,
+               tdli.sort_num
         from t_device_ledger_item tdli
                  left join t_item ti on tdli.item_id = ti.id
                  LEFT JOIN t_item_group tig ON ti.item_group_id = tig.id
         where tdli.device_ledger_id = #{deviceLedgerId}
+        order by tdli.sort_num
     </select>
 
 </mapper>